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, 2731 insertions, 2626 deletions

diff --git a/tde-i18n-hr/messages/tdesdk/umbrello.po b/tde-i18n-hr/messages/tdesdk/umbrello.po
index ddef92e9b36..aaf557fda29 100644
--- a/tde-i18n-hr/messages/tdesdk/umbrello.po
+++ b/tde-i18n-hr/messages/tdesdk/umbrello.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello 0\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2004-04-20 13:30+CEST\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <[email protected]>\n"
@@ -12,275 +12,220 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :  n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :  n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
 "X-Generator: TransDict server\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Autori Umbrello-a, UML modelara"
-
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "datoteka za otvaranje"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Darko Bednjanec, Denis Lackovic, Nikola Planinac, Robert Pezer"
 
-#: docgenerators/main.cpp:64
-#, fuzzy
+#: _translatorinfo:2
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "Autori Umbrello-a, UML modelara"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "[email protected]"
 
-#: docgenerators/main.cpp:67 main.cpp:98
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
 #, fuzzy
-msgid "Umbrello UML Modeller Authors"
-msgstr "Autori Umbrello-a, UML modelara"
+msgid "Enter Activity Name"
+msgstr "Unesite ime za aktivnost"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
+#: toolbarstateother.cpp:144 umlview.cpp:2546
 #, fuzzy
-msgid "Exporting all views..."
-msgstr "Izvezi kao sliku..."
+msgid "Enter the name of the new activity:"
+msgstr "Unesite ime za novu aktivnost:"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
 msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
-#: umlviewimageexportermodel.cpp:158
-#, fuzzy, c-format
-msgid "There was a problem saving file: %1"
-msgstr "Došlo je do problema prilikom spremanja datotekaa: %1"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr ""
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
-#: umllistview.cpp:385
-msgid "Save Error"
-msgstr "Spremi pogrešku"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr ""
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objekt"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr ""
 
-#: worktoolbar.cpp:246
-#, fuzzy
-msgid "Synchronous Message"
-msgstr "Sinhrona poruka"
+#: aligntoolbar.cpp:44
+msgid "Align Vertical Middle"
+msgstr ""
 
-#: worktoolbar.cpp:247
-#, fuzzy
-msgid "Asynchronous Message"
-msgstr "Asinhrona poruka"
+#: aligntoolbar.cpp:45
+msgid "Align Horizontal Middle"
+msgstr ""
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "U vezi s"
+#: aligntoolbar.cpp:46
+msgid "Align Vertical Distribute"
+msgstr ""
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
+#: aligntoolbar.cpp:47
+msgid "Align Horizontal Distribute"
 msgstr ""
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Sidro"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
+msgstr ""
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Oznaka"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Oblikovanje"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Bilješka"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Kutija"
+#: association.cpp:84
+#, fuzzy
+msgid "Generalization"
+msgstr "Uopćenje"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Učesnik"
+#: association.cpp:85 worktoolbar.cpp:256
+msgid "Aggregation"
+msgstr "Agregacija"
 
 #: association.cpp:86 worktoolbar.cpp:255
 msgid "Dependency"
 msgstr "Ovisnosti"
 
-#: association.cpp:85 worktoolbar.cpp:256
-msgid "Aggregation"
-msgstr "Agregacija"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "U vezi s"
 
-#: worktoolbar.cpp:257
+#: association.cpp:88
 #, fuzzy
-msgid "Relationship"
-msgstr "Realizacija"
+msgid "Self Association"
+msgstr "Samopridruživanje"
 
-#: worktoolbar.cpp:258
-#, fuzzy
-msgid "Directional Association"
-msgstr "Unesite naziv objekta:"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr ""
 
-#: worktoolbar.cpp:259
-#, fuzzy
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementira (generalizacija-realizacija)"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr ""
+
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr ""
+
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr ""
+
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr ""
 
 #: association.cpp:94 worktoolbar.cpp:260
 msgid "Composition"
 msgstr "Sastavljanje poruka"
 
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-#, fuzzy
-msgid "Use Case"
-msgstr "Slučaj upotrebe"
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 249
-#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
-#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
-#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
-#, no-c-format
-msgid "Class"
-msgstr "Klasa"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+#: association.cpp:95
 #, fuzzy
-msgid "Initial State"
-msgstr "Početno stanje"
+msgid "Realization"
+msgstr "Realizacija"
 
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+#: association.cpp:96
 #, fuzzy
-msgid "End State"
-msgstr "Završno stanje"
+msgid "Uni Association"
+msgstr "Jednostrano pridruživanje"
 
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-#, fuzzy
-msgid "Branch/Merge"
-msgstr "Granaj/Stopi"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Sidro"
 
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+#: association.cpp:98 worktoolbar.cpp:284
 #, fuzzy
-msgid "Fork/Join"
-msgstr "Podeli/Spoji"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paket"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponenta"
+msgid "State Transition"
+msgstr "Prelaz stanja"
 
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Čvor"
+#: association.cpp:99 dialogs/activitydialog.cpp:70
+#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
+#: worktoolbar.cpp:286
+msgid "Activity"
+msgstr "Aktivnost"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+#: associationwidget.cpp:2328
 #, fuzzy
-msgid "Artifact"
-msgstr "Artifakt"
-
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Sučelje"
-
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "&podaci"
+msgid "Multiplicity"
+msgstr "Višestrukost"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
 #, fuzzy
-msgid "Enum"
-msgstr "Nabrajanje"
+msgid "Enter multiplicity:"
+msgstr "Unesite višestrukost:"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+#: associationwidget.cpp:2346
 #, fuzzy
-msgid "Entity"
-msgstr "Završna aktivnost"
-
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr ""
-
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr ""
+msgid "Association Name"
+msgstr "Ime pridruživanja"
 
-#: worktoolbar.cpp:277
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
 #, fuzzy
-msgid "Join"
-msgstr "Podeli/Spoji"
+msgid "Enter association name:"
+msgstr "Unesite ime pridruživanja:"
 
-#: worktoolbar.cpp:278
+#: associationwidget.cpp:2366
 #, fuzzy
-msgid "Fork"
-msgstr "Obrazac1"
+msgid "Role Name"
+msgstr "Ime uloge"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr ""
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Unesite ime uloge:"
 
-#: worktoolbar.cpp:280
-msgid "Choice"
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
 msgstr ""
 
-#: association.cpp:98 worktoolbar.cpp:284
-#, fuzzy
-msgid "State Transition"
-msgstr "Prelaz stanja"
-
-#: worktoolbar.cpp:285
+#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
+#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
 #, fuzzy
-msgid "Activity Transition"
-msgstr "Prijelaz aktivnosti"
-
-#: association.cpp:99 dialogs/activitydialog.cpp:70
-#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
-#: worktoolbar.cpp:286
-msgid "Activity"
-msgstr "Aktivnost"
+msgid "That is an invalid name."
+msgstr "To ime nije ispravno."
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Država"
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "Neispravno ime"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
+#: umldoc.cpp:1043 umldoc.cpp:1073
 #, fuzzy
-msgid "End Activity"
-msgstr "Završna aktivnost"
+msgid "That name is already being used."
+msgstr "To ime se već koristi."
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
+#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
 #, fuzzy
-msgid "Initial Activity"
-msgstr "Početna aktivnost"
-
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Poruka"
-
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr ""
-
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Odaberi"
+msgid "Not a Unique Name"
+msgstr "Nije jedinstveno ime"
 
 #: clipboard/umlclipboard.cpp:687
 #, fuzzy
 msgid ""
-"At least one of the items in the clipboard could not be pasted because an item "
-"of the same name already exists.  Any other items have been pasted."
+"At least one of the items in the clipboard could not be pasted because an "
+"item of the same name already exists.  Any other items have been pasted."
 msgstr ""
-"Bar jedna stavka iz klipborda nije mogla biti umetnuta zato jer stavka sa istim "
-"imenom već postoji. Sve ostale stavke su umetnute."
+"Bar jedna stavka iz klipborda nije mogla biti umetnuta zato jer stavka sa "
+"istim imenom već postoji. Sve ostale stavke su umetnute."
 
 #: clipboard/umlclipboard.cpp:691 uml.cpp:851
 #, fuzzy
@@ -303,10 +248,8 @@ msgstr "Ne mogu otvoriti datoteka"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
 #, fuzzy
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Ne mogu napraviti direktorij:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Ne mogu napraviti direktorij:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 #, fuzzy
@@ -322,1364 +265,1685 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Ne mogu napraviti direktorij"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+#: codegenerators/cppcodegenerationform.cpp:36
 #, fuzzy
-msgid "Enter State Name"
-msgstr "Unesite ime stanja"
+msgid "General Options"
+msgstr "Opće postavke"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+#: codegenerators/cppcodegenerationform.cpp:38
 #, fuzzy
-msgid "Enter the name of the new state:"
-msgstr "Unesite ime novog stanja:"
+msgid "Package is a namespace"
+msgstr "Paket je imenski prostor"
 
-#: statewidget.cpp:176
+#: codegenerators/cppcodegenerationform.cpp:41
 #, fuzzy
-msgid "Enter Activity"
-msgstr "Unesite aktivnost"
+msgid "Virtual destructors"
+msgstr "Virtualni razgrađivač"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
+#: codegenerators/cppcodegenerationform.cpp:44
 #, fuzzy
-msgid "Enter the name of the new activity:"
-msgstr "Unesite ime za novu aktivnost:"
+msgid "Generate empty constructors"
+msgstr "Generiraj prazne konstrusktore"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
+#: codegenerators/cppcodegenerationform.cpp:47
 #, fuzzy
-msgid "new activity"
-msgstr "nova aktivnost"
+msgid "Generate accessor methods"
+msgstr "Generiraj pristupne metode"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
+#: codegenerators/cppcodegenerationform.cpp:50
 #, fuzzy
-msgid "UML Model"
-msgstr "Umbrello, UML modelar"
+msgid "Operations are inline"
+msgstr "Operacije su u liniji"
 
-#: umldoc.cpp:106
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Pristupnici su u liniji"
+
+#: codegenerators/cppcodegenerationform.cpp:57
 #, fuzzy
-msgid "Logical View"
-msgstr "Logički prikaz"
+msgid "Accessors are public"
+msgstr "Pristupnici su u liniji"
 
-#: umldoc.cpp:107
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr ""
+
+#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
+#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
+#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
+#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
+#: umlviewimageexporterall.cpp:73
+msgid "Ready."
+msgstr "Spreman."
+
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr ""
+
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr ""
+
+#: codeimport/import_utils.cpp:183
 #, fuzzy
-msgid "Use Case View"
-msgstr "Prikaz slučaja upotrebe"
+msgid "Namespace"
+msgstr "novi_paket"
 
-#: umldoc.cpp:108
+#: codeimport/import_utils.cpp:183 dialogs/codegenerationwizardbase.ui:249
+#: dialogs/diagramprintpage.cpp:91 dialogs/diagramprintpage.cpp:198
+#: dialogs/settingsdlg.cpp:210 listpopupmenu.cpp:609 worktoolbar.cpp:262
+#, no-c-format
+msgid "Class"
+msgstr "Klasa"
+
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr ""
+
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr ""
+
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr ""
+
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr ""
+
+#: dialogs/activitydialog.cpp:28 dialogs/activitydialog.cpp:74
+#: dialogs/assocgenpage.cpp:55 dialogs/classpropdlg.cpp:37
+#: dialogs/classpropdlg.cpp:56 dialogs/classpropdlg.cpp:86
+#: dialogs/parmpropdlg.cpp:55 dialogs/statedialog.cpp:33
+#: dialogs/statedialog.cpp:89 dialogs/umlviewdialog.cpp:38
+#: listpopupmenu.cpp:468 refactoring/refactoringassistant.cpp:307
 #, fuzzy
-msgid "Component View"
-msgstr "Prikaz komponenti"
+msgid "Properties"
+msgstr "$Postavke..."
 
-#: umldoc.cpp:109
+#: dialogs/activitydialog.cpp:70
 #, fuzzy
-msgid "Deployment View"
-msgstr "Prikaz razvijanja"
+msgid "Initial activity"
+msgstr "Početna aktivnost"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr ""
+#: dialogs/activitydialog.cpp:70
+#, fuzzy
+msgid "End activity"
+msgstr "Završna aktivnost"
 
-#: umldoc.cpp:117 umldoc.cpp:293
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
 #, fuzzy
-msgid "Datatypes"
-msgstr "Vrste podataka"
+msgid "Branch/Merge"
+msgstr "Granaj/Stopi"
 
-#: umldoc.cpp:229
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
 #, fuzzy
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Trenutni datoteka je izmjenjen.\n"
-"Želite li da ga sačuvate?"
+msgid "Fork/Join"
+msgstr "Podeli/Spoji"
 
-#: umldoc.cpp:355
+#: codegenerators/cppcodegenerationformbase.ui:118
+#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
+#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
+#: dialogs/classpropdlg.cpp:232 dialogs/codegenerationoptionsbase.ui:50
+#: dialogs/settingsdlg.cpp:99 dialogs/statedialog.cpp:88
+#: dialogs/umlviewdialog.cpp:70
+#, no-c-format
+msgid "General"
+msgstr "Općenito"
+
+#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
+#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
+#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
+msgid "General Properties"
+msgstr "Opća svojstva"
+
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Vrsta aktivnosti:"
+
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Ime aktivnosti:"
+
+#: codegenerators/cppcodegenerationformbase.ui:36
+#: codegenerators/javacodegenerationformbase.ui:225
+#: codegenerators/rubycodegenerationformbase.ui:196
+#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
+#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
+#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
+#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
+#: dialogs/diagrampropertiespage.ui:388 dialogs/notedialog.cpp:29
+#: dialogs/parmpropdlg.cpp:100 dialogs/statedialog.cpp:104
+#: dialogs/umlrolepropertiesbase.ui:88 docwindow.cpp:33
+#, no-c-format
+msgid "Documentation"
+msgstr "Dokumentacija"
+
+#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
+#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
+#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
 #, fuzzy
-msgid "The file %1 does not exist."
-msgstr "Datoteka %1 ne postoji."
+msgid "Font"
+msgstr "Pismo:"
 
-#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
-#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
+#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
+#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
+#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
+msgid "Font Settings"
+msgstr "Postavke pisma"
+
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
+#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
+#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
+#: listpopupmenu.cpp:750
+msgid "Color"
+msgstr "Boja"
+
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
 #, fuzzy
-msgid "Load Error"
-msgstr "Greška pri učitavanju"
+msgid "Widget Colors"
+msgstr "Boje kontrole"
 
-#: umldoc.cpp:380
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Aktivnosti"
+
+#: dialogs/activitypage.cpp:72
 #, fuzzy
-msgid "The file %1 seems to be corrupted."
-msgstr "Datoteka %1 ne postoji."
+msgid "New Activity..."
+msgstr "Nova aktivnost..."
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr ""
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Izbriši odabrano"
 
-#: umldoc.cpp:448
-#, fuzzy, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Došlo je do problema prilikom učitavanja datotekaa: %1"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Preimenuj"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, fuzzy, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Došlo je do problema prilikom učitavanja datotekaa: %1"
+#: dialogs/activitypage.cpp:134
+#, fuzzy
+msgid "New Activity"
+msgstr "Nova aktivnost"
 
