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, 2565 insertions, 2466 deletions

diff --git a/tde-i18n-sl/messages/tdesdk/umbrello.po b/tde-i18n-sl/messages/tdesdk/umbrello.po
index fd87cfdc4df..89deeb32874 100644
--- a/tde-i18n-sl/messages/tdesdk/umbrello.po
+++ b/tde-i18n-sl/messages/tdesdk/umbrello.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2014-09-29 12:05-0500\n"
+"POT-Creation-Date: 2018-12-31 18:49+0100\n"
 "PO-Revision-Date: 2006-07-23 23:26+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -21,251 +21,198 @@ msgstr ""
 "Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
 "n%100==4 ? 2 : 3);\n"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Avtorji modelirnika za UML Umbrello"
-
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "Datoteka za odprtje"
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
-
-#: docgenerators/main.cpp:64
-#, fuzzy
+#: _translatorinfo:1
 msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr ""
-"(c) 2001 Paul Hensgen, (c) 2002-2005 Avtorji modelirnika za UML Umbrello"
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Avtorji modelirnika za UML Umbrello"
-
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-#, fuzzy
-msgid "Exporting all views..."
-msgstr "Izvozi kot sliko"
-
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr ""
-
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
-#: umlviewimageexportermodel.cpp:158
-#, c-format
-msgid "There was a problem saving file: %1"
-msgstr "Prišlo je to težav pri shranjevanju datoteke: %1"
-
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
-#: umllistview.cpp:385
-msgid "Save Error"
-msgstr "Napaka pri shranjevanju"
-
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Predmet"
-
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Sinhrono sporočilo"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Gregor Rakar"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Asinhrono sporočilo"
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "gregor.rakar@kiss.si"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Povezava"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Vnesite ime delovanja"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Vsebovanje"
+#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
+#: toolbarstateother.cpp:144 umlview.cpp:2546
+msgid "Enter the name of the new activity:"
+msgstr "Vnesite ime novega delovanja:"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Sidro"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Poravnaj levo"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Oznaka"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Poravnaj desno"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Opomba"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Poravnaj navzgor"
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Okvir"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Poravnaj navzdol"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
+#: aligntoolbar.cpp:44
+msgid "Align Vertical Middle"
 msgstr ""
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Odvisnost"
-
-#: association.cpp:85 worktoolbar.cpp:256
-msgid "Aggregation"
+#: aligntoolbar.cpp:45
+msgid "Align Horizontal Middle"
 msgstr ""
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Razmerje"
-
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Smerna povezava"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
+#: aligntoolbar.cpp:46
+msgid "Align Vertical Distribute"
 msgstr ""
 
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
+#: aligntoolbar.cpp:47
+msgid "Align Horizontal Distribute"
 msgstr ""
 
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. "
+"You can not align associations."
 msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 249
-#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
-#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
-#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
-#, no-c-format
-msgid "Class"
-msgstr "Razred"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Začetno stanje"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Končno stanje"
+#: aligntoolbar.cpp:384
+#, fuzzy
+msgid "Information"
+msgstr "Oblikovanje"
 
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Veja/Zlitje"
+#: aligntoolbar.cpp:384 autolayout/newautolayoutdialog.ui:381
+#: dialogs/exportallviewsdialogbase.ui:166
+#, no-c-format
+msgid "&OK"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Razvejitev/Združitev"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Generalizacija"
 
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paket"
+#: association.cpp:85 worktoolbar.cpp:256
+msgid "Aggregation"
+msgstr ""
 
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponenta"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Odvisnost"
 
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Vozlišče"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Povezava"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
+#: association.cpp:88
+msgid "Self Association"
 msgstr ""
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Vmesnik"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Sporočilo sodelovanja"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr ""
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Sporočilo zaporedja"
 
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
+#: association.cpp:91
+msgid "Collaboration Self Message"
 msgstr ""
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entiteta"
-
-#: worktoolbar.cpp:275
-msgid "Deep History"
+#: association.cpp:92
+msgid "Sequence Self Message"
 msgstr ""
 
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr ""
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Vsebovanje"
 
-#: worktoolbar.cpp:277
-#, fuzzy
-msgid "Join"
-msgstr "Razvejitev/Združitev"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr ""
 
-#: worktoolbar.cpp:278
-#, fuzzy
-msgid "Fork"
-msgstr "Razvejitev/Združitev"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realizacija"
 
-#: worktoolbar.cpp:279
-msgid "Junction"
+#: association.cpp:96
+msgid "Uni Association"
 msgstr ""
 
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr ""
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Sidro"
 
 #: association.cpp:98 worktoolbar.cpp:284
 msgid "State Transition"
 msgstr ""
 
-#: worktoolbar.cpp:285
-#, fuzzy
-msgid "Activity Transition"
-msgstr "Diagram delovanja"
-
 #: association.cpp:99 dialogs/activitydialog.cpp:70
 #: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
 #: worktoolbar.cpp:286
 msgid "Activity"
 msgstr "Delovanje"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Stanje"
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr ""
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Končno delovanje"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr ""
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Začetno delovanje"
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Ime povezave"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Sporočilo"
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Vnesite ime povezave:"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Ime vloge:"
+
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Vnesite ime vloge:"
+
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not "
+"add it again."
 msgstr ""
+"Operacija z enakim imenom in podpisom že obstaja. Ne morete je več dodati."
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Izberite"
+#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
+#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "That is an invalid name."
+msgstr "To je neveljavno ime."
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "Neveljavno ime"
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
+#: umldoc.cpp:1043 umldoc.cpp:1073
+msgid "That name is already being used."
+msgstr "To ime je že uporabljeno"
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
+#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
+msgid "Not a Unique Name"
+msgstr "Ni edinstveno ime"
 
 #: clipboard/umlclipboard.cpp:687
 msgid ""
-"At least one of the items in the clipboard could not be pasted because an item "
-"of the same name already exists.  Any other items have been pasted."
+"At least one of the items in the clipboard could not be pasted because an "
+"item of the same name already exists.  Any other items have been pasted."
 msgstr ""
 "Vsaj eden od predmetov v odložišču ni bil prilepljen, ker predmet z enakim "
 "imenom že obstaja. Vsi drugi predmeti so bili prilepljeni."
@@ -279,18 +226,16 @@ msgid ""
 "Cannot open file %1 for writing. Please make sure the folder exists and you "
 "have permissions to write to it."
 msgstr ""
-"Ni moč odpreti datoteke %1 za pisanje. Prosim preverite, da mapa obstaja in da "
-"imate dovoljenja za pisanje v njo."
+"Ni moč odpreti datoteke %1 za pisanje. Prosim preverite, da mapa obstaja in "
+"da imate dovoljenja za pisanje v njo."
 
 #: codegenerator.cpp:473
 msgid "Cannot Open File"
 msgstr "Ni moč odpreti datoteke"
 
 #: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Ni moč ustvariti mape:\n"
+msgid "Cannot create the folder:\n"
+msgstr "Ni moč ustvariti mape:\n"
 
 #: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 msgid ""
@@ -304,1301 +249,1533 @@ msgstr ""
 msgid "Cannot Create Folder"
 msgstr "Ni moč ustvariti mape"
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Vnesite ime stanja"
-
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Vnesite ime novega stanja:"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Splošne možnosti"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "Vnesite delovanje"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Paket je imenski prostor"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "Vnesite ime novega delovanja:"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Navidezni destruktorji"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "novo delovanje"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Ustvari prazen konstruktor"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "Model UML"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr ""
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logični prikaz"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operacije so notranje"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
 msgstr ""
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Komponentni prikaz"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr ""
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Prikaz razvitja"
+#: codeimport/classimport.cpp:34
+#, fuzzy
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Uvažanje datoteke: %1"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Model odvisnosti entitete"
+#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
+#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
+#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
+#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
+#: umlviewimageexporterall.cpp:73
+msgid "Ready."
+msgstr "Pripravljen."
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr ""
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Ali je obseg %1 imenski prostor ali razred?"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Trenutna datoteka je bila spremenjena.\n"
-"Ali jo želite shraniti?"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "Uvoz C++ zahteva vašo pomoč"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Datoteka %1 ne obstaja."
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Imenski prostor"
 
-#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
-#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
-msgid "Load Error"
-msgstr "Napaka pri nalaganju"
+#: codeimport/import_utils.cpp:183 dialogs/codegenerationwizardbase.ui:249
+#: dialogs/diagramprintpage.cpp:91 dialogs/diagramprintpage.cpp:198
+#: dialogs/settingsdlg.cpp:210 listpopupmenu.cpp:609 worktoolbar.cpp:262
+#, no-c-format
+msgid "Class"
+msgstr "Razred"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Datoteka %1 je očitno okvarjena."
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Notranja napaka"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Ni bilo najdene datoteke XMI v stisnjeni datoteki %1."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Skladenjska napaka pred »%1«"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Prišlo je do težav pri nalaganju izvlečene datoteke: %1"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Napaka razčlenjevanja pred »%1«"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Prišlo je to težav pri nalaganju datoteke: %1"
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Prišlo je do težave pri postavljanju datoteke: %1"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "pričakovan izraz"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr ""
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Skladenjska napaka deklaracije"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "diagram razreda"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "pričakovan }"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "diagram zaporedja"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "pričakovan imenski prostor"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "diagram sodelovanja"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "pričakovan {"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "diagram stanja"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Pričakovano ime imenskega prostora"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "diagram delovanja"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Potreben je določitelj tipa za deklaracijo"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "diagram komponente"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "pričakovana deklaracija"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "diagram razvitja"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Pričakovan konstanten izraz"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "diagram odvisnosti entitete"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "Pričakovan »)«"
 
-#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
-#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Name"
-msgstr "Ime"
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "Manjka }"
 
-#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Enter name:"
-msgstr "Vnesite ime:"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Pričakovan inicializator člana"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "To je neveljavno ime za diagram."
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Pričakovan inicializator osnovnega razreda"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Neveljavno ime"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr ""
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Diagram že uporablja to ime."
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Pričakovan identifikator"
 
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
-#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
-msgid "Not a Unique Name"
-msgstr "Ni edinstveno ime"
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Pričakovan ID tipa"
 
-#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
-#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "That is an invalid name."
-msgstr "To je neveljavno ime."
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Pričakovano ime razreda"
 
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
-#: umldoc.cpp:1043 umldoc.cpp:1073
-msgid "That name is already being used."
-msgstr "To ime je že uporabljeno"
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "pričakovan pogoj"
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Ime, ki ste ga vnesli, ni edinstveno.\n"
-"Ali ste to želeli?"
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "pričakovana izjava"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid "Name Not Unique"
-msgstr "Ime ni edinstveno"
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "pričakovano za inicializacijo"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
-#, fuzzy
-msgid "Use Name"
-msgstr "Ime vloge:"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr ""
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: dialogs/activitydialog.cpp:28 dialogs/activitydialog.cpp:74
+#: dialogs/assocgenpage.cpp:55 dialogs/classpropdlg.cpp:37
+#: dialogs/classpropdlg.cpp:56 dialogs/classpropdlg.cpp:86
+#: dialogs/parmpropdlg.cpp:55 dialogs/statedialog.cpp:33
+#: dialogs/statedialog.cpp:89 dialogs/umlviewdialog.cpp:38
+#: listpopupmenu.cpp:468 refactoring/refactoringassistant.cpp:307
 #, fuzzy
-msgid "Enter New Name"
-msgstr "Vnesite ime stanja"
+msgid "Properties"
+msgstr "&Lastnosti"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Ali zares želite zbrisati diagram %1?"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Začetno delovanje"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Zbriši diagram"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Končno delovanje"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Nastavljanje dokumenta"
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Veja/Zlitje"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Razreševanje referenc predmeta ..."
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Razvejitev/Združitev"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Nalaganje elementov UML ..."
+#: codegenerators/cppcodegenerationformbase.ui:118
+#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
+#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
+#: dialogs/classpropdlg.cpp:232 dialogs/codegenerationoptionsbase.ui:50
+#: dialogs/settingsdlg.cpp:99 dialogs/statedialog.cpp:88
+#: dialogs/umlviewdialog.cpp:70
+#, no-c-format
+msgid "General"
+msgstr "Splošno"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Nalaganje diagramov ..."
+#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
+#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
+#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
+msgid "General Properties"
+msgstr "Splošne lastnosti"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr ""
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Vrsta delovanja:"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/samodejno shranjevanje %1"
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Ime delovanja:"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr ""
+#: codegenerators/cppcodegenerationformbase.ui:36
+#: codegenerators/javacodegenerationformbase.ui:225
+#: codegenerators/rubycodegenerationformbase.ui:196
+#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
+#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
+#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
+#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
+#: dialogs/diagrampropertiespage.ui:388 dialogs/notedialog.cpp:29
+#: dialogs/parmpropdlg.cpp:100 dialogs/statedialog.cpp:104
+#: dialogs/umlrolepropertiesbase.ui:88 docwindow.cpp:33
+#, no-c-format
+msgid "Documentation"
+msgstr "Dokumentacija"
 
-#: umllistview.cpp:416
+#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
+#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
+#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
 #, fuzzy
-msgid "Enter Model Name"
-msgstr "Vnesite ime stanja"
+msgid "Font"
+msgstr "Pisava:"
 
-#: umllistview.cpp:417
-#, fuzzy
-msgid "Enter the new name of the model:"
-msgstr "Vnesite novo ime diagrama:"
+#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
+#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
+#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
+msgid "Font Settings"
+msgstr "Nastavitve pisav"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Prikazi"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
+#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
+#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
+#: listpopupmenu.cpp:750
+msgid "Color"
+msgstr "Barva"
 
-#: umllistview.cpp:1906
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Ime, ki ste ga vnesli, je neveljavno.\n"
-"Proces ustvarjanja je bil preklican."
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Barve gradnikov"
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Ime ni veljavno"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Delovanja"
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Ime, ki ste ga vnesli, ni edinstveno.\n"
-"Proces ustvarjanja je bil preklican."
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Novo delovanje ..."
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
-msgid "Creation canceled"
-msgstr "Ustvarjanje je preklicano"
+#: dialogs/activitypage.cpp:73 listpopupmenu.cpp:474
+#, fuzzy
+msgid "Delete"
+msgstr "Zbriši sidro"
 
-#: umllistview.cpp:2338
-msgid "Loading listview..."
-msgstr "Nalaganje seznamskega prikaza ..."
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Preimenuj"
 
-#: umllistview.cpp:2670
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Mapa mora biti spraznjena, preden se lahko zbriše."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Novo delovanje"
 
-#: umllistview.cpp:2671
-msgid "Folder Not Empty"
-msgstr "Mapa ni prazna"
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "novo delovanje"
 
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Operacija z enakim imenom in podpisom že obstaja. Ne morete je več dodati."
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Preimenuj delovanje"
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Vnesite ime delovanja"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Vnesite novo ime delovanja"
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "novo stanje"
+#: dialogs/assocgenpage.cpp:67 dialogs/diagrampropertiespage.ui:61
+#, no-c-format
+msgid "Name:"
+msgstr "Ime:"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Generalizacija"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Vrsta:"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr ""
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Povezave"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Sporočilo sodelovanja"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Lastnosti povezave"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Sporočilo zaporedja"
+#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
+#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
+#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
+msgid "General Settings"
+msgstr "Splošne nastavitve"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr ""
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Vloge"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr ""
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Nastavitve vloge"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realizacija"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Pisava povezave"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr ""
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Lastnosti vloge A"
 
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Lastnosti vloge B"
 
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, no-c-format
-msgid "&Diagram"
-msgstr "&Diagram"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Vidljivost vloge A"
+
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Vidljivost vloge B"
+
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Spremenljivost vloge A"
+
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Spremenljivost vloge B"
 
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152
+#: dialogs/umlrolepropertiesbase.ui:59
 #, no-c-format
-msgid "&New"
-msgstr "&Nov"
+msgid "Rolename:"
+msgstr "Ime vloge:"
 
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158
+#: dialogs/umlrolepropertiesbase.ui:77
 #, no-c-format
-msgid "Sh&ow"
-msgstr "Pri&kaži"
+msgid "Multiplicity:"
+msgstr "Večkratnost:"
 
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
+#: codegenerators/javacodegenerationformbase.ui:129
+#: codegenerators/javacodegenerationformbase.ui:183
+#: codegenerators/rubycodegenerationformbase.ui:100
+#: codegenerators/rubycodegenerationformbase.ui:154
+#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
+#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267
+#: dialogs/umlrolepropertiesbase.ui:167
 #, no-c-format
-msgid "&Code"
-msgstr "&Koda"
+msgid "Public"
+msgstr "Javni"
 
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
+#: codegenerators/javacodegenerationformbase.ui:134
+#: codegenerators/javacodegenerationformbase.ui:188
+#: codegenerators/rubycodegenerationformbase.ui:105
+#: codegenerators/rubycodegenerationformbase.ui:159
+#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
+#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268
+#: dialogs/umlrolepropertiesbase.ui:178
 #, no-c-format
-msgid "Active &Language"
-msgstr "Aktiven &jezik"
+msgid "Private"
+msgstr "Zasebni"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 36
-#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
-#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
-#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
-#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
-#: dialogs/notedialog.cpp:29 dialogs/parmpropdlg.cpp:100
-#: dialogs/statedialog.cpp:104 docwindow.cpp:33 rc.cpp:30 rc.cpp:150
-#: rc.cpp:207 rc.cpp:445 rc.cpp:492
+#: codegenerators/javacodegenerationformbase.ui:139
+#: codegenerators/javacodegenerationformbase.ui:193
+#: codegenerators/rubycodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:164
+#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
+#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269
+#: dialogs/umlrolepropertiesbase.ui:186
 #, no-c-format
-msgid "Documentation"
+msgid "Protected"
+msgstr "Zaščiten"
+
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175
+#: dialogs/umlrolepropertiesbase.ui:194
+#, fuzzy, no-c-format
+msgid "Implementation"
 msgstr "Dokumentacija"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192
+#: dialogs/umlrolepropertiesbase.ui:141
 #, no-c-format
-msgid "Slash-Slash (//)"
-msgstr "Poševnica-poševnica (//)"
+msgid "Changeable"
+msgstr "Možno spreminjanje"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195
+#: dialogs/umlrolepropertiesbase.ui:133
 #, no-c-format
-msgid "Slash-Star (/**  */)"
-msgstr "Poševnica-zvezdica (/** */)"
+msgid "Frozen"
+msgstr "Zamrznjen"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198
+#: dialogs/umlrolepropertiesbase.ui:125
 #, no-c-format
-msgid "Style:"
-msgstr "Slog:"
+msgid "Add only"
+msgstr "Samo dodajanje"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "<p align=\"center\">Ustvarjanje kode v C++</p>"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Ime &razreda:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
-#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
-#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
-#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
-#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
-#: rc.cpp:225
-#, no-c-format
-msgid "General"
-msgstr "Splošno"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, no-c-format
-msgid "Method Body Generation"
-msgstr "Ustvarjanje telesa metode"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "&Ime paketa:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "Uporabi naslednje za razrede v ustvarjeni kodi:"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, no-c-format
-msgid "QPtrList"
-msgstr "QPtrList"
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "&Ime vmesnika:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, no-c-format
-msgid "vector"
-msgstr "vektor"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "&Ime komponente:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, no-c-format
-msgid "<b>Variable</b>"
-msgstr "<b>Spremenljivka</b>"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, no-c-format
-msgid "QString"
-msgstr "QString"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "niz"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "Ime &entitete:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "<p align=\"center\">Niz</p>"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "<p align=\"center\">Seznam</p>"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Ime &paketa:"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, no-c-format
-msgid "qptrlist.h"
-msgstr "qptrlist.h"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, no-c-format
-msgid "<i>global?</i>"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
 msgstr ""
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, no-c-format
-msgid "qstring.h"
-msgstr "qstring.h"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Izvedljivo"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, no-c-format
-msgid "Class name"
-msgstr "Ime razreda"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Nariši kot"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "&Privzeto"
+
+#: dialogs/classgenpage.cpp:146 umbrelloui.rc:4
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "&Zapolni:"
+
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Knjižnica"
+
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabela"
+
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Vidnost"
+
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "&Javno"
+
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "&Zaseben"
+
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Za&ščiteno"
+
+#: dialogs/classgenpage.cpp:186
+#, fuzzy
+msgid "Imple&mentation"
+msgstr "&Dokumentacija"
+
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Ime razreda:"
+
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, no-c-format
-msgid "Project Generation"
-msgstr "Ustvarjanje projekta"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, no-c-format
-msgid "Create ANT build document"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "Metode samodejnega grajenja"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr "Metode praznega konstruktorja"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Ime komponente:"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Ime vozlišča:"
+
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
+#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
+#: dialogs/classgenpage.cpp:456
+msgid ""
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
 msgstr ""
+"Ime, ki ste ga izbrali,\n"
+"je že uporabljeno.\n"
+"Ime je bilo ponastavljeno."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "Javni"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Ime ni edinstveno"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "Zasebni"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Lastnosti"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "Zaščiten"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "No&v atribut ..."
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, no-c-format
-msgid "From Parent Object"
-msgstr "Od matičnega predmeta"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operacije"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, no-c-format
-msgid "Default attribute accessor scope:"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "No&va operacija ..."
+
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Predloge"
+
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "No&va predloga ..."
+
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, no-c-format
-msgid "Default association field scope:"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
 msgstr ""
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, no-c-format
-msgid "From Parent Role"
-msgstr "Od vloge matičnega"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Atributi entitete"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "<p align=\"center\">Ustvarjanje kode v javi</p>"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "No&v atribut entitete ..."
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, no-c-format
-msgid "Hash (#)"
+#: dialogs/classifierlistpage.cpp:99 dialogs/umloperationdialog.cpp:142
+#: uml.cpp:267 umldoc.cpp:1099 umlview.cpp:2738
+#, fuzzy
+msgid "&Delete"
+msgstr "Zbriši sidro"
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Lastnosti"
+
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Prikaži"
+
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "Opera&cije"
+
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Vidnost"
+
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "&Podpis operacije"
+
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&ket"
+
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "At&ributi"
+
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, no-c-format
-msgid "Begin-End (=begin  =end)"
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Podpis atr&ibuta"
+
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Nariši kot krog"
+
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Zaslon"
+
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Možnosti prikaza"
+
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Nastavitve atributa"
+
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Nastavitve operacije"
+
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Nastavitve predloge"
+
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
 msgstr ""
 
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "<p align=\"center\">Ustvarjanje kode v C++</p>"
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Nastavitve atributa entitete"
+
+#: dialogs/classpropdlg.cpp:216
+#, fuzzy
+msgid "Contents"
+msgstr "Vsebovanje"
+
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Nastavitve vsebine"
+
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Razredne povezave"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nov_razred"
+
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nov Razred"
+
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Atributi razreda"
+
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Operacije razreda"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#: dialogs/codegenerationoptionsbase.ui:24 dialogs/codegenerationwizard.cpp:54
 #, no-c-format
 msgid "Code Generation Options"
 msgstr "Možnosti ustvarjanja kode"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Jezik"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Ustvari"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Mape"
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Končaj"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Zapiši vse ustvarjene datoteke v mapo:"
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Koda je ustvarjena"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, no-c-format
-msgid "Bro&wse..."
-msgstr "&Brskaj ..."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Ni ustvarjena"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, no-c-format
-msgid "B&rowse..."
-msgstr "&Brskaj ..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Ni še ustvarjena"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, no-c-format
-msgid "&Include heading files from folder:"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:162
+#, fuzzy
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Imenik %1 ne obstaja. Ali ga želite ustvariti sedaj?"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "Datoteke, ustvarjene z generatorjem kode, bodo zapisane v to mapo"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+#, fuzzy
+msgid "Output Folder Does Not Exist"
+msgstr "Izhodni imenik ne obstaja"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Create Folder"
+msgstr "Ni moč ustvariti mape"
+
+#: dialogs/codegenerationwizard.cpp:163
+#, fuzzy
+msgid "Do Not Create"
+msgstr "&Ne ustvari datoteke"
+
+#: dialogs/codegenerationwizard.cpp:168
+#, fuzzy
 msgid ""
-"Files in this folder will be used as heading files in the generated code"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select "
+"another, valid, folder."
 msgstr ""
+"Imenik ni bil ustvarjen.\n"
+"Prosim preverite, da imate dostop do pisanja v njegove matične imenike ali "
+"pa izberite drug, veljaven imenik."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, no-c-format
-msgid "Overwrite Policy"
-msgstr "Politika nadomeščanja"
+#: dialogs/codegenerationwizard.cpp:169
+#, fuzzy
+msgid "Error Creating Folder"
+msgstr "Napaka pri ustvarjanju imenika"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, no-c-format
+#: dialogs/codegenerationwizard.cpp:176
+#, fuzzy
+msgid "Please select a valid folder."
+msgstr "Prosim izberite veljaven imenik."
+
+#: dialogs/codegenerationwizard.cpp:184
+#, fuzzy
 msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Če že obstaja datoteka z enakim imenom kot je datoteka,\n"
-"ki jo želi generator kode uporabiti za izhodno datoteko:"
+"Izhodni imenik obstaja, vendar ni zapisljiv.\n"
+"Prosim nastavite primerna dovoljenja ali pa izberite drug imenik."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, no-c-format
-msgid "O&verwrite"
-msgstr "&Nadomesti"
+#: dialogs/codegenerationwizard.cpp:185
+#, fuzzy
+msgid "Error Writing to Output Folder"
+msgstr "Napaka pri pisanju v izhodni imenik"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Nadomesti obstoječe datoteke, če obstajajao v ciljni mapi"
+#: dialogs/codegenerationwizard.cpp:191
+#, fuzzy
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 očitno ni imenik. Prosim izberite veljaven imenik."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, no-c-format
-msgid "As&k"
-msgstr "&Vprašaj"
+#: dialogs/codegenerationwizard.cpp:192
+#, fuzzy
+msgid "Please Choose Valid Folder"
+msgstr "Prosim izberite veljaven imenik"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
+#: dialogs/codeviewerdialog.cpp:119 dialogs/codeviewerdialogbase.ui:21
+#: dialogs/settingsdlg.cpp:301
 #, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "Če že obstaja datoteka z enakim imenom, vprašaj, kaj narediti"
+msgid "Code Viewer"
+msgstr "Pregledovalnik kode"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, no-c-format
-msgid "&Use a different name"
-msgstr "&Uporabi drugo ime"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Na voljo ni možnosti.</p>"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, no-c-format
-msgid ""
-"If a file already exists in the destination folder, select a different name to "
-"use by adding a suffix to the file name"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Diagrami"
+
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filter"
+
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Trenuten diagran"
+
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Vsi diagrami"
+
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Izbrani diagrami"
+
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "V&rsta diagrama"
+
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Izbor"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
 msgstr ""
-"Če datoteka že obstaja v ciljni mapi, uporabi drugo ime tako, da se doda "
-"pripona k imenu datoteke"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Oblikovanje"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Sodelovanje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Črte"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Zaporedje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, no-c-format
-msgid "Line ending style:"
-msgstr "Slog konca vrstice:"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Stanje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, no-c-format
-msgid "Indentation type:"
-msgstr "Vrsta zamikanja:"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponenta"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, no-c-format
-msgid "Indentation amount:"
-msgstr "Količina zamikanja:"
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Razvitje"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
 msgstr ""
-"*NIX (\"\\n\")"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Ni izbranega diagrama."
+
+#: dialogs/exportallviewsdialog.cpp:51 dialogs/exportallviewsdialogbase.ui:90
 #, no-c-format
+msgid "The format that the images will be exported to"
+msgstr ""
+
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr ""
+
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Ciljna datoteka že obstaja"
+
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
-"Windows (\"\\r\\n\")"
+"The file %1 already exists in %2.\n"
+"\n"
+"Umbrello can overwrite the file, generate a similar\n"
+"file name or not generate this file."
 msgstr ""
-"Windows (\"\\r\\n\")"
+"Datoteka %1 že obstaja v %2.\n"
+"\n"
+"Umbrello lahko nadomesti datoteko, ustvari podobno\n"
+"datoteko ali pa ne ustvari te datoteke."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "Mac (\"\\r\")"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Uporabi na vseh preostalih datotekah"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, no-c-format
-msgid "No Indentation"
-msgstr "Brez zamikanja"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Nadomesti"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Tabulator"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "U&stvari podobno ime datoteke"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Presledek"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "&Ne ustvari datoteke"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, no-c-format
-msgid "Comment Verbosity"
-msgstr "Zgovornost komentarjev"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Lastnosti parametra"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
-#, no-c-format
-msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
-msgstr "Zapi&ši komentarje za razdelke, tudi če so ti prazni"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Vrsta:"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, no-c-format
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Ime:"
+
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Začetna vrednost:"
+
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Smer prehoda"
+
+#: dialogs/parmpropdlg.cpp:84
 msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout"
+"\" is a parameter for reading and writing."
 msgstr ""
-"Zapiši komentarje, da se označi različne razdelke (javne, zasebne ...) v "
-"razredu, tudi če so razdelki prazni"
+"»in« je parameter samo za branje, »out« je parameter samo za pisanje in "
+"»inout« je parameter samo za branje in pisanje."
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "&Zapiši komentarje k dokumentaciji, tudi če je prazna"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Vsebovani predmeti"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr ""
-"Z&apiši komentarje za dokumentacijo razredov in metod, tudi če je prazna"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Izberite operacijo"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, no-c-format
-msgid "Language Options"
-msgstr "Možnosti jezika"
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Številka zaporedja:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Čarovnik za ustvarjanje kode"
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Razredna operacija:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, no-c-format
-msgid "Select Classes"
-msgstr "Izberite razrede"
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Prilagojena operacija:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 41
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"Place all the classes you want to generate code\n"
-"for in the right hand side list"
+#: dialogs/settingsdlg.cpp:30
+msgid "Umbrello Setup"
+msgstr "Nastavitve Umbrella"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Uporabniški vmesnik"
+
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Nastavitve uporabniškega vmesnika"
+
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Barva črte:"
+
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "P&rivzeta barva"
+
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Barva polnitve"
+
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Pri&vzeta barva"
+
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Širina črte:"
+
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "Privzeta &širina"
+
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Uporabi zapolnitveno barvo"
+
+#: dialogs/settingsdlg.cpp:102
+msgid "Miscellaneous"
 msgstr ""
-"Postavite vse razrede, za katere želite ustvariti\n"
-"kodo, v seznam na desni strani"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, no-c-format
-msgid "Add class for code generation"
-msgstr "Dodaj razred za ustvarjanje kode"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Omogoči razveljavitve"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, no-c-format
-msgid "Classes Selected"
-msgstr "Izbrani razredi"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Odstrani razred iz ustvarjanja kode"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr ""
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, no-c-format
-msgid "Classes Available"
-msgstr "Razpoložljivi razredi"
+#: dialogs/settingsdlg.cpp:120
+#, fuzzy
+msgid "Use angular association lines"
+msgstr "Vnesite ime povezave:"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, no-c-format
-msgid "Code Generation Status"
-msgstr "Stanje ustvarjanja kode"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Samoshranjevanje"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "Pritisnite gumb »Ustvari« za začetek ustvarjanja kode"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "O&mogoči samodejno shranjevanje"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, no-c-format
-msgid "Generation Status"
-msgstr "Stanje ustvarjanja"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Izberite časovni interval samodejnega shranjevanja (minute):"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Pregledovalnik kode"
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Izberite pripono samodejnega shranjevanja:"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, no-c-format
-msgid "Show hidden blocks"
-msgstr "Prikaži skrite bloke"
+#: dialogs/settingsdlg.cpp:148
+msgid ""
+"<qt><p>The autosave file will be saved to ~/autosave.xmi if the autosaving "
+"occurs before you have manually saved the file.</p><p>If you've already "
+"saved it, the autosave file will be saved in the same folder as the file and "
+"will be named like the file's name, followed by the suffix specified.</"
+"p><p>If the suffix is equal to the suffix of the file you've saved, the "
+"autosave will overwrite your file automatically.</p></qt>"
+msgstr ""
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "<p align=\"center\">tukaj ime komponente</p>"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Zagon"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, no-c-format
-msgid "Show block type"
-msgstr "Prikaži vrsto bloka"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Slika pri za&gonu"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Barve"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Nasvet dneva"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Pisava:"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "Na&loži zadnji projekt"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, no-c-format
-msgid "Paper:"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Začni nov projekt z:"
+
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Brez diagrama"
+
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Razredni diagram"
+
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
 msgstr ""
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, no-c-format
-msgid "Selected:"
-msgstr "Izbrano:"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Diagram zaporedja"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "<p align=\"right\">Predmetni blok UML:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Diagram sodelovanja"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "<p align=\"right\">Skriti blok:</p>"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Diagram stanja"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "<p align=\"right\">Neurejevalno besedilo:</p>"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Diagram delovanja"
 
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "<p align=\"right\">Urejevalno besedilo:</p>"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Diagram komponent"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, no-c-format
-msgid "Diagram Properties"
-msgstr "Lastnosti diagrama"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Diagram razvitja"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Ime:"
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Nastavitve razreda"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, no-c-format
-msgid "Zoom:"
-msgstr "Povečava:"
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Prikaži &vidnost"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Prikaz lastnosti"
+
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Prikaži operacije"
+
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr ""
+
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Prikaži podpis atributa"
+
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Prikaži paket"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#: dialogs/diagrampropertiespage.ui:146 dialogs/settingsdlg.cpp:242
 #, no-c-format
 msgid "Show operation signature"
 msgstr "Prikaži podpis operacije"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, no-c-format
-msgid "Show &grid"
-msgstr "Prikaži &mrežo"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Začetni obseg"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, no-c-format
-msgid "Snap &to grid"
-msgstr "Pripni &na mrežo"
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Privzet obseg atributa:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, no-c-format
-msgid "Snap component size"
-msgstr "Pripni velikost komponent"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Privzet obseg operacije:"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, no-c-format
-msgid ""
-"Snap the size of the components to be a multiple of the grid spacing.\n"
-"If 'Snap to Grid' is enabled a component will always be aligned with the grid "
-"on all 4 sides."
-msgstr ""
-"Pripne velikosti komponent, da so večkratnik razmika mreže.\n"
-"Če je omogočena možnost »Pripni na mrežo«, bodo komponente vedno poravnane z "
-"mrežo na vseh štirih stranicah."
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Ustvarjanje kode"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, no-c-format
-msgid "Grid spacing:  "
-msgstr "Razmik mreže:"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Nastavitve ustvarjanja kode"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Nastavitve pregledovalnika kode"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Začetno stanje"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, no-c-format
-msgid "Line width:  "
-msgstr "Širina črte:"
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Končno stanje"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, fuzzy, no-c-format
-msgid "Export all views"
-msgstr "Izvozi kot sliko"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Vrsta stanja:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr ""
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Ime stanja:"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 55
-#: rc.cpp:454 rc.cpp:457
-#, no-c-format
-msgid "The base directory used to save the images"
-msgstr ""
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Barve gradnikov"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, fuzzy, no-c-format
-msgid "&Image type:"
-msgstr "Vrsta stanja:"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Lastnosti atributa"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
 msgstr ""
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "mapa"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Javen"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Zašči&ten"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+#, fuzzy
+msgid "I&mplementation"
+msgstr "&Dokumentacija"
+
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Vnesli ste neveljavno ime atributa."
+
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Ime atributa neveljavno"
+
+#: dialogs/umlattributedialog.cpp:163
 msgid ""
-"The views are stored in folders in the document. The same tree structure used "
-"in the document to store the views can be created in the selected base "
-"directory with this option.\n"
-"Only the folders made by the user are created in the base directory (Logical "
-"view, use case view and so on aren't created)."
-msgstr ""
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Ime atributa, ki ste ga izbrali, je že uporabljeno v tej operaciji."
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Lastnosti vloge"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Ime atributa ni edinstveno"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Ime vloge:"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Lastnosti atributa entitete"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Večkratnost:"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Privzeta vrednost:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, no-c-format
-msgid "Role Changeability"
-msgstr "Spremenljivost vloge"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Dolžina/Vrednosti:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Samo dodajanje"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Samodejno povečaj"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Zamrznjen"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Dovoli &null (nič)"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Možno spreminjanje"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Atributi:"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, no-c-format
-msgid "Role Visibility"
-msgstr "Vidljivost vloge"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indeksiranje"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, fuzzy, no-c-format
-msgid "Implementation"
-msgstr "Dokumentacija"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Brez"
 
-#: tips.txt:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Dobrodošli v Umbrello.</p>\n"
-"<p>Z diagrami UML lahko zasnujete in dokumentirate predmetno usmerjeno "
-"programje. <a href=\"help:/umbrello\">Priročnik za Umbrello</a> "
-"je dober uvod za uporabo UML.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Glavno"
 
-#: tips.txt:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Indeks"
 
-#: tips.txt:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Edinstveno"
 
-#: tips.txt:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Vnesli ste neveljavno ime atributa entitete"
 
-#: tips.txt:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Če želite dodati obstoječi razred v diagram, potem njegov vnos samo "
-"potegnite iz drevesnega prikaza.</p>\n"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Ime atributa entitete ni veljavno"
 
-#: tips.txt:30
+#: dialogs/umlentityattributedialog.cpp:192
 msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
+"The entity attribute name you have chosen is already being used in this "
+"operation."
 msgstr ""
+"Ime atributa entitete, ki ste ga izbrali, je že uporabljeno v operaciji."
 
-#: tips.txt:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Ime atributa entitete ni edinstveno"
 
-#: tips.txt:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Lastnosti operacije"
 
-#: tips.txt:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
 msgstr ""
 
-#: tips.txt:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
 msgstr ""
 
-#: tips.txt:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametri"
 
-#: tips.txt:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Ni potrebno, da so povezave ravne črte. Dvojni klik na črto bo ustvarilo "
-"premikajočo točko.</p>\n"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "No&v parametrer ..."
 
-#: tips.txt:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>V nastavitvenem oknu Umbrella lahko vključite samodejno shranjevanje.</p>\n"
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Vnesli ste neveljavno ime parametra."
 
-#: tips.txt:76
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Ime parametra neveljavno"
+
+#: dialogs/umloperationdialog.cpp:339
 msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+"The parameter name you have chosen\n"
+"is already being used in this operation."
 msgstr ""
+"Ime parametra, ki ste ga izbrali, \n"
+"je že uporabljen v tej operaciji."
 
-#: tips.txt:86
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Ime parametra ni edinstveno"
+
+#: dialogs/umloperationdialog.cpp:406
 msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>Vse predmete lahko zbrišete s pritiskom na Del ali Vračalko.</p>\n"
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Ime parametra, ki ste ga izbrali, je že uporabljen v tej operaciji."
+
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Vnesli ste neveljavno ime operacije."
 
-#: tips.txt:91
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Ime operacije je neveljavno"
+
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid "An operation with that signature already exists in %1.\n"
+msgstr "Operacija s tem podpisom že obstaja v %1.\n"
+
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Izberite drugo ime ali seznam parametrov."
+
+#: dialogs/umlroledialog.cpp:25 dialogs/umlrolepropertiesbase.ui:36
+#, no-c-format
+msgid "Role Properties"
+msgstr "Lastnosti vloge"
+
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Lastnosti predloge"
+
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Vnesli ste neveljavno ime predloge."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Ime predloge je neveljavno"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
+"Ime parametra predloge, ki ste ga izbrali, je že uporabljeno v tej operaciji."
 
-#: tips.txt:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Ime predloge ni edinstveno"
+
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Možnosti prikaza razredov"
+
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Barve diagrama"
+
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Ime, ki ste ga vnesli, je neveljavno."
+
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Ime, ki ste ga vnesli, ni edinstveno."
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Ime ni edinstveno"
+
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Vrstica:"
+
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Zapolni:"
+
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "&Privzeto"
+
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Uporabi zapolnjevanje"
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "Izvozi kot sliko"
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
 msgstr ""
 
-#: tips.txt:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
+#: umlviewimageexportermodel.cpp:158
+#, c-format
+msgid "There was a problem saving file: %1"
+msgstr "Prišlo je to težav pri shranjevanju datoteke: %1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Napaka pri shranjevanju"
+
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Avtorji modelirnika za UML Umbrello"
+
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "Datoteka za odprtje"
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
 msgstr ""
-"<p>Vse predmete lahko izberete s pritiskom na Ctrl-A.</p>\n"
 
-#: tips.txt:108
+#: docgenerators/main.cpp:64
+#, fuzzy
 msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
 msgstr ""
+"(c) 2001 Paul Hensgen, (c) 2002-2005 Avtorji modelirnika za UML Umbrello"
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Avtorji modelirnika za UML Umbrello"
+
+#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
+#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Name"
+msgstr "Ime"
+
+#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
+#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Enter name:"
+msgstr "Vnesite ime:"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Vnesite ime operacije:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Vnesite novo besedilo:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "NAPAKA"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Spremeni besedilo"
+
+#: folder.cpp:289
+#, fuzzy
+msgid "The folderfile %1 does not exist."
+msgstr "Datoteka %1 ne obstaja."
+
+#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
+#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
+msgid "Load Error"
+msgstr "Napaka pri nalaganju"
+
+#: folder.cpp:293
+#, fuzzy
+msgid "The folderfile %1 cannot be opened."
+msgstr "Datoteka %1 je očitno okvarjena."
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -1653,6 +1830,10 @@ msgstr "Nova operacija"
 msgid "Select Operation..."
 msgstr "Izberite operacijo ..."
 
+#: listpopupmenu.cpp:344
+msgid "Clear"
+msgstr ""
+
 #: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 msgid "Change Text..."
 msgstr "Spremeni besedilo ..."
@@ -1702,6 +1883,19 @@ msgstr "Novo"
 msgid "Rename..."
 msgstr "Preimenuj..."
 
+#: listpopupmenu.cpp:477
+msgid "Cut"
+msgstr ""
+
+#: listpopupmenu.cpp:480
+msgid "Copy"
+msgstr ""
+
+#: listpopupmenu.cpp:483
+#, fuzzy
+msgid "Paste"
+msgstr "Napaka prilepljanja"
+
 #: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
 msgid "Line Color..."
 msgstr "Barva vrstice ..."
@@ -1732,14 +1926,26 @@ msgstr "Notranja napaka"
 msgid "Import Classes..."
 msgstr "Razred ..."
 
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paket"
+
 #: listpopupmenu.cpp:512
 msgid "Subsystem"
 msgstr ""
 
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr ""
+
 #: listpopupmenu.cpp:521 uml.cpp:426
 msgid "Component Diagram..."
 msgstr "Doagram komponente ..."
 
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Vozlišče"
+
 #: listpopupmenu.cpp:528 uml.cpp:427
 msgid "Deployment Diagram..."
 msgstr "Diagram razvitja ..."
@@ -1748,10 +1954,18 @@ msgstr "Diagram razvitja ..."
 msgid "Folder"
 msgstr "Mapa"
 
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entiteta"
+
 #: listpopupmenu.cpp:541 uml.cpp:428
 msgid "Entity Relationship Diagram..."
 msgstr "Diagram odvisnosti entitete ..."
 
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr ""
+
 #: listpopupmenu.cpp:551 uml.cpp:423
 msgid "Use Case Diagram..."
 msgstr ""
@@ -1788,6 +2002,18 @@ msgstr "Nov atribut entitete ..."
 msgid "Export as Picture..."
 msgstr "Izvozi kot sliko"
 
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Vmesnik"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr ""
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr ""
+
 #: listpopupmenu.cpp:615 uml.cpp:420
 msgid "Class Diagram..."
 msgstr "Diagram razreda ..."
@@ -1808,26 +2034,10 @@ msgstr "Diagram zaporedja ..."
 msgid "Collaboration Diagram..."
 msgstr "Diagram sodelovanja ..."
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Lastnosti"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operacije"
-
 #: listpopupmenu.cpp:676
 msgid "Public Only"
 msgstr "Samo javno"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Vidnost"
-
 #: listpopupmenu.cpp:680
 msgid "Operation Signature"
 msgstr "Podpis operacije"
@@ -1840,11 +2050,6 @@ msgstr "Podpis atributa"
 msgid "Stereotype"
 msgstr ""
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Prikaži"
-
 #: listpopupmenu.cpp:707
 msgid "Attribute..."
 msgstr "Atribut ..."
@@ -1869,14 +2074,6 @@ msgstr "Barva zapolnjevanja ..."
 msgid "Use Fill Color"
 msgstr "Uporabi barvo zapolnjevanja"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
-#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
-#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
-#: listpopupmenu.cpp:750
-msgid "Color"
-msgstr "Barva"
-
 #: listpopupmenu.cpp:1007
 msgid "Actor..."
 msgstr ""
@@ -1905,10 +2102,26 @@ msgstr ""
 msgid "Package..."
 msgstr "Paket ..."
 
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Začetno stanje"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Končno stanje"
+
 #: listpopupmenu.cpp:1032
 msgid "State..."
 msgstr "Stanje ..."
 
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Začetno delovanje"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Končno delovanje"
+
 #: listpopupmenu.cpp:1053
 #, fuzzy
 msgid "Subsystem..."
@@ -1954,6 +2167,14 @@ msgstr "Zbriši sidro"
 msgid "Change Association Name..."
 msgstr "Spremeni ime povezave ..."
 
+#: listpopupmenu.cpp:1332
+msgid "Undo"
+msgstr ""
+
+#: listpopupmenu.cpp:1333
+msgid "Redo"
+msgstr ""
+
 #: listpopupmenu.cpp:1339
 msgid "Clear Diagram"
 msgstr "Počisti idagram"
@@ -1988,8 +2209,8 @@ msgstr ""
 
 #: main.cpp:43
 msgid ""
-"keep the tree structure used to store the views in the document in the target "
-"directory"
+"keep the tree structure used to store the views in the document in the "
+"target directory"
 msgstr ""
 
 #: main.cpp:95
@@ -1998,188 +2219,96 @@ msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
 msgstr ""
 "(c) 2001 Paul Hensgen, (c) 2002-2005 Avtorji modelirnika za UML Umbrello"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Nepravilna uporaba povezav."
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr ""
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Napaka povezave"
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr ""
 
-#: folder.cpp:289
-#, fuzzy
-msgid "The folderfile %1 does not exist."
-msgstr "Datoteka %1 ne obstaja."
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "nov_paket"
 
-#: folder.cpp:293
-#, fuzzy
-msgid "The folderfile %1 cannot be opened."
-msgstr "Datoteka %1 je očitno okvarjena."
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "nova_komponenta"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Gregor Rakar"
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "novo_vozlišče"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "gregor.rakar@kiss.si"
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr ""
 
-#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
-#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
-#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
-#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
-#: umlviewimageexporterall.cpp:73
-msgid "Ready."
-msgstr "Pripravljen."
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "nov_vmesnik"
 
-#: umlwidgetcontroller.cpp:128
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel move."
+#: model_utils.cpp:258
+msgid "new_datatype"
 msgstr ""
 
-#: umlwidgetcontroller.cpp:379
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel resize."
+#: model_utils.cpp:260
+msgid "new_enum"
 msgstr ""
 
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Ali je obseg %1 imenski prostor ali razred?"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "Uvoz C++ zahteva vašo pomoč"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Imenski prostor"
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "nova_entiteta"
 
-#: codeimport/classimport.cpp:34
+#: model_utils.cpp:264
 #, fuzzy
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Uvažanje datoteke: %1"
-
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Notranja napaka"
-
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Skladenjska napaka pred »%1«"
-
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Napaka razčlenjevanja pred »%1«"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
-
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "pričakovan izraz"
-
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Skladenjska napaka deklaracije"
-
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "pričakovan }"
-
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "pričakovan imenski prostor"
-
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "pričakovan {"
-
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Pričakovano ime imenskega prostora"
-
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Potreben je določitelj tipa za deklaracijo"
-
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "pričakovana deklaracija"
-
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Pričakovan konstanten izraz"
-
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "Pričakovan »)«"
-
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "Manjka }"
+msgid "new_folder"
+msgstr "novo_vozlišče"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Pričakovan inicializator člana"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "nova_povezava"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Pričakovan inicializator osnovnega razreda"
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "nov_predmet"
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
+#: model_utils.cpp:559
+msgid "OK"
 msgstr ""
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Pričakovan identifikator"
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Prazno"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Pričakovan ID tipa"
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Napačno oblikovan argument"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Pričakovano ime razreda"
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Neznan tip argumenta"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "pričakovan pogoj"
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Neveljavno ime metode"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "pričakovana izjava"
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Neznan vrnjen tip"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "pričakovano za inicializacijo"
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Nedoločena napaka"
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
 msgstr ""
+"To je rezervirana ključna beseda za jezik nastavljenega generatorja kode"
+
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Rezervirana ključna beseda"
 
 #: objectwidget.cpp:90
 msgid "Rename Object"
@@ -2193,105 +2322,66 @@ msgstr "Vnesite ime predmeta:"
 msgid "new_parameter"
 msgstr "nov_parameter"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Splošne možnosti"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Paket je imenski prostor"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Navidezni destruktorji"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Ustvari prazen konstruktor"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Dodaj osnoven razred"
 
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
 msgstr ""
 
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operacije so notranje"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Dodaj operacijo"
 
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr ""
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Dodaj atribut"
 
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
 msgstr ""
 
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Diagram: %2 Stran %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Vnesite ime diagrama"
-
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Vnesite novo ime diagrama:"
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
 msgstr ""
-"Zbrisali boste celoten diagram.\n"
-"Ste prepričani?"
-
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Zbrišem diagram:"
-
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Preimenovanje preklicano"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
 msgstr ""
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funkcija še ni izvedena"
-
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
 msgstr ""
-"Ime, ki ste ga vnesli, je neveljavno.\n"
-"Proces preimenovanja je bil preklican."
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "nova_povezava"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Vnesite ime stanja"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "nov_atribut"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Vnesite ime novega stanja:"
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "nova_predloga"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "Vnesite delovanje"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nova_operacija"
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Nepravilna uporaba povezav."
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr ""
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Napaka povezave"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "novo_polje"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "novo stanje"
 
 #: uml.cpp:179
 msgid "&Export model to DocBook"
@@ -2447,11 +2537,6 @@ msgstr "&Izvozi kot sliko ..."
 msgid "Export &All Diagrams as Pictures..."
 msgstr "Izvozi kot sliko"
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Lastnosti"
-
 #: uml.cpp:286
 msgid "&Zoom Slider"
 msgstr "&Drsnik povečave"
@@ -2536,6 +2621,13 @@ msgstr "&Dokumentacija"
 msgid "Opening file..."
 msgstr "Odpiranje datoteke ..."
 
+#: uml.cpp:519 uml.cpp:591 uml.cpp:717 umldoc.cpp:232 umldoc.cpp:312
+#: umldoc.cpp:356 umldoc.cpp:381 umldoc.cpp:423 umldoc.cpp:435 umldoc.cpp:449
+#: umldoc.cpp:462 umldoc.cpp:473 umldoc.cpp:634 umldoc.cpp:642 umldoc.cpp:2103
+#: umldoc.cpp:2106
+msgid "Untitled"
+msgstr ""
+
 #: uml.cpp:650
 msgid "Creating new document..."
 msgstr "Ustvarjanje novega dokumenta ..."
@@ -2543,15 +2635,15 @@ msgstr "Ustvarjanje novega dokumenta ..."
 #: uml.cpp:673
 #, fuzzy
 msgid ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, *."
+"xmi.tar.bz2, *.mdl)\n"
 "*.xmi|Uncompressed XMI Files (*.xmi)\n"
 "*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
 "*.mdl|Rose model files"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2|Vse podprte datoteke (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2)\n"
+"*.xmi *.xmi.tgz *.xmi.tar.bz2|Vse podprte datoteke (*.xmi, *.xmi.tgz, *.xmi."
+"tar.bz2)\n"
 "*.xmi|Nestisnjene datoteke XMI (*.xmi)\n"
 "*.xmi.tgz|Stisnjene datoteke XMI z Gzip (*.xmi.tgz)\n"
 "*.xmi.tar.bz2|Stisnjene datoteke XMI z Bzip2 (*.xmi.tar.bz2)"
@@ -2580,6 +2672,10 @@ msgstr ""
 "*.xmi.tar.bz2|Stisnjena datoteka XMI z Bzip2\n"
 "*|Vse datoteke"
 
+#: uml.cpp:732 umlviewimageexporter.cpp:112
+msgid "Save As"
+msgstr ""
+
 #: uml.cpp:740
 msgid ""
 "The file %1 exists.\n"
@@ -2588,6 +2684,10 @@ msgstr ""
 "Datoteka %1 obstaja.\n"
 "Jo želite nadomestiti?"
 
+#: uml.cpp:740 umldoc.cpp:229
+msgid "Warning"
+msgstr ""
+
 #: uml.cpp:740
 msgid "Overwrite"
 msgstr "Nadomesti"
@@ -2623,11 +2723,11 @@ msgstr "Vstavljanje vsebine odložišča ..."
 
 #: uml.cpp:849
 msgid ""
-"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
-"may be of the wrong type to be pasted here."
+"Umbrello could not paste the clipboard contents.  The objects in the "
+"clipboard may be of the wrong type to be pasted here."
 msgstr ""
-"Umbrello ni mogel prilepiti vsebine odložišča. Predmeti v odložišču so mogoče "
-"napačne vrste."
+"Umbrello ni mogel prilepiti vsebine odložišča. Predmeti v odložišču so "
+"mogoče napačne vrste."
 
 #: uml.cpp:863
 msgid "Toggling toolbar..."
@@ -2681,1263 +2781,1262 @@ msgstr ""
 msgid "Select Code to Import"
 msgstr "Izberite kodo za uvoz"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Ime &razreda:"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "nov_atribut"
 
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr ""
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "nova_predloga"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "&Ime paketa:"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nova_operacija"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "&Ime vmesnika:"
-
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "&Ime komponente:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "novo_polje"
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr ""
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "Model UML"
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr ""
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logični prikaz"
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
+#: umldoc.cpp:107
+msgid "Use Case View"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "Ime &entitete:"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Komponentni prikaz"
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr ""
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Prikaz razvitja"
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Ime &paketa:"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Model odvisnosti entitete"
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
 msgstr ""
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
 msgstr ""
+"Trenutna datoteka je bila spremenjena.\n"
+"Ali jo želite shraniti?"
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Izvedljivo"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Datoteka %1 ne obstaja."
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Nariši kot"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Datoteka %1 je očitno okvarjena."
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "&Privzeto"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Ni bilo najdene datoteke XMI v stisnjeni datoteki %1."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Knjižnica"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Prišlo je do težav pri nalaganju izvlečene datoteke: %1"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabela"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Prišlo je to težav pri nalaganju datoteke: %1"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "&Javno"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Prišlo je do težave pri postavljanju datoteke: %1"
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "&Zaseben"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Za&ščiteno"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "diagram razreda"
 
-#: dialogs/classgenpage.cpp:186
-#, fuzzy
-msgid "Imple&mentation"
-msgstr "&Dokumentacija"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "diagram zaporedja"
 
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Ime razreda:"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "diagram sodelovanja"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr ""
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "diagram stanja"
 
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr ""
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "diagram delovanja"
 
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr ""
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "diagram komponente"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr ""
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "diagram razvitja"
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Ime komponente:"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "diagram odvisnosti entitete"
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Ime vozlišča:"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "To je neveljavno ime za diagram."
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-msgid "Stereotype name:"
-msgstr ""
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Diagram že uporablja to ime."
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: umldoc.cpp:1067 umllistview.cpp:1916
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Ime, ki ste ga izbrali,\n"
-"je že uporabljeno.\n"
-"Ime je bilo ponastavljeno."
+"Ime, ki ste ga vnesli, ni edinstveno.\n"
+"Ali ste to želeli?"
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Ime ni edinstveno"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Use Name"
+msgstr "Ime vloge:"
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Vrstica:"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Enter New Name"
+msgstr "Vnesite ime stanja"
 
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Zapolni:"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Ali zares želite zbrisati diagram %1?"
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "&Privzeto"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Zbriši diagram"
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Uporabi zapolnjevanje"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Nastavljanje dokumenta"
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Delovanja"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Razreševanje referenc predmeta ..."
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Novo delovanje ..."
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Nalaganje elementov UML ..."
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Preimenuj"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Nalaganje diagramov ..."
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Novo delovanje"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/samodejno shranjevanje %1"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Preimenuj delovanje"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr ""
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Vnesite novo ime delovanja"
+#: umllistview.cpp:416
+#, fuzzy
+msgid "Enter Model Name"
+msgstr "Vnesite ime stanja"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Lastnosti povezave"
+#: umllistview.cpp:417
+#, fuzzy
+msgid "Enter the new name of the model:"
+msgstr "Vnesite novo ime diagrama:"
 
-#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
-#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
-#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
-msgid "General Settings"
-msgstr "Splošne nastavitve"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Prikazi"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Vloge"
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"Ime, ki ste ga vnesli, je neveljavno.\n"
+"Proces ustvarjanja je bil preklican."
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Nastavitve vloge"
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Ime ni veljavno"
 
-#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
-#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
-#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
-msgid "Font Settings"
-msgstr "Nastavitve pisav"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Ime, ki ste ga vnesli, ni edinstveno.\n"
+"Proces ustvarjanja je bil preklican."
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Pisava povezave"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Ustvarjanje je preklicano"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Lastnosti predloge"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Nalaganje seznamskega prikaza ..."
 
-#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
-#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
-#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
-msgid "General Properties"
-msgstr "Splošne lastnosti"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Mapa mora biti spraznjena, preden se lahko zbriše."
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Vrsta:"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Mapa ni prazna"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Ime:"
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Preimenovanje preklicano"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Vnesli ste neveljavno ime predloge."
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Ime predloge je neveljavno"
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funkcija še ni izvedena"
 
-#: dialogs/umltemplatedialog.cpp:138
+#: umllistviewitem.cpp:478
 msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
 msgstr ""
-"Ime parametra predloge, ki ste ga izbrali, je že uporabljeno v tej operaciji."
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Ime predloge ni edinstveno"
-
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Lastnosti atributa entitete"
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Privzeta vrednost:"
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Dolžina/Vrednosti:"
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Samodejno povečaj"
-
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Dovoli &null (nič)"
-
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Atributi:"
+"Ime, ki ste ga vnesli, je neveljavno.\n"
+"Proces preimenovanja je bil preklican."
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indeksiranje"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Diagram: %2 Stran %1"
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Brez"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Vnesite ime diagrama"
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Glavno"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Vnesite novo ime diagrama:"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Indeks"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"Zbrisali boste celoten diagram.\n"
+"Ste prepričani?"
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Edinstveno"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Zbrišem diagram:"
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Vnesli ste neveljavno ime atributa entitete"
+#: umlviewimageexporter.cpp:46
+#, fuzzy
+msgid "Exporting view..."
+msgstr "Končujem ..."
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Ime atributa entitete ni veljavno"
+#: umlviewimageexporter.cpp:50
+msgid "An error happened when exporting the image:\n"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: umlviewimageexporter.cpp:66
 msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
 msgstr ""
-"Ime atributa entitete, ki ste ga izbrali, je že uporabljeno v operaciji."
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Ime atributa entitete ni edinstveno"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Zaslon"
-
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Možnosti prikaza razredov"
+"Izbrana datoteka %1 obstaja.\n"
+"Jo želite nadomestiti?"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Barve diagrama"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Datoteka že obstaja"
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Ime, ki ste ga vnesli, je neveljavno."
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "Ni moč ustvariti mape"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Ime, ki ste ga vnesli, ni edinstveno."
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Ni moč shraniti praznega diagrama"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Vrsta:"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Nastavitve Umbrella"
+#: umlwidgetcontroller.cpp:128
+msgid ""
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y "
+"axis. Right button click to cancel move."
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Uporabniški vmesnik"
+#: umlwidgetcontroller.cpp:379
+msgid ""
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y "
+"axis. Right button click to cancel resize."
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Nastavitve uporabniškega vmesnika"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Predmet"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Barva črte:"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Sinhrono sporočilo"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "P&rivzeta barva"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Asinhrono sporočilo"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Barva polnitve"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Oznaka"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Pri&vzeta barva"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Opomba"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Širina črte:"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Okvir"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "Privzeta &širina"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Razmerje"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Uporabi zapolnitveno barvo"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Smerna povezava"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Omogoči razveljavitve"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
+#: worktoolbar.cpp:275
+msgid "Deep History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:120
+#: worktoolbar.cpp:277
 #, fuzzy
-msgid "Use angular association lines"
-msgstr "Vnesite ime povezave:"
-
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Samoshranjevanje"
-
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "O&mogoči samodejno shranjevanje"
-
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Izberite časovni interval samodejnega shranjevanja (minute):"
+msgid "Join"
+msgstr "Razvejitev/Združitev"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Izberite pripono samodejnega shranjevanja:"
+#: worktoolbar.cpp:278
+#, fuzzy
+msgid "Fork"
+msgstr "Razvejitev/Združitev"
 
-#: dialogs/settingsdlg.cpp:148
-msgid ""
-"<qt>"
-"<p>The autosave file will be saved to ~/autosave.xmi if the autosaving occurs "
-"before you have manually saved the file.</p>"
-"<p>If you've already saved it, the autosave file will be saved in the same "
-"folder as the file and will be named like the file's name, followed by the "
-"suffix specified.</p>"
-"<p>If the suffix is equal to the suffix of the file you've saved, the autosave "
-"will overwrite your file automatically.</p></qt>"
+#: worktoolbar.cpp:279
+msgid "Junction"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Zagon"
-
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Slika pri za&gonu"
-
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Nasvet dneva"
-
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "Na&loži zadnji projekt"
-
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Začni nov projekt z:"
-
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Brez diagrama"
-
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Razredni diagram"
-
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
+#: worktoolbar.cpp:280
+msgid "Choice"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Diagram zaporedja"
-
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Diagram sodelovanja"
-
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Diagram stanja"
-
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
+#: worktoolbar.cpp:285
+#, fuzzy
+msgid "Activity Transition"
 msgstr "Diagram delovanja"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Diagram komponent"
-
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Diagram razvitja"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Sporočilo"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Nastavitve razreda"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Prikaži &vidnost"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Izberite"
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Prikaz lastnosti"
+#: autolayout/newautolayoutdialog.ui:41
+#, no-c-format
+msgid "La&yout Algorithm"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Prikaži operacije"
+#: autolayout/newautolayoutdialog.ui:50
+#, no-c-format
+msgid "dot"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
+#: autolayout/newautolayoutdialog.ui:55
+#, no-c-format
+msgid "neato"
 msgstr ""
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Prikaži podpis atributa"
+#: autolayout/newautolayoutdialog.ui:60
+#, no-c-format
+msgid "circo"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Prikaži paket"
+#: autolayout/newautolayoutdialog.ui:88
+#, fuzzy, no-c-format
+msgid "Shape separation"
+msgstr "Prikaži operacije"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Začetni obseg"
+#: autolayout/newautolayoutdialog.ui:129
+#, no-c-format
+msgid "Clusteri&ze Hierarchies"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Privzet obseg atributa:"
+#: autolayout/newautolayoutdialog.ui:137
+#, fuzzy, no-c-format
+msgid "Ce&nter Diagram"
+msgstr "Počisti idagram"
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Privzet obseg operacije:"
+#: autolayout/newautolayoutdialog.ui:145
+#, no-c-format
+msgid "Co&mpress Shapes"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Ustvarjanje kode"
+#: autolayout/newautolayoutdialog.ui:183
+#, fuzzy, no-c-format
+msgid "Generalization as Ed&ges"
+msgstr "Generalizacija"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Nastavitve ustvarjanja kode"
+#: autolayout/newautolayoutdialog.ui:203 autolayout/newautolayoutdialog.ui:258
+#: autolayout/newautolayoutdialog.ui:313
+#, no-c-format
+msgid "Weight"
+msgstr ""
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Nastavitve pregledovalnika kode"
+#: autolayout/newautolayoutdialog.ui:206 autolayout/newautolayoutdialog.ui:261
+#: autolayout/newautolayoutdialog.ui:316
+#, no-c-format
+msgid ""
+"Select the weight that the autolayout algoritm must use to compare "
+"association with other relationships like Generalization and Dependence"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Lastnosti operacije"
+#: autolayout/newautolayoutdialog.ui:238
+#, fuzzy, no-c-format
+msgid "Association as Ed&ges"
+msgstr "Ime povezave"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
+#: autolayout/newautolayoutdialog.ui:293
+#, no-c-format
+msgid "Dependencies &as Edges"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
+#: autolayout/newautolayoutdialog.ui:353
+#, no-c-format
+msgid "He&lp"
 msgstr ""
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
+#: autolayout/newautolayoutdialog.ui:398
+#: dialogs/exportallviewsdialogbase.ui:183
+#, no-c-format
+msgid "&Cancel"
 msgstr ""
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Zašči&ten"
+#: autolayout/newautolayoutdialog.ui:412
+#, fuzzy, no-c-format
+msgid "&Restore Default"
+msgstr "&Privzeto"
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-#, fuzzy
-msgid "I&mplementation"
-msgstr "&Dokumentacija"
+#: autolayout/newautolayoutdialog.ui:420
+#, no-c-format
+msgid "Save As Defa&ult"
+msgstr ""
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametri"
+#: codegenerators/cppcodegenerationformbase.ui:53
+#: codegenerators/javacodegenerationformbase.ui:242
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr "Poševnica-poševnica (//)"
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "No&v parametrer ..."
+#: codegenerators/cppcodegenerationformbase.ui:58
+#: codegenerators/javacodegenerationformbase.ui:247
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr "Poševnica-zvezdica (/** */)"
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Vnesli ste neveljavno ime parametra."
+#: codegenerators/cppcodegenerationformbase.ui:70
+#: codegenerators/javacodegenerationformbase.ui:236
+#: codegenerators/rubycodegenerationformbase.ui:207
+#, no-c-format
+msgid "Style:"
+msgstr "Slog:"
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Ime parametra neveljavno"
+#: codegenerators/cppcodegenerationformbase.ui:98
+#, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "<p align=\"center\">Ustvarjanje kode v C++</p>"
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Ime parametra, ki ste ga izbrali, \n"
-"je že uporabljen v tej operaciji."
+#: codegenerators/cppcodegenerationformbase.ui:136
+#, no-c-format
+msgid "Method Body Generation"
+msgstr "Ustvarjanje telesa metode"
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Ime parametra ni edinstveno"
+#: codegenerators/cppcodegenerationformbase.ui:164
+#, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "Uporabi naslednje za razrede v ustvarjeni kodi:"
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Ime parametra, ki ste ga izbrali, je že uporabljen v tej operaciji."
+#: codegenerators/cppcodegenerationformbase.ui:201
+#, no-c-format
+msgid "QPtrList"
+msgstr "QPtrList"
 
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Vnesli ste neveljavno ime operacije."
+#: codegenerators/cppcodegenerationformbase.ui:202
+#: codegenerators/cppcodegenerationformbase.ui:365
+#, no-c-format
+msgid "vector"
+msgstr "vektor"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Ime operacije je neveljavno"
+#: codegenerators/cppcodegenerationformbase.ui:211
+#, no-c-format
+msgid "<b>Variable</b>"
+msgstr "<b>Spremenljivka</b>"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Operacija s tem podpisom že obstaja v %1.\n"
+#: codegenerators/cppcodegenerationformbase.ui:233
+#: codegenerators/cppcodegenerationformbase.ui:440
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Izberite drugo ime ali seznam parametrov."
+#: codegenerators/cppcodegenerationformbase.ui:273
+#, no-c-format
+msgid "QString"
+msgstr "QString"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Lastnosti vloge A"
+#: codegenerators/cppcodegenerationformbase.ui:274
+#: codegenerators/cppcodegenerationformbase.ui:398
+#, no-c-format
+msgid "string"
+msgstr "niz"
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Lastnosti vloge B"
+#: codegenerators/cppcodegenerationformbase.ui:325
+#, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "<p align=\"center\">Niz</p>"
 
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Vidljivost vloge A"
+#: codegenerators/cppcodegenerationformbase.ui:341
+#, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "<p align=\"center\">Seznam</p>"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Vidljivost vloge B"
+#: codegenerators/cppcodegenerationformbase.ui:364
+#, no-c-format
+msgid "qptrlist.h"
+msgstr "qptrlist.h"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Spremenljivost vloge A"
+#: codegenerators/cppcodegenerationformbase.ui:374
+#, no-c-format
+msgid "<i>global?</i>"
+msgstr ""
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Spremenljivost vloge B"
+#: codegenerators/cppcodegenerationformbase.ui:397
+#, no-c-format
+msgid "qstring.h"
+msgstr "qstring.h"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Vsebovani predmeti"
+#: codegenerators/cppcodegenerationformbase.ui:418
+#, no-c-format
+msgid "Class name"
+msgstr "Ime razreda"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
+#: codegenerators/cppcodegenerationformbase.ui:448
+#, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "No&v atribut ..."
+#: codegenerators/javacodegenerationformbase.ui:40
+#, no-c-format
+msgid "Project Generation"
+msgstr "Ustvarjanje projekta"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "No&va operacija ..."
+#: codegenerators/javacodegenerationformbase.ui:51
+#, no-c-format
+msgid "Create ANT build document"
+msgstr ""
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Predloge"
+#: codegenerators/javacodegenerationformbase.ui:69
+#: codegenerators/rubycodegenerationformbase.ui:40
+#, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "Metode samodejnega grajenja"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "No&va predloga ..."
+#: codegenerators/javacodegenerationformbase.ui:88
+#: codegenerators/rubycodegenerationformbase.ui:59
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr "Metode praznega konstruktorja"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
+#: codegenerators/javacodegenerationformbase.ui:99
+#: codegenerators/rubycodegenerationformbase.ui:70
+#, no-c-format
+msgid "Association accessor methods"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
+#: codegenerators/javacodegenerationformbase.ui:110
+#: codegenerators/rubycodegenerationformbase.ui:81
+#, no-c-format
+msgid "Attribute accessor methods"
 msgstr ""
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Atributi entitete"
+#: codegenerators/javacodegenerationformbase.ui:144
+#: codegenerators/rubycodegenerationformbase.ui:115
+#, no-c-format
+msgid "From Parent Object"
+msgstr "Od matičnega predmeta"
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "No&v atribut entitete ..."
+#: codegenerators/javacodegenerationformbase.ui:159
+#: codegenerators/rubycodegenerationformbase.ui:130
+#, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Začetno delovanje"
+#: codegenerators/javacodegenerationformbase.ui:177
+#: codegenerators/rubycodegenerationformbase.ui:148
+#, no-c-format
+msgid "Default association field scope:"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Končno delovanje"
+#: codegenerators/javacodegenerationformbase.ui:198
+#: codegenerators/rubycodegenerationformbase.ui:169
+#, no-c-format
+msgid "From Parent Role"
+msgstr "Od vloge matičnega"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Vrsta delovanja:"
+#: codegenerators/javacodegenerationformbase.ui:269
+#, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "<p align=\"center\">Ustvarjanje kode v javi</p>"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Ime delovanja:"
+#: codegenerators/rubycodegenerationformbase.ui:213
+#, no-c-format
+msgid "Hash (#)"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Barve gradnikov"
+#: codegenerators/rubycodegenerationformbase.ui:218
+#, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr ""
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Lastnosti atributa"
+#: codegenerators/rubycodegenerationformbase.ui:240
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "<p align=\"center\">Ustvarjanje kode v C++</p>"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Začetna vrednost:"
+#: dialogs/codegenerationoptionsbase.ui:69
+#, no-c-format
+msgid "Language"
+msgstr "Jezik"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Javen"
+#: dialogs/codegenerationoptionsbase.ui:93
+#, no-c-format
+msgid "Folders"
+msgstr "Mape"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Vnesli ste neveljavno ime atributa."
+#: dialogs/codegenerationoptionsbase.ui:110
+#, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Zapiši vse ustvarjene datoteke v mapo:"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Ime atributa neveljavno"
+#: dialogs/codegenerationoptionsbase.ui:118
+#, no-c-format
+msgid "Bro&wse..."
+msgstr "&Brskaj ..."
 
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Ime atributa, ki ste ga izbrali, je že uporabljeno v tej operaciji."
+#: dialogs/codegenerationoptionsbase.ui:126
+#, no-c-format
+msgid "B&rowse..."
+msgstr "&Brskaj ..."
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Ime atributa ni edinstveno"
+#: dialogs/codegenerationoptionsbase.ui:134
+#, no-c-format
+msgid "&Include heading files from folder:"
+msgstr ""
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Izberite operacijo"
+#: dialogs/codegenerationoptionsbase.ui:145
+#, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "Datoteke, ustvarjene z generatorjem kode, bodo zapisane v to mapo"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Številka zaporedja:"
+#: dialogs/codegenerationoptionsbase.ui:153
+#, no-c-format
+msgid ""
+"Files in this folder will be used as heading files in the generated code"
+msgstr ""
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Razredna operacija:"
+#: dialogs/codegenerationoptionsbase.ui:197
+#, no-c-format
+msgid "Overwrite Policy"
+msgstr "Politika nadomeščanja"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Prilagojena operacija:"
+#: dialogs/codegenerationoptionsbase.ui:214
+#, no-c-format
+msgid ""
+"If a file with the same name as the name code \n"
+"generator wants to use as output file already exists:"
+msgstr ""
+"Če že obstaja datoteka z enakim imenom kot je datoteka,\n"
+"ki jo želi generator kode uporabiti za izhodno datoteko:"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Diagrami"
+#: dialogs/codegenerationoptionsbase.ui:223
+#, no-c-format
+msgid "O&verwrite"
+msgstr "&Nadomesti"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filter"
+#: dialogs/codegenerationoptionsbase.ui:226
+#, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Nadomesti obstoječe datoteke, če obstajajao v ciljni mapi"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Trenuten diagran"
+#: dialogs/codegenerationoptionsbase.ui:234
+#, no-c-format
+msgid "As&k"
+msgstr "&Vprašaj"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Vsi diagrami"
+#: dialogs/codegenerationoptionsbase.ui:240
+#, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "Če že obstaja datoteka z enakim imenom, vprašaj, kaj narediti"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Izbrani diagrami"
+#: dialogs/codegenerationoptionsbase.ui:248
+#, no-c-format
+msgid "&Use a different name"
+msgstr "&Uporabi drugo ime"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "V&rsta diagrama"
+#: dialogs/codegenerationoptionsbase.ui:251
+#, no-c-format
+msgid ""
+"If a file already exists in the destination folder, select a different name "
+"to use by adding a suffix to the file name"
+msgstr ""
+"Če datoteka že obstaja v ciljni mapi, uporabi drugo ime tako, da se doda "
+"pripona k imenu datoteke"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Izbor"
+#: dialogs/codegenerationoptionsbase.ui:265
+#, no-c-format
+msgid "Formatting"
+msgstr "Oblikovanje"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Sodelovanje"
+#: dialogs/codegenerationoptionsbase.ui:284
+#, no-c-format
+msgid "Lines"
+msgstr "Črte"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Zaporedje"
+#: dialogs/codegenerationoptionsbase.ui:346
+#, no-c-format
+msgid "Line ending style:"
+msgstr "Slog konca vrstice:"
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Razvitje"
+#: dialogs/codegenerationoptionsbase.ui:354
+#, no-c-format
+msgid "Indentation type:"
+msgstr "Vrsta zamikanja:"
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Ni izbranega diagrama."
+#: dialogs/codegenerationoptionsbase.ui:362
+#, no-c-format
+msgid "Indentation amount:"
+msgstr "Količina zamikanja:"
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Možnosti prikaza"
+#: dialogs/codegenerationoptionsbase.ui:368
+#, no-c-format
+msgid "*NIX (\"\\n\")"
+msgstr "*NIX (\"\\n\")"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Nastavitve atributa"
+#: dialogs/codegenerationoptionsbase.ui:373
+#, no-c-format
+msgid "Windows (\"\\r\\n\")"
+msgstr "Windows (\"\\r\\n\")"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Nastavitve operacije"
+#: dialogs/codegenerationoptionsbase.ui:378
+#, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "Mac (\"\\r\")"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Nastavitve predloge"
+#: dialogs/codegenerationoptionsbase.ui:388
+#, no-c-format
+msgid "No Indentation"
+msgstr "Brez zamikanja"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr ""
+#: dialogs/codegenerationoptionsbase.ui:393
+#, no-c-format
+msgid "Tab"
+msgstr "Tabulator"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Nastavitve atributa entitete"
+#: dialogs/codegenerationoptionsbase.ui:398
+#, no-c-format
+msgid "Space"
+msgstr "Presledek"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Nastavitve vsebine"
+#: dialogs/codegenerationoptionsbase.ui:417
+#, no-c-format
+msgid "Comment Verbosity"
+msgstr "Zgovornost komentarjev"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Povezave"
+#: dialogs/codegenerationoptionsbase.ui:432
+#, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr "Zapi&ši komentarje za razdelke, tudi če so ti prazni"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Razredne povezave"
+#: dialogs/codegenerationoptionsbase.ui:436
+#, no-c-format
+msgid ""
+"Writes comments to indicate the different sections (public, private etc) in "
+"a class, even if the sections are empty"
+msgstr ""
+"Zapiši komentarje, da se označi različne razdelke (javne, zasebne ...) v "
+"razredu, tudi če so razdelki prazni"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "Opera&cije"
+#: dialogs/codegenerationoptionsbase.ui:452
+#, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "&Zapiši komentarje k dokumentaciji, tudi če je prazna"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Vidnost"
+#: dialogs/codegenerationoptionsbase.ui:455
+#, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr ""
+"Z&apiši komentarje za dokumentacijo razredov in metod, tudi če je prazna"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "&Podpis operacije"
+#: dialogs/codegenerationoptionsbase.ui:468
+#, no-c-format
+msgid "Language Options"
+msgstr "Možnosti jezika"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&ket"
+#: dialogs/codegenerationwizardbase.ui:16
+#, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Čarovnik za ustvarjanje kode"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "At&ributi"
+#: dialogs/codegenerationwizardbase.ui:23
+#, no-c-format
+msgid "Select Classes"
+msgstr "Izberite razrede"
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
+#: dialogs/codegenerationwizardbase.ui:40
+#, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
 msgstr ""
+"Postavite vse razrede, za katere želite ustvariti\n"
+"kodo, v seznam na desni strani"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Podpis atr&ibuta"
+#: dialogs/codegenerationwizardbase.ui:78
+#, no-c-format
+msgid "Add class for code generation"
+msgstr "Dodaj razred za ustvarjanje kode"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Nariši kot krog"
+#: dialogs/codegenerationwizardbase.ui:101
+#, no-c-format
+msgid "Classes Selected"
+msgstr "Izbrani razredi"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Začetno stanje"
+#: dialogs/codegenerationwizardbase.ui:136
+#, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Odstrani razred iz ustvarjanja kode"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Končno stanje"
+#: dialogs/codegenerationwizardbase.ui:159
+#, no-c-format
+msgid "Classes Available"
+msgstr "Razpoložljivi razredi"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Vrsta stanja:"
+#: dialogs/codegenerationwizardbase.ui:209
+#, no-c-format
+msgid "Code Generation Status"
+msgstr "Stanje ustvarjanja kode"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Ime stanja:"
+#: dialogs/codegenerationwizardbase.ui:226
+#, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "Pritisnite gumb »Ustvari« za začetek ustvarjanja kode"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Barve gradnikov"
+#: dialogs/codegenerationwizardbase.ui:234
+#: dialogs/codegenerationwizardbase.ui:260
+#, no-c-format
+msgid "Generation Status"
+msgstr "Stanje ustvarjanja"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nov_razred"
+#: dialogs/codeviewerdialogbase.ui:43
+#, no-c-format
+msgid "Show hidden blocks"
+msgstr "Prikaži skrite bloke"
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nov Razred"
+#: dialogs/codeviewerdialogbase.ui:59
+#, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "<p align=\"center\">tukaj ime komponente</p>"
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Atributi razreda"
+#: dialogs/codeviewerdialogbase.ui:78
+#, no-c-format
+msgid "Close"
+msgstr ""
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Operacije razreda"
+#: dialogs/codeviewerdialogbase.ui:86
+#, no-c-format
+msgid "Show block type"
+msgstr "Prikaži vrsto bloka"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Lastnosti parametra"
+#: dialogs/codevieweroptionsbase.ui:45
+#, no-c-format
+msgid "Colors"
+msgstr "Barve"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Smer prehoda"
+#: dialogs/codevieweroptionsbase.ui:72
+#, no-c-format
+msgid "Font:"
+msgstr "Pisava:"
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
+#: dialogs/codevieweroptionsbase.ui:103
+#, no-c-format
+msgid "Paper:"
 msgstr ""
-"»in« je parameter samo za branje, »out« je parameter samo za pisanje in »inout« "
-"je parameter samo za branje in pisanje."
-
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Ustvari"
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Končaj"
+#: dialogs/codevieweroptionsbase.ui:134
+#, no-c-format
+msgid "Selected:"
+msgstr "Izbrano:"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Koda je ustvarjena"
+#: dialogs/codevieweroptionsbase.ui:260
+#, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "<p align=\"right\">Predmetni blok UML:</p>"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Ni ustvarjena"
+#: dialogs/codevieweroptionsbase.ui:276
+#, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "<p align=\"right\">Skriti blok:</p>"
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Ni še ustvarjena"
+#: dialogs/codevieweroptionsbase.ui:294
+#, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "<p align=\"right\">Neurejevalno besedilo:</p>"
 
-#: dialogs/codegenerationwizard.cpp:162
-#, fuzzy
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Imenik %1 ne obstaja. Ali ga želite ustvariti sedaj?"
+#: dialogs/codevieweroptionsbase.ui:333
+#, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "<p align=\"right\">Urejevalno besedilo:</p>"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-#, fuzzy
-msgid "Output Folder Does Not Exist"
-msgstr "Izhodni imenik ne obstaja"
+#: dialogs/diagrampropertiespage.ui:30
+#, no-c-format
+msgid "Diagram Properties"
+msgstr "Lastnosti diagrama"
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Create Folder"
-msgstr "Ni moč ustvariti mape"
+#: dialogs/diagrampropertiespage.ui:92
+#, no-c-format
+msgid "Zoom:"
+msgstr "Povečava:"
 
-#: dialogs/codegenerationwizard.cpp:163
-#, fuzzy
-msgid "Do Not Create"
-msgstr "&Ne ustvari datoteke"
+#: dialogs/diagrampropertiespage.ui:119
+#, no-c-format
+msgid "%"
+msgstr "%"
 
-#: dialogs/codegenerationwizard.cpp:168
-#, fuzzy
-msgid ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
-msgstr ""
-"Imenik ni bil ustvarjen.\n"
-"Prosim preverite, da imate dostop do pisanja v njegove matične imenike ali pa "
-"izberite drug, veljaven imenik."
+#: dialogs/diagrampropertiespage.ui:186
+#, no-c-format
+msgid "Show &grid"
+msgstr "Prikaži &mrežo"
 
-#: dialogs/codegenerationwizard.cpp:169
-#, fuzzy
-msgid "Error Creating Folder"
-msgstr "Napaka pri ustvarjanju imenika"
+#: dialogs/diagrampropertiespage.ui:194
+#, no-c-format
+msgid "Snap &to grid"
+msgstr "Pripni &na mrežo"
 
-#: dialogs/codegenerationwizard.cpp:176
-#, fuzzy
-msgid "Please select a valid folder."
-msgstr "Prosim izberite veljaven imenik."
+#: dialogs/diagrampropertiespage.ui:202
+#, no-c-format
+msgid "Snap component size"
+msgstr "Pripni velikost komponent"
 
-#: dialogs/codegenerationwizard.cpp:184
-#, fuzzy
+#: dialogs/diagrampropertiespage.ui:205
+#, no-c-format
 msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
+"Snap the size of the components to be a multiple of the grid spacing.\n"
+"If 'Snap to Grid' is enabled a component will always be aligned with the "
+"grid on all 4 sides."
 msgstr ""
-"Izhodni imenik obstaja, vendar ni zapisljiv.\n"
-"Prosim nastavite primerna dovoljenja ali pa izberite drug imenik."
-
-#: dialogs/codegenerationwizard.cpp:185
-#, fuzzy
-msgid "Error Writing to Output Folder"
-msgstr "Napaka pri pisanju v izhodni imenik"
+"Pripne velikosti komponent, da so večkratnik razmika mreže.\n"
+"Če je omogočena možnost »Pripni na mrežo«, bodo komponente vedno poravnane z "
+"mrežo na vseh štirih stranicah."
 
-#: dialogs/codegenerationwizard.cpp:191
-#, fuzzy
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 očitno ni imenik. Prosim izberite veljaven imenik."
+#: dialogs/diagrampropertiespage.ui:257
+#, no-c-format
+msgid "Grid spacing:  "
+msgstr "Razmik mreže:"
 
-#: dialogs/codegenerationwizard.cpp:192
-#, fuzzy
-msgid "Please Choose Valid Folder"
-msgstr "Prosim izberite veljaven imenik"
+#: dialogs/diagrampropertiespage.ui:265
+#, no-c-format
+msgid "X"
+msgstr "X"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Ciljna datoteka že obstaja"
+#: dialogs/diagrampropertiespage.ui:284
+#, no-c-format
+msgid "Y"
+msgstr "Y"
 
-#: dialogs/overwritedialogue.cpp:31
-msgid ""
-"The file %1 already exists in %2.\n"
-"\n"
-"Umbrello can overwrite the file, generate a similar\n"
-"file name or not generate this file."
-msgstr ""
-"Datoteka %1 že obstaja v %2.\n"
-"\n"
-"Umbrello lahko nadomesti datoteko, ustvari podobno\n"
-"datoteko ali pa ne ustvari te datoteke."
+#: dialogs/diagrampropertiespage.ui:346
+#, no-c-format
+msgid "Line width:  "
+msgstr "Širina črte:"
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Uporabi na vseh preostalih datotekah"
+#: dialogs/exportallviewsdialogbase.ui:16
+#, fuzzy, no-c-format
+msgid "Export all views"
+msgstr "Izvozi kot sliko"
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Nadomesti"
+#: dialogs/exportallviewsdialogbase.ui:49
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr ""
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "U&stvari podobno ime datoteke"
+#: dialogs/exportallviewsdialogbase.ui:55
+#: dialogs/exportallviewsdialogbase.ui:66
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr ""
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "&Ne ustvari datoteke"
+#: dialogs/exportallviewsdialogbase.ui:84
+#, fuzzy, no-c-format
+msgid "&Image type:"
+msgstr "Vrsta stanja:"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Na voljo ni možnosti.</p>"
+#: dialogs/exportallviewsdialogbase.ui:100
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "mapa"
 
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
+#: dialogs/exportallviewsdialogbase.ui:103
+#, no-c-format
+msgid ""
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
 msgstr ""
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
+#: dialogs/exportallviewsdialogbase.ui:107
+#, no-c-format
+msgid ""
+"The views are stored in folders in the document. The same tree structure "
+"used in the document to store the views can be created in the selected base "
+"directory with this option.\n"
+"Only the folders made by the user are created in the base directory (Logical "
+"view, use case view and so on aren't created)."
 msgstr ""
 
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Ime povezave"
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Vnesite ime povezave:"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Ime vloge:"
-
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Vnesite ime vloge:"
+#: dialogs/umlrolepropertiesbase.ui:106
+#, no-c-format
+msgid "Role Changeability"
+msgstr "Spremenljivost vloge"
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Vnesite ime operacije:"
+#: dialogs/umlrolepropertiesbase.ui:156
+#, no-c-format
+msgid "Role Visibility"
+msgstr "Vidljivost vloge"
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Vnesite novo besedilo:"
+#: umbrelloui.rc:5
+#, no-c-format
+msgid "&Export"
+msgstr ""
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "NAPAKA"
+#: umbrelloui.rc:10
+#, no-c-format
+msgid "&Edit"
+msgstr ""
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Spremeni besedilo"
+#: umbrelloui.rc:13
+#, no-c-format
+msgid "&Diagram"
+msgstr "&Diagram"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Poravnaj levo"
+#: umbrelloui.rc:14
+#, no-c-format
+msgid "&New"
+msgstr "&Nov"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Poravnaj desno"
+#: umbrelloui.rc:31
+#, no-c-format
+msgid "Sh&ow"
+msgstr "Pri&kaži"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Poravnaj navzgor"
+#: umbrelloui.rc:35
+#, fuzzy, no-c-format
+msgid "&Zoom"
+msgstr "Povečava:"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Poravnaj navzdol"
+#: umbrelloui.rc:43
+#, no-c-format
+msgid "&Code"
+msgstr "&Koda"
 
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
-msgstr ""
+#: umbrelloui.rc:47
+#, no-c-format
+msgid "Active &Language"
+msgstr "Aktiven &jezik"
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
+#: tips:3
+#, fuzzy
+msgid ""
+"<p>Welcome to Umbrello.</p>\n"
+"\n"
+"<p>UML diagrams let you design and document object oriented software.  <a "
+"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
+"using UML.</p>\n"
 msgstr ""
+"<p>Dobrodošli v Umbrello.</p>\n"
+"<p>Z diagrami UML lahko zasnujete in dokumentirate predmetno usmerjeno "
+"programje. <a href=\"help:/umbrello\">Priročnik za Umbrello</a> je dober "
+"uvod za uporabo UML.</p>\n"
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
+#: tips:11
+msgid ""
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, "
+"Ruby code generation, externalizable folders, ability to change interfaces "
+"into classes, and more.</p>\n"
 msgstr ""
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
+#: tips:17
+msgid ""
+"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you "
+"need External Folders then deselect &quot;Use tabbed diagrams&quot; in the "
+"General Settings.</p>\n"
 msgstr ""
 
-#: aligntoolbar.cpp:383
+#: tips:23
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"<p>Most diagram items can not be resized, they will resize themselves to fit "
+"to their contents.\n"
+"Boxes, notes and sequence diagram messages can be resized, just click and "
+"drag on the red square.</p>\n"
 msgstr ""
 
-#: object_factory.cpp:164
+#: tips:30
 msgid ""
-"This is a reserved keyword for the language of the configured code generator."
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
 msgstr ""
-"To je rezervirana ključna beseda za jezik nastavljenega generatorja kode"
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Rezervirana ključna beseda"
-
-#: umlviewimageexporter.cpp:46
-#, fuzzy
-msgid "Exporting view..."
-msgstr "Končujem ..."
+"<p>Če želite dodati obstoječi razred v diagram, potem njegov vnos samo "
+"potegnite iz drevesnega prikaza.</p>\n"
 
-#: umlviewimageexporter.cpp:50
+#: tips:36
 msgid ""
-"An error happened when exporting the image:\n"
+"<p>Umbrello's refactoring agent lets you move operations between a class and "
+"its derived and base \n"
+"classes.\n"
+"Right click a class to open the refactoring agent.</p>\n"
 msgstr ""
 
-#: umlviewimageexporter.cpp:66
+#: tips:44
 msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
+"<p>Sequence diagram objects can have a destructor box and be drawn as "
+"actors.  Double click one for\n"
+"the Properties dialogue.</p>\n"
 msgstr ""
-"Izbrana datoteka %1 obstaja.\n"
-"Jo želite nadomestiti?"
 
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Datoteka že obstaja"
-
-#: model_utils.cpp:244
-msgid "new_actor"
+#: tips:51
+msgid ""
+"<p>Sequence diagram messages can act as constructors.  Click on the object "
+"box (rather than the vertical line) to make it a constructor.</p>\n"
 msgstr ""
 
-#: model_utils.cpp:246
-msgid "new_usecase"
+#: tips:57
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical "
+"line again to create an automessage.</p>\n"
 msgstr ""
 
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "nov_paket"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "nova_komponenta"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "novo_vozlišče"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
+#: tips:63
+msgid ""
+"<p>If on loading a foreign file nothing is displayed in the list view, try "
+"saving the model under a different name,\n"
+"closing, and reloading the saved file.  Usually the list view is then "
+"properly populated.\n"
+"</p>\n"
 msgstr ""
 
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "nov_vmesnik"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
+#: tips:71
+msgid ""
+"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
+"pasted into KWord\n"
+"and other applications.</p>\n"
 msgstr ""
 
-#: model_utils.cpp:260
-msgid "new_enum"
+#: tips:78
+msgid ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
 msgstr ""
+"<p>Ni potrebno, da so povezave ravne črte. Dvojni klik na črto bo ustvarilo "
+"premikajočo točko.</p>\n"
 
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "nova_entiteta"
-
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "novo_vozlišče"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "nov_predmet"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Prazno"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Napačno oblikovan argument"
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Neznan tip argumenta"
-
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Neveljavno ime metode"
-
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Neznan vrnjen tip"
-
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Nedoločena napaka"
-
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Dodaj osnoven razred"
-
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
+#: tips:84
+msgid "<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
 msgstr ""
+"<p>V nastavitvenem oknu Umbrella lahko vključite samodejno shranjevanje.</"
+"p>\n"
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Dodaj operacijo"
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Dodaj atribut"
-
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
+#: tips:90
+msgid ""
+"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
+"Either add it to the bugs database with Report Bug from the Help menu\n"
+"or send it to the uml-devel mailing list.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</"
+"a>.</li>\n"
+"</ul>\n"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr ""
+#: tips:101
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr "<p>Vse predmete lahko zbrišete s pritiskom na Del ali Vračalko.</p>\n"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
+#: tips:107
+msgid ""
+"<p>If you've found a bug in Umbrello, please let us know. \n"
+"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
 msgstr ""
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
+#: tips:114
+msgid ""
+"<p>Pressing the Escape key sets the current tool to the select tool.\n"
+"Backspace jumps to the previously used tool.</p>\n"
 msgstr ""
 
-#: umlviewimageexportermodel.cpp:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "Ni moč ustvariti mape"
-
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Ni moč shraniti praznega diagrama"
+#: tips:121
+msgid "<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr "<p>Vse predmete lahko izberete s pritiskom na Ctrl-A.</p>\n"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
+#: tips:127
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the "
+"Code menu.</p>\n"
 msgstr ""
 
 #~ msgid "Enables/disables the toolbar"