Update translation files

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

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

1 files changed, 2666 insertions, 2567 deletions

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"