-#: umldoc.cpp:641
-#, fuzzy, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Došlo je do problema prilikom slanja datotekaa: %1"
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+#, fuzzy
+msgid "new activity"
+msgstr "nova aktivnost"
 
-#: umldoc.cpp:934
+#: dialogs/activitypage.cpp:153
 #, fuzzy
-msgid "use case diagram"
-msgstr "dijagram slučaja upotrebe"
+msgid "Rename Activity"
+msgstr "Promijeni ime aktivnosti"
 
-#: umldoc.cpp:936
+#: dialogs/activitypage.cpp:153
 #, fuzzy
-msgid "class diagram"
-msgstr "dijagram klase"
+msgid "Enter the new name of the activity:"
+msgstr "Unesite novo ime za aktivnost:"
 
-#: umldoc.cpp:938
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Ime:"
+
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Tip:"
+
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
 #, fuzzy
-msgid "sequence diagram"
-msgstr "dijagram sekvence"
+msgid "Associations"
+msgstr "Pridruženja"
 
-#: umldoc.cpp:940
+#: dialogs/assocpropdlg.cpp:39
 #, fuzzy
-msgid "collaboration diagram"
-msgstr "dijagram saradnje"
+msgid "Association Properties"
+msgstr "Svojstva pridruživanja"
 
-#: umldoc.cpp:942
+#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
+#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
+#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
+msgid "General Settings"
+msgstr "Opće postavke"
+
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Funkcije"
+
+#: dialogs/assocpropdlg.cpp:94
 #, fuzzy
-msgid "state diagram"
-msgstr "dijagram stanja"
+msgid "Role Settings"
+msgstr "Postavke uloge"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "dijagram aktivnosti"
+#: dialogs/assocpropdlg.cpp:112
+#, fuzzy
+msgid "Association font"
+msgstr "Pismo pridruživanja"
 
-#: umldoc.cpp:946
+#: dialogs/assocrolepage.cpp:50
 #, fuzzy
-msgid "component diagram"
-msgstr "dijagram komponenti"
+msgid "Role A Properties"
+msgstr "Svojstva uloge „A“"
 
-#: umldoc.cpp:948
+#: dialogs/assocrolepage.cpp:51
 #, fuzzy
-msgid "deployment diagram"
-msgstr "dijagram razvijanja"
+msgid "Role B Properties"
+msgstr "Svojstva uloge „B“"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr ""
+#: dialogs/assocrolepage.cpp:68
+#, fuzzy
+msgid "Role A Visibility"
+msgstr "Vidljivost uloge „A“"
 
-#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
-#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Name"
-msgstr "Ime"
+#: dialogs/assocrolepage.cpp:69
+#, fuzzy
+msgid "Role B Visibility"
+msgstr "Vidljivost uloge „B“"
 
-#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Enter name:"
-msgstr "Unesite ime:"
+#: dialogs/assocrolepage.cpp:70
+#, fuzzy
+msgid "Role A Changeability"
+msgstr "Promenjljivost uloge „A“"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
+#: dialogs/assocrolepage.cpp:71
 #, fuzzy
-msgid "That is an invalid name for a diagram."
-msgstr "To je neispravno ime za dijagram."
+msgid "Role B Changeability"
+msgstr "Promenjljivost uloge „B“"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Neispravno ime"
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
+#, fuzzy, no-c-format
+msgid "Rolename:"
+msgstr "Ime uloge:"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Dijagram već koristi to ime."
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
+#, no-c-format
+msgid "Multiplicity:"
+msgstr "Višestrukost:"
 
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
-#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
+#: codegenerators/javacodegenerationformbase.ui:129
+#: codegenerators/javacodegenerationformbase.ui:183
+#: codegenerators/rubycodegenerationformbase.ui:100
+#: codegenerators/rubycodegenerationformbase.ui:154
+#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
+#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267
+#: dialogs/umlrolepropertiesbase.ui:167
+#, no-c-format
+msgid "Public"
+msgstr "Javno"
+
+#: codegenerators/javacodegenerationformbase.ui:134
+#: codegenerators/javacodegenerationformbase.ui:188
+#: codegenerators/rubycodegenerationformbase.ui:105
+#: codegenerators/rubycodegenerationformbase.ui:159
+#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
+#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268
+#: dialogs/umlrolepropertiesbase.ui:178
+#, no-c-format
+msgid "Private"
+msgstr "Privatno"
+
+#: codegenerators/javacodegenerationformbase.ui:139
+#: codegenerators/javacodegenerationformbase.ui:193
+#: codegenerators/rubycodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:164
+#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
+#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269
+#: dialogs/umlrolepropertiesbase.ui:186
+#, no-c-format
+msgid "Protected"
+msgstr "Zaštićeno"
+
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
+#, fuzzy, no-c-format
+msgid "Implementation"
+msgstr "Dokumentacija"
+
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
+#, fuzzy, no-c-format
+msgid "Changeable"
+msgstr "Izmjenjivo"
+
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
+#, no-c-format
+msgid "Frozen"
+msgstr "Zamrznut"
+
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
+#, no-c-format
+msgid "Add only"
+msgstr "Dodaj samo"
+
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "&Ime Datoteke:"
+
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Ime &učesnika:"
+
+#: dialogs/classgenpage.cpp:54
 #, fuzzy
-msgid "Not a Unique Name"
-msgstr "Nije jedinstveno ime"
+msgid "Package &name:"
+msgstr "Ime &paketa:"
 
-#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
-#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
+#: dialogs/classgenpage.cpp:56
 #, fuzzy
-msgid "That is an invalid name."
-msgstr "To ime nije ispravno."
+msgid "Use case &name:"
+msgstr "&Ime slučaja upotrebe:"
 
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
-#: umldoc.cpp:1043 umldoc.cpp:1073
+#: dialogs/classgenpage.cpp:58
 #, fuzzy
-msgid "That name is already being used."
-msgstr "To ime se već koristi."
+msgid "Interface &name:"
+msgstr "Ime i&nterfejsa:"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
+#: dialogs/classgenpage.cpp:60
+#, fuzzy
+msgid "Component &name:"
+msgstr "Ime &komponente:"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
+#: dialogs/classgenpage.cpp:62
 #, fuzzy
-msgid "Name Not Unique"
-msgstr "Ime nije jedinstveno"
+msgid "Artifact &name:"
+msgstr "Ime &artifakta:"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: dialogs/classgenpage.cpp:64
 #, fuzzy
-msgid "Use Name"
-msgstr "Slučaj upotrebe"
+msgid "Enum &name:"
+msgstr "I&me nabrajanja:"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: dialogs/classgenpage.cpp:66
 #, fuzzy
-msgid "Enter New Name"
-msgstr "Unesite ime stanja"
+msgid "Datatype &name:"
+msgstr "Ime tipa po&datka:"
 
-#: umldoc.cpp:1099
+#: dialogs/classgenpage.cpp:68
 #, fuzzy
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Jeste li sigurni da želite da obrišete dijagram %1?"
+msgid "Entity &name:"
+msgstr "I&me nabrajanja:"
 
-#: umldoc.cpp:1099
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
 #, fuzzy
-msgid "Delete Diagram"
-msgstr "Obriši dijagram"
+msgid "&Stereotype name:"
+msgstr "Ime &stereotipa:"
 
-#: umldoc.cpp:1573
+#: dialogs/classgenpage.cpp:107
 #, fuzzy
-msgid "Setting up the document..."
-msgstr "Postavljam dokument..."
+msgid "&Package name:"
+msgstr "Ime &paketa:"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr ""
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "A&pstraktna klasa"
 
-#: umldoc.cpp:1638
+#: dialogs/classgenpage.cpp:123
 #, fuzzy
-msgid "Loading UML elements..."
-msgstr "Učitavam UML elemente..."
+msgid "A&bstract use case"
+msgstr "A&pstraktna klasa"
 
-#: umldoc.cpp:1811
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Izvršni"
+
+#: dialogs/classgenpage.cpp:138
 #, fuzzy
-msgid "Loading diagrams..."
-msgstr "Učitavam dijagrame..."
+msgid "Draw As"
+msgstr "Crtaj kao"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Uobičajeno"
+
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Ispuni:"
+
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Biblioteka"
+
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tablica"
+
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Vidljivost"
+
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "&Javno"
+
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "&Privatno"
+
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "&Zaštićeno"
+
+#: dialogs/classgenpage.cpp:186
 #, fuzzy
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-dijagram"
+msgid "Imple&mentation"
+msgstr "&Dokumentacija"
 
-#: umldoc.cpp:2104
-#, fuzzy, c-format
-msgid "/autosave%1"
-msgstr "/automatsko spremanje%1"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Ime klase:"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr ""
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+#, fuzzy
+msgid "Instance name:"
+msgstr "Ime primjerka:"
 
-#: umllistview.cpp:416
+#: dialogs/classgenpage.cpp:272
 #, fuzzy
-msgid "Enter Model Name"
-msgstr "Unesite ime stanja"
+msgid "Draw as actor"
+msgstr "Crtaj kao aktera"
 
-#: umllistview.cpp:417
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Višestruke instance"
+
+#: dialogs/classgenpage.cpp:284
 #, fuzzy
-msgid "Enter the new name of the model:"
-msgstr "Unesite novo ime za aktivnost:"
+msgid "Show destruction"
+msgstr "Pokaži razgrađivanje"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Pogledi"
+#: dialogs/classgenpage.cpp:322
+#, fuzzy
+msgid "Component name:"
+msgstr "Ime komponente:"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
+#: dialogs/classgenpage.cpp:324
+#, fuzzy
+msgid "Node name:"
+msgstr "Ime čvora:"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
 #, fuzzy
-msgid "Name Not Valid"
-msgstr "Ime nije ispravno"
+msgid "Stereotype name:"
+msgstr "Ime stereotipa:"
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
+#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
+#: dialogs/classgenpage.cpp:456
 #, fuzzy
 msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
 msgstr ""
-"Ime koje ste unijeli nije jedinstveno!\n"
-"Proces pravljenja je obustavljen."
+"Ime koje ste odabrali\n"
+"već se koristi.\n"
+"Ime je resetovano."
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr ""
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+#, fuzzy
+msgid "Name is Not Unique"
+msgstr "Ime nije jedinstveno"
 
-#: umllistview.cpp:2338
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Atributi"
+
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "&Novi atribut..."
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Postupci"
+
+#: dialogs/classifierlistpage.cpp:42
 #, fuzzy
-msgid "Loading listview..."
-msgstr "Učitavam dijagrame..."
+msgid "N&ew Operation..."
+msgstr "N&ova operacija..."
 
-#: umllistview.cpp:2670
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Predlošci"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "&Novi predložak..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
 #, fuzzy
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Direktorij se mora prvo isprazniti da bi se obrisao."
+msgid "Enum Literals"
+msgstr "Literali nabrajanja"
 
-#: umllistview.cpp:2671
+#: dialogs/classifierlistpage.cpp:48
 #, fuzzy
-msgid "Folder Not Empty"
-msgstr "Direktorij nije prazan"
+msgid "N&ew Enum Literal..."
+msgstr "N&ovi literal nabrajanja..."
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes"
+msgstr "Atributi"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+#: dialogs/classifierlistpage.cpp:51
 #, fuzzy
-msgid "Enter Activity Name"
-msgstr "Unesite ime za aktivnost"
+msgid "N&ew Entity Attribute..."
+msgstr "&Novi atribut..."
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
 #, fuzzy
-msgid "new state"
-msgstr "novo stanje"
+msgid "&Delete"
+msgstr "Izbriši odabrano"
 
-#: association.cpp:84
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "$Postavke..."
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Pokaži"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "&Postupci"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Vidljivost"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
 #, fuzzy
-msgid "Generalization"
-msgstr "Uopćenje"
+msgid "O&peration signature"
+msgstr "Potpis o&peracije"
 
-#: association.cpp:88
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "&Paket"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "&Atributi"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "&Stereotip"
+
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
 #, fuzzy
-msgid "Self Association"
-msgstr "Samopridruživanje"
+msgid "Attr&ibute signature"
+msgstr "Potpis atr&ibuta"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr ""
+#: dialogs/classoptionspage.cpp:108
+#, fuzzy
+msgid "Draw as circle"
+msgstr "Crtaj kao krug"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr ""
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Prikaz"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr ""
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Mogućnosti prikaza"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr ""
+#: dialogs/classpropdlg.cpp:179
+#, fuzzy
+msgid "Attribute Settings"
+msgstr "Postavke atributa"
 
-#: association.cpp:95
+#: dialogs/classpropdlg.cpp:187
 #, fuzzy
-msgid "Realization"
-msgstr "Realizacija"
+msgid "Operation Settings"
+msgstr "Postavke operacija"
 
-#: association.cpp:96
+#: dialogs/classpropdlg.cpp:195
 #, fuzzy
-msgid "Uni Association"
-msgstr "Jednostrano pridruživanje"
+msgid "Templates Settings"
+msgstr "Postavke predložak"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
+#: dialogs/classpropdlg.cpp:202
+#, fuzzy
+msgid "Enum Literals Settings"
+msgstr "Postavke literala nabrajanja"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Grafikon"
+#: dialogs/classpropdlg.cpp:209
+#, fuzzy
+msgid "Entity Attributes Settings"
+msgstr "Postavke atributa"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "&Novi"
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Postavke sadržaja"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, no-c-format
-msgid "Sh&ow"
-msgstr "&Pokaži"
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents Settings"
+msgstr "Postavke sadržaja"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
-#, no-c-format
-msgid "&Code"
-msgstr "&Kod"
+#: dialogs/classpropdlg.cpp:222
+#, fuzzy
+msgid "Class Associations"
+msgstr "Pridruženja klasa"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
-#, no-c-format
-msgid "Active &Language"
-msgstr "Aktivni &jezik"
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+#, fuzzy
+msgid "new_class"
+msgstr "nova_klasa"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 36
-#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
-#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
-#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
-#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
-#: dialogs/notedialog.cpp:29 dialogs/parmpropdlg.cpp:100
-#: dialogs/statedialog.cpp:104 docwindow.cpp:33 rc.cpp:30 rc.cpp:150
-#: rc.cpp:207 rc.cpp:445 rc.cpp:492
-#, no-c-format
-msgid "Documentation"
-msgstr "Dokumentacija"
+#: dialogs/classwizard.cpp:54
+#, fuzzy
+msgid "New Class"
+msgstr "Nova klasa"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
-#, fuzzy, no-c-format
-msgid "Slash-Slash (//)"
-msgstr "Kroz-kroz (//)"
+#: dialogs/classwizard.cpp:59
+#, fuzzy
+msgid "Class Attributes"
+msgstr "Atributi klase"
+
+#: dialogs/classwizard.cpp:63
+#, fuzzy
+msgid "Class Operations"
+msgstr "Operacije klase"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, fuzzy, no-c-format
-msgid "Slash-Star (/**  */)"
-msgstr "Kroz-zvezdica (/**  */)"
+msgid "Code Generation Options"
+msgstr "Opcije za generiranje kôda"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
-#, no-c-format
-msgid "Style:"
-msgstr "Stil:"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "N&ačin"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Generiranje C++ kôda</p>"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Završetak"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
-#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
-#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
-#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
-#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
-#: rc.cpp:225
-#, no-c-format
-msgid "General"
-msgstr "Općenito"
+#: dialogs/codegenerationwizard.cpp:132
+#, fuzzy
+msgid "Code Generated"
+msgstr "Kôd je generiran"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, fuzzy, no-c-format
-msgid "Method Body Generation"
-msgstr "Generiranje tela metoda"
+#: dialogs/codegenerationwizard.cpp:134
+#, fuzzy
+msgid "Not Generated"
+msgstr "Nije generiran"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, fuzzy, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Koristi sljedeće za klase u generiranom kôdu:"
+#: dialogs/codegenerationwizard.cpp:141
+#, fuzzy
+msgid "Not Yet Generated"
+msgstr "Još uvijek nije generiran"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, fuzzy, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/codegenerationwizard.cpp:162
+#, fuzzy
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr ""
+"Odabrani datoteka %1 postoji.\n"
+"Želite li da ga prebrišete?"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vektor"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, fuzzy, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Varijabla</b>"
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Create Folder"
+msgstr "Ne mogu napraviti direktorij"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Do Not Create"
+msgstr "Ne&moj da praviš datoteka"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, fuzzy, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/codegenerationwizard.cpp:168
+msgid ""
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "niz znakova"
+#: dialogs/codegenerationwizard.cpp:169
+#, fuzzy
+msgid "Error Creating Folder"
+msgstr "Ne mogu napraviti direktorij"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Znakovni niz</p>"
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Lista</p>"
+#: dialogs/codegenerationwizard.cpp:184
+msgid ""
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, fuzzy, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, fuzzy, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i>globalno?</i>"
+#: dialogs/codegenerationwizard.cpp:191
+#, fuzzy
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 se čini da nije direktorij. Molim, odaberite ispravan direktorij."
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, fuzzy, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, fuzzy, no-c-format
-msgid "Class name"
-msgstr "Ime klase"
+msgid "Code Viewer"
+msgstr "Prikazivač koda"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, fuzzy, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<p align=\"center\">Uključni datoteka</p>"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+#, fuzzy
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Nema dostupnih opcija.</p>"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, fuzzy, no-c-format
-msgid "Project Generation"
-msgstr "Generiranje projekta"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Dijagrami"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, fuzzy, no-c-format
-msgid "Create ANT build document"
-msgstr "Napravi graditeljski ANT dokument"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filtar"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, fuzzy, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Automatski generiraj metode"
+#: dialogs/diagramprintpage.cpp:48
+#, fuzzy
+msgid "&Current diagram"
+msgstr "&Trenutni dijagram"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, fuzzy, no-c-format
-msgid "Empty constructor methods"
-msgstr "Prazni konstruktorski metodi"
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Svi dijagrami"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, fuzzy, no-c-format
-msgid "Association accessor methods"
-msgstr "Pristupni način"
+#: dialogs/diagramprintpage.cpp:57
+#, fuzzy
+msgid "&Select diagrams"
+msgstr "&Odaberi dijagram"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, fuzzy, no-c-format
-msgid "Attribute accessor methods"
-msgstr "Pristupni način"
+#: dialogs/diagramprintpage.cpp:61
+#, fuzzy
+msgid "&Type of diagram"
+msgstr "&Vrsta dijagrama"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "Javno"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Odabir"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "Privatno"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+#, fuzzy
+msgid "Use Case"
+msgstr "Slučaj upotrebe"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "Zaštićeno"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Suradnja"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, fuzzy, no-c-format
-msgid "From Parent Object"
-msgstr "Iz roditeljskog objekta"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Slijed"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, fuzzy, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Uobičajeni opseg atributa:"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Država"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, fuzzy, no-c-format
-msgid "Default association field scope:"
-msgstr "Uobičajeni opseg operacije:"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponenta"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, fuzzy, no-c-format
-msgid "From Parent Role"
-msgstr "Iz roditeljskog objekta"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+#, fuzzy
+msgid "Deployment"
+msgstr "Prikaz razvijanja"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Generiranje Java kôda</p>"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+#, fuzzy
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-dijagram"
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
+#: dialogs/diagramprintpage.cpp:135
+#, fuzzy
+msgid "No diagrams selected."
+msgstr "Nema odabranih dijagrama."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
-msgid "Hash (#)"
+msgid "The format that the images will be exported to"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
+#: dialogs/notedialog.cpp:25
+#, fuzzy
+msgid "Note Documentation"
+msgstr "Dokumentacija napomene"
+
+#: dialogs/overwritedialogue.cpp:27
+#, fuzzy
+msgid "Destination File Already Exists"
+msgstr "Odredišni datoteka već postoji"
+
+#: dialogs/overwritedialogue.cpp:31
+#, fuzzy
+msgid ""
+"The file %1 already exists in %2.\n"
+"\n"
+"Umbrello can overwrite the file, generate a similar\n"
+"file name or not generate this file."
 msgstr ""
+"Datoteka %1 već postoji u %2.\n"
+"\n"
+"Umbrello može da prebriše datoteka, napravi datoteka\n"
+"sosobnog imena ili da ga uopše i ne napravi."
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Generiranje C++ kôda</p>"
+#: dialogs/overwritedialogue.cpp:34
+#, fuzzy
+msgid "&Apply to all remaining files"
+msgstr "&Priizbornik na sve preostale datotekaove"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, fuzzy, no-c-format
-msgid "Code Generation Options"
-msgstr "Opcije za generiranje kôda"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "Pr&epiši"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Jezik"
+#: dialogs/overwritedialogue.cpp:39
+#, fuzzy
+msgid "&Generate Similar File Name"
+msgstr "&Napravi sosobno ime datotekaa"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Mape"
+#: dialogs/overwritedialogue.cpp:40
+#, fuzzy
+msgid "&Do Not Generate File"
+msgstr "Ne&moj da praviš datoteka"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, fuzzy, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Zapiši sve generirane datotekaove u direktorij:"
+#: dialogs/parmpropdlg.cpp:35
+#, fuzzy
+msgid "Parameter Properties"
+msgstr "Svojstva parametra"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Potraži..."
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Tip:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "&Potraži..."
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Ime:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, fuzzy, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "&Uključi zaglavne datotekaove iz direktorija:"
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+#, fuzzy
+msgid "&Initial value:"
+msgstr "&Početna vrijednost:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, fuzzy, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
 msgstr ""
-"Datoteke napravljeni generatorom kôda biti će zapisani u ovaj direktorij"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, fuzzy, no-c-format
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Datoteke iz ovog direktorija će biti korišteni kao zaglavni datoteke u "
-"generiranom kôdu"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, fuzzy, no-c-format
-msgid "Overwrite Policy"
-msgstr "Politika prebrisavanja"
+#: dialogs/pkgcontentspage.cpp:29
+#, fuzzy
+msgid "Contained Items"
+msgstr "Sadržane stavke"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, fuzzy, no-c-format
-msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
-msgstr ""
-"Ako već postoji datoteka sa istim imenom kakvo \n"
-"generator kôda hoće treba koristiti za svoj izlazni datoteka:"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+#, fuzzy
+msgid "Select Operation"
+msgstr "Odaberite operaciju"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "&Prebriši"
+#: dialogs/selectopdlg.cpp:43
+#, fuzzy
+msgid "Sequence number:"
+msgstr "Broj sekvence:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, fuzzy, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr ""
-"Prebriši postojeće datotekaove ako oni postoje u odredišnom direktoriju"
+#: dialogs/selectopdlg.cpp:46
+#, fuzzy
+msgid "Class operation:"
+msgstr "Operacija klase:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Pitaj"
+#: dialogs/selectopdlg.cpp:54
+#, fuzzy
+msgid "Custom operation:"
+msgstr "Posebna operacija:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
-#, fuzzy, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Ako datoteka sa istim imenom već postoji, pitaj šta da radiš"
+#: dialogs/settingsdlg.cpp:30
+#, fuzzy
+msgid "Umbrello Setup"
+msgstr "Podešavanje Umbrello-a"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, fuzzy, no-c-format
-msgid "&Use a different name"
-msgstr "&Koristi drugačije ime"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Korisničko sučelje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, fuzzy, no-c-format
-msgid ""
-"If a file already exists in the destination folder, select a different name to "
-"use by adding a suffix to the file name"
-msgstr ""
-"Ako datoteka već postoji u odredišnom direktoriju, odaberi drugo ime dodavanjem "
-"sufiksa na ime datotekaa"
+#: dialogs/settingsdlg.cpp:47
+#, fuzzy
+msgid "User Interface Settings"
+msgstr "Postavke korisničkog interfejsa"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Oblikovanje"
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Boja crte:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Linije"
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "&Uobičajena boja"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, fuzzy, no-c-format
-msgid "Line ending style:"
-msgstr "Stil kraja linije:"
+#: dialogs/settingsdlg.cpp:63
+#, fuzzy
+msgid "Fill color:"
+msgstr "Boja za popunjavanje:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, fuzzy, no-c-format
-msgid "Indentation type:"
-msgstr "Vrsta uvlačenja:"
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "&Uobičajena boja"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, fuzzy, no-c-format
-msgid "Indentation amount:"
-msgstr "Veličina uvlačenja:"
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, fuzzy, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
 msgstr ""
-"*NIX (\"\n"
-"\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, fuzzy, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
+#: dialogs/settingsdlg.cpp:86
+#, fuzzy
+msgid "&Use fill color"
+msgstr "&Koristi boju za popunjavanje"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Windows (\"\\r\n"
-"\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, fuzzy, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/settingsdlg.cpp:108
+#, fuzzy
+msgid "Enable undo"
+msgstr "&Uključi automatsko spremanje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, fuzzy, no-c-format
-msgid "No Indentation"
-msgstr "Bez uvlačenja"
+#: dialogs/settingsdlg.cpp:112
+#, fuzzy
+msgid "Use tabbed diagrams"
+msgstr "dijagram stanja"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tab"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Razmak"
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "Uobičajeni opseg operacije:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, fuzzy, no-c-format
-msgid "Comment Verbosity"
-msgstr "Opširnost komentara"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Automatsko spremanje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
-#, fuzzy, no-c-format
-msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
+#: dialogs/settingsdlg.cpp:132
+#, fuzzy
+msgid "E&nable autosave"
+msgstr "&Uključi automatsko spremanje"
+
+#: dialogs/settingsdlg.cpp:136
+#, fuzzy
+msgid "Select auto-save time interval (mins):"
+msgstr "Odaberite period automatskog spremanja (minuti):"
+
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
 msgstr ""
-"Piši komentare &za odeljke iako je odeljak\n"
-"prazan"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, fuzzy, no-c-format
+#: dialogs/settingsdlg.cpp:148
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"<qt><p>The autosave file will be saved to ~/autosave.xmi if the autosaving "
+"occurs before you have manually saved the file.</p><p>If you've already "
+"saved it, the autosave file will be saved in the same folder as the file and "
+"will be named like the file's name, followed by the suffix specified.</"
+"p><p>If the suffix is equal to the suffix of the file you've saved, the "
+"autosave will overwrite your file automatically.</p></qt>"
 msgstr ""
-"Piše komentare za naznaku drugog odeljka (javni, privatni itd.) u klasi, čak i "
-"ako su odeljci prazni"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Piši dokumentaciju komentara čak iako su prazni"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Podizanje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr "Piši komentare &za dokumentaciju klase i metoda čak iako su prazni"
+#: dialogs/settingsdlg.cpp:164
+#, fuzzy
+msgid "Sta&rtup logo"
+msgstr "Logo p&ri pokretanju"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Language Options"
-msgstr "Opcije jezika"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Savjet dana"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, fuzzy, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Čarobnjak za generiranje kôda"
+#: dialogs/settingsdlg.cpp:172
+#, fuzzy
+msgid "&Load last project"
+msgstr "&Učitaj posljednji projekat"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, fuzzy, no-c-format
-msgid "Select Classes"
-msgstr "Odaberite klase"
+#: dialogs/settingsdlg.cpp:176
+#, fuzzy
+msgid "Start new project with:"
+msgstr "Počni novi projekat:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 41
-#: rc.cpp:335
-#, fuzzy, no-c-format
-msgid ""
-"Place all the classes you want to generate code\n"
-"for in the right hand side list"
-msgstr ""
-"U popis desno smijestite sve klase za\n"
-"koje želite da se generiše kôd"
+#: dialogs/settingsdlg.cpp:183
+#, fuzzy
+msgid "No Diagram"
+msgstr "Bez dijagrama"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Dodaj klasu za izradu koda"
+#: dialogs/settingsdlg.cpp:183
+#, fuzzy
+msgid "Class Diagram"
+msgstr "Dijagram klasa"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, fuzzy, no-c-format
-msgid "Classes Selected"
-msgstr "Odabrane klase"
+#: dialogs/settingsdlg.cpp:184
+#, fuzzy
+msgid "Use Case Diagram"
+msgstr "Dijagram slučaja upotrebe"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, fuzzy, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Ukloni klasu iz generiranja kôda"
+#: dialogs/settingsdlg.cpp:184
+#, fuzzy
+msgid "Sequence Diagram"
+msgstr "Dijagram sekvenci"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, fuzzy, no-c-format
-msgid "Classes Available"
-msgstr "Dostupne klase"
+#: dialogs/settingsdlg.cpp:185
+#, fuzzy
+msgid "Collaboration Diagram"
+msgstr "Dijagram saradnje"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, fuzzy, no-c-format
-msgid "Code Generation Status"
-msgstr "Status generiranja kôda"
+#: dialogs/settingsdlg.cpp:185
+#, fuzzy
+msgid "State Diagram"
+msgstr "Dijagram stanja"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, fuzzy, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Pritisnite gumb za generiranje za početak generiranja kôda"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Dijagram aktivnosti"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, fuzzy, no-c-format
-msgid "Generation Status"
-msgstr "Status generiranja"
+#: dialogs/settingsdlg.cpp:186
+#, fuzzy
+msgid "Component Diagram"
+msgstr "Dijagram komponenti"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, fuzzy, no-c-format
-msgid "Code Viewer"
-msgstr "Prikazivač koda"
+#: dialogs/settingsdlg.cpp:187
+#, fuzzy
+msgid "Deployment Diagram"
+msgstr "Dijagram razvijanja"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, fuzzy, no-c-format
-msgid "Show hidden blocks"
-msgstr "Pokaži skrivene blokove"
+#: dialogs/settingsdlg.cpp:210
+#, fuzzy
+msgid "Class Settings"
+msgstr "Postavke klase"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">ovdje ide ime komponente</p>"
+#: dialogs/settingsdlg.cpp:217
+#, fuzzy
+msgid "Show &visibility"
+msgstr "Pokaži &vidljivost"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, fuzzy, no-c-format
-msgid "Show block type"
-msgstr "Pokaži vrstu bloka"
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Prikaži osobine"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Boje"
+#: dialogs/settingsdlg.cpp:225
+#, fuzzy
+msgid "Show operations"
+msgstr "Pokaži operacije"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Pismo:"
+#: dialogs/settingsdlg.cpp:229
+#, fuzzy
+msgid "Show stereot&ype"
+msgstr "Pr&ikaži stereotip"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, fuzzy, no-c-format
-msgid "Paper:"
-msgstr "Papir:"
+#: dialogs/settingsdlg.cpp:233
+#, fuzzy
+msgid "Show attribute signature"
+msgstr "Pokaži potpis atributa"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Označeno"
+#: dialogs/settingsdlg.cpp:238
+#, fuzzy
+msgid "Show package"
+msgstr "Pokaži paket"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, fuzzy, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">UML blok objekta:</p>"
+msgid "Show operation signature"
+msgstr "Pokaži potpis operacije"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Skriveni blok:</p>"
+#: dialogs/settingsdlg.cpp:247
+#, fuzzy
+msgid "Starting Scope"
+msgstr "Početni opseg"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Neizmjenljiv tekst:</p>"
+#: dialogs/settingsdlg.cpp:252
+#, fuzzy
+msgid "Default attribute scope:"
+msgstr "Uobičajeni opseg atributa:"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Urediv tekst:</p>"
+#: dialogs/settingsdlg.cpp:255
+#, fuzzy
+msgid "Default operation scope:"
+msgstr "Uobičajeni opseg operacije:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Svojstva dijagrama"
+#: dialogs/settingsdlg.cpp:294
+#, fuzzy
+msgid "Code Generation"
+msgstr "Generiranje kôda"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Ime:"
+#: dialogs/settingsdlg.cpp:294
+#, fuzzy
+msgid "Code Generation Settings"
+msgstr "Postavke generiranja kôda"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Zumiraj:"
+#: dialogs/settingsdlg.cpp:301
+#, fuzzy
+msgid "Code Viewer Settings"
+msgstr "Postavke prikazivača kôda"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/statedialog.cpp:85
+#, fuzzy
+msgid "Initial state"
+msgstr "Početno stanje"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
-#, fuzzy, no-c-format
-msgid "Show operation signature"
-msgstr "Pokaži potpis operacije"
+#: dialogs/statedialog.cpp:85
+#, fuzzy
+msgid "End state"
+msgstr "Završno stanje"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Prikaži rešetku"
+#: dialogs/statedialog.cpp:96
+#, fuzzy
+msgid "State type:"
+msgstr "Vrsta stanja:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "&Prijanjaj uz mrežu"
+#: dialogs/statedialog.cpp:101
+#, fuzzy
+msgid "State name:"
+msgstr "Ime stanja:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, fuzzy, no-c-format
-msgid "Snap component size"
-msgstr "Veličina komponente uklapanja"
+#: dialogs/statedialog.cpp:130
+#, fuzzy
+msgid "Widget Color"
+msgstr "Boja kontrole"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, fuzzy, no-c-format
+#: dialogs/umlattributedialog.cpp:42
+#, fuzzy
+msgid "Attribute Properties"
+msgstr "Svojstva atributa"
+
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+#, fuzzy
+msgid "Classifier &scope (\"static\")"
+msgstr "Op&seg klasifikatora („static“)"
+
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Javno"
+
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "&Zaštićeno"
+
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+#, fuzzy
+msgid "I&mplementation"
+msgstr "&Dokumentacija"
+
+#: dialogs/umlattributedialog.cpp:155
+#, fuzzy
+msgid "You have entered an invalid attribute name."
+msgstr "Unijeli ste neispravno ime atributa."
+
+#: dialogs/umlattributedialog.cpp:156
+#, fuzzy
+msgid "Attribute Name Invalid"
+msgstr "Neispravno ime atributa"
+
+#: dialogs/umlattributedialog.cpp:163
+#, fuzzy
 msgid ""
-"Snap the size of the components to be a multiple of the grid spacing.\n"
-"If 'Snap to Grid' is enabled a component will always be aligned with the grid "
-"on all 4 sides."
-msgstr ""
-"Postavlja veličinu komponente tako da ona bude umnožak razmaka u mreži.\n"
-"Ako je uključena opcija „uklapaj uz mrežu“ komponenta će uvijek biti poravnata "
-"sa mrežom na sve četiri strane."
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Ime koje ste odabrali za atribut već se koristi u ovoj operaciji."
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr ""
+#: dialogs/umlattributedialog.cpp:164
+#, fuzzy
+msgid "Attribute Name Not Unique"
+msgstr "Ime atributa nije jedinstveno"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/umlentityattributedialog.cpp:43
+#, fuzzy
+msgid "Entity Attribute Properties"
+msgstr "Svojstva atributa"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/umlentityattributedialog.cpp:73
+#, fuzzy
+msgid "&Default value:"
+msgstr "&Uobičajeno"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, fuzzy, no-c-format
-msgid "Export all views"
-msgstr "Izvezi kao sliku..."
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 55
-#: rc.cpp:454 rc.cpp:457
-#, no-c-format
-msgid "The base directory used to save the images"
+#: dialogs/umlentityattributedialog.cpp:92
+#, fuzzy
+msgid "Attributes:"
+msgstr "Atributi"
+
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, fuzzy, no-c-format
-msgid "&Image type:"
-msgstr "Vrsta stanja:"
+#: dialogs/umlentityattributedialog.cpp:112
+#, fuzzy
+msgid "&None"
+msgstr "&Novi"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
+#: dialogs/umlentityattributedialog.cpp:115
+#, fuzzy
+msgid "&Primary"
+msgstr "&Biblioteka"
+
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "mapa"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
+#: dialogs/umlentityattributedialog.cpp:184
+#, fuzzy
+msgid "You have entered an invalid entity attribute name."
+msgstr "Unijeli ste neispravno ime atributa."
+
+#: dialogs/umlentityattributedialog.cpp:185
+#, fuzzy
+msgid "Entity Attribute Name Invalid"
+msgstr "Neispravno ime atributa"
+
+#: dialogs/umlentityattributedialog.cpp:192
+#, fuzzy
 msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
+msgstr "Ime koje ste odabrali za atribut već se koristi u ovoj operaciji."
+
+#: dialogs/umlentityattributedialog.cpp:193
+#, fuzzy
+msgid "Entity Attribute Name Not Unique"
+msgstr "Ime atributa nije jedinstveno"
+
+#: dialogs/umloperationdialog.cpp:50
+#, fuzzy
+msgid "Operation Properties"
+msgstr "Svojstva operacija"
+
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Apstraktna operacija"
+
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametri"
+
+#: dialogs/umloperationdialog.cpp:141
+#, fuzzy
+msgid "Ne&w Parameter..."
+msgstr "No&vi parametar..."
+
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+#, fuzzy
+msgid "You have entered an invalid parameter name."
+msgstr "Unijeli ste neispravno ime za parametar."
+
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+#, fuzzy
+msgid "Parameter Name Invalid"
+msgstr "Neispravno ime parametra"
+
+#: dialogs/umloperationdialog.cpp:339
+#, fuzzy
 msgid ""
-"The views are stored in folders in the document. The same tree structure used "
-"in the document to store the views can be created in the selected base "
-"directory with this option.\n"
-"Only the folders made by the user are created in the base directory (Logical "
-"view, use case view and so on aren't created)."
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
+"Ime koje ste odabrali za parametar\n"
+"već se koristi u ovoj operaciji."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, fuzzy, no-c-format
-msgid "Role Properties"
-msgstr "Svojstva uloge"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+#, fuzzy
+msgid "Parameter Name Not Unique"
+msgstr "Ime parametra nije jedinstveno"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, fuzzy, no-c-format
-msgid "Rolename:"
-msgstr "Ime uloge:"
+#: dialogs/umloperationdialog.cpp:406
+#, fuzzy
+msgid ""
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Ime koje ste odabrali za parametar već se koristi u ovoj operaciji."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Višestrukost:"
+#: dialogs/umloperationdialog.cpp:456
+#, fuzzy
+msgid "You have entered an invalid operation name."
+msgstr "Unijeli ste neispravno ime operacije."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, fuzzy, no-c-format
-msgid "Role Changeability"
-msgstr "Izmjenljivost uloge"
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+#, fuzzy
+msgid "Operation Name Invalid"
+msgstr "Neispravno ime operacije"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Dodaj samo"
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+#, fuzzy
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Operacija sa takvim potpisom već postoji u %1.\n"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Zamrznut"
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+#, fuzzy
+msgid "Choose a different name or parameter list."
+msgstr "Odaberite drugačije ime ili parametarsku popis."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
 #, fuzzy, no-c-format
-msgid "Changeable"
-msgstr "Izmjenjivo"
+msgid "Role Properties"
+msgstr "Svojstva uloge"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, fuzzy, no-c-format
-msgid "Role Visibility"
-msgstr "Vidljivost uloge"
+#: dialogs/umltemplatedialog.cpp:36
+#, fuzzy
+msgid "Template Properties"
+msgstr "Svojstva predložak"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, fuzzy, no-c-format
-msgid "Implementation"
-msgstr "Dokumentacija"
+#: dialogs/umltemplatedialog.cpp:128
+#, fuzzy
+msgid "You have entered an invalid template name."
+msgstr "Unijeli ste neispravno ime za šablon."
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
+#: dialogs/umltemplatedialog.cpp:129
+#, fuzzy
+msgid "Template Name Invalid"
+msgstr "Neispravno ime za šablon"
 
-#: tips.txt:9
+#: dialogs/umltemplatedialog.cpp:138
+#, fuzzy
 msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "Ime koje ste odabrali za parametar već se koristi u ovoj operaciji."
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
+#: dialogs/umltemplatedialog.cpp:139
+#, fuzzy
+msgid "Template Name Not Unique"
+msgstr "Ime parametra nije jedinstveno"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
+#: dialogs/umlviewdialog.cpp:93
+#, fuzzy
+msgid "Classes Display Options"
+msgstr "Opcije za prikaz klasa"
 
-#: tips.txt:25
+#: dialogs/umlviewdialog.cpp:100
 #, fuzzy
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Ako želite u dijagram dodati klasu koja već postoji, samo prevucite njen "
-"unos iz stablolikog prikaza.</p>\n"
+msgid "Diagram Colors"
+msgstr "Boje za dijagram"
 
-#: tips.txt:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
+#: dialogs/umlviewdialog.cpp:164
+#, fuzzy
+msgid "The name you have entered is invalid."
+msgstr "Ime koje ste unijeli nije ispravno."
 
-#: tips.txt:37
+#: dialogs/umlviewdialog.cpp:170
 #, fuzzy
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Objekti dijagrama sekvence mogu imati kućicu za razgrađivanje i biti "
-"nacrtani kao akteri. Dvokliknite na neki za dijalog sa svojstvima.</p>\n"
+msgid "The name you have entered is not unique."
+msgstr "Ime koje ste unijeli nije jedinstveno."
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+#, fuzzy
+msgid "Name Not Unique"
+msgstr "Ime nije jedinstveno"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Redak:"
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Ispuni:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "&Uobičajeno"
 
-#: tips.txt:60
+#: dialogs/umlwidgetcolorpage.cpp:78
 #, fuzzy
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Izreži i kopiraj će također izvesti sliku u PNG klipbord, odakle može biti "
-"umetnuta u KWord i druge programe.</p>\n"
+msgid "&Use fill"
+msgstr "&Koristi popunjavanje"
 
-#: tips.txt:66
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
 #, fuzzy
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
+msgid "Exporting all views..."
+msgstr "Izvezi kao sliku..."
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
 msgstr ""
-"<p>Pridruživanja ne moraju da budu u pravim linijama, dvoklik na neku će "
-"napraviti pomerljivu tačku.</p>\n"
 
-#: tips.txt:71
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
+#: umlviewimageexportermodel.cpp:158
+#, fuzzy, c-format
+msgid "There was a problem saving file: %1"
+msgstr "Došlo je do problema prilikom spremanja datotekaa: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Spremi pogrešku"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Autori Umbrello-a, UML modelara"
+
+#: docgenerators/main.cpp:47
 #, fuzzy
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Automatsko spremanje možete uključiti u dijalogu za podešavanje "
-"Umbrello-a.</p>\n"
+msgid "File to transform"
+msgstr "datoteka za otvaranje"
 
-#: tips.txt:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
 
-#: tips.txt:86
+#: docgenerators/main.cpp:64
 #, fuzzy
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>Sve odabrane objekte možete obrisati pritiskom na Del ili Backspace.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "Autori Umbrello-a, UML modelara"
 
-#: tips.txt:91
+#: docgenerators/main.cpp:67 main.cpp:98
 #, fuzzy
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Ako ste našli grešku u Umbrello-u, molimo vas da nas obavestite.\n"
-"Greške možete poslani alatom za prijavu grešaka iz izbornika Pomoć.</p>\n"
+msgid "Umbrello UML Modeller Authors"
+msgstr "Autori Umbrello-a, UML modelara"
 
-#: tips.txt:97
+#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
+#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Name"
+msgstr "Ime"
+
+#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
+#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Enter name:"
+msgstr "Unesite ime:"
+
+#: floatingtextwidget.cpp:112
 #, fuzzy
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>Pritiskom na tipka Escape postavlja se trenutni alat na odabrani alat.\n"
-"Backspace-om se skače na prethodno korišteni alat.</p>\n"
+msgid "Enter operation name:"
+msgstr "Unesite ime pridruživanja:"
 
-#: tips.txt:103
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Unesite novi tekst:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "GREŠKA"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Promijeni kut"
+
+#: folder.cpp:289
 #, fuzzy
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr ""
-"<p>Možete odabrati sve objekte pritiskom na Ctrl-A.</p>\n"
+msgid "The folderfile %1 does not exist."
+msgstr "Datoteka %1 ne postoji."
+
+#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
+#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
+#, fuzzy
+msgid "Load Error"
+msgstr "Greška pri učitavanju"
 
-#: tips.txt:108
+#: folder.cpp:293
 #, fuzzy
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>Možete napraviti i podesiti novu klasu koristeći čarobnjaka iz izbornika "
-"Kôd.</p>\n"
+msgid "The folderfile %1 cannot be opened."
+msgstr "Datoteka %1 ne postoji."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1743,6 +2007,10 @@ msgstr "Nova operacija..."
 msgid "Select Operation..."
 msgstr "Odaberi operaciju..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Promijeni kut..."
@@ -1798,6 +2066,19 @@ msgstr "Novi"
 msgid "Rename..."
 msgstr "Promijeni ime..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Greška prilikom umetanja"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Boja crte..."
@@ -1828,15 +2109,28 @@ msgstr "Ne mogu napraviti direktorij"
 msgid "Import Classes..."
 msgstr "Uvezi klase..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paket"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr ""
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+#, fuzzy
+msgid "Artifact"
+msgstr "Artifakt"
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 #, fuzzy
 msgid "Component Diagram..."
 msgstr "Dijagram komponenti..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Čvor"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 #, fuzzy
 msgid "Deployment Diagram..."
@@ -1846,11 +2140,20 @@ msgstr "Dijagram razvijanja..."
 msgid "Folder"
 msgstr "Mapa"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+#, fuzzy
+msgid "Entity"
+msgstr "Završna aktivnost"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 #, fuzzy
 msgid "Entity Relationship Diagram..."
 msgstr "Dijagram saradnje..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Učesnik"
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 #, fuzzy
 msgid "Use Case Diagram..."
@@ -1894,6 +2197,19 @@ msgstr "Novi atribut..."
 msgid "Export as Picture..."
 msgstr "Izvezi kao sliku..."
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Sučelje"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "&podaci"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+#, fuzzy
+msgid "Enum"
+msgstr "Nabrajanje"
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 #, fuzzy
 msgid "Class Diagram..."
@@ -1918,26 +2234,10 @@ msgstr "Dijagram sekvence..."
 msgid "Collaboration Diagram..."
 msgstr "Dijagram saradnje..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Atributi"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Postupci"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Vidljivost"
-
 #: listpopupmenu.cpp:680
 #, fuzzy
 msgid "Operation Signature"
@@ -1952,11 +2252,6 @@ msgstr "Potpis atributa"
 msgid "Stereotype"
 msgstr "Stereotip"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Pokaži"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Atribut..."
@@ -1983,14 +2278,6 @@ msgstr "Boja ispune..."
 msgid "Use Fill Color"
 msgstr "Koristi boju popunjavanja"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
-#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
-#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
-#: listpopupmenu.cpp:750
-msgid "Color"
-msgstr "Boja"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr "Učesnik..."
@@ -2021,10 +2308,30 @@ msgstr "Nabrajanje..."
 msgid "Package..."
 msgstr "Paket..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+#, fuzzy
+msgid "Initial State"
+msgstr "Početno stanje"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+#, fuzzy
+msgid "End State"
+msgstr "Završno stanje"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Država..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+#, fuzzy
+msgid "Initial Activity"
+msgstr "Početna aktivnost"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+#, fuzzy
+msgid "End Activity"
+msgstr "Završna aktivnost"
+
 #: listpopupmenu.cpp:1053
 #, fuzzy
 msgid "Subsystem..."
@@ -2074,6 +2381,14 @@ msgstr "Izbriši odabrano"
 msgid "Change Association Name..."
 msgstr "Promijeni ime pridruživanja..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 #, fuzzy
 msgid "Clear Diagram"
@@ -2111,8 +2426,8 @@ msgstr ""
 
 #: main.cpp:43
 msgid ""
-"keep the tree structure used to store the views in the document in the target "
-"directory"
+"keep the tree structure used to store the views in the document in the "
+"target directory"
 msgstr ""
 
 #: main.cpp:95
@@ -2120,189 +2435,106 @@ msgstr ""
 msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr "Autori Umbrello-a, UML modelara"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+#: model_utils.cpp:244
 #, fuzzy
-msgid "Incorrect use of associations."
-msgstr "Neispravno korištenje pridruživanja."
+msgid "new_actor"
+msgstr "novi_akter"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+#: model_utils.cpp:246
 #, fuzzy
-msgid "Association Error"
-msgstr "Greška pridruživanja"
+msgid "new_usecase"
+msgstr "novo_korištenje_slučaja"
 
-#: folder.cpp:289
+#: model_utils.cpp:248
 #, fuzzy
-msgid "The folderfile %1 does not exist."
-msgstr "Datoteka %1 ne postoji."
+msgid "new_package"
+msgstr "novi_paket"
 
-#: folder.cpp:293
+#: model_utils.cpp:250
 #, fuzzy
-msgid "The folderfile %1 cannot be opened."
-msgstr "Datoteka %1 ne postoji."
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Darko Bednjanec, Denis Lackovic, Nikola Planinac, Robert Pezer"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "[email protected]"
-
-#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
-#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
-#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
-#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
-#: umlviewimageexporterall.cpp:73
-msgid "Ready."
-msgstr "Spreman."
-
-#: umlwidgetcontroller.cpp:128
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel move."
-msgstr ""
-
-#: umlwidgetcontroller.cpp:379
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel resize."
-msgstr ""
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr ""
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr ""
+msgid "new_component"
+msgstr "nova_komponenta"
 
-#: codeimport/import_utils.cpp:183
+#: model_utils.cpp:252
 #, fuzzy
-msgid "Namespace"
-msgstr "novi_paket"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr ""
-
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr ""
+msgid "new_node"
+msgstr "novi_čvor"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr ""
+#: model_utils.cpp:254
+#, fuzzy
+msgid "new_artifact"
+msgstr "novi_artifakt"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr ""
+#: model_utils.cpp:256
+#, fuzzy
+msgid "new_interface"
+msgstr "novi_interfejs"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr ""
+#: model_utils.cpp:258
+#, fuzzy
+msgid "new_datatype"
+msgstr "nova_vrsta_podataka"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr ""
+#: model_utils.cpp:260
+#, fuzzy
+msgid "new_enum"
+msgstr "novo_nabrajanje"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr ""
+#: model_utils.cpp:262
+#, fuzzy
+msgid "new_entity"
+msgstr "novo_nabrajanje"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr ""
+#: model_utils.cpp:264
+#, fuzzy
+msgid "new_folder"
+msgstr "novi_čvor"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr ""
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+#, fuzzy
+msgid "new_association"
+msgstr "novo_pridruživanje"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr ""
+#: model_utils.cpp:268
+#, fuzzy
+msgid "new_object"
+msgstr "novi_objekt"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
+#: model_utils.cpp:559
+msgid "OK"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
+#: model_utils.cpp:559
+msgid "Empty"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
+#: model_utils.cpp:559
+msgid "Malformed argument"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
+#: model_utils.cpp:560
+msgid "Illegal method name"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
+#: model_utils.cpp:561
+msgid "Unknown return type"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
+#: model_utils.cpp:561
+msgid "Unspecified error"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
 msgstr ""
 
 #: objectwidget.cpp:90
@@ -2319,118 +2551,74 @@ msgstr "Unesite naziv objekta:"
 msgid "new_parameter"
 msgstr "novi_parametar"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-#, fuzzy
-msgid "General Options"
-msgstr "Opće postavke"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-#, fuzzy
-msgid "Package is a namespace"
-msgstr "Paket je imenski prostor"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Dodajte osnovnu klasu"
 
-#: codegenerators/cppcodegenerationform.cpp:41
-#, fuzzy
-msgid "Virtual destructors"
-msgstr "Virtualni razgrađivač"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Dodaj izvedenu klasu"
 
-#: codegenerators/cppcodegenerationform.cpp:44
-#, fuzzy
-msgid "Generate empty constructors"
-msgstr "Generiraj prazne konstrusktore"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Postupak"
 
-#: codegenerators/cppcodegenerationform.cpp:47
-#, fuzzy
-msgid "Generate accessor methods"
-msgstr "Generiraj pristupne metode"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Atributi"
 
-#: codegenerators/cppcodegenerationform.cpp:50
-#, fuzzy
-msgid "Operations are inline"
-msgstr "Operacije su u liniji"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Dodaj osnovnu sučelje"
 
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Pristupnici su u liniji"
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Dodaj izvedeno sučelje"
 
-#: codegenerators/cppcodegenerationform.cpp:57
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
 #, fuzzy
-msgid "Accessors are public"
-msgstr "Pristupnici su u liniji"
+msgid "Base Classifiers"
+msgstr "Bazni klasifikatori"
 
-#: umlview.cpp:297 umlview.cpp:357
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
 #, fuzzy
-msgid "Diagram: %2 Page %1"
-msgstr "Dijagram: %2 stranica %1"
+msgid "Derived Classifiers"
+msgstr "Izvedeni klasifikatori"
 
-#: umlview.cpp:2578
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
 #, fuzzy
-msgid "Enter Diagram Name"
+msgid "Enter State Name"
 msgstr "Unesite ime stanja"
 
-#: umlview.cpp:2579
-#, fuzzy
-msgid "Enter the new name of the diagram:"
-msgstr "Unesite novo ime za aktivnost:"
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Odabrali ste prisanje cijelog dijagrama.\n"
-"Da li ste sigurni?"
-
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Obristai dijagram?"
-
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr ""
-
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr ""
-
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
 #, fuzzy
-msgid "new_association"
-msgstr "novo_pridruživanje"
+msgid "Enter the name of the new state:"
+msgstr "Unesite ime novog stanja:"
 
-#: umlcanvasobject.cpp:150
+#: statewidget.cpp:176
 #, fuzzy
-msgid "new_attribute"
-msgstr "novi_atribut"
-
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "novi_predložak"
+msgid "Enter Activity"
+msgstr "Unesite aktivnost"
 
-#: umlcanvasobject.cpp:156
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
 #, fuzzy
-msgid "new_operation"
-msgstr "nova_operacija"
+msgid "Incorrect use of associations."
+msgstr "Neispravno korištenje pridruživanja."
 
-#: umlcanvasobject.cpp:159
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
 #, fuzzy
-msgid "new_literal"
-msgstr "novi_literal"
+msgid "Association Error"
+msgstr "Greška pridruživanja"
 
-#: umlcanvasobject.cpp:162
+#: toolbarstateother.cpp:148 umlview.cpp:2511
 #, fuzzy
-msgid "new_field"
-msgstr "novi_literal"
+msgid "new state"
+msgstr "novo stanje"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2609,11 +2797,6 @@ msgstr "Izv&ezi kao sliku..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Izvezi kao sliku..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "$Postavke..."
-
 #: uml.cpp:286
 #, fuzzy
 msgid "&Zoom Slider"
@@ -2703,14 +2886,21 @@ msgstr "&Dokumentacija"
 msgid "Opening file..."
 msgstr "Otvaram datoteku..."
 
+#: uml.cpp:519 uml.cpp:591 uml.cpp:717 umldoc.cpp:232 umldoc.cpp:312
+#: umldoc.cpp:356 umldoc.cpp:381 umldoc.cpp:423 umldoc.cpp:435 umldoc.cpp:449
+#: umldoc.cpp:462 umldoc.cpp:473 umldoc.cpp:634 umldoc.cpp:642 umldoc.cpp:2103
+#: umldoc.cpp:2106
+msgid "Untitled"
+msgstr ""
+
 #: uml.cpp:650
 msgid "Creating new document..."
 msgstr "Stvaram novi dokument..."
 
 #: uml.cpp:673
 msgid ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, *."
+"xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Uncompressed XMI Files (*.xmi)\n"
 "*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
@@ -2738,6 +2928,10 @@ msgid ""
 "*|All Files"
 msgstr ""
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 #, fuzzy
 msgid ""
@@ -2747,6 +2941,10 @@ msgstr ""
 "Datoteka %1 postoji.\n"
 "Želite li da ga prebrišete?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 #, fuzzy
 msgid "Overwrite"
@@ -2783,8 +2981,8 @@ msgstr "Ubacivanje sadržaja odlagališta..."
 
 #: uml.cpp:849
 msgid ""
-"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
-"may be of the wrong type to be pasted here."
+"Umbrello could not paste the clipboard contents.  The objects in the "
+"clipboard may be of the wrong type to be pasted here."
 msgstr ""
 
 #: uml.cpp:863
@@ -2846,1419 +3044,1321 @@ msgstr ""
 msgid "Select Code to Import"
 msgstr "Odaberite klase za uvoz"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "&Ime Datoteke:"
-
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Ime &učesnika:"
-
-#: dialogs/classgenpage.cpp:54
+#: umlcanvasobject.cpp:150
 #, fuzzy
-msgid "Package &name:"
-msgstr "Ime &paketa:"
+msgid "new_attribute"
+msgstr "novi_atribut"
 
-#: dialogs/classgenpage.cpp:56
-#, fuzzy
-msgid "Use case &name:"
-msgstr "&Ime slučaja upotrebe:"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "novi_predložak"
 
-#: dialogs/classgenpage.cpp:58
+#: umlcanvasobject.cpp:156
 #, fuzzy
-msgid "Interface &name:"
-msgstr "Ime i&nterfejsa:"
+msgid "new_operation"
+msgstr "nova_operacija"
 
-#: dialogs/classgenpage.cpp:60
+#: umlcanvasobject.cpp:159
 #, fuzzy
-msgid "Component &name:"
-msgstr "Ime &komponente:"
+msgid "new_literal"
+msgstr "novi_literal"
 
-#: dialogs/classgenpage.cpp:62
+#: umlcanvasobject.cpp:162
 #, fuzzy
-msgid "Artifact &name:"
-msgstr "Ime &artifakta:"
+msgid "new_field"
+msgstr "novi_literal"
 
-#: dialogs/classgenpage.cpp:64
+#: umldoc.cpp:82 umldoc.cpp:1518
 #, fuzzy
-msgid "Enum &name:"
-msgstr "I&me nabrajanja:"
+msgid "UML Model"
+msgstr "Umbrello, UML modelar"
 
-#: dialogs/classgenpage.cpp:66
+#: umldoc.cpp:106
 #, fuzzy
-msgid "Datatype &name:"
-msgstr "Ime tipa po&datka:"
+msgid "Logical View"
+msgstr "Logički prikaz"
 
-#: dialogs/classgenpage.cpp:68
+#: umldoc.cpp:107
 #, fuzzy
-msgid "Entity &name:"
-msgstr "I&me nabrajanja:"
+msgid "Use Case View"
+msgstr "Prikaz slučaja upotrebe"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+#: umldoc.cpp:108
 #, fuzzy
-msgid "&Stereotype name:"
-msgstr "Ime &stereotipa:"
+msgid "Component View"
+msgstr "Prikaz komponenti"
 
-#: dialogs/classgenpage.cpp:107
+#: umldoc.cpp:109
 #, fuzzy
-msgid "&Package name:"
-msgstr "Ime &paketa:"
+msgid "Deployment View"
+msgstr "Prikaz razvijanja"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "A&pstraktna klasa"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:123
+#: umldoc.cpp:117 umldoc.cpp:293
 #, fuzzy
-msgid "A&bstract use case"
-msgstr "A&pstraktna klasa"
-
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Izvršni"
+msgid "Datatypes"
+msgstr "Vrste podataka"
 
-#: dialogs/classgenpage.cpp:138
+#: umldoc.cpp:229
 #, fuzzy
-msgid "Draw As"
-msgstr "Crtaj kao"
-
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Uobičajeno"
-
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Biblioteka"
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Trenutni datoteka je izmjenjen.\n"
+"Želite li da ga sačuvate?"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tablica"
+#: umldoc.cpp:355
+#, fuzzy
+msgid "The file %1 does not exist."
+msgstr "Datoteka %1 ne postoji."
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "&Javno"
+#: umldoc.cpp:380
+#, fuzzy
+msgid "The file %1 seems to be corrupted."
+msgstr "Datoteka %1 ne postoji."
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "&Privatno"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr ""
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "&Zaštićeno"
+#: umldoc.cpp:448
+#, fuzzy, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Došlo je do problema prilikom učitavanja datotekaa: %1"
 
-#: dialogs/classgenpage.cpp:186
-#, fuzzy
-msgid "Imple&mentation"
-msgstr "&Dokumentacija"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, fuzzy, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Došlo je do problema prilikom učitavanja datotekaa: %1"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Ime klase:"
+#: umldoc.cpp:641
+#, fuzzy, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Došlo je do problema prilikom slanja datotekaa: %1"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+#: umldoc.cpp:934
 #, fuzzy
-msgid "Instance name:"
-msgstr "Ime primjerka:"
+msgid "use case diagram"
+msgstr "dijagram slučaja upotrebe"
 
-#: dialogs/classgenpage.cpp:272
+#: umldoc.cpp:936
 #, fuzzy
-msgid "Draw as actor"
-msgstr "Crtaj kao aktera"
-
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Višestruke instance"
+msgid "class diagram"
+msgstr "dijagram klase"
 
-#: dialogs/classgenpage.cpp:284
+#: umldoc.cpp:938
 #, fuzzy
-msgid "Show destruction"
-msgstr "Pokaži razgrađivanje"
+msgid "sequence diagram"
+msgstr "dijagram sekvence"
 
-#: dialogs/classgenpage.cpp:322
+#: umldoc.cpp:940
 #, fuzzy
-msgid "Component name:"
-msgstr "Ime komponente:"
+msgid "collaboration diagram"
+msgstr "dijagram saradnje"
 
-#: dialogs/classgenpage.cpp:324
+#: umldoc.cpp:942
 #, fuzzy
-msgid "Node name:"
-msgstr "Ime čvora:"
+msgid "state diagram"
+msgstr "dijagram stanja"
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-#, fuzzy
-msgid "Stereotype name:"
-msgstr "Ime stereotipa:"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "dijagram aktivnosti"
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:946
 #, fuzzy
-msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
-msgstr ""
-"Ime koje ste odabrali\n"
-"već se koristi.\n"
-"Ime je resetovano."
+msgid "component diagram"
+msgstr "dijagram komponenti"
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
+#: umldoc.cpp:948
 #, fuzzy
-msgid "Name is Not Unique"
-msgstr "Ime nije jedinstveno"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Redak:"
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Ispuni:"
+msgid "deployment diagram"
+msgstr "dijagram razvijanja"
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "&Uobičajeno"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:78
+#: umldoc.cpp:984 umldoc.cpp:1017
 #, fuzzy
-msgid "&Use fill"
-msgstr "&Koristi popunjavanje"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Aktivnosti"
+msgid "That is an invalid name for a diagram."
+msgstr "To je neispravno ime za dijagram."
 
-#: dialogs/activitypage.cpp:72
-#, fuzzy
-msgid "New Activity..."
-msgstr "Nova aktivnost..."
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Dijagram već koristi to ime."
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Preimenuj"
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+msgstr ""
 
-#: dialogs/activitypage.cpp:134
+#: umldoc.cpp:1068 umllistview.cpp:1917
 #, fuzzy
-msgid "New Activity"
-msgstr "Nova aktivnost"
+msgid "Use Name"
+msgstr "Slučaj upotrebe"
 
-#: dialogs/activitypage.cpp:153
+#: umldoc.cpp:1068 umllistview.cpp:1917
 #, fuzzy
-msgid "Rename Activity"
-msgstr "Promijeni ime aktivnosti"
+msgid "Enter New Name"
+msgstr "Unesite ime stanja"
 
-#: dialogs/activitypage.cpp:153
+#: umldoc.cpp:1099
 #, fuzzy
-msgid "Enter the new name of the activity:"
-msgstr "Unesite novo ime za aktivnost:"
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Jeste li sigurni da želite da obrišete dijagram %1?"
 
-#: dialogs/assocpropdlg.cpp:39
+#: umldoc.cpp:1099
 #, fuzzy
-msgid "Association Properties"
-msgstr "Svojstva pridruživanja"
-
-#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
-#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
-#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
-msgid "General Settings"
-msgstr "Opće postavke"
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Funkcije"
+msgid "Delete Diagram"
+msgstr "Obriši dijagram"
 
-#: dialogs/assocpropdlg.cpp:94
+#: umldoc.cpp:1573
 #, fuzzy
-msgid "Role Settings"
-msgstr "Postavke uloge"
+msgid "Setting up the document..."
+msgstr "Postavljam dokument..."
 
-#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
-#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
-#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
-msgid "Font Settings"
-msgstr "Postavke pisma"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr ""
 
-#: dialogs/assocpropdlg.cpp:112
+#: umldoc.cpp:1638
 #, fuzzy
-msgid "Association font"
-msgstr "Pismo pridruživanja"
+msgid "Loading UML elements..."
+msgstr "Učitavam UML elemente..."
 
-#: dialogs/umltemplatedialog.cpp:36
+#: umldoc.cpp:1811
 #, fuzzy
-msgid "Template Properties"
-msgstr "Svojstva predložak"
-
-#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
-#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
-#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
-msgid "General Properties"
-msgstr "Opća svojstva"
+msgid "Loading diagrams..."
+msgstr "Učitavam dijagrame..."
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Tip:"
+#: umldoc.cpp:2104
+#, fuzzy, c-format
+msgid "/autosave%1"
+msgstr "/automatsko spremanje%1"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Ime:"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:128
+#: umllistview.cpp:416
 #, fuzzy
-msgid "You have entered an invalid template name."
-msgstr "Unijeli ste neispravno ime za šablon."
+msgid "Enter Model Name"
+msgstr "Unesite ime stanja"
 
-#: dialogs/umltemplatedialog.cpp:129
+#: umllistview.cpp:417
 #, fuzzy
-msgid "Template Name Invalid"
-msgstr "Neispravno ime za šablon"
+msgid "Enter the new name of the model:"
+msgstr "Unesite novo ime za aktivnost:"
 
-#: dialogs/umltemplatedialog.cpp:138
-#, fuzzy
-msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "Ime koje ste odabrali za parametar već se koristi u ovoj operaciji."
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Pogledi"
 
-#: dialogs/umltemplatedialog.cpp:139
-#, fuzzy
-msgid "Template Name Not Unique"
-msgstr "Ime parametra nije jedinstveno"
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:43
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
 #, fuzzy
-msgid "Entity Attribute Properties"
-msgstr "Svojstva atributa"
+msgid "Name Not Valid"
+msgstr "Ime nije ispravno"
 
-#: dialogs/umlentityattributedialog.cpp:73
+#: umllistview.cpp:1923 umllistview.cpp:2160
 #, fuzzy
-msgid "&Default value:"
-msgstr "&Uobičajeno"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr ""
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
 msgstr ""
+"Ime koje ste unijeli nije jedinstveno!\n"
+"Proces pravljenja je obustavljen."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:92
+#: umllistview.cpp:2338
 #, fuzzy
-msgid "Attributes:"
-msgstr "Atributi"
-
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr ""
+msgid "Loading listview..."
+msgstr "Učitavam dijagrame..."
 
-#: dialogs/umlentityattributedialog.cpp:112
+#: umllistview.cpp:2670
 #, fuzzy
-msgid "&None"
-msgstr "&Novi"
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Direktorij se mora prvo isprazniti da bi se obrisao."
 
-#: dialogs/umlentityattributedialog.cpp:115
+#: umllistview.cpp:2671
 #, fuzzy
-msgid "&Primary"
-msgstr "&Biblioteka"
+msgid "Folder Not Empty"
+msgstr "Direktorij nije prazan"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
 msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:184
-#, fuzzy
-msgid "You have entered an invalid entity attribute name."
-msgstr "Unijeli ste neispravno ime atributa."
-
-#: dialogs/umlentityattributedialog.cpp:185
-#, fuzzy
-msgid "Entity Attribute Name Invalid"
-msgstr "Neispravno ime atributa"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
-#, fuzzy
+#: umllistviewitem.cpp:478
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "Ime koje ste odabrali za atribut već se koristi u ovoj operaciji."
-
-#: dialogs/umlentityattributedialog.cpp:193
-#, fuzzy
-msgid "Entity Attribute Name Not Unique"
-msgstr "Ime atributa nije jedinstveno"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Prikaz"
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
 
-#: dialogs/umlviewdialog.cpp:93
+#: umlview.cpp:297 umlview.cpp:357
 #, fuzzy
-msgid "Classes Display Options"
-msgstr "Opcije za prikaz klasa"
+msgid "Diagram: %2 Page %1"
+msgstr "Dijagram: %2 stranica %1"
 
-#: dialogs/umlviewdialog.cpp:100
+#: umlview.cpp:2578
 #, fuzzy
-msgid "Diagram Colors"
-msgstr "Boje za dijagram"
+msgid "Enter Diagram Name"
+msgstr "Unesite ime stanja"
 
-#: dialogs/umlviewdialog.cpp:164
+#: umlview.cpp:2579
 #, fuzzy
-msgid "The name you have entered is invalid."
-msgstr "Ime koje ste unijeli nije ispravno."
+msgid "Enter the new name of the diagram:"
+msgstr "Unesite novo ime za aktivnost:"
 
-#: dialogs/umlviewdialog.cpp:170
-#, fuzzy
-msgid "The name you have entered is not unique."
-msgstr "Ime koje ste unijeli nije jedinstveno."
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"Odabrali ste prisanje cijelog dijagrama.\n"
+"Da li ste sigurni?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Tip:"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Obristai dijagram?"
 
-#: dialogs/settingsdlg.cpp:30
+#: umlviewimageexporter.cpp:46
 #, fuzzy
-msgid "Umbrello Setup"
-msgstr "Podešavanje Umbrello-a"
+msgid "Exporting view..."
+msgstr "Izlazim..."
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Korisničko sučelje"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:47
-#, fuzzy
-msgid "User Interface Settings"
-msgstr "Postavke korisničkog interfejsa"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Odabrana datoteka %1 postoji.\n"
+"Želite je prepisati?"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Boja crte:"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Datoteka već postoji"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "&Uobičajena boja"
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "Ne mogu napraviti direktorij"
 
-#: dialogs/settingsdlg.cpp:63
-#, fuzzy
-msgid "Fill color:"
-msgstr "Boja za popunjavanje:"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Nije moguće snimiti prazan dijagram"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "&Uobičajena boja"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
+#: umlwidgetcontroller.cpp:128
+msgid ""
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y "
+"axis. Right button click to cancel move."
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
+#: umlwidgetcontroller.cpp:379
+msgid ""
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y "
+"axis. Right button click to cancel resize."
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:86
-#, fuzzy
-msgid "&Use fill color"
-msgstr "&Koristi boju za popunjavanje"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objekt"
 
-#: dialogs/settingsdlg.cpp:108
+#: worktoolbar.cpp:246
 #, fuzzy
-msgid "Enable undo"
-msgstr "&Uključi automatsko spremanje"
+msgid "Synchronous Message"
+msgstr "Sinhrona poruka"
 
-#: dialogs/settingsdlg.cpp:112
+#: worktoolbar.cpp:247
 #, fuzzy
-msgid "Use tabbed diagrams"
-msgstr "dijagram stanja"
+msgid "Asynchronous Message"
+msgstr "Asinhrona poruka"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr ""
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Oznaka"
 
-#: dialogs/settingsdlg.cpp:120
-#, fuzzy
-msgid "Use angular association lines"
-msgstr "Uobičajeni opseg operacije:"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Bilješka"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Automatsko spremanje"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Kutija"
 
-#: dialogs/settingsdlg.cpp:132
+#: worktoolbar.cpp:257
 #, fuzzy
-msgid "E&nable autosave"
-msgstr "&Uključi automatsko spremanje"
+msgid "Relationship"
+msgstr "Realizacija"
 
-#: dialogs/settingsdlg.cpp:136
+#: worktoolbar.cpp:258
 #, fuzzy
-msgid "Select auto-save time interval (mins):"
-msgstr "Odaberite period automatskog spremanja (minuti):"
+msgid "Directional Association"
+msgstr "Unesite naziv objekta:"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr ""
+#: worktoolbar.cpp:259
+#, fuzzy
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementira (generalizacija-realizacija)"
 
-#: dialogs/settingsdlg.cpp:148
-msgid ""
-"<qt>"
-"<p>The autosave file will be saved to ~/autosave.xmi if the autosaving occurs "
-"before you have manually saved the file.</p>"
-"<p>If you've already saved it, the autosave file will be saved in the same "
-"folder as the file and will be named like the file's name, followed by the "
-"suffix specified.</p>"
-"<p>If the suffix is equal to the suffix of the file you've saved, the autosave "
-"will overwrite your file automatically.</p></qt>"
+#: worktoolbar.cpp:275
+msgid "Deep History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Podizanje"
-
-#: dialogs/settingsdlg.cpp:164
-#, fuzzy
-msgid "Sta&rtup logo"
-msgstr "Logo p&ri pokretanju"
-
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Savjet dana"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:172
+#: worktoolbar.cpp:277
 #, fuzzy
-msgid "&Load last project"
-msgstr "&Učitaj posljednji projekat"
+msgid "Join"
+msgstr "Podeli/Spoji"
 
-#: dialogs/settingsdlg.cpp:176
+#: worktoolbar.cpp:278
 #, fuzzy
-msgid "Start new project with:"
-msgstr "Počni novi projekat:"
+msgid "Fork"
+msgstr "Obrazac1"
 
-#: dialogs/settingsdlg.cpp:183
-#, fuzzy
-msgid "No Diagram"
-msgstr "Bez dijagrama"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:183
-#, fuzzy
-msgid "Class Diagram"
-msgstr "Dijagram klasa"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
+#: worktoolbar.cpp:285
 #, fuzzy
-msgid "Use Case Diagram"
-msgstr "Dijagram slučaja upotrebe"
+msgid "Activity Transition"
+msgstr "Prijelaz aktivnosti"
 
-#: dialogs/settingsdlg.cpp:184
-#, fuzzy
-msgid "Sequence Diagram"
-msgstr "Dijagram sekvenci"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Poruka"
 
-#: dialogs/settingsdlg.cpp:185
-#, fuzzy
-msgid "Collaboration Diagram"
-msgstr "Dijagram saradnje"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:185
-#, fuzzy
-msgid "State Diagram"
-msgstr "Dijagram stanja"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Odaberi"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Dijagram aktivnosti"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:186
-#, fuzzy
-msgid "Component Diagram"
-msgstr "Dijagram komponenti"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:187
-#, fuzzy
-msgid "Deployment Diagram"
-msgstr "Dijagram razvijanja"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:210
-#, fuzzy
-msgid "Class Settings"
-msgstr "Postavke klase"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-#, fuzzy
-msgid "Show &visibility"
-msgstr "Pokaži &vidljivost"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Pokaži operacije"
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Prikaži osobine"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:225
-#, fuzzy
-msgid "Show operations"
-msgstr "Pokaži operacije"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Očisti dijagram"
 
-#: dialogs/settingsdlg.cpp:229
-#, fuzzy
-msgid "Show stereot&ype"
-msgstr "Pr&ikaži stereotip"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-#, fuzzy
-msgid "Show attribute signature"
-msgstr "Pokaži potpis atributa"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Uopćenje"
 
-#: dialogs/settingsdlg.cpp:238
-#, fuzzy
-msgid "Show package"
-msgstr "Pokaži paket"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:247
-#, fuzzy
-msgid "Starting Scope"
-msgstr "Početni opseg"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-#, fuzzy
-msgid "Default attribute scope:"
-msgstr "Uobičajeni opseg atributa:"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Ime pridruživanja"
 
-#: dialogs/settingsdlg.cpp:255
-#, fuzzy
-msgid "Default operation scope:"
-msgstr "Uobičajeni opseg operacije:"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-#, fuzzy
-msgid "Code Generation"
-msgstr "Generiranje kôda"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-#, fuzzy
-msgid "Code Generation Settings"
-msgstr "Postavke generiranja kôda"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:301
-#, fuzzy
-msgid "Code Viewer Settings"
-msgstr "Postavke prikazivača kôda"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Uobičajeno"
 
-#: dialogs/umloperationdialog.cpp:50
-#, fuzzy
-msgid "Operation Properties"
-msgstr "Svojstva operacija"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Apstraktna operacija"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, fuzzy, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Kroz-kroz (//)"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-#, fuzzy
-msgid "Classifier &scope (\"static\")"
-msgstr "Op&seg klasifikatora („static“)"
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, fuzzy, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Kroz-zvezdica (/**  */)"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Stil:"
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "&Zaštićeno"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Generiranje C++ kôda</p>"
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-#, fuzzy
-msgid "I&mplementation"
-msgstr "&Dokumentacija"
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, fuzzy, no-c-format
+msgid "Method Body Generation"
+msgstr "Generiranje tela metoda"
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametri"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, fuzzy, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Koristi sljedeće za klase u generiranom kôdu:"
 
-#: dialogs/umloperationdialog.cpp:141
-#, fuzzy
-msgid "Ne&w Parameter..."
-msgstr "No&vi parametar..."
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, fuzzy, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-#, fuzzy
-msgid "You have entered an invalid parameter name."
-msgstr "Unijeli ste neispravno ime za parametar."
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vektor"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-#, fuzzy
-msgid "Parameter Name Invalid"
-msgstr "Neispravno ime parametra"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, fuzzy, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Varijabla</b>"
 
-#: dialogs/umloperationdialog.cpp:339
-#, fuzzy
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Ime koje ste odabrali za parametar\n"
-"već se koristi u ovoj operaciji."
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-#, fuzzy
-msgid "Parameter Name Not Unique"
-msgstr "Ime parametra nije jedinstveno"
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, fuzzy, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/umloperationdialog.cpp:406
-#, fuzzy
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Ime koje ste odabrali za parametar već se koristi u ovoj operaciji."
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "niz znakova"
 
-#: dialogs/umloperationdialog.cpp:456
-#, fuzzy
-msgid "You have entered an invalid operation name."
-msgstr "Unijeli ste neispravno ime operacije."
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Znakovni niz</p>"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-#, fuzzy
-msgid "Operation Name Invalid"
-msgstr "Neispravno ime operacije"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Lista</p>"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-#, fuzzy
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Operacija sa takvim potpisom već postoji u %1.\n"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, fuzzy, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-#, fuzzy
-msgid "Choose a different name or parameter list."
-msgstr "Odaberite drugačije ime ili parametarsku popis."
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, fuzzy, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i>globalno?</i>"
 
-#: dialogs/assocrolepage.cpp:50
-#, fuzzy
-msgid "Role A Properties"
-msgstr "Svojstva uloge „A“"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, fuzzy, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/assocrolepage.cpp:51
-#, fuzzy
-msgid "Role B Properties"
-msgstr "Svojstva uloge „B“"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, fuzzy, no-c-format
+msgid "Class name"
+msgstr "Ime klase"
 
-#: dialogs/assocrolepage.cpp:68
-#, fuzzy
-msgid "Role A Visibility"
-msgstr "Vidljivost uloge „A“"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, fuzzy, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<p align=\"center\">Uključni datoteka</p>"
 
-#: dialogs/assocrolepage.cpp:69
-#, fuzzy
-msgid "Role B Visibility"
-msgstr "Vidljivost uloge „B“"
+#: codegenerators/javacodegenerationformbase.ui:40
+#, fuzzy, no-c-format
+msgid "Project Generation"
+msgstr "Generiranje projekta"
 
-#: dialogs/assocrolepage.cpp:70
-#, fuzzy
-msgid "Role A Changeability"
-msgstr "Promenjljivost uloge „A“"
+#: codegenerators/javacodegenerationformbase.ui:51
+#, fuzzy, no-c-format
+msgid "Create ANT build document"
+msgstr "Napravi graditeljski ANT dokument"
 
-#: dialogs/assocrolepage.cpp:71
-#, fuzzy
-msgid "Role B Changeability"
-msgstr "Promenjljivost uloge „B“"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, fuzzy, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Automatski generiraj metode"
 
-#: dialogs/pkgcontentspage.cpp:29
-#, fuzzy
-msgid "Contained Items"
-msgstr "Sadržane stavke"
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, fuzzy, no-c-format
+msgid "Empty constructor methods"
+msgstr "Prazni konstruktorski metodi"
 
-#: dialogs/notedialog.cpp:25
-#, fuzzy
-msgid "Note Documentation"
-msgstr "Dokumentacija napomene"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, fuzzy, no-c-format
+msgid "Association accessor methods"
+msgstr "Pristupni način"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "&Novi atribut..."
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, fuzzy, no-c-format
+msgid "Attribute accessor methods"
+msgstr "Pristupni način"
 
-#: dialogs/classifierlistpage.cpp:42
-#, fuzzy
-msgid "N&ew Operation..."
-msgstr "N&ova operacija..."
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, fuzzy, no-c-format
+msgid "From Parent Object"
+msgstr "Iz roditeljskog objekta"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Predlošci"
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, fuzzy, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Uobičajeni opseg atributa:"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "&Novi predložak..."
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, fuzzy, no-c-format
+msgid "Default association field scope:"
+msgstr "Uobičajeni opseg operacije:"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-#, fuzzy
-msgid "Enum Literals"
-msgstr "Literali nabrajanja"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, fuzzy, no-c-format
+msgid "From Parent Role"
+msgstr "Iz roditeljskog objekta"
 
-#: dialogs/classifierlistpage.cpp:48
-#, fuzzy
-msgid "N&ew Enum Literal..."
-msgstr "N&ovi literal nabrajanja..."
+#: codegenerators/javacodegenerationformbase.ui:269
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Generiranje Java kôda</p>"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes"
-msgstr "Atributi"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:51
-#, fuzzy
-msgid "N&ew Entity Attribute..."
-msgstr "&Novi atribut..."
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-#, fuzzy
-msgid "Initial activity"
-msgstr "Početna aktivnost"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Generiranje C++ kôda</p>"
 
-#: dialogs/activitydialog.cpp:70
-#, fuzzy
-msgid "End activity"
-msgstr "Završna aktivnost"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Jezik"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Vrsta aktivnosti:"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Mape"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Ime aktivnosti:"
+#: dialogs/codegenerationoptionsbase.ui:110
+#, fuzzy, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Zapiši sve generirane datotekaove u direktorij:"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-#, fuzzy
-msgid "Widget Colors"
-msgstr "Boje kontrole"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Potraži..."
 
-#: dialogs/umlattributedialog.cpp:42
-#, fuzzy
-msgid "Attribute Properties"
-msgstr "Svojstva atributa"
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "&Potraži..."
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-#, fuzzy
-msgid "&Initial value:"
-msgstr "&Početna vrijednost:"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, fuzzy, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "&Uključi zaglavne datotekaove iz direktorija:"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Javno"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, fuzzy, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr ""
+"Datoteke napravljeni generatorom kôda biti će zapisani u ovaj direktorij"
 
-#: dialogs/umlattributedialog.cpp:155
-#, fuzzy
-msgid "You have entered an invalid attribute name."
-msgstr "Unijeli ste neispravno ime atributa."
+#: dialogs/codegenerationoptionsbase.ui:153
+#, fuzzy, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
+"Datoteke iz ovog direktorija će biti korišteni kao zaglavni datoteke u "
+"generiranom kôdu"
 
-#: dialogs/umlattributedialog.cpp:156
-#, fuzzy
-msgid "Attribute Name Invalid"
-msgstr "Neispravno ime atributa"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, fuzzy, no-c-format
+msgid "Overwrite Policy"
+msgstr "Politika prebrisavanja"
 
-#: dialogs/umlattributedialog.cpp:163
-#, fuzzy
+#: dialogs/codegenerationoptionsbase.ui:214
+#, fuzzy, no-c-format
 msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Ime koje ste odabrali za atribut već se koristi u ovoj operaciji."
+"If a file with the same name as the name code \n"
+"generator wants to use as output file already exists:"
+msgstr ""
+"Ako već postoji datoteka sa istim imenom kakvo \n"
+"generator kôda hoće treba koristiti za svoj izlazni datoteka:"
 
-#: dialogs/umlattributedialog.cpp:164
-#, fuzzy
-msgid "Attribute Name Not Unique"
-msgstr "Ime atributa nije jedinstveno"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "&Prebriši"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-#, fuzzy
-msgid "Select Operation"
-msgstr "Odaberite operaciju"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, fuzzy, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr ""
+"Prebriši postojeće datotekaove ako oni postoje u odredišnom direktoriju"
 
-#: dialogs/selectopdlg.cpp:43
-#, fuzzy
-msgid "Sequence number:"
-msgstr "Broj sekvence:"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Pitaj"
 
-#: dialogs/selectopdlg.cpp:46
-#, fuzzy
-msgid "Class operation:"
-msgstr "Operacija klase:"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, fuzzy, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Ako datoteka sa istim imenom već postoji, pitaj šta da radiš"
 
-#: dialogs/selectopdlg.cpp:54
-#, fuzzy
-msgid "Custom operation:"
-msgstr "Posebna operacija:"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, fuzzy, no-c-format
+msgid "&Use a different name"
+msgstr "&Koristi drugačije ime"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Dijagrami"
+#: dialogs/codegenerationoptionsbase.ui:251
+#, fuzzy, no-c-format
+msgid ""
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
+msgstr ""
+"Ako datoteka već postoji u odredišnom direktoriju, odaberi drugo ime "
+"dodavanjem sufiksa na ime datotekaa"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filtar"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Oblikovanje"
 
-#: dialogs/diagramprintpage.cpp:48
-#, fuzzy
-msgid "&Current diagram"
-msgstr "&Trenutni dijagram"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Linije"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Svi dijagrami"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, fuzzy, no-c-format
+msgid "Line ending style:"
+msgstr "Stil kraja linije:"
 
-#: dialogs/diagramprintpage.cpp:57
-#, fuzzy
-msgid "&Select diagrams"
-msgstr "&Odaberi dijagram"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, fuzzy, no-c-format
+msgid "Indentation type:"
+msgstr "Vrsta uvlačenja:"
 
-#: dialogs/diagramprintpage.cpp:61
-#, fuzzy
-msgid "&Type of diagram"
-msgstr "&Vrsta dijagrama"
+#: dialogs/codegenerationoptionsbase.ui:362
+#, fuzzy, no-c-format
+msgid "Indentation amount:"
+msgstr "Veličina uvlačenja:"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Odabir"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, fuzzy, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr ""
+"*NIX (\"\n"
+"\")"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Suradnja"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, fuzzy, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr ""
+"Windows (\"\\r\n"
+"\")"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Slijed"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, fuzzy, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-#, fuzzy
-msgid "Deployment"
-msgstr "Prikaz razvijanja"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, fuzzy, no-c-format
+msgid "No Indentation"
+msgstr "Bez uvlačenja"
 
-#: dialogs/diagramprintpage.cpp:135
-#, fuzzy
-msgid "No diagrams selected."
-msgstr "Nema odabranih dijagrama."
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tab"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Mogućnosti prikaza"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Razmak"
 
-#: dialogs/classpropdlg.cpp:179
-#, fuzzy
-msgid "Attribute Settings"
-msgstr "Postavke atributa"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, fuzzy, no-c-format
+msgid "Comment Verbosity"
+msgstr "Opširnost komentara"
 
-#: dialogs/classpropdlg.cpp:187
-#, fuzzy
-msgid "Operation Settings"
-msgstr "Postavke operacija"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, fuzzy, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Piši komentare &za odeljke iako je odeljak\n"
+"prazan"
 
-#: dialogs/classpropdlg.cpp:195
-#, fuzzy
-msgid "Templates Settings"
-msgstr "Postavke predložak"
+#: dialogs/codegenerationoptionsbase.ui:436
+#, fuzzy, no-c-format
+msgid ""
+"Writes comments to indicate the different sections (public, private etc) in "
+"a class, even if the sections are empty"
+msgstr ""
+"Piše komentare za naznaku drugog odeljka (javni, privatni itd.) u klasi, čak "
+"i ako su odeljci prazni"
 
-#: dialogs/classpropdlg.cpp:202
-#, fuzzy
-msgid "Enum Literals Settings"
-msgstr "Postavke literala nabrajanja"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, fuzzy, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Piši dokumentaciju komentara čak iako su prazni"
 
-#: dialogs/classpropdlg.cpp:209
-#, fuzzy
-msgid "Entity Attributes Settings"
-msgstr "Postavke atributa"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, fuzzy, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "Piši komentare &za dokumentaciju klase i metoda čak iako su prazni"
 
-#: dialogs/classpropdlg.cpp:216
-#, fuzzy
-msgid "Contents Settings"
-msgstr "Postavke sadržaja"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, fuzzy, no-c-format
+msgid "Language Options"
+msgstr "Opcije jezika"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-#, fuzzy
-msgid "Associations"
-msgstr "Pridruženja"
+#: dialogs/codegenerationwizardbase.ui:16
+#, fuzzy, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Čarobnjak za generiranje kôda"
 
-#: dialogs/classpropdlg.cpp:222
-#, fuzzy
-msgid "Class Associations"
-msgstr "Pridruženja klasa"
+#: dialogs/codegenerationwizardbase.ui:23
+#, fuzzy, no-c-format
+msgid "Select Classes"
+msgstr "Odaberite klase"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "&Postupci"
+#: dialogs/codegenerationwizardbase.ui:40
+#, fuzzy, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr ""
+"U popis desno smijestite sve klase za\n"
+"koje želite da se generiše kôd"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Vidljivost"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Dodaj klasu za izradu koda"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-#, fuzzy
-msgid "O&peration signature"
-msgstr "Potpis o&peracije"
+#: dialogs/codegenerationwizardbase.ui:101
+#, fuzzy, no-c-format
+msgid "Classes Selected"
+msgstr "Odabrane klase"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "&Paket"
+#: dialogs/codegenerationwizardbase.ui:136
+#, fuzzy, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Ukloni klasu iz generiranja kôda"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "&Atributi"
+#: dialogs/codegenerationwizardbase.ui:159
+#, fuzzy, no-c-format
+msgid "Classes Available"
+msgstr "Dostupne klase"
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "&Stereotip"
+#: dialogs/codegenerationwizardbase.ui:209
+#, fuzzy, no-c-format
+msgid "Code Generation Status"
+msgstr "Status generiranja kôda"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-#, fuzzy
-msgid "Attr&ibute signature"
-msgstr "Potpis atr&ibuta"
+#: dialogs/codegenerationwizardbase.ui:226
+#, fuzzy, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Pritisnite gumb za generiranje za početak generiranja kôda"
 
-#: dialogs/classoptionspage.cpp:108
-#, fuzzy
-msgid "Draw as circle"
-msgstr "Crtaj kao krug"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, fuzzy, no-c-format
+msgid "Generation Status"
+msgstr "Status generiranja"
 
-#: dialogs/statedialog.cpp:85
-#, fuzzy
-msgid "Initial state"
-msgstr "Početno stanje"
+#: dialogs/codeviewerdialogbase.ui:43
+#, fuzzy, no-c-format
+msgid "Show hidden blocks"
+msgstr "Pokaži skrivene blokove"
 
-#: dialogs/statedialog.cpp:85
-#, fuzzy
-msgid "End state"
-msgstr "Završno stanje"
+#: dialogs/codeviewerdialogbase.ui:59
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">ovdje ide ime komponente</p>"
 
-#: dialogs/statedialog.cpp:96
-#, fuzzy
-msgid "State type:"
-msgstr "Vrsta stanja:"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/statedialog.cpp:101
-#, fuzzy
-msgid "State name:"
-msgstr "Ime stanja:"
+#: dialogs/codeviewerdialogbase.ui:86
+#, fuzzy, no-c-format
+msgid "Show block type"
+msgstr "Pokaži vrstu bloka"
 
-#: dialogs/statedialog.cpp:130
-#, fuzzy
-msgid "Widget Color"
-msgstr "Boja kontrole"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Boje"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-#, fuzzy
-msgid "new_class"
-msgstr "nova_klasa"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Pismo:"
 
-#: dialogs/classwizard.cpp:54
-#, fuzzy
-msgid "New Class"
-msgstr "Nova klasa"
+#: dialogs/codevieweroptionsbase.ui:103
+#, fuzzy, no-c-format
+msgid "Paper:"
+msgstr "Papir:"
 
-#: dialogs/classwizard.cpp:59
-#, fuzzy
-msgid "Class Attributes"
-msgstr "Atributi klase"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Označeno"
 
-#: dialogs/classwizard.cpp:63
-#, fuzzy
-msgid "Class Operations"
-msgstr "Operacije klase"
+#: dialogs/codevieweroptionsbase.ui:260
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">UML blok objekta:</p>"
 
-#: dialogs/parmpropdlg.cpp:35
-#, fuzzy
-msgid "Parameter Properties"
-msgstr "Svojstva parametra"
+#: dialogs/codevieweroptionsbase.ui:276
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Skriveni blok:</p>"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:294
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Neizmjenljiv tekst:</p>"
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
-msgstr ""
+#: dialogs/codevieweroptionsbase.ui:333
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Urediv tekst:</p>"
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "N&ačin"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Svojstva dijagrama"
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Završetak"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Zumiraj:"
 
-#: dialogs/codegenerationwizard.cpp:132
-#, fuzzy
-msgid "Code Generated"
-msgstr "Kôd je generiran"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/codegenerationwizard.cpp:134
-#, fuzzy
-msgid "Not Generated"
-msgstr "Nije generiran"
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Prikaži rešetku"
 
-#: dialogs/codegenerationwizard.cpp:141
-#, fuzzy
-msgid "Not Yet Generated"
-msgstr "Još uvijek nije generiran"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "&Prijanjaj uz mrežu"
 
-#: dialogs/codegenerationwizard.cpp:162
-#, fuzzy
-msgid "The folder %1 does not exist. Do you want to create it now?"
+#: dialogs/diagrampropertiespage.ui:202
+#, fuzzy, no-c-format
+msgid "Snap component size"
+msgstr "Veličina komponente uklapanja"
+
+#: dialogs/diagrampropertiespage.ui:205
+#, fuzzy, no-c-format
+msgid ""
+"Snap the size of the components to be a multiple of the grid spacing.\n"
+"If 'Snap to Grid' is enabled a component will always be aligned with the "
+"grid on all 4 sides."
 msgstr ""
-"Odabrani datoteka %1 postoji.\n"
-"Želite li da ga prebrišete?"
+"Postavlja veličinu komponente tako da ona bude umnožak razmaka u mreži.\n"
+"Ako je uključena opcija „uklapaj uz mrežu“ komponenta će uvijek biti "
+"poravnata sa mrežom na sve četiri strane."
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Create Folder"
-msgstr "Ne mogu napraviti direktorij"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Do Not Create"
-msgstr "Ne&moj da praviš datoteka"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/codegenerationwizard.cpp:168
-msgid ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:169
-#, fuzzy
-msgid "Error Creating Folder"
-msgstr "Ne mogu napraviti direktorij"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, fuzzy, no-c-format
+msgid "Export all views"
+msgstr "Izvezi kao sliku..."
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:184
-msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
 msgstr ""
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr ""
+#: dialogs/exportallviewsdialogbase.ui:84
+#, fuzzy, no-c-format
+msgid "&Image type:"
+msgstr "Vrsta stanja:"
 
-#: dialogs/codegenerationwizard.cpp:191
-#, fuzzy
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 se čini da nije direktorij. Molim, odaberite ispravan direktorij."
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "mapa"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
+msgid ""
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
 
-#: dialogs/overwritedialogue.cpp:27
-#, fuzzy
-msgid "Destination File Already Exists"
-msgstr "Odredišni datoteka već postoji"
-
-#: dialogs/overwritedialogue.cpp:31
-#, fuzzy
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
 msgid ""
-"The file %1 already exists in %2.\n"
-"\n"
-"Umbrello can overwrite the file, generate a similar\n"
-"file name or not generate this file."
+"The views are stored in folders in the document. The same tree structure "
+"used in the document to store the views can be created in the selected base "
+"directory with this option.\n"
+"Only the folders made by the user are created in the base directory (Logical "
+"view, use case view and so on aren't created)."
 msgstr ""
-"Datoteka %1 već postoji u %2.\n"
-"\n"
-"Umbrello može da prebriše datoteka, napravi datoteka\n"
-"sosobnog imena ili da ga uopše i ne napravi."
-
-#: dialogs/overwritedialogue.cpp:34
-#, fuzzy
-msgid "&Apply to all remaining files"
-msgstr "&Priizbornik na sve preostale datotekaove"
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "Pr&epiši"
-
-#: dialogs/overwritedialogue.cpp:39
-#, fuzzy
-msgid "&Generate Similar File Name"
-msgstr "&Napravi sosobno ime datotekaa"
-
-#: dialogs/overwritedialogue.cpp:40
-#, fuzzy
-msgid "&Do Not Generate File"
-msgstr "Ne&moj da praviš datoteka"
-
-#: dialogs/defaultcodegenpolicypage.cpp:36
-#, fuzzy
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Nema dostupnih opcija.</p>"
-
-#: associationwidget.cpp:2328
-#, fuzzy
-msgid "Multiplicity"
-msgstr "Višestrukost"
-
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-#, fuzzy
-msgid "Enter multiplicity:"
-msgstr "Unesite višestrukost:"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, fuzzy, no-c-format
+msgid "Role Changeability"
+msgstr "Izmjenljivost uloge"
 
-#: associationwidget.cpp:2346
-#, fuzzy
-msgid "Association Name"
-msgstr "Ime pridruživanja"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, fuzzy, no-c-format
+msgid "Role Visibility"
+msgstr "Vidljivost uloge"
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-#, fuzzy
-msgid "Enter association name:"
-msgstr "Unesite ime pridruživanja:"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr ""
 
-#: associationwidget.cpp:2366
-#, fuzzy
-msgid "Role Name"
-msgstr "Ime uloge"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Unesite ime uloge:"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Grafikon"
 
-#: floatingtextwidget.cpp:112
-#, fuzzy
-msgid "Enter operation name:"
-msgstr "Unesite ime pridruživanja:"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Novi"
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Unesite novi tekst:"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "&Pokaži"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "GREŠKA"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Zumiraj:"
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Promijeni kut"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Kod"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr ""
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Aktivni &jezik"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
+#: tips:3
+msgid ""
+"<p>Welcome to Umbrello.</p>\n"
+"\n"
+"<p>UML diagrams let you design and document object oriented software.  <a "
+"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
+"using UML.</p>\n"
 msgstr ""
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
+#: tips:11
+msgid ""
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
+"Ruby code generation, externalizable folders, ability to change interfaces "
+"into classes, and more.</p>\n"
 msgstr ""
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
+#: tips:17
+msgid ""
+"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you "
+"need External Folders then deselect &quot;Use tabbed diagrams&quot; in the "
+"General Settings.</p>\n"
 msgstr ""
 
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
+#: tips:23
+msgid ""
+"<p>Most diagram items can not be resized, they will resize themselves to fit "
+"to their contents.\n"
+"Boxes, notes and sequence diagram messages can be resized, just click and "
+"drag on the red square.</p>\n"
 msgstr ""
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
+#: tips:30
+#, fuzzy
+msgid ""
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
 msgstr ""
+"<p>Ako želite u dijagram dodati klasu koja već postoji, samo prevucite njen "
+"unos iz stablolikog prikaza.</p>\n"
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
+#: tips:36
+msgid ""
+"<p>Umbrello's refactoring agent lets you move operations between a class and "
+"its derived and base \n"
+"classes.\n"
+"Right click a class to open the refactoring agent.</p>\n"
 msgstr ""
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
+#: tips:44
+#, fuzzy
+msgid ""
+"<p>Sequence diagram objects can have a destructor box and be drawn as "
+"actors.  Double click one for\n"
+"the Properties dialogue.</p>\n"
 msgstr ""
+"<p>Objekti dijagrama sekvence mogu imati kućicu za razgrađivanje i biti "
+"nacrtani kao akteri. Dvokliknite na neki za dijalog sa svojstvima.</p>\n"
 
-#: aligntoolbar.cpp:383
+#: tips:51
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<p>Sequence diagram messages can act as constructors.  Click on the object "
+"box (rather than the vertical line) to make it a constructor.</p>\n"
 msgstr ""
 
-#: object_factory.cpp:164
+#: tips:57
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
 msgstr ""
 
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
+#: tips:63
+msgid ""
+"<p>If on loading a foreign file nothing is displayed in the list view, try "
+"saving the model under a different name,\n"
+"closing, and reloading the saved file.  Usually the list view is then "
+"properly populated.\n"
+"</p>\n"
 msgstr ""
 
-#: umlviewimageexporter.cpp:46
+#: tips:71
 #, fuzzy
-msgid "Exporting view..."
-msgstr "Izlazim..."
-
-#: umlviewimageexporter.cpp:50
 msgid ""
-"An error happened when exporting the image:\n"
+"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
+"pasted into KWord\n"
+"and other applications.</p>\n"
 msgstr ""
+"<p>Izreži i kopiraj će također izvesti sliku u PNG klipbord, odakle može "
+"biti umetnuta u KWord i druge programe.</p>\n"
 
-#: umlviewimageexporter.cpp:66
+#: tips:78
+#, fuzzy
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
 msgstr ""
-"Odabrana datoteka %1 postoji.\n"
-"Želite je prepisati?"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Datoteka već postoji"
-
-#: model_utils.cpp:244
-#, fuzzy
-msgid "new_actor"
-msgstr "novi_akter"
-
-#: model_utils.cpp:246
-#, fuzzy
-msgid "new_usecase"
-msgstr "novo_korištenje_slučaja"
-
-#: model_utils.cpp:248
-#, fuzzy
-msgid "new_package"
-msgstr "novi_paket"
-
-#: model_utils.cpp:250
-#, fuzzy
-msgid "new_component"
-msgstr "nova_komponenta"
-
-#: model_utils.cpp:252
-#, fuzzy
-msgid "new_node"
-msgstr "novi_čvor"
-
-#: model_utils.cpp:254
-#, fuzzy
-msgid "new_artifact"
-msgstr "novi_artifakt"
-
-#: model_utils.cpp:256
-#, fuzzy
-msgid "new_interface"
-msgstr "novi_interfejs"
-
-#: model_utils.cpp:258
-#, fuzzy
-msgid "new_datatype"
-msgstr "nova_vrsta_podataka"
-
-#: model_utils.cpp:260
-#, fuzzy
-msgid "new_enum"
-msgstr "novo_nabrajanje"
-
-#: model_utils.cpp:262
-#, fuzzy
-msgid "new_entity"
-msgstr "novo_nabrajanje"
-
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "novi_čvor"
+"<p>Pridruživanja ne moraju da budu u pravim linijama, dvoklik na neku će "
+"napraviti pomerljivu tačku.</p>\n"
 
-#: model_utils.cpp:268
+#: tips:84
 #, fuzzy
-msgid "new_object"
-msgstr "novi_objekt"
-
-#: model_utils.cpp:559
-msgid "Empty"
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
 msgstr ""
+"<p>Automatsko spremanje možete uključiti u dijalogu za podešavanje Umbrello-"
+"a.</p>\n"
 
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr ""
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
+#: tips:90
+msgid ""
+"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
+"Either add it to the bugs database with Report Bug from the Help menu\n"
+"or send it to the uml-devel mailing list.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 msgstr ""
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
+#: tips:101
+#, fuzzy
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
 msgstr ""
+"<p>Sve odabrane objekte možete obrisati pritiskom na Del ili Backspace.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
+#: tips:107
+#, fuzzy
+msgid ""
+"<p>If you've found a bug in Umbrello, please let us know. \n"
+"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
 msgstr ""
+"<p>Ako ste našli grešku u Umbrello-u, molimo vas da nas obavestite.\n"
+"Greške možete poslani alatom za prijavu grešaka iz izbornika Pomoć.</p>\n"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
+#: tips:114
+#, fuzzy
+msgid ""
+"<p>Pressing the Escape key sets the current tool to the select tool.\n"
+"Backspace jumps to the previously used tool.</p>\n"
 msgstr ""
+"<p>Pritiskom na tipka Escape postavlja se trenutni alat na odabrani alat.\n"
+"Backspace-om se skače na prethodno korišteni alat.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Dodajte osnovnu klasu"
-
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Dodaj izvedenu klasu"
-
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Postupak"
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Atributi"
-
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Dodaj osnovnu sučelje"
-
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Dodaj izvedeno sučelje"
-
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
+#: tips:121
 #, fuzzy
-msgid "Base Classifiers"
-msgstr "Bazni klasifikatori"
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Možete odabrati sve objekte pritiskom na Ctrl-A.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
+#: tips:127
 #, fuzzy
-msgid "Derived Classifiers"
-msgstr "Izvedeni klasifikatori"
-
-#: umlviewimageexportermodel.cpp:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "Ne mogu napraviti direktorij"
-
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Nije moguće snimiti prazan dijagram"
-
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the "
+"Code menu.</p>\n"
 msgstr ""
+"<p>Možete napraviti i podesiti novu klasu koristeći čarobnjaka iz izbornika "
+"Kôd.</p>\n"
 
 #, fuzzy
 #~ msgid "new_stereotype"
@@ -4406,7 +4506,8 @@ msgstr ""
 #~ msgstr "Pravi pridruživanja odnosa između UML elemenata"
 
 #, fuzzy
-#~ msgid "Creates unidirectional association relationships between UML elements"
+#~ msgid ""
+#~ "Creates unidirectional association relationships between UML elements"
 #~ msgstr "Pravi jednosmerna pridruživanja odnosa između UML elemenata"
 
 #, fuzzy
@@ -4453,9 +4554,13 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "<p>Many new code generators have been added in this release.  You can now generate code for\n"
+#~ "<p>Many new code generators have been added in this release.  You can now "
+#~ "generate code for\n"
 #~ "JavaScript, ActionScript, XMLSchema, Perl, Python, SQL, IDL and Ada.</p>\n"
-#~ msgstr "<p>Mnogi novi generatori kôda su dodati u ovom izdanju. Sada možete generisati kôd za JavaScript, ActionScript, XMLSchema, Perl, Python, SQL, IDL i Ada.</p>\n"
+#~ msgstr ""
+#~ "<p>Mnogi novi generatori kôda su dodati u ovom izdanju. Sada možete "
+#~ "generisati kôd za JavaScript, ActionScript, XMLSchema, Perl, Python, SQL, "
+#~ "IDL i Ada.</p>\n"
 
 #, fuzzy
 #~ msgid "UML Diagrams"