From 242434109c14a494dee7738b9c343f5947d20506 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Mon, 29 Sep 2014 03:08:03 -0500
Subject: Automated l10n update (.po files)

---
 tde-i18n-sr@Latn/messages/tdesdk/umbrello.po | 4665 +++++++++++++-------------
 1 file changed, 2336 insertions(+), 2329 deletions(-)

(limited to 'tde-i18n-sr@Latn/messages/tdesdk/umbrello.po')

diff --git a/tde-i18n-sr@Latn/messages/tdesdk/umbrello.po b/tde-i18n-sr@Latn/messages/tdesdk/umbrello.po
index 5e0f7569266..3d0476ea699 100644
--- a/tde-i18n-sr@Latn/messages/tdesdk/umbrello.po
+++ b/tde-i18n-sr@Latn/messages/tdesdk/umbrello.po
@@ -10,330 +10,398 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2006-10-01 13:46+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Objekat"
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 36
+#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
+#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
+#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
+#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
+#: dialogs/notedialog.cpp:29 dialogs/parmpropdlg.cpp:100
+#: dialogs/statedialog.cpp:104 docwindow.cpp:33 rc.cpp:30 rc.cpp:150
+#: rc.cpp:207 rc.cpp:445 rc.cpp:492
+#, no-c-format
+msgid "Documentation"
+msgstr "Dokumentacija"
 
-#: worktoolbar.cpp:246
-msgid "Synchronous Message"
-msgstr "Sinhrona poruka"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Toplica Tanasković"
 
-#: worktoolbar.cpp:247
-msgid "Asynchronous Message"
-msgstr "Asinhrona poruka"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "toptan@kde.org.yu"
 
-#: association.cpp:87 worktoolbar.cpp:248
-msgid "Association"
-msgstr "Pridruživanje"
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Poravnaj levo"
 
-#: association.cpp:93 worktoolbar.cpp:249
-msgid "Containment"
-msgstr "Sadržalac"
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Poravnaj desno"
 
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Sidro"
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Poravnaj na vrhu"
 
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Oznaka"
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Poravnaj na dnu"
 
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Zabeleška"
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "AlignQt::Vertical Middle"
+msgstr "Poravnaj uspravno u sredini"
 
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Kutija"
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "AlignQt::Horizontal Middle"
+msgstr "Poravnaj vodoravno u sredini"
 
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Akter"
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "AlignQt::Vertical Distribute"
+msgstr "Poravnaj uspravno raspoređeno"
 
-#: association.cpp:86 worktoolbar.cpp:255
-msgid "Dependency"
-msgstr "Zavisnost"
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "AlignQt::Horizontal Distribute"
+msgstr "Poravnaj vodoravno raspoređeno"
 
-#: association.cpp:85 worktoolbar.cpp:256
-msgid "Aggregation"
-msgstr "Agregacija"
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. You "
+"can not align associations."
+msgstr ""
+"Za poravnanje morate izabrati bar dva objekta kao klase ili aktere. Ne možete "
+"poravnati pridruživanja."
 
-#: worktoolbar.cpp:257
-msgid "Relationship"
-msgstr "Odnos"
+#: tips.txt:3
+msgid ""
+"<p>Welcome to Umbrello.</p>\n"
+"<p>UML diagrams let you design and document object oriented software.  <a "
+"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
+"using UML.</p>\n"
+msgstr ""
+"<p>Dobrodošli u Umbrello.</p>\n"
+"<p>Pomoću UML dijagrama možete dizajnirati i dokumentisati objektno "
+"orijentisani softver.  <a href=\"help:/umbrello\">Priručnik za Umbrello</a> "
+"je dobar uvod u korišćenje UML-a.</p>\n"
 
-#: worktoolbar.cpp:258
-msgid "Directional Association"
-msgstr "Direkciono pridruživanje"
+#: tips.txt:9
+msgid ""
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
+"code generation, externalizable folders, ability to change interfaces into "
+"classes, and more.</p>\n"
+msgstr ""
+"<p>Dobrodošli u  Umbrello 1.5.  Novo u ovoj verziji su klase pridruživanja, "
+"generacija Ruby koda, eksternalizacija fascikli, mogućnost pretvaranja "
+"interfejsa u klase i još mnogo toga.</p>\n"
 
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr "Implementira (generalizacija-realizacija)"
+#: tips.txt:14
+msgid ""
+"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
+"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
+"Settings.</p>\n"
+msgstr ""
+"<p>Dijagrami sa jezičcima i Spoljne fascikle se međusobno isključuju. Ako vam "
+"trebaju Spoljne fascikle onda demarkirajte &quot;Koristi dijagrame sa "
+"jezičcima&quot; u opštim podešavanjima.</p>\n"
 
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "Kompozicija"
+#: tips.txt:19
+msgid ""
+"<p>Most diagram items can not be resized, they will resize themselves to fit to "
+"their contents.\n"
+"Boxes, notes and sequence diagram messages can be resized, just click and drag "
+"on the red square.</p>\n"
+msgstr ""
+"<p>Većini dijagramskih stavki ne može da se promeni veličina, već će to učiniti "
+"same da bi se prilagodile svom sadržaju.\n"
+"Kutijama, beleškama i porukama dijagrama sekvence veličina može biti promenjena "
+"klikom na i povlačenjem crvenog kvadrata.</p>\n"
 
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-msgid "Use Case"
-msgstr "Slučaj upotrebe"
+#: tips.txt:25
+msgid ""
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
+msgstr ""
+"<p>Ako želite u dijagram da dodate klasu koja već postoji, samo prevucite njen "
+"unos iz stablolikog prikaza.</p>\n"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 249
-#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
-#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
-#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
-#, no-c-format
-msgid "Class"
-msgstr "Klasa"
+#: tips.txt:30
+msgid ""
+"<p>Umbrello's refactoring agent lets you move operations between a class and "
+"its derived and base \n"
+"classes.\n"
+"Right click a class to open the refactoring agent.</p>\n"
+msgstr ""
+"<p>Umbrello-ov refaktorizacioni agent vam omogućava da premeštate operacije "
+"između klase i njenih izvedenih i baznih klasa.\n"
+"Desno kliknite na klasu da biste otvorili refaktorizacioni agent.</p>\n"
 
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-msgid "Initial State"
-msgstr "Početno stanje"
+#: tips.txt:37
+msgid ""
+"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
+"Double click one for\n"
+"the Properties dialogue.</p>\n"
+msgstr ""
+"<p>Objekti dijagrama sekvence mogu imati kućicu za razgrađivanje i biti "
+"nacrtani kao akteri. Dvokliknite na neki za dijalog sa svojstvima.</p>\n"
 
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-msgid "End State"
-msgstr "Završno stanje"
+#: tips.txt:43
+msgid ""
+"<p>Sequence diagram messages can act as constructors.  Click on the object box "
+"(rather than the vertical line) to make it a constructor.</p>\n"
+msgstr ""
+"<p>Poruke dijagrama sekvence mogu imati ulogu konstruktora. Kliknite na kutiju "
+"objekta (umesto na uspravnu liniju) da je učinite konstruktorom.</p>\n"
 
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr "Granaj/Stopi"
+#: tips.txt:48
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
+"again to create an automessage.</p>\n"
+msgstr ""
+"<p>Dijagrami sekvence podržavaju poruke za same sebe. Kliknite ponovo na istu "
+"uspravnu liniju da napravite autoporuku.</p>\n"
 
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-msgid "Fork/Join"
-msgstr "Podeli/Spoji"
+#: tips.txt:53
+msgid ""
+"<p>If on loading a foreign file nothing is displayed in the list view, try "
+"saving the model under a different name,\n"
+"closing, and reloading the saved file.  Usually the list view is then properly "
+"populated.\n"
+"</p>\n"
+msgstr ""
+"<p>Ako se po učitavanju stranog fajla ništa ne pojavi u prikazu liste, "
+"pokušajte da snimite model pod drugim imenom, zatvorite, i ponovo učitate "
+"snimljeni fajl. Obično će tada prikaz liste biti ispravno popunjen.</p>\n"
 
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Paket"
+#: tips.txt:60
+msgid ""
+"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
+"pasted into KWord\n"
+"and other applications.</p>\n"
+msgstr ""
+"<p>Iseci i kopiraj će takođe izvesti sliku u PNG klipbord, odakle može biti "
+"umetnuta u KWord i druge programe.</p>\n"
 
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-msgid "Component"
-msgstr "Komponenta"
+#: tips.txt:66
+msgid ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
+msgstr ""
+"<p>Pridruživanja ne moraju da budu u pravim linijama, dvoklik na neku će "
+"napraviti pomerljivu tačku.</p>\n"
 
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-msgid "Node"
-msgstr "Čvor"
+#: tips.txt:71
+msgid ""
+"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>Automatsko snimanje možete uključiti u dijalogu za podešavanje "
+"Umbrello-a.</p>\n"
 
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-msgid "Artifact"
-msgstr "Artifakt"
+#: tips.txt:76
+msgid ""
+"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
+"Either add it to the bugs database with Report Bug from the Help menu\n"
+"or send it to the uml-devel mailing list.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
+".</li>\n"
+"</ul>\n"
+msgstr ""
+"<p>Da li Umbrello nema neku mogućnost koja vam treba? Ako je tako, obavestite "
+"nas.\n"
+"Ili je dodajte u bazu podataka o greškama pomoću prijave grešaka iz menija "
+"Pomoć, ili nam je pošaljite na dospisnu listu uml-devel.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
+".</li>\n"
+"</ul>\n"
 
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Interfejs"
+#: tips.txt:86
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>Sve izabrane objekte možete obrisati pritiskom na Del ili Backspace.</p>\n"
 
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-msgid "Datatype"
-msgstr "Tip podataka"
-
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
-msgid "Enum"
-msgstr "Nabrajanje"
-
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
-msgid "Entity"
-msgstr "Entitet"
-
-#: worktoolbar.cpp:275
-msgid "Deep History"
-msgstr "Daleka istorija"
-
-#: worktoolbar.cpp:276
-msgid "Shallow History"
-msgstr "Bliska istorija"
-
-#: worktoolbar.cpp:277
-msgid "Join"
-msgstr "Spoji"
-
-#: worktoolbar.cpp:278
-msgid "Fork"
-msgstr "Razdvoj"
-
-#: worktoolbar.cpp:279
-msgid "Junction"
-msgstr "Sastav"
-
-#: worktoolbar.cpp:280
-msgid "Choice"
-msgstr "Izbor"
+#: tips.txt:91
+msgid ""
+"<p>If you've found a bug in Umbrello, please let us know. \n"
+"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
+msgstr ""
+"<p>Ako ste našli grešku u Umbrello-u, obavestite nas.\n"
+"Greške možete poslati alatom za prijavu grešaka iz menija Pomoć.</p>\n"
 
-#: association.cpp:98 worktoolbar.cpp:284
-msgid "State Transition"
-msgstr "Prelaz stanja"
+#: tips.txt:97
+msgid ""
+"<p>Pressing the Escape key sets the current tool to the select tool.\n"
+"Backspace jumps to the previously used tool.</p>\n"
+msgstr ""
+"<p>Pritiskom na taster Escape postavlja se tekući alat na izabrani alat.\n"
+"Backspace-om se skače na prethodno korišćeni alat.</p>\n"
 
-#: worktoolbar.cpp:285
-msgid "Activity Transition"
-msgstr "Prelaz aktivnosti"
+#: tips.txt:103
+msgid ""
+"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr ""
+"<p>Možete izabrati sve objekte pritiskom na Ctrl-A.</p>\n"
 
-#: association.cpp:99 dialogs/activitydialog.cpp:70
-#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
-#: worktoolbar.cpp:286
-msgid "Activity"
-msgstr "Aktivnost"
+#: tips.txt:108
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the Code "
+"menu.</p>\n"
+msgstr ""
+"<p>Možete napraviti i podesiti novu klasu koristeći čarobnjaka iz menija "
+"Kôd.</p>\n"
 
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Stanje"
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "Učini fasciklu spoljnom"
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
-msgid "End Activity"
-msgstr "Završna aktivnost"
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
+#: umlviewimageexportermodel.cpp:158
+#, c-format
+msgid "There was a problem saving file: %1"
+msgstr "Došlo je do problema prilikom snimanja fajla: %1"
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
-msgid "Initial Activity"
-msgstr "Početna aktivnost"
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Greška pri snimanju"
 
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Poruka"
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "Unesite ime modela"
 
-#: worktoolbar.cpp:298
-msgid "UNDEFINED"
-msgstr "NEDEFINISANO"
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "Unesite novo ime modela:"
 
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Izbor"
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "Prikazi"
 
-#: umlwidgetcontroller.cpp:128
+#: umllistview.cpp:1906
 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."
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
 msgstr ""
-"Držite Shift ili Ctrl za kretanje duž X-ose. Držite Shift i Ctrl za kretanje "
-"duž Y-ose. Desnim klikom se prekida kretanje."
+"Ime koje ste uneli nije ispravno.\n"
+"Proces pravljenja je otkazan."
 
-#: umlwidgetcontroller.cpp:379
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "Ime nije ispravno"
+
+#: umldoc.cpp:1067 umllistview.cpp:1916
 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."
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
 msgstr ""
-"Držite Shift ili Ctrl za kretanje duž X-ose. Držite Shift i Ctrl za kretanje "
-"duž Y-ose. Desnim klikom se prekida promena veličine."
+"Ime koje ste uneli nije jedinstveno.\n"
+"Da li ste ovo želeli?"
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "Početna aktivnost"
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "Ime nije jedinstveno"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "Završna aktivnost"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "Koristi ime"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
-#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
-#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
-#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
-#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
-#: rc.cpp:225
-#, no-c-format
-msgid "General"
-msgstr "Opšte"
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "Unesite novo ime"
 
-#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
-#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
-#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
-msgid "General Properties"
-msgstr "Opšte osobine"
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Ime koje ste uneli nije jedinstveno!\n"
+"Proces pravljenja je otkazan."
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "Tip aktivnosti:"
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "Pravljenje je otkazano"
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "Ime aktivnosti:"
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "Učitavam prikaz liste..."
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 36
-#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
-#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
-#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
-#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
-#: dialogs/notedialog.cpp:29 dialogs/parmpropdlg.cpp:100
-#: dialogs/statedialog.cpp:104 docwindow.cpp:33 rc.cpp:30 rc.cpp:150
-#: rc.cpp:207 rc.cpp:445 rc.cpp:492
-#, no-c-format
-msgid "Documentation"
-msgstr "Dokumentacija"
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Fascikla se mora prvo isprazniti da bi se obrisala."
 
-#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
-#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
-#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
-msgid "Font Settings"
-msgstr "Postavke fonta"
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "Fascikla nije prazna"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
-#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
-#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
-#: listpopupmenu.cpp:750
-msgid "Color"
-msgstr "Boja"
+#: codegenerator.cpp:473
+msgid ""
+"Cannot open file %1 for writing. Please make sure the folder exists and you "
+"have permissions to write to it."
+msgstr ""
+"Ne mogu da otvorim fajl %1 za upis. Uverite se da fascikla postoji i da imate "
+"pravo upisa u nju."
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "Boje kontrole"
+#: codegenerator.cpp:473
+msgid "Cannot Open File"
+msgstr "Ne mogu da otvorim fajl"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "Odredišni fajl već postoji"
+#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
+msgid ""
+"Cannot create the folder:\n"
+msgstr ""
+"Ne mogu da napravim fasciklu:\n"
 
-#: dialogs/overwritedialogue.cpp:31
+#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
 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."
+"Please check the access rights"
 msgstr ""
-"Fajl %1 već postoji u %2.\n"
 "\n"
-"Umbrello može da prebriše fajl, napravi fajl\n"
-"sličnog imena ili da ga uopše i ne napravi."
+"Proverite prava pristupa"
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "&Primeni na sve preostale fajlove"
+#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
+msgid "Cannot Create Folder"
+msgstr "Ne mogu da napravim fasciklu"
 
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "&Prebriši"
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "Dijagram: %2 strana %1"
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "&Napravi slično ime fajla"
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "Unesite ime stanja"
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "Ne&moj da praviš fajl"
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "Unesite ime novog stanja:"
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "Aktivnosti"
-
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "Nova aktivnost..."
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Promeni ime"
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "novo stanje"
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "Nova aktivnost"
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "Unesite ime za aktivnost"
 
 #: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
 #: toolbarstateother.cpp:144 umlview.cpp:2546
@@ -345,2287 +413,2302 @@ msgstr "Unesite ime za novu aktivnost:"
 msgid "new activity"
 msgstr "nova aktivnost"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "Promeni ime aktivnosti"
-
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "Unesite novo ime za aktivnost:"
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "Unesite ime dijagrama"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
-msgstr "Opcije za generisanje kôda"
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "Unesite novo ime za dijagram:"
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "&Generiši"
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"Upravo ćete obrisati ceo dijagram.\n"
+"Da li ste sigurni?"
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "Završetak"
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "Da li da obrišem dijagram?"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "Kôd je generisan"
+#: operation.cpp:185
+msgid "new_parameter"
+msgstr "novi_parametar"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "Nije generisan"
+#: listpopupmenu.cpp:695 stereotype.cpp:76
+msgid "Stereotype"
+msgstr "Stereotip"
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "Još uvek nije generisan"
+#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
+#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Enter name:"
+msgstr "Unesite ime:"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "Fascikla %1 ne postoji. Želite li da je napravite sada?"
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Uvozim fajl: %1 Napredak: %2/%3"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "Izlazna fascikla ne postoji"
+#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
+#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
+#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
+#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
+#: umlviewimageexporterall.cpp:73
+msgid "Ready."
+msgstr "Spreman."
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "Napravi fasciklu"
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "Da li je opseg %1 imenski prostor ili klasa?"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "Ne pravi"
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "Uvoz C++-a zahteva vašu pomoć"
 
-#: dialogs/codegenerationwizard.cpp:168
-msgid ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
-msgstr ""
-"Fascikla se ne može napraviti.\n"
-"Proverite da li imate pravo upisa u njenu roditeljsku fasciklu ili izaberite "
-"drugu, ispravanu, fasciklu."
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "Imenski prostor"
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "Greška pri pravljenju fascikle"
+#. i18n: file dialogs/codegenerationwizardbase.ui line 249
+#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
+#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
+#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
+#, no-c-format
+msgid "Class"
+msgstr "Klasa"
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "Izaberite ispravnu fasciklu."
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "Unutrašnja greška"
 
-#: dialogs/codegenerationwizard.cpp:184
-msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
-msgstr ""
-"Izlazna fascikla postoji, ali se u nju ne može pisati.\n"
-"Postavite odgovarajuće dozvole ili izaberite drugu fasciklu."
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "Sintaksna greška pre „%1“"
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "Greška pri pisanju u izlaznu fasciklu"
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "Greška u raščlanjivanju pre „%1“"
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 ne izgleda kao fascikla. Izaberite ispravnu fasciklu."
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<eof>"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "Izaberite ispravnu fasciklu"
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "očekivan je izraz"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "Početno stanje"
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "Sintaksna greška deklaracije"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "Završno stanje"
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "očekivano je }"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "Tip stanja:"
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "očekivan je imenski prostor"
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "Ime stanja:"
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "očekivano je {"
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "Boja kontrole"
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "Očekivano je ime imenskog prostora"
 
-#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
-#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
-#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
-msgid "General Settings"
-msgstr "Opšte postavke"
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "Potreban je specifikator tipa za deklaraciju"
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Prikaz"
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "očekivana je deklaracija"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "Opcije za prikaz klasa"
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "Očekivan je konstantan izraz"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "Boje za dijagram"
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "očekivano je „)“"
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "Ime koje ste uneli nije ispravno."
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "nedostaje }"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Neispravno ime"
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "Očekivani su inicijalizatori članova"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "Ime koje ste uneli nije jedinstveno."
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "Očekivan je specifikator bazne klase"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1918
-#: umllistview.cpp:1925 umllistview.cpp:2162
-msgid "Name Not Unique"
-msgstr "Ime nije jedinstveno"
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "Očekivana je klauzula inicijalizatora"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "Prikazivač koda"
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "Očekivan je identifikator"
 
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Atributi"
-
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "N&ovi atribut..."
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "Očekivan je id. tipa"
 
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Operacije"
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "Očekivano je ime klase"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "N&ova operacija..."
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "očekivan je uslov"
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Šabloni"
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "očekivana je naredba"
 
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "N&ovi šablon..."
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "očekivana je inicijalizacija for petlje"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "Literali nabrajanja"
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "očekivano je catch"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "N&ovi literal nabrajanja..."
+#: uml.cpp:179
+msgid "&Export model to DocBook"
+msgstr "&Izvezi model u DocBook"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "Atributi entiteta"
+#: uml.cpp:182
+msgid "&Export model to XHTML"
+msgstr "&Izvezi model u XHTML"
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "N&ov atribut entiteta..."
+#: uml.cpp:186
+msgid "&New Class Wizard..."
+msgstr "Čarobnjak za &novu klasu..."
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "&Svojstva"
+#: uml.cpp:188
+msgid "&Add Default Datatypes for Active Language"
+msgstr "&Dodaj podrazumevane tipove podataka za aktivan jezik"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, no-c-format
-msgid "Role Properties"
-msgstr "Svojstva uloge"
+#: uml.cpp:193
+msgid "&Code Generation Wizard..."
+msgstr "Čarobnjak za generisanje &kôda..."
 
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "Opcije prikaza"
+#: uml.cpp:195
+msgid "&Generate All Code"
+msgstr "&Generiši sav kôd"
 
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "Postavke atributa"
+#: uml.cpp:198
+msgid "&Import Classes..."
+msgstr "&Uvezi klase..."
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "Postavke operacija"
+#: uml.cpp:201
+msgid "Creates a new document"
+msgstr "Pravi novi dokument"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "Postavke šablona"
+#: uml.cpp:202
+msgid "Opens an existing document"
+msgstr "Otvara postojeći dokument"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "Postavke literala nabrajanja"
+#: uml.cpp:203
+msgid "Opens a recently used file"
+msgstr "Otvara skoro korišćeni fajl"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "Postavke atributa entiteta"
+#: uml.cpp:204
+msgid "Saves the document"
+msgstr "Snima dokument"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "Postavke sadržaja"
+#: uml.cpp:205
+msgid "Saves the document as..."
+msgstr "Snima dokument kao..."
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "Pridruživanja"
+#: uml.cpp:206
+msgid "Closes the document"
+msgstr "Zatvara dokument"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "Pridruženja klasa"
+#: uml.cpp:207
+msgid "Prints out the document"
+msgstr "Štampa dokument"
 
-#: dialogs/umloperationdialog.cpp:50
-msgid "Operation Properties"
-msgstr "Svojstva operacija"
+#: uml.cpp:208
+msgid "Quits the application"
+msgstr "Izlazi iz programa"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "&Ime:"
+#: uml.cpp:209
+msgid "Exports the model to the docbook format"
+msgstr "Izvozi model u formatu DocBook-a"
 
-#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
-#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
-#: dialogs/umltemplatedialog.cpp:53
-msgid "&Type:"
-msgstr "&Tip:"
+#: uml.cpp:210
+msgid "Exports the model to the XHTML format"
+msgstr "Izvozi model u formatu XHTML-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 "Ime stereotipa:"
+#: uml.cpp:211
+msgid "Cuts the selected section and puts it to the clipboard"
+msgstr "Iseca izabranu sekciju i stavlja je u klipbord"
 
-#: dialogs/umloperationdialog.cpp:89
-msgid "&Abstract operation"
-msgstr "&Apstraktna operacija"
+#: uml.cpp:212
+msgid "Copies the selected section to the clipboard"
+msgstr "Kopira trenutni izbor u klipbord"
 
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-msgid "Classifier &scope (\"static\")"
-msgstr "Op&seg klasifikatora („static“)"
+#: uml.cpp:213
+msgid "Pastes the contents of the clipboard"
+msgstr "Prenosi sadržaj klipborda"
 
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr "&Upit („const“)"
+#: uml.cpp:214
+msgid "Set the default program preferences"
+msgstr "Postavlja podrazumevana podešavanja programa"
 
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "Vidljivost"
+#: uml.cpp:216
+msgid "Delete &Selected"
+msgstr "Obriši &označeno"
 
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-msgid "P&ublic"
-msgstr "Ja&vno"
+#: uml.cpp:224
+msgid "&Class Diagram..."
+msgstr "Dijagram &klase..."
 
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-msgid "P&rivate"
-msgstr "P&rivatno"
+#: uml.cpp:228
+msgid "&Autolayout..."
+msgstr "S&am rasporedi..."
 
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-msgid "Prot&ected"
-msgstr "Z&aštićeno"
+#: uml.cpp:231
+msgid "&Sequence Diagram..."
+msgstr "Dijagram &sekvence..."
 
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-msgid "I&mplementation"
-msgstr "Pri&mena"
+#: uml.cpp:234
+msgid "C&ollaboration Diagram..."
+msgstr "Dijagram s&aradnje..."
 
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Parametri"
+#: uml.cpp:237
+msgid "&Use Case Diagram..."
+msgstr "D&ijagram slučaja upotrebe..."
 
-#: dialogs/umloperationdialog.cpp:141
-msgid "Ne&w Parameter..."
-msgstr "No&vi parametar..."
+#: uml.cpp:240
+msgid "S&tate Diagram..."
+msgstr "Dijagram s&tanja..."
 
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-msgid "You have entered an invalid parameter name."
-msgstr "Uneli ste neispravno ime za parametar."
+#: uml.cpp:243
+msgid "&Activity Diagram..."
+msgstr "Dijagram &aktivnosti..."
 
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-msgid "Parameter Name Invalid"
-msgstr "Neispravno ime parametra"
+#: uml.cpp:246
+msgid "Co&mponent Diagram..."
+msgstr "Dijagram &komponente..."
 
-#: dialogs/umloperationdialog.cpp:339
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr ""
-"Ime koje ste odabrali za parametar\n"
-"već se koristi u ovoj operaciji."
+#: uml.cpp:250
+msgid "&Deployment Diagram..."
+msgstr "Dijagram &razvijanja..."
 
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr "Ime parametra nije jedinstveno"
+#: uml.cpp:254
+msgid "&Entity Relationship Diagram..."
+msgstr "Dijagram odnosa &među entitetima..."
 
-#: dialogs/umloperationdialog.cpp:406
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Ime koje ste odabrali za parametar već se koristi u ovoj operaciji."
-
-#: dialogs/umloperationdialog.cpp:456
-msgid "You have entered an invalid operation name."
-msgstr "Uneli ste neispravno ime operacije."
+#: uml.cpp:258
+msgid "&Clear Diagram"
+msgstr "&Očisti dijagram"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "Neispravno ime operacije"
+#: uml.cpp:260
+msgid "&Snap to Grid"
+msgstr "&Uklapaj uz mrežu"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Operacija sa takvim potpisom već postoji u %1.\n"
+#: uml.cpp:262
+msgid "S&how Grid"
+msgstr "P&rikaži mrežu"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "Izaberite drugačije ime ili parametarsku listu."
+#: uml.cpp:265
+msgid "&Hide Grid"
+msgstr "&Sakrij mrežu"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "nova_klasa"
+#: uml.cpp:269
+msgid "&Export as Picture..."
+msgstr "Izv&ezi kao sliku..."
 
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "Nova klasa"
+#: uml.cpp:271
+msgid "Export &All Diagrams as Pictures..."
+msgstr "Izvezi &sve dijagrame kao slike..."
 
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "Atributi klase"
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "&Svojstva"
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "Operacije klase"
+#: uml.cpp:286
+msgid "&Zoom Slider"
+msgstr "Klizač &zumiranja"
 
-#: dialogs/parmpropdlg.cpp:35
-msgid "Parameter Properties"
-msgstr "Svojstva parametra"
+#: uml.cpp:289
+#, c-format
+msgid "Z&oom to 100%"
+msgstr "&Zumiraj na 100%"
 
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
-msgid "&Initial value:"
-msgstr "&Početna vrednost:"
+#: uml.cpp:295
+msgid "&Move Tab Left"
+msgstr "Pomeri jezičak u&levo"
 
-#: dialogs/parmpropdlg.cpp:82
-msgid "Passing Direction"
-msgstr "Pravac prolaska"
+#: uml.cpp:296
+msgid "&Move Tab Right"
+msgstr "Pomeri jezičak u&desno"
 
-#: dialogs/parmpropdlg.cpp:84
-msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
-msgstr ""
-"„in“ je parametar samo za čitanje, „out“ je parametar samo za upisivanje, a "
-"„inout“ je parametar i za čitanje i za upisivanje."
+#: uml.cpp:308
+msgid "Select Diagram on Left"
+msgstr "Odaberi dijagram levo"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "Svojstva atributa"
+#: uml.cpp:309
+msgid "Select Diagram on Right"
+msgstr "Odaberi dijagram desno"
 
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "&Javno"
+#: uml.cpp:327
+msgid "&Windows"
+msgstr "&Prozori"
 
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "Uneli ste neispravno ime atributa."
+#: uml.cpp:347
+#, c-format
+msgid " &33%"
+msgstr " &33%"
 
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "Neispravno ime atributa"
+#: uml.cpp:348
+#, c-format
+msgid " &50%"
+msgstr " &50%"
 
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Ime koje ste odabrali za atribut već se koristi u ovoj operaciji."
+#: uml.cpp:349
+#, c-format
+msgid " &75%"
+msgstr " &75%"
 
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "Ime atributa nije jedinstveno"
+#: uml.cpp:350
+#, c-format
+msgid "&100%"
+msgstr "&100%"
 
-#: dialogs/classgenpage.cpp:50
-msgid "Class &name:"
-msgstr "Ime &klase:"
+#: uml.cpp:351
+#, c-format
+msgid "1&50%"
+msgstr "1&50%"
 
-#: dialogs/classgenpage.cpp:52
-msgid "Actor &name:"
-msgstr "Ime &aktera:"
+#: uml.cpp:352
+#, c-format
+msgid "&200%"
+msgstr "&200%"
 
-#: dialogs/classgenpage.cpp:54
-msgid "Package &name:"
-msgstr "Ime &paketa:"
+#: uml.cpp:353
+#, c-format
+msgid "3&00%"
+msgstr "3&00%"
 
-#: dialogs/classgenpage.cpp:56
-msgid "Use case &name:"
-msgstr "&Ime slučaja upotrebe:"
+#: uml.cpp:394
+msgid "Diagram Toolbar"
+msgstr "Traka dijagrama"
 
-#: dialogs/classgenpage.cpp:58
-msgid "Interface &name:"
-msgstr "Ime i&nterfejsa:"
+#: uml.cpp:398
+msgid "Alignment Toolbar"
+msgstr "Traka poravnanja"
 
-#: dialogs/classgenpage.cpp:60
-msgid "Component &name:"
-msgstr "Ime &komponente:"
+#: listpopupmenu.cpp:615 uml.cpp:420
+msgid "Class Diagram..."
+msgstr "Dijagram klasa..."
 
-#: dialogs/classgenpage.cpp:62
-msgid "Artifact &name:"
-msgstr "Ime &artifakta:"
+#: listpopupmenu.cpp:618 uml.cpp:421
+msgid "Sequence Diagram..."
+msgstr "Dijagram sekvence..."
 
-#: dialogs/classgenpage.cpp:64
-msgid "Enum &name:"
-msgstr "I&me nabrajanja:"
+#: listpopupmenu.cpp:619 uml.cpp:422
+msgid "Collaboration Diagram..."
+msgstr "Dijagram saradnje..."
 
-#: dialogs/classgenpage.cpp:66
-msgid "Datatype &name:"
-msgstr "Ime tipa po&datka:"
+#: listpopupmenu.cpp:551 uml.cpp:423
+msgid "Use Case Diagram..."
+msgstr "Dijagram slučaja upotrebe..."
 
-#: dialogs/classgenpage.cpp:68
-msgid "Entity &name:"
-msgstr "I&me entiteta:"
+#: listpopupmenu.cpp:616 uml.cpp:424
+msgid "State Diagram..."
+msgstr "Dijagram stanja..."
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
-msgid "&Stereotype name:"
-msgstr "Ime &stereotipa:"
+#: listpopupmenu.cpp:617 uml.cpp:425
+msgid "Activity Diagram..."
+msgstr "Dijagram aktivnosti..."
 
-#: dialogs/classgenpage.cpp:107
-msgid "&Package name:"
-msgstr "Ime &paketa:"
+#: listpopupmenu.cpp:521 uml.cpp:426
+msgid "Component Diagram..."
+msgstr "Dijagram komponenti..."
 
-#: dialogs/classgenpage.cpp:121
-msgid "A&bstract class"
-msgstr "A&pstraktna klasa"
+#: listpopupmenu.cpp:528 uml.cpp:427
+msgid "Deployment Diagram..."
+msgstr "Dijagram razvijanja..."
 
-#: dialogs/classgenpage.cpp:123
-msgid "A&bstract use case"
-msgstr "Slučaj korišćenja a&pstrakcije"
+#: listpopupmenu.cpp:541 uml.cpp:428
+msgid "Entity Relationship Diagram..."
+msgstr "Dijagram odnosa među entitetima..."
 
-#: dialogs/classgenpage.cpp:131
-msgid "&Executable"
-msgstr "&Izvršno"
+#: uml.cpp:458
+msgid "&Tree View"
+msgstr "&Stabloliki prikaz"
 
-#: dialogs/classgenpage.cpp:138
-msgid "Draw As"
-msgstr "Crtaj kao"
+#: uml.cpp:467
+msgid "&Documentation"
+msgstr "&Dokumentacija"
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "Po&drazumevano"
+#: uml.cpp:479 uml.cpp:664 uml.cpp:692
+msgid "Opening file..."
+msgstr "Otvaram fajl..."
 
-#: dialogs/classgenpage.cpp:149
-msgid "&Library"
-msgstr "&Biblioteka"
+#: uml.cpp:650
+msgid "Creating new document..."
+msgstr "Pravim novi dokument..."
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "&Tabela"
+#: uml.cpp:673
+msgid ""
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
+"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi|Uncompressed XMI Files (*.xmi)\n"
+"*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
+"*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
+"*.mdl|Rose model files"
+msgstr ""
+"*.xmi *.xmi.tgz *.xmi.tar.bz2|Svi podržani fajlovi (*.xmi, *.xmi.tgz, "
+"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi|Raspakovani XMI fajlovi (*.xmi)\n"
+"*.xmi.tgz|Gzip-om kompresovani XMI fajlovi (*.xmi.tgz)\n"
+"*.xmi.tar.bz2|Bzip2-om kompresovani XMI fajlovi (*.xmi.tar.bz2) *.mdl|Rose-ovi "
+"modelski fajlovi"
 
-#: dialogs/classgenpage.cpp:182
-msgid "Pro&tected"
-msgstr "Zaš&tićeno"
-
-#: dialogs/classgenpage.cpp:186
-msgid "Imple&mentation"
-msgstr "Pri&mena"
-
-#: dialogs/classgenpage.cpp:256
-msgid "Class name:"
-msgstr "Ime klase:"
-
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
-msgid "Instance name:"
-msgstr "Ime primerka:"
-
-#: dialogs/classgenpage.cpp:272
-msgid "Draw as actor"
-msgstr "Crtaj kao aktera"
-
-#: dialogs/classgenpage.cpp:277
-msgid "Multiple instance"
-msgstr "Višestruki primerak"
+#: uml.cpp:677
+msgid "Open File"
+msgstr "Otvori fajl"
 
-#: dialogs/classgenpage.cpp:284
-msgid "Show destruction"
-msgstr "Prikaži razgrađivanje"
+#: uml.cpp:716
+msgid "Saving file..."
+msgstr "Snimam fajl..."
 
-#: dialogs/classgenpage.cpp:322
-msgid "Component name:"
-msgstr "Ime komponente:"
+#: uml.cpp:727
+msgid "Saving file with a new filename..."
+msgstr "Snimam fajl pod novim imenom..."
 
-#: dialogs/classgenpage.cpp:324
-msgid "Node name:"
-msgstr "Ime čvora:"
+#: uml.cpp:732
+msgid ""
+"*.xmi|XMI File\n"
+"*.xmi.tgz|Gzip Compressed XMI File\n"
+"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
+"*|All Files"
+msgstr ""
+"*.xmi|XMI fajl\n"
+"*.xmi.tgz|Gzip kompresovani XMI fajl\n"
+"*.xmi.tar.bz2|Bzip2 kompresovani XMI fajl\n"
+"*|Svi fajlovi"
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: uml.cpp:740
 msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
+"The file %1 exists.\n"
+"Do you wish to overwrite it?"
 msgstr ""
-"Ime koje ste odabrali\n"
-"već se koristi.\n"
-"Ime je resetovano."
+"Fajl %1 postoji.\n"
+"Želite li da ga prebrišete?"
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-msgid "Name is Not Unique"
-msgstr "Ime nije jedinstveno"
+#: uml.cpp:740
+msgid "Overwrite"
+msgstr "Prebriši"
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "Svojstva atributa entiteta"
+#: uml.cpp:764
+msgid "Closing file..."
+msgstr "Zatvaram fajl..."
 
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "&Podrazumevana vrednost:"
+#: uml.cpp:772
+msgid "Printing..."
+msgstr "Štampam..."
 
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "Dužina/vrednosti:"
+#: uml.cpp:779
+#, c-format
+msgid "Print %1"
+msgstr "Štampaj %1"
 
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "&Automatsko uvećanje"
+#: uml.cpp:787
+msgid "Exiting..."
+msgstr "Izlazim..."
 
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "Dozvoli &nulto"
+#: uml.cpp:823
+msgid "Cutting selection..."
+msgstr "Isecam izbor..."
 
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "Atributi:"
+#: uml.cpp:836
+msgid "Copying selection to clipboard..."
+msgstr "Kopiram izbor u klipbord..."
 
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "Indeksiranje"
+#: uml.cpp:844
+msgid "Inserting clipboard contents..."
+msgstr "Umećem sadržaj klipborda..."
 
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "&Nikakvo"
+#: 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."
+msgstr ""
+"Umbrello nije mogao da umetne sadržaj klipborda. Objekti u klipbordu su možda "
+"pogrešnog tipa da bi se ovde umetnuli."
 
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "&Primarno"
+#: clipboard/umlclipboard.cpp:691 uml.cpp:851
+msgid "Paste Error"
+msgstr "Greška prilikom umetanja"
 
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "&Indeks"
+#: uml.cpp:863
+msgid "Toggling toolbar..."
+msgstr "Uključuje/isključuje traku sa alatima..."
 
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "&Jedinstveno"
+#: uml.cpp:878
+msgid "Toggle the statusbar..."
+msgstr "Uključuje/isključuje statusnu traku..."
 
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "Uneli ste neispravno ime atributa entiteta."
+#: uml.cpp:1186
+msgid "Cannot view code until you generate some first."
+msgstr "Ne mogu da prikažem kôd dok ga ne generišite."
 
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "Neispravno ime atributa entiteta"
+#: uml.cpp:1186 uml.cpp:1189
+msgid "Cannot View Code"
+msgstr "Ne mogu da prikažem kôd"
 
-#: dialogs/umlentityattributedialog.cpp:192
-msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr ""
-"Ime koje ste odabrali za atribut entiteta već se koristi u ovoj operaciji."
+#: uml.cpp:1189
+msgid "Cannot view code from simple code writer."
+msgstr "Ne mogu da prikažem kôd iz prostog pisača kôda."
 
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "Ime atributa entiteta nije jedinstveno"
+#: uml.cpp:1387
+msgid "*.idl|IDL Files (*.idl)"
+msgstr "*.idl|IDL fajlovi (*.idl)"
 
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "&Dijagrami"
+#: uml.cpp:1389
+msgid "*.py|Python Files (*.py)"
+msgstr "*.py|Python-ski fajlovi (*.py)"
 
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "Filter"
+#: uml.cpp:1391
+msgid "*.java|Java Files (*.java)"
+msgstr "*.java|Java fajlovi (*.java)"
 
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "&Tekući dijagram"
+#: uml.cpp:1393
+msgid "*.pas|Pascal Files (*.pas)"
+msgstr "*.pas|Pascal fajlovi (*.pas)"
 
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "&Svi dijagrami"
+#: uml.cpp:1395
+msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
+msgstr "*.ads *.ada|Ada Fajlovi (*.ads *.ada)"
 
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "&Odaberi dijagram"
+#: uml.cpp:1397
+msgid "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
+msgstr "*.h *.hh *.hpp *.hxx *.H|Fajlovi zaglavlja (*.h *.hh *.hpp *.hxx *.H)"
 
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "&Tip dijagrama"
+#: uml.cpp:1399
+msgid "All Files"
+msgstr "Svi fajlovi"
 
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "Izbor"
+#: uml.cpp:1401
+msgid "Select Code to Import"
+msgstr "Odaberite kôd za uvoz"
 
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "Saradnja"
+#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
+#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Name"
+msgstr "Ime"
 
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "Sekvenca"
+#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
+#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "That is an invalid name."
+msgstr "To ime nije ispravno."
 
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "Iskorištenje"
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "Neispravno ime"
 
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-dijagram"
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr "Ovo je rezervisana ključna reč za jezik podešenog generatora kôda."
 
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "Nema odabranih dijagrama."
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "Rezervisana ključna reč"
 
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "Svojstva uloge „A“"
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
+#: umldoc.cpp:1043 umldoc.cpp:1073
+msgid "That name is already being used."
+msgstr "To ime se već koristi."
 
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "Svojstva uloge „B“"
-
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "Vidljivost uloge „A“"
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
+#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
+msgid "Not a Unique Name"
+msgstr "Nije jedinstveno ime"
 
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "Vidljivost uloge „B“"
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Objekat"
 
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "Promenljivost uloge „A“"
+#: worktoolbar.cpp:246
+msgid "Synchronous Message"
+msgstr "Sinhrona poruka"
 
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "Promenljivost uloge „B“"
+#: worktoolbar.cpp:247
+msgid "Asynchronous Message"
+msgstr "Asinhrona poruka"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "Ime uloge:"
+#: association.cpp:87 worktoolbar.cpp:248
+msgid "Association"
+msgstr "Pridruživanje"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "Višestrukost:"
+#: association.cpp:93 worktoolbar.cpp:249
+msgid "Containment"
+msgstr "Sadržalac"
 
-#. 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"
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Sidro"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "Privatni"
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Oznaka"
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "Zaštićeni"
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Zabeleška"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "Primena"
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Kutija"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "Izmenjivo"
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Akter"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "Zamrznuto"
+#: association.cpp:86 worktoolbar.cpp:255
+msgid "Dependency"
+msgstr "Zavisnost"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "Dodaj samo"
+#: association.cpp:85 worktoolbar.cpp:256
+msgid "Aggregation"
+msgstr "Agregacija"
 
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "&Linija:"
+#: worktoolbar.cpp:257
+msgid "Relationship"
+msgstr "Odnos"
 
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "&Popunjavanje:"
+#: worktoolbar.cpp:258
+msgid "Directional Association"
+msgstr "Direkciono pridruživanje"
 
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "P&odrazumevano"
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr "Implementira (generalizacija-realizacija)"
 
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "&Koristi popunjavanje"
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "Kompozicija"
 
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "Svojstva šablona"
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+msgid "Use Case"
+msgstr "Slučaj upotrebe"
 
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "Uneli ste neispravno ime za šablon."
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+msgid "Initial State"
+msgstr "Početno stanje"
 
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "Neispravno ime za šablon"
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+msgid "End State"
+msgstr "Završno stanje"
 
-#: dialogs/umltemplatedialog.cpp:138
-msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr ""
-"Ime koje ste odabrali za parametar šablona već se koristi u ovoj operaciji."
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr "Granaj/Stopi"
 
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "Ime šablona nije jedinstveno"
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+msgid "Fork/Join"
+msgstr "Podeli/Spoji"
 
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr "Format u kojem će slike biti izvezene"
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Paket"
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "Odaberite operaciju"
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+msgid "Component"
+msgstr "Komponenta"
 
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "Broj sekvence:"
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+msgid "Node"
+msgstr "Čvor"
 
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "Operacija klase:"
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+msgid "Artifact"
+msgstr "Artifakt"
 
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "Posebna operacija:"
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Interfejs"
 
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "Dokumentacija napomene"
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+msgid "Datatype"
+msgstr "Tip podataka"
 
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "Sadržane stavke"
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+msgid "Enum"
+msgstr "Nabrajanje"
 
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "Svojstva pridruživanja"
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+msgid "Entity"
+msgstr "Entitet"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "Uloge"
+#: worktoolbar.cpp:275
+msgid "Deep History"
+msgstr "Daleka istorija"
 
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "Postavke uloge"
+#: worktoolbar.cpp:276
+msgid "Shallow History"
+msgstr "Bliska istorija"
 
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "Font pridruživanja"
+#: worktoolbar.cpp:277
+msgid "Join"
+msgstr "Spoji"
 
-#: dialogs/settingsdlg.cpp:30
-msgid "Umbrello Setup"
-msgstr "Podešavanje Umbrello-a"
+#: worktoolbar.cpp:278
+msgid "Fork"
+msgstr "Razdvoj"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface"
-msgstr "Korisnički interfejs"
+#: worktoolbar.cpp:279
+msgid "Junction"
+msgstr "Sastav"
 
-#: dialogs/settingsdlg.cpp:47
-msgid "User Interface Settings"
-msgstr "Postavke korisničkog interfejsa"
+#: worktoolbar.cpp:280
+msgid "Choice"
+msgstr "Izbor"
 
-#: dialogs/settingsdlg.cpp:54
-msgid "Line color:"
-msgstr "Boja linije:"
+#: association.cpp:98 worktoolbar.cpp:284
+msgid "State Transition"
+msgstr "Prelaz stanja"
 
-#: dialogs/settingsdlg.cpp:60
-msgid "D&efault Color"
-msgstr "Po&drazumevana boja"
+#: worktoolbar.cpp:285
+msgid "Activity Transition"
+msgstr "Prelaz aktivnosti"
 
-#: dialogs/settingsdlg.cpp:63
-msgid "Fill color:"
-msgstr "Boja za popunjavanje:"
+#: association.cpp:99 dialogs/activitydialog.cpp:70
+#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
+#: worktoolbar.cpp:286
+msgid "Activity"
+msgstr "Aktivnost"
 
-#: dialogs/settingsdlg.cpp:69
-msgid "De&fault Color"
-msgstr "Po&drazumevana boja"
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Stanje"
 
-#: dialogs/settingsdlg.cpp:73
-msgid "Line width:"
-msgstr "Širina linije:"
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+msgid "End Activity"
+msgstr "Završna aktivnost"
 
-#: dialogs/settingsdlg.cpp:81
-msgid "D&efault Width"
-msgstr "P&odrazumevana širina"
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+msgid "Initial Activity"
+msgstr "Početna aktivnost"
 
-#: dialogs/settingsdlg.cpp:86
-msgid "&Use fill color"
-msgstr "&Koristi boju za popunjavanje"
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Poruka"
 
-#: dialogs/settingsdlg.cpp:108
-msgid "Enable undo"
-msgstr "Uključi opozivanje"
+#: worktoolbar.cpp:298
+msgid "UNDEFINED"
+msgstr "NEDEFINISANO"
 
-#: dialogs/settingsdlg.cpp:112
-msgid "Use tabbed diagrams"
-msgstr "Koristi dijagrame sa jezičcima"
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Izbor"
 
-#: dialogs/settingsdlg.cpp:116
-msgid "Use new C++/Java/Ruby generators"
-msgstr "Koristite nove C++/Java/Ruby generatore"
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "novo_pridruzivanje"
 
-#: dialogs/settingsdlg.cpp:120
-msgid "Use angular association lines"
-msgstr "Koristi uglovne linije pridruživanja"
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "novi_atribut"
 
-#: dialogs/settingsdlg.cpp:126
-msgid "Autosave"
-msgstr "Automatsko snimanje"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "novi_sablon"
 
-#: dialogs/settingsdlg.cpp:132
-msgid "E&nable autosave"
-msgstr "&Uključi automatsko snimanje"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "nova_operacija"
 
-#: dialogs/settingsdlg.cpp:136
-msgid "Select auto-save time interval (mins):"
-msgstr "Odaberite period automatskog snimanja (minuta):"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "novi_literal"
 
-#: dialogs/settingsdlg.cpp:146
-msgid "Set autosave suffix:"
-msgstr "Postavite sufiks automatskog snimanja:"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "novo_polje"
 
-#: dialogs/settingsdlg.cpp:148
-msgid ""
-"<qt>"
-"<p>The autosave file will be saved to ~/autosave.xmi if the autosaving occurs "
-"before you have manually saved the file.</p>"
-"<p>If you've already saved it, the autosave file will be saved in the same "
-"folder as the file and will be named like the file's name, followed by the "
-"suffix specified.</p>"
-"<p>If the suffix is equal to the suffix of the file you've saved, the autosave "
-"will overwrite your file automatically.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>Ako niste već jednom ručno snimili fajl, pri automatskom snimanju fajl će "
-"biti imenovan ~/autosave.xmi.</p>"
-"<p>Ako jeste već jednom snimili, pri automatskom snimanju biće napravljen fajl "
-"u istoj fascikli i istog imena, ali sa dodatkom navedenog sufiksa.</p>"
-"<p>Ako je sufiks isti kao sufiks fajla koji ste snimili, automatsko snimanje će "
-"prebrisati taj fajl.</p></qt>"
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "Izvozim sve prikaze..."
 
-#: dialogs/settingsdlg.cpp:158
-msgid "Startup"
-msgstr "Pokretanje"
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "Došlo je do nekih grešaka pri izvozu slika:"
 
-#: dialogs/settingsdlg.cpp:164
-msgid "Sta&rtup logo"
-msgstr "Logo p&ri pokretanju"
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "Umbrello-ov generator autonomnog koda"
 
-#: dialogs/settingsdlg.cpp:168
-msgid "&Tip of the day"
-msgstr "&Savet dana"
+#: docgenerators/main.cpp:47
+msgid "File to transform"
+msgstr "fajl za transformisanje"
 
-#: dialogs/settingsdlg.cpp:172
-msgid "&Load last project"
-msgstr "&Učitaj poslednji projekat"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr "XSLT fajl koji treba upotrebiti"
 
-#: dialogs/settingsdlg.cpp:176
-msgid "Start new project with:"
-msgstr "Počni novi projekat:"
+#: docgenerators/main.cpp:64
+msgid ""
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "© 2006 Gael de Chalendar (tpk. Kleag), © 2002-2006 autori Umbrello-a"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "No Diagram"
-msgstr "Bez dijagrama"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "Autori Umbrello-a, UML modelara"
 
-#: dialogs/settingsdlg.cpp:183
-msgid "Class Diagram"
-msgstr "Dijagram klasa"
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "Izvozim prikaz..."
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Use Case Diagram"
-msgstr "Dijagram slučaja upotrebe"
+#: umlviewimageexporter.cpp:50
+msgid ""
+"An error happened when exporting the image:\n"
+msgstr ""
+"Došlo je do greške pri izvozu slike:\n"
 
-#: dialogs/settingsdlg.cpp:184
-msgid "Sequence Diagram"
-msgstr "Dijagram sekvenci"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Izabrani fajl %1 postoji.\n"
+"Želite li da ga prebrišete?"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "Collaboration Diagram"
-msgstr "Dijagram saradnje"
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Fajl već postoji"
 
-#: dialogs/settingsdlg.cpp:185
-msgid "State Diagram"
-msgstr "Dijagram stanja"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "&Prebriši"
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Activity Diagram"
-msgstr "Dijagram aktivnosti"
+#: clipboard/umlclipboard.cpp:687
+msgid ""
+"At least one of the items in the clipboard could not be pasted because an item "
+"of the same name already exists.  Any other items have been pasted."
+msgstr ""
+"Bar jedna stavka iz klipborda nije mogla biti umetnuta zato što stavka sa istim "
+"imenom već postoji. Sve ostale stavke su umetnute."
 
-#: dialogs/settingsdlg.cpp:186
-msgid "Component Diagram"
-msgstr "Dijagram komponenti"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML modelar"
 
-#: dialogs/settingsdlg.cpp:187
-msgid "Deployment Diagram"
-msgstr "Dijagram razvijanja"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "Logički prikaz"
 
-#: dialogs/settingsdlg.cpp:210
-msgid "Class Settings"
-msgstr "Postavke klase"
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "Prikaz slučaja upotrebe"
 
-#: dialogs/settingsdlg.cpp:217
-msgid "Show &visibility"
-msgstr "Prikaži &vidljivost"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "Prikaz komponenti"
 
-#: dialogs/settingsdlg.cpp:221
-msgid "Show attributes"
-msgstr "Prikaži atribute"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "Prikaz razvijanja"
 
-#: dialogs/settingsdlg.cpp:225
-msgid "Show operations"
-msgstr "Prikaži operacije"
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "Model odnosa među entitetima"
 
-#: dialogs/settingsdlg.cpp:229
-msgid "Show stereot&ype"
-msgstr "Pr&ikaži stereotip"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "Tipovi podataka"
 
-#: dialogs/settingsdlg.cpp:233
-msgid "Show attribute signature"
-msgstr "Prikaži potpis atributa"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"Tekući fajl je izmenjen.\n"
+"Želite li da ga sačuvate?"
 
-#: dialogs/settingsdlg.cpp:238
-msgid "Show package"
-msgstr "Prikaži paket"
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "Fajl %1 ne postoji."
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
-#, no-c-format
-msgid "Show operation signature"
-msgstr "Prikaži potpis operacije"
+#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
+#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
+msgid "Load Error"
+msgstr "Greška pri učitavanju"
 
-#: dialogs/settingsdlg.cpp:247
-msgid "Starting Scope"
-msgstr "Početni opseg"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "Fajl %1 izgleda pokvareno."
 
-#: dialogs/settingsdlg.cpp:252
-msgid "Default attribute scope:"
-msgstr "Podrazumevani opseg atributa:"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Nije nađen nijedan XMI fajl u kompresovanom fajlu %1."
 
-#: dialogs/settingsdlg.cpp:255
-msgid "Default operation scope:"
-msgstr "Podrazumevani opseg operacije:"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "Došlo je do problema prilikom učitavanja raspakovanog fajla: %1"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation"
-msgstr "Generisanje kôda"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "Došlo je do problema prilikom učitavanja fajla: %1"
 
-#: dialogs/settingsdlg.cpp:294
-msgid "Code Generation Settings"
-msgstr "Postavke generisanja kôda"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "Došlo je do problema prilikom slanja fajla: %1"
 
-#: dialogs/settingsdlg.cpp:301
-msgid "Code Viewer Settings"
-msgstr "Postavke prikazivača kôda"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "dijagram slučaja upotrebe"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">Nema dostupnih opcija.</p>"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "dijagram klase"
 
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Prikaži"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "dijagram sekvence"
 
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "O&peracije"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "dijagram saradnje"
 
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "&Vidljivost"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "dijagram stanja"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "Potpis o&peracije"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "dijagram aktivnosti"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "Pa&ket"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "dijagram komponenti"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "At&ributi"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "dijagram razvijanja"
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "Stereot&ip"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "dijagrama odnosa među entitetima"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "Potpis atr&ibuta"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "To je neispravno ime za dijagram."
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "Crtaj kao krug"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "Dijagram već koristi to ime."
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "Ime:"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Da li ste sigurni da želite da obrišete dijagram %1?"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Tip:"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "Obriši dijagram"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "Učini fasciklu spoljnom"
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "Postavljam dokument..."
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
-#: umlviewimageexportermodel.cpp:158
-#, c-format
-msgid "There was a problem saving file: %1"
-msgstr "Došlo je do problema prilikom snimanja fajla: %1"
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "Razrešavam reference objekta..."
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
-#: umllistview.cpp:385
-msgid "Save Error"
-msgstr "Greška pri snimanju"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "Učitavam UML elemente..."
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "Unesite ime modela"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "Učitavam dijagrame..."
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "Unesite novo ime modela:"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-dijagram"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "Prikazi"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/automatsko snimanje%1"
 
-#: umllistview.cpp:1907
+#: classifier.cpp:201
 msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
+"An operation with the same name and signature already exists. You can not add "
+"it again."
 msgstr ""
-"Ime koje ste uneli nije ispravno.\n"
-"Proces pravljenja je otkazan."
-
-#: umllistview.cpp:1908 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "Ime nije ispravno"
+"Operacija sa istim imenom i potpisom već postoji. Ne možete je ponovo dodati."
 
-#: umldoc.cpp:1067 umllistview.cpp:1917
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Ime koje ste uneli nije jedinstveno.\n"
-"Da li ste ovo želeli?"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "Dodaj baznu klasu"
 
-#: umldoc.cpp:1068 umllistview.cpp:1918
-msgid "Use Name"
-msgstr "Koristi ime"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "Dodaj izvedenu klasu"
 
-#: umldoc.cpp:1068 umllistview.cpp:1918
-msgid "Enter New Name"
-msgstr "Unesite novo ime"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "Dodaj operaciju"
 
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Ime koje ste uneli nije jedinstveno!\n"
-"Proces pravljenja je otkazan."
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Dodaj atribut"
 
-#: umllistview.cpp:2119 umllistview.cpp:2136 umllistview.cpp:2151
-msgid "Creation canceled"
-msgstr "Pravljenje je otkazano"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "Dodaj bazni interfejs"
 
-#: umllistview.cpp:2339
-msgid "Loading listview..."
-msgstr "Učitavam prikaz liste..."
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "Dodaj izvedeni interfejs"
 
-#: umllistview.cpp:2671
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Fascikla se mora prvo isprazniti da bi se obrisala."
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "Bazni klasifikatori"
 
-#: umllistview.cpp:2672
-msgid "Folder Not Empty"
-msgstr "Fascikla nije prazna"
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "Izvedeni klasifikatori"
 
-#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
-#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Name"
-msgstr "Ime"
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Atributi"
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "Unesite ime operacije:"
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Operacije"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "Unesite ime uloge:"
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid ""
+"An operation with that signature already exists in %1.\n"
+msgstr ""
+"Operacija sa takvim potpisom već postoji u %1.\n"
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "Unesite višestrukost:"
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "Izaberite drugačije ime ili parametarsku listu."
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "Unesite ime pridruživanja:"
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "Neispravno ime operacije"
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "Unesite novi tekst:"
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "Fajl fascikle %1 ne postoji."
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "GREŠKA"
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "Fajl fascikle %1 se ne može otvoriti."
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "Izmeni tekst"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "Svojstva pridruživanja"
 
-#: codegenerator.cpp:473
-msgid ""
-"Cannot open file %1 for writing. Please make sure the folder exists and you "
-"have permissions to write to it."
-msgstr ""
-"Ne mogu da otvorim fajl %1 za upis. Uverite se da fascikla postoji i da imate "
-"pravo upisa u nju."
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
+#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
+#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
+#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
+#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
+#: rc.cpp:225
+#, no-c-format
+msgid "General"
+msgstr "Opšte"
 
-#: codegenerator.cpp:473
-msgid "Cannot Open File"
-msgstr "Ne mogu da otvorim fajl"
+#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
+#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
+#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
+msgid "General Settings"
+msgstr "Opšte postavke"
 
-#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Ne mogu da napravim fasciklu:\n"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "Uloge"
 
-#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
-msgid ""
-"\n"
-"Please check the access rights"
-msgstr ""
-"\n"
-"Proverite prava pristupa"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "Postavke uloge"
 
-#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
-msgid "Cannot Create Folder"
-msgstr "Ne mogu da napravim fasciklu"
+#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
+#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
+#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
+msgid "Font Settings"
+msgstr "Postavke fonta"
 
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "Izvozim prikaz..."
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "Font pridruživanja"
 
-#: umlviewimageexporter.cpp:50
-msgid ""
-"An error happened when exporting the image:\n"
-msgstr ""
-"Došlo je do greške pri izvozu slike:\n"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">Nema dostupnih opcija.</p>"
 
-#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
-#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
-#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
-#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
-#: umlviewimageexporterall.cpp:73
-msgid "Ready."
-msgstr "Spreman."
+#. i18n: file dialogs/codeviewerdialogbase.ui line 21
+#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
+#, no-c-format
+msgid "Code Viewer"
+msgstr "Prikazivač koda"
 
-#: umlviewimageexporter.cpp:66
-msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Izabrani fajl %1 postoji.\n"
-"Želite li da ga prebrišete?"
+#: dialogs/umloperationdialog.cpp:50
+msgid "Operation Properties"
+msgstr "Svojstva operacija"
 
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Fajl već postoji"
+#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
+#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
+#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
+msgid "General Properties"
+msgstr "Opšte osobine"
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Poravnaj levo"
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
+msgstr "&Ime:"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Poravnaj desno"
+#: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
+#: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
+#: dialogs/umltemplatedialog.cpp:53
+msgid "&Type:"
+msgstr "&Tip:"
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Poravnaj na vrhu"
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
+msgid "Stereotype name:"
+msgstr "Ime stereotipa:"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Poravnaj na dnu"
+#: dialogs/umloperationdialog.cpp:89
+msgid "&Abstract operation"
+msgstr "&Apstraktna operacija"
 
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
-msgstr "Poravnaj uspravno u sredini"
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
+msgid "Classifier &scope (\"static\")"
+msgstr "Op&seg klasifikatora („static“)"
 
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
-msgstr "Poravnaj vodoravno u sredini"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr "&Upit („const“)"
 
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
-msgstr "Poravnaj uspravno raspoređeno"
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "Vidljivost"
 
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
-msgstr "Poravnaj vodoravno raspoređeno"
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
+msgid "P&ublic"
+msgstr "Ja&vno"
 
-#: aligntoolbar.cpp:383
-msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
-msgstr ""
-"Za poravnanje morate izabrati bar dva objekta kao klase ili aktere. Ne možete "
-"poravnati pridruživanja."
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
+msgid "P&rivate"
+msgstr "P&rivatno"
 
-#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Enter name:"
-msgstr "Unesite ime:"
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
+msgid "Prot&ected"
+msgstr "Z&aštićeno"
 
-#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
-#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "That is an invalid name."
-msgstr "To ime nije ispravno."
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
+msgid "I&mplementation"
+msgstr "Pri&mena"
 
-#: object_factory.cpp:164
-msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "Ovo je rezervisana ključna reč za jezik podešenog generatora kôda."
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Parametri"
 
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "Rezervisana ključna reč"
+#: dialogs/umloperationdialog.cpp:141
+msgid "Ne&w Parameter..."
+msgstr "No&vi parametar..."
 
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
-#: umldoc.cpp:1043 umldoc.cpp:1073
-msgid "That name is already being used."
-msgstr "To ime se već koristi."
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
+msgid "You have entered an invalid parameter name."
+msgstr "Uneli ste neispravno ime za parametar."
 
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
-#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
-msgid "Not a Unique Name"
-msgstr "Nije jedinstveno ime"
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
+msgid "Parameter Name Invalid"
+msgstr "Neispravno ime parametra"
 
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "Ne mogu da napravim fasciklu: %1"
+#: dialogs/umloperationdialog.cpp:339
+msgid ""
+"The parameter name you have chosen\n"
+"is already being used in this operation."
+msgstr ""
+"Ime koje ste odabrali za parametar\n"
+"već se koristi u ovoj operaciji."
 
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "Ne mogu da snimim prazan dijagram"
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr "Ime parametra nije jedinstveno"
 
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "Došlo je do problema pri snimanju dijagrama u %1"
+#: dialogs/umloperationdialog.cpp:406
+msgid ""
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Ime koje ste odabrali za parametar već se koristi u ovoj operaciji."
 
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "novi_akter"
+#: dialogs/umloperationdialog.cpp:456
+msgid "You have entered an invalid operation name."
+msgstr "Uneli ste neispravno ime operacije."
 
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "novi_slucaj_upotrebe"
+#. i18n: file dialogs/diagrampropertiespage.ui line 61
+#: dialogs/assocgenpage.cpp:67 rc.cpp:408
+#, no-c-format
+msgid "Name:"
+msgstr "Ime:"
 
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "novi_paket"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Tip:"
 
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "nova_komponenta"
+#: dialogs/parmpropdlg.cpp:35
+msgid "Parameter Properties"
+msgstr "Svojstva parametra"
 
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "novi_cvor"
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+msgid "&Initial value:"
+msgstr "&Početna vrednost:"
 
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "novi_artifakt"
+#: dialogs/parmpropdlg.cpp:82
+msgid "Passing Direction"
+msgstr "Pravac prolaska"
 
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "novi_interfejs"
+#: dialogs/parmpropdlg.cpp:84
+msgid ""
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
+"is a parameter for reading and writing."
+msgstr ""
+"„in“ je parametar samo za čitanje, „out“ je parametar samo za upisivanje, a "
+"„inout“ je parametar i za čitanje i za upisivanje."
 
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "novi_tip_podataka"
+#: dialogs/classgenpage.cpp:50
+msgid "Class &name:"
+msgstr "Ime &klase:"
 
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "novo_nabrajanje"
+#: dialogs/classgenpage.cpp:52
+msgid "Actor &name:"
+msgstr "Ime &aktera:"
 
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "novi_entitet"
+#: dialogs/classgenpage.cpp:54
+msgid "Package &name:"
+msgstr "Ime &paketa:"
 
-#: model_utils.cpp:264
-msgid "new_folder"
-msgstr "nova_fascikla"
+#: dialogs/classgenpage.cpp:56
+msgid "Use case &name:"
+msgstr "&Ime slučaja upotrebe:"
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "novo_pridruzivanje"
+#: dialogs/classgenpage.cpp:58
+msgid "Interface &name:"
+msgstr "Ime i&nterfejsa:"
 
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "novi_objekat"
+#: dialogs/classgenpage.cpp:60
+msgid "Component &name:"
+msgstr "Ime &komponente:"
 
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "Prazno"
+#: dialogs/classgenpage.cpp:62
+msgid "Artifact &name:"
+msgstr "Ime &artifakta:"
 
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "Loše formiran argument"
+#: dialogs/classgenpage.cpp:64
+msgid "Enum &name:"
+msgstr "I&me nabrajanja:"
 
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "Nepoznat tip argumenta"
+#: dialogs/classgenpage.cpp:66
+msgid "Datatype &name:"
+msgstr "Ime tipa po&datka:"
 
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "Nedozvoljeno ime metoda"
+#: dialogs/classgenpage.cpp:68
+msgid "Entity &name:"
+msgstr "I&me entiteta:"
 
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "Nepoznat povratni tip"
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+msgid "&Stereotype name:"
+msgstr "Ime &stereotipa:"
 
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "Neodređena greška"
+#: dialogs/classgenpage.cpp:107
+msgid "&Package name:"
+msgstr "Ime &paketa:"
 
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Uvozim fajl: %1 Napredak: %2/%3"
+#: dialogs/classgenpage.cpp:121
+msgid "A&bstract class"
+msgstr "A&pstraktna klasa"
 
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "Da li je opseg %1 imenski prostor ili klasa?"
+#: dialogs/classgenpage.cpp:123
+msgid "A&bstract use case"
+msgstr "Slučaj korišćenja a&pstrakcije"
 
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "Uvoz C++-a zahteva vašu pomoć"
+#: dialogs/classgenpage.cpp:131
+msgid "&Executable"
+msgstr "&Izvršno"
 
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "Imenski prostor"
+#: dialogs/classgenpage.cpp:138
+msgid "Draw As"
+msgstr "Crtaj kao"
 
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<eof>"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "Po&drazumevano"
 
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "očekivan je izraz"
+#: dialogs/classgenpage.cpp:149
+msgid "&Library"
+msgstr "&Biblioteka"
 
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "Sintaksna greška deklaracije"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "&Tabela"
 
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "očekivano je }"
+#: dialogs/classgenpage.cpp:182
+msgid "Pro&tected"
+msgstr "Zaš&tićeno"
 
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "očekivan je imenski prostor"
+#: dialogs/classgenpage.cpp:186
+msgid "Imple&mentation"
+msgstr "Pri&mena"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "očekivano je {"
+#: dialogs/classgenpage.cpp:256
+msgid "Class name:"
+msgstr "Ime klase:"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "Očekivano je ime imenskog prostora"
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+msgid "Instance name:"
+msgstr "Ime primerka:"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "Potreban je specifikator tipa za deklaraciju"
+#: dialogs/classgenpage.cpp:272
+msgid "Draw as actor"
+msgstr "Crtaj kao aktera"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "očekivana je deklaracija"
+#: dialogs/classgenpage.cpp:277
+msgid "Multiple instance"
+msgstr "Višestruki primerak"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "Očekivan je konstantan izraz"
+#: dialogs/classgenpage.cpp:284
+msgid "Show destruction"
+msgstr "Prikaži razgrađivanje"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "očekivano je „)“"
+#: dialogs/classgenpage.cpp:322
+msgid "Component name:"
+msgstr "Ime komponente:"
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "nedostaje }"
+#: dialogs/classgenpage.cpp:324
+msgid "Node name:"
+msgstr "Ime čvora:"
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "Očekivani su inicijalizatori članova"
+#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
+#: dialogs/classgenpage.cpp:456
+msgid ""
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
+msgstr ""
+"Ime koje ste odabrali\n"
+"već se koristi.\n"
+"Ime je resetovano."
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "Očekivan je specifikator bazne klase"
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
+msgid "Name is Not Unique"
+msgstr "Ime nije jedinstveno"
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "Očekivana je klauzula inicijalizatora"
+#: dialogs/settingsdlg.cpp:30
+msgid "Umbrello Setup"
+msgstr "Podešavanje Umbrello-a"
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "Očekivan je identifikator"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface"
+msgstr "Korisnički interfejs"
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "Očekivan je id. tipa"
+#: dialogs/settingsdlg.cpp:47
+msgid "User Interface Settings"
+msgstr "Postavke korisničkog interfejsa"
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "Očekivano je ime klase"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
+#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
+#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
+#: listpopupmenu.cpp:750
+msgid "Color"
+msgstr "Boja"
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "očekivan je uslov"
+#: dialogs/settingsdlg.cpp:54
+msgid "Line color:"
+msgstr "Boja linije:"
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "očekivana je naredba"
+#: dialogs/settingsdlg.cpp:60
+msgid "D&efault Color"
+msgstr "Po&drazumevana boja"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "očekivana je inicijalizacija for petlje"
+#: dialogs/settingsdlg.cpp:63
+msgid "Fill color:"
+msgstr "Boja za popunjavanje:"
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "očekivano je catch"
+#: dialogs/settingsdlg.cpp:69
+msgid "De&fault Color"
+msgstr "Po&drazumevana boja"
 
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "Unutrašnja greška"
+#: dialogs/settingsdlg.cpp:73
+msgid "Line width:"
+msgstr "Širina linije:"
 
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "Sintaksna greška pre „%1“"
+#: dialogs/settingsdlg.cpp:81
+msgid "D&efault Width"
+msgstr "P&odrazumevana širina"
 
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "Greška u raščlanjivanju pre „%1“"
+#: dialogs/settingsdlg.cpp:86
+msgid "&Use fill color"
+msgstr "&Koristi boju za popunjavanje"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Toplica Tanasković"
+#: dialogs/settingsdlg.cpp:108
+msgid "Enable undo"
+msgstr "Uključi opozivanje"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "toptan@kde.org.yu"
+#: dialogs/settingsdlg.cpp:112
+msgid "Use tabbed diagrams"
+msgstr "Koristi dijagrame sa jezičcima"
 
-#: main.cpp:32 main.cpp:93
-msgid "Umbrello UML Modeller"
-msgstr "Umbrello, UML modelar"
+#: dialogs/settingsdlg.cpp:116
+msgid "Use new C++/Java/Ruby generators"
+msgstr "Koristite nove C++/Java/Ruby generatore"
 
-#: main.cpp:40
-msgid "File to open"
-msgstr "fajl za otvaranje"
+#: dialogs/settingsdlg.cpp:120
+msgid "Use angular association lines"
+msgstr "Koristi uglovne linije pridruživanja"
 
-#: main.cpp:41
-msgid "export diagrams to extension and exit"
-msgstr "izvezi dijagrame u nastavak i izađi"
+#: dialogs/settingsdlg.cpp:126
+msgid "Autosave"
+msgstr "Automatsko snimanje"
 
-#: main.cpp:42
-msgid "the local directory to save the exported diagrams in"
-msgstr "lokalna fascikla u koju se snimaju izvezeni dijagrami"
+#: dialogs/settingsdlg.cpp:132
+msgid "E&nable autosave"
+msgstr "&Uključi automatsko snimanje"
 
-#: main.cpp:42
-msgid "the directory of the file"
-msgstr "fascikla fajla"
+#: dialogs/settingsdlg.cpp:136
+msgid "Select auto-save time interval (mins):"
+msgstr "Odaberite period automatskog snimanja (minuta):"
 
-#: main.cpp:43
+#: dialogs/settingsdlg.cpp:146
+msgid "Set autosave suffix:"
+msgstr "Postavite sufiks automatskog snimanja:"
+
+#: dialogs/settingsdlg.cpp:148
 msgid ""
-"keep the tree structure used to store the views in the document in the target "
-"directory"
+"<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 ""
-"drži u ciljnoj fascikli strukturu stabla koja se koristi za skladištenje "
-"prikaza u dokumentu"
-
-#: main.cpp:95
-msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
-msgstr "© 2001 Pol Hensgen (Paul Hensgen), © 2002-2006 autori Umbrello-a"
+"<qt>"
+"<p>Ako niste već jednom ručno snimili fajl, pri automatskom snimanju fajl će "
+"biti imenovan ~/autosave.xmi.</p>"
+"<p>Ako jeste već jednom snimili, pri automatskom snimanju biće napravljen fajl "
+"u istoj fascikli i istog imena, ali sa dodatkom navedenog sufiksa.</p>"
+"<p>Ako je sufiks isti kao sufiks fajla koji ste snimili, automatsko snimanje će "
+"prebrisati taj fajl.</p></qt>"
 
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "Autori Umbrello-a, UML modelara"
+#: dialogs/settingsdlg.cpp:158
+msgid "Startup"
+msgstr "Pokretanje"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "Umbrello-ov generator autonomnog koda"
+#: dialogs/settingsdlg.cpp:164
+msgid "Sta&rtup logo"
+msgstr "Logo p&ri pokretanju"
 
-#: docgenerators/main.cpp:47
-msgid "File to transform"
-msgstr "fajl za transformisanje"
+#: dialogs/settingsdlg.cpp:168
+msgid "&Tip of the day"
+msgstr "&Savet dana"
 
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr "XSLT fajl koji treba upotrebiti"
+#: dialogs/settingsdlg.cpp:172
+msgid "&Load last project"
+msgstr "&Učitaj poslednji projekat"
 
-#: docgenerators/main.cpp:64
-msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "© 2006 Gael de Chalendar (tpk. Kleag), © 2002-2006 autori Umbrello-a"
+#: dialogs/settingsdlg.cpp:176
+msgid "Start new project with:"
+msgstr "Počni novi projekat:"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "Izvozim sve prikaze..."
+#: dialogs/settingsdlg.cpp:183
+msgid "No Diagram"
+msgstr "Bez dijagrama"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "Došlo je do nekih grešaka pri izvozu slika:"
+#: dialogs/settingsdlg.cpp:183
+msgid "Class Diagram"
+msgstr "Dijagram klasa"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "Uopštenje"
+#: dialogs/settingsdlg.cpp:184
+msgid "Use Case Diagram"
+msgstr "Dijagram slučaja upotrebe"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "Samopridruživanje"
+#: dialogs/settingsdlg.cpp:184
+msgid "Sequence Diagram"
+msgstr "Dijagram sekvenci"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "Poruka o saradnji"
+#: dialogs/settingsdlg.cpp:185
+msgid "Collaboration Diagram"
+msgstr "Dijagram saradnje"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "Poruka o sekvenci"
+#: dialogs/settingsdlg.cpp:185
+msgid "State Diagram"
+msgstr "Dijagram stanja"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "Poruka o samosaradnji"
+#: dialogs/settingsdlg.cpp:186
+msgid "Activity Diagram"
+msgstr "Dijagram aktivnosti"
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "Poruka o samosekvenci"
+#: dialogs/settingsdlg.cpp:186
+msgid "Component Diagram"
+msgstr "Dijagram komponenti"
 
-#: association.cpp:95
-msgid "Realization"
-msgstr "Realizacija"
+#: dialogs/settingsdlg.cpp:187
+msgid "Deployment Diagram"
+msgstr "Dijagram razvijanja"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "Jednostrano pridruživanje"
+#: dialogs/settingsdlg.cpp:210
+msgid "Class Settings"
+msgstr "Postavke klase"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML modelar"
+#: dialogs/settingsdlg.cpp:217
+msgid "Show &visibility"
+msgstr "Prikaži &vidljivost"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "Logički prikaz"
+#: dialogs/settingsdlg.cpp:221
+msgid "Show attributes"
+msgstr "Prikaži atribute"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "Prikaz slučaja upotrebe"
+#: dialogs/settingsdlg.cpp:225
+msgid "Show operations"
+msgstr "Prikaži operacije"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "Prikaz komponenti"
+#: dialogs/settingsdlg.cpp:229
+msgid "Show stereot&ype"
+msgstr "Pr&ikaži stereotip"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "Prikaz razvijanja"
+#: dialogs/settingsdlg.cpp:233
+msgid "Show attribute signature"
+msgstr "Prikaži potpis atributa"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "Model odnosa među entitetima"
+#: dialogs/settingsdlg.cpp:238
+msgid "Show package"
+msgstr "Prikaži paket"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "Tipovi podataka"
+#. i18n: file dialogs/diagrampropertiespage.ui line 146
+#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#, no-c-format
+msgid "Show operation signature"
+msgstr "Prikaži potpis operacije"
 
-#: umldoc.cpp:229
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"Tekući fajl je izmenjen.\n"
-"Želite li da ga sačuvate?"
+#: dialogs/settingsdlg.cpp:247
+msgid "Starting Scope"
+msgstr "Početni opseg"
 
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "Fajl %1 ne postoji."
+#: dialogs/settingsdlg.cpp:252
+msgid "Default attribute scope:"
+msgstr "Podrazumevani opseg atributa:"
 
-#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
-#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
-msgid "Load Error"
-msgstr "Greška pri učitavanju"
+#: dialogs/settingsdlg.cpp:255
+msgid "Default operation scope:"
+msgstr "Podrazumevani opseg operacije:"
 
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "Fajl %1 izgleda pokvareno."
+#. 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"
 
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Nije nađen nijedan XMI fajl u kompresovanom fajlu %1."
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
+#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
+#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
+#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
+#, no-c-format
+msgid "Private"
+msgstr "Privatni"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "Došlo je do problema prilikom učitavanja raspakovanog fajla: %1"
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
+#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
+#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
+#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
+#, no-c-format
+msgid "Protected"
+msgstr "Zaštićeni"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "Došlo je do problema prilikom učitavanja fajla: %1"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation"
+msgstr "Generisanje kôda"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "Došlo je do problema prilikom slanja fajla: %1"
+#: dialogs/settingsdlg.cpp:294
+msgid "Code Generation Settings"
+msgstr "Postavke generisanja kôda"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "dijagram slučaja upotrebe"
+#: dialogs/settingsdlg.cpp:301
+msgid "Code Viewer Settings"
+msgstr "Postavke prikazivača kôda"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "dijagram klase"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "Pridruživanja"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "dijagram sekvence"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "Sadržane stavke"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "dijagram saradnje"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "Boje kontrole"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "dijagram stanja"
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Prikaz"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "dijagram aktivnosti"
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "Opcije prikaza"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "dijagram komponenti"
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "Postavke atributa"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "dijagram razvijanja"
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "Postavke operacija"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "dijagrama odnosa među entitetima"
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Šabloni"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "To je neispravno ime za dijagram."
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "Postavke šablona"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "Dijagram već koristi to ime."
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "Literali nabrajanja"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Da li ste sigurni da želite da obrišete dijagram %1?"
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "Postavke literala nabrajanja"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "Obriši dijagram"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "Atributi entiteta"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "Postavljam dokument..."
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "Postavke atributa entiteta"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "Razrešavam reference objekta..."
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "Postavke sadržaja"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "Učitavam UML elemente..."
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "Pridruženja klasa"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "Učitavam dijagrame..."
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
+#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#, no-c-format
+msgid "Role Properties"
+msgstr "Svojstva uloge"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/automatsko snimanje%1"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "Svojstva atributa entiteta"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "Preimenovanje je otkazano"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "&Podrazumevana vrednost:"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr ""
-"Preimenovanje stavke tipa %1 u prikazu liste još uvek nije implementirano."
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "Dužina/vrednosti:"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "Funkcija nije implementirana"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "&Automatsko uvećanje"
 
-#: umllistviewitem.cpp:478
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Ime koje ste uneli nije ispravno.\n"
-"Proces promene imena je otkazan."
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "Dozvoli &nulto"
 
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Opšte opcije"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "Atributi:"
 
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "Paket je imenski prostor"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "Indeksiranje"
 
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "Virtuelni razgrađivač"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "&Nikakvo"
 
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "Generiši prazne konstrusktore"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "&Primarno"
 
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "Generiši pristupne metode"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "&Indeks"
 
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "Operacije su u liniji"
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "&Jedinstveno"
 
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "Pristupači su u liniji"
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "Uneli ste neispravno ime atributa entiteta."
 
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "Pristupači su javni"
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "Neispravno ime atributa entiteta"
 
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "novi_atribut"
+#: dialogs/umlentityattributedialog.cpp:192
+msgid ""
+"The entity attribute name you have chosen is already being used in this "
+"operation."
+msgstr ""
+"Ime koje ste odabrali za atribut entiteta već se koristi u ovoj operaciji."
 
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "novi_sablon"
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "Ime atributa entiteta nije jedinstveno"
 
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "nova_operacija"
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "&Linija:"
 
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "novi_literal"
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "&Popunjavanje:"
 
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "novo_polje"
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "P&odrazumevano"
 
-#: uml.cpp:179
-msgid "&Export model to DocBook"
-msgstr "&Izvezi model u DocBook"
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "&Koristi popunjavanje"
 
-#: uml.cpp:182
-msgid "&Export model to XHTML"
-msgstr "&Izvezi model u XHTML"
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "Odredišni fajl već postoji"
 
-#: uml.cpp:186
-msgid "&New Class Wizard..."
-msgstr "Čarobnjak za &novu klasu..."
+#: 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 ""
+"Fajl %1 već postoji u %2.\n"
+"\n"
+"Umbrello može da prebriše fajl, napravi fajl\n"
+"sličnog imena ili da ga uopše i ne napravi."
 
-#: uml.cpp:188
-msgid "&Add Default Datatypes for Active Language"
-msgstr "&Dodaj podrazumevane tipove podataka za aktivan jezik"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "&Primeni na sve preostale fajlove"
 
-#: uml.cpp:193
-msgid "&Code Generation Wizard..."
-msgstr "Čarobnjak za generisanje &kôda..."
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "&Napravi slično ime fajla"
 
-#: uml.cpp:195
-msgid "&Generate All Code"
-msgstr "&Generiši sav kôd"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "Ne&moj da praviš fajl"
 
-#: uml.cpp:198
-msgid "&Import Classes..."
-msgstr "&Uvezi klase..."
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "Početno stanje"
 
-#: uml.cpp:201
-msgid "Creates a new document"
-msgstr "Pravi novi dokument"
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "Završno stanje"
 
-#: uml.cpp:202
-msgid "Opens an existing document"
-msgstr "Otvara postojeći dokument"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "Tip stanja:"
 
-#: uml.cpp:203
-msgid "Opens a recently used file"
-msgstr "Otvara skoro korišćeni fajl"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "Ime stanja:"
 
-#: uml.cpp:204
-msgid "Saves the document"
-msgstr "Snima dokument"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "Boja kontrole"
 
-#: uml.cpp:205
-msgid "Saves the document as..."
-msgstr "Snima dokument kao..."
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "Aktivnosti"
 
-#: uml.cpp:206
-msgid "Closes the document"
-msgstr "Zatvara dokument"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "N&ovi atribut..."
 
-#: uml.cpp:207
-msgid "Prints out the document"
-msgstr "Štampa dokument"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "N&ova operacija..."
 
-#: uml.cpp:208
-msgid "Quits the application"
-msgstr "Izlazi iz programa"
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "N&ovi šablon..."
 
-#: uml.cpp:209
-msgid "Exports the model to the docbook format"
-msgstr "Izvozi model u formatu DocBook-a"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "N&ovi literal nabrajanja..."
 
-#: uml.cpp:210
-msgid "Exports the model to the XHTML format"
-msgstr "Izvozi model u formatu XHTML-a"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "N&ov atribut entiteta..."
 
-#: uml.cpp:211
-msgid "Cuts the selected section and puts it to the clipboard"
-msgstr "Iseca izabranu sekciju i stavlja je u klipbord"
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "nova_klasa"
 
-#: uml.cpp:212
-msgid "Copies the selected section to the clipboard"
-msgstr "Kopira trenutni izbor u klipbord"
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "Nova klasa"
 
-#: uml.cpp:213
-msgid "Pastes the contents of the clipboard"
-msgstr "Prenosi sadržaj klipborda"
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "Atributi klase"
 
-#: uml.cpp:214
-msgid "Set the default program preferences"
-msgstr "Postavlja podrazumevana podešavanja programa"
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "Operacije klase"
 
-#: uml.cpp:216
-msgid "Delete &Selected"
-msgstr "Obriši &označeno"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "Nova aktivnost..."
 
-#: uml.cpp:224
-msgid "&Class Diagram..."
-msgstr "Dijagram &klase..."
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Promeni ime"
 
-#: uml.cpp:228
-msgid "&Autolayout..."
-msgstr "S&am rasporedi..."
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "Nova aktivnost"
 
-#: uml.cpp:231
-msgid "&Sequence Diagram..."
-msgstr "Dijagram &sekvence..."
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "Promeni ime aktivnosti"
 
-#: uml.cpp:234
-msgid "C&ollaboration Diagram..."
-msgstr "Dijagram s&aradnje..."
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "Unesite novo ime za aktivnost:"
 
-#: uml.cpp:237
-msgid "&Use Case Diagram..."
-msgstr "D&ijagram slučaja upotrebe..."
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "&Dijagrami"
 
-#: uml.cpp:240
-msgid "S&tate Diagram..."
-msgstr "Dijagram s&tanja..."
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "Filter"
 
-#: uml.cpp:243
-msgid "&Activity Diagram..."
-msgstr "Dijagram &aktivnosti..."
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "&Tekući dijagram"
 
-#: uml.cpp:246
-msgid "Co&mponent Diagram..."
-msgstr "Dijagram &komponente..."
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "&Svi dijagrami"
 
-#: uml.cpp:250
-msgid "&Deployment Diagram..."
-msgstr "Dijagram &razvijanja..."
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "&Odaberi dijagram"
 
-#: uml.cpp:254
-msgid "&Entity Relationship Diagram..."
-msgstr "Dijagram odnosa &među entitetima..."
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "&Tip dijagrama"
 
-#: uml.cpp:258
-msgid "&Clear Diagram"
-msgstr "&Očisti dijagram"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "Izbor"
 
-#: uml.cpp:260
-msgid "&Snap to Grid"
-msgstr "&Uklapaj uz mrežu"
-
-#: uml.cpp:262
-msgid "S&how Grid"
-msgstr "P&rikaži mrežu"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "Saradnja"
 
-#: uml.cpp:265
-msgid "&Hide Grid"
-msgstr "&Sakrij mrežu"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "Sekvenca"
 
-#: uml.cpp:269
-msgid "&Export as Picture..."
-msgstr "Izv&ezi kao sliku..."
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "Iskorištenje"
 
-#: uml.cpp:271
-msgid "Export &All Diagrams as Pictures..."
-msgstr "Izvezi &sve dijagrame kao slike..."
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "Nema odabranih dijagrama."
 
-#: uml.cpp:286
-msgid "&Zoom Slider"
-msgstr "Klizač &zumiranja"
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "Svojstva uloge „A“"
 
-#: uml.cpp:289
-#, c-format
-msgid "Z&oom to 100%"
-msgstr "&Zumiraj na 100%"
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "Svojstva uloge „B“"
 
-#: uml.cpp:295
-msgid "&Move Tab Left"
-msgstr "Pomeri jezičak u&levo"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "Vidljivost uloge „A“"
 
-#: uml.cpp:296
-msgid "&Move Tab Right"
-msgstr "Pomeri jezičak u&desno"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "Vidljivost uloge „B“"
 
-#: uml.cpp:308
-msgid "Select Diagram on Left"
-msgstr "Odaberi dijagram levo"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "Promenljivost uloge „A“"
 
-#: uml.cpp:309
-msgid "Select Diagram on Right"
-msgstr "Odaberi dijagram desno"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "Promenljivost uloge „B“"
 
-#: uml.cpp:327
-msgid "&Windows"
-msgstr "&Prozori"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
+#, no-c-format
+msgid "Rolename:"
+msgstr "Ime uloge:"
 
-#: uml.cpp:347
-#, c-format
-msgid " &33%"
-msgstr " &33%"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
+#, no-c-format
+msgid "Multiplicity:"
+msgstr "Višestrukost:"
 
-#: uml.cpp:348
-#, c-format
-msgid " &50%"
-msgstr " &50%"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
+#, no-c-format
+msgid "Implementation"
+msgstr "Primena"
 
-#: uml.cpp:349
-#, c-format
-msgid " &75%"
-msgstr " &75%"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
+#, no-c-format
+msgid "Changeable"
+msgstr "Izmenjivo"
 
-#: uml.cpp:350
-#, c-format
-msgid "&100%"
-msgstr "&100%"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
+#, no-c-format
+msgid "Frozen"
+msgstr "Zamrznuto"
 
-#: uml.cpp:351
-#, c-format
-msgid "1&50%"
-msgstr "1&50%"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
+#, no-c-format
+msgid "Add only"
+msgstr "Dodaj samo"
 
-#: uml.cpp:352
-#, c-format
-msgid "&200%"
-msgstr "&200%"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "Svojstva atributa"
 
-#: uml.cpp:353
-#, c-format
-msgid "3&00%"
-msgstr "3&00%"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "&Javno"
 
-#: uml.cpp:394
-msgid "Diagram Toolbar"
-msgstr "Traka dijagrama"
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "Uneli ste neispravno ime atributa."
 
-#: uml.cpp:398
-msgid "Alignment Toolbar"
-msgstr "Traka poravnanja"
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "Neispravno ime atributa"
 
-#: listpopupmenu.cpp:615 uml.cpp:420
-msgid "Class Diagram..."
-msgstr "Dijagram klasa..."
+#: dialogs/umlattributedialog.cpp:163
+msgid ""
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Ime koje ste odabrali za atribut već se koristi u ovoj operaciji."
 
-#: listpopupmenu.cpp:618 uml.cpp:421
-msgid "Sequence Diagram..."
-msgstr "Dijagram sekvence..."
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "Ime atributa nije jedinstveno"
 
-#: listpopupmenu.cpp:619 uml.cpp:422
-msgid "Collaboration Diagram..."
-msgstr "Dijagram saradnje..."
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Prikaži"
 
-#: listpopupmenu.cpp:551 uml.cpp:423
-msgid "Use Case Diagram..."
-msgstr "Dijagram slučaja upotrebe..."
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "O&peracije"
 
-#: listpopupmenu.cpp:616 uml.cpp:424
-msgid "State Diagram..."
-msgstr "Dijagram stanja..."
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "&Vidljivost"
 
-#: listpopupmenu.cpp:617 uml.cpp:425
-msgid "Activity Diagram..."
-msgstr "Dijagram aktivnosti..."
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "Potpis o&peracije"
 
-#: listpopupmenu.cpp:521 uml.cpp:426
-msgid "Component Diagram..."
-msgstr "Dijagram komponenti..."
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "Pa&ket"
 
-#: listpopupmenu.cpp:528 uml.cpp:427
-msgid "Deployment Diagram..."
-msgstr "Dijagram razvijanja..."
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "At&ributi"
 
-#: listpopupmenu.cpp:541 uml.cpp:428
-msgid "Entity Relationship Diagram..."
-msgstr "Dijagram odnosa među entitetima..."
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "Stereot&ip"
 
-#: uml.cpp:458
-msgid "&Tree View"
-msgstr "&Stabloliki prikaz"
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "Potpis atr&ibuta"
 
-#: uml.cpp:467
-msgid "&Documentation"
-msgstr "&Dokumentacija"
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "Crtaj kao krug"
 
-#: uml.cpp:479 uml.cpp:664 uml.cpp:692
-msgid "Opening file..."
-msgstr "Otvaram fajl..."
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "Opcije za prikaz klasa"
 
-#: uml.cpp:650
-msgid "Creating new document..."
-msgstr "Pravim novi dokument..."
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "Boje za dijagram"
 
-#: uml.cpp:673
-msgid ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
-"*.xmi|Uncompressed XMI Files (*.xmi)\n"
-"*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
-"*.mdl|Rose model files"
-msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2|Svi podržani fajlovi (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
-"*.xmi|Raspakovani XMI fajlovi (*.xmi)\n"
-"*.xmi.tgz|Gzip-om kompresovani XMI fajlovi (*.xmi.tgz)\n"
-"*.xmi.tar.bz2|Bzip2-om kompresovani XMI fajlovi (*.xmi.tar.bz2) *.mdl|Rose-ovi "
-"modelski fajlovi"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "Ime koje ste uneli nije ispravno."
 
-#: uml.cpp:677
-msgid "Open File"
-msgstr "Otvori fajl"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "Ime koje ste uneli nije jedinstveno."
 
-#: uml.cpp:716
-msgid "Saving file..."
-msgstr "Snimam fajl..."
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
+#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#, no-c-format
+msgid "Code Generation Options"
+msgstr "Opcije za generisanje kôda"
 
-#: uml.cpp:727
-msgid "Saving file with a new filename..."
-msgstr "Snimam fajl pod novim imenom..."
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "&Generiši"
 
-#: uml.cpp:732
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "Završetak"
+
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "Kôd je generisan"
+
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "Nije generisan"
+
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "Još uvek nije generisan"
+
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "Fascikla %1 ne postoji. Želite li da je napravite sada?"
+
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "Izlazna fascikla ne postoji"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "Napravi fasciklu"
+
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "Ne pravi"
+
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"*.xmi|XMI File\n"
-"*.xmi.tgz|Gzip Compressed XMI File\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
-"*|All Files"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select another, "
+"valid, folder."
 msgstr ""
-"*.xmi|XMI fajl\n"
-"*.xmi.tgz|Gzip kompresovani XMI fajl\n"
-"*.xmi.tar.bz2|Bzip2 kompresovani XMI fajl\n"
-"*|Svi fajlovi"
+"Fascikla se ne može napraviti.\n"
+"Proverite da li imate pravo upisa u njenu roditeljsku fasciklu ili izaberite "
+"drugu, ispravanu, fasciklu."
 
-#: uml.cpp:740
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "Greška pri pravljenju fascikle"
+
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "Izaberite ispravnu fasciklu."
+
+#: dialogs/codegenerationwizard.cpp:184
 msgid ""
-"The file %1 exists.\n"
-"Do you wish to overwrite it?"
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
-"Fajl %1 postoji.\n"
-"Želite li da ga prebrišete?"
+"Izlazna fascikla postoji, ali se u nju ne može pisati.\n"
+"Postavite odgovarajuće dozvole ili izaberite drugu fasciklu."
 
-#: uml.cpp:740
-msgid "Overwrite"
-msgstr "Prebriši"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "Greška pri pisanju u izlaznu fasciklu"
 
-#: uml.cpp:764
-msgid "Closing file..."
-msgstr "Zatvaram fajl..."
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 ne izgleda kao fascikla. Izaberite ispravnu fasciklu."
 
-#: uml.cpp:772
-msgid "Printing..."
-msgstr "Štampam..."
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "Izaberite ispravnu fasciklu"
 
-#: uml.cpp:779
-#, c-format
-msgid "Print %1"
-msgstr "Štampaj %1"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "Odaberite operaciju"
 
-#: uml.cpp:787
-msgid "Exiting..."
-msgstr "Izlazim..."
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "Broj sekvence:"
 
-#: uml.cpp:823
-msgid "Cutting selection..."
-msgstr "Isecam izbor..."
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "Operacija klase:"
 
-#: uml.cpp:836
-msgid "Copying selection to clipboard..."
-msgstr "Kopiram izbor u klipbord..."
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "Posebna operacija:"
 
-#: uml.cpp:844
-msgid "Inserting clipboard contents..."
-msgstr "Umećem sadržaj klipborda..."
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "Svojstva šablona"
 
-#: uml.cpp:849
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "Uneli ste neispravno ime za šablon."
+
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "Neispravno ime za šablon"
+
+#: dialogs/umltemplatedialog.cpp:138
 msgid ""
-"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
-"may be of the wrong type to be pasted here."
+"The template parameter name you have chosen is already being used in this "
+"operation."
 msgstr ""
-"Umbrello nije mogao da umetne sadržaj klipborda. Objekti u klipbordu su možda "
-"pogrešnog tipa da bi se ovde umetnuli."
+"Ime koje ste odabrali za parametar šablona već se koristi u ovoj operaciji."
 
-#: clipboard/umlclipboard.cpp:691 uml.cpp:851
-msgid "Paste Error"
-msgstr "Greška prilikom umetanja"
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "Ime šablona nije jedinstveno"
 
-#: uml.cpp:863
-msgid "Toggling toolbar..."
-msgstr "Uključuje/isključuje traku sa alatima..."
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "Dokumentacija napomene"
 
-#: uml.cpp:878
-msgid "Toggle the statusbar..."
-msgstr "Uključuje/isključuje statusnu traku..."
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "Početna aktivnost"
 
-#: uml.cpp:1186
-msgid "Cannot view code until you generate some first."
-msgstr "Ne mogu da prikažem kôd dok ga ne generišite."
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "Završna aktivnost"
 
-#: uml.cpp:1186 uml.cpp:1189
-msgid "Cannot View Code"
-msgstr "Ne mogu da prikažem kôd"
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "Tip aktivnosti:"
 
-#: uml.cpp:1189
-msgid "Cannot view code from simple code writer."
-msgstr "Ne mogu da prikažem kôd iz prostog pisača kôda."
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "Ime aktivnosti:"
 
-#: uml.cpp:1387
-msgid "*.idl|IDL Files (*.idl)"
-msgstr "*.idl|IDL fajlovi (*.idl)"
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
+#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
+#, no-c-format
+msgid "The format that the images will be exported to"
+msgstr "Format u kojem će slike biti izvezene"
 
-#: uml.cpp:1389
-msgid "*.py|Python Files (*.py)"
-msgstr "*.py|Python-ski fajlovi (*.py)"
+#: objectwidget.cpp:90
+msgid "Rename Object"
+msgstr "Promeni ime objektu"
 
-#: uml.cpp:1391
-msgid "*.java|Java Files (*.java)"
-msgstr "*.java|Java fajlovi (*.java)"
+#: objectwidget.cpp:91
+msgid "Enter object name:"
+msgstr "Unesite ime objekta:"
 
-#: uml.cpp:1393
-msgid "*.pas|Pascal Files (*.pas)"
-msgstr "*.pas|Pascal fajlovi (*.pas)"
+#: umlwidgetcontroller.cpp:128
+msgid ""
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
+"Right button click to cancel move."
+msgstr ""
+"Držite Shift ili Ctrl za kretanje duž X-ose. Držite Shift i Ctrl za kretanje "
+"duž Y-ose. Desnim klikom se prekida kretanje."
 
-#: uml.cpp:1395
-msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
-msgstr "*.ads *.ada|Ada Fajlovi (*.ads *.ada)"
+#: umlwidgetcontroller.cpp:379
+msgid ""
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
+"Right button click to cancel resize."
+msgstr ""
+"Držite Shift ili Ctrl za kretanje duž X-ose. Držite Shift i Ctrl za kretanje "
+"duž Y-ose. Desnim klikom se prekida promena veličine."
 
-#: uml.cpp:1397
-msgid "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
-msgstr "*.h *.hh *.hpp *.hxx *.H|Fajlovi zaglavlja (*.h *.hh *.hpp *.hxx *.H)"
+#: umlviewimageexportermodel.cpp:126
+#, c-format
+msgid "Can not create directory: %1"
+msgstr "Ne mogu da napravim fasciklu: %1"
 
-#: uml.cpp:1399
-msgid "All Files"
-msgstr "Svi fajlovi"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "Ne mogu da snimim prazan dijagram"
 
-#: uml.cpp:1401
-msgid "Select Code to Import"
-msgstr "Odaberite kôd za uvoz"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "Došlo je do problema pri snimanju dijagrama u %1"
 
 #. i18n: file umbrelloui.rc line 5
 #: rc.cpp:6
@@ -3351,324 +3434,73 @@ msgstr "Izmenljivost uloge"
 msgid "Role Visibility"
 msgstr "Vidljivost uloge"
 
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "Fajl fascikle %1 ne postoji."
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "Fajl fascikle %1 se ne može otvoriti."
-
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr ""
-"Operacija sa istim imenom i potpisom već postoji. Ne možete je ponovo dodati."
-
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "Unesite ime za aktivnost"
-
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "Unesite ime stanja"
-
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "Unesite ime novog stanja:"
-
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "novo stanje"
-
-#: listpopupmenu.cpp:695 stereotype.cpp:76
-msgid "Stereotype"
-msgstr "Stereotip"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "Višestrukost"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "Ime pridruživanja"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "Ime uloge"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "Dijagram: %2 strana %1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "Unesite ime dijagrama"
-
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "Unesite novo ime za dijagram:"
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"Upravo ćete obrisati ceo dijagram.\n"
-"Da li ste sigurni?"
-
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "Da li da obrišem dijagram?"
-
-#: objectwidget.cpp:90
-msgid "Rename Object"
-msgstr "Promeni ime objektu"
-
-#: objectwidget.cpp:91
-msgid "Enter object name:"
-msgstr "Unesite ime objekta:"
-
-#: clipboard/umlclipboard.cpp:687
-msgid ""
-"At least one of the items in the clipboard could not be pasted because an item "
-"of the same name already exists.  Any other items have been pasted."
-msgstr ""
-"Bar jedna stavka iz klipborda nije mogla biti umetnuta zato što stavka sa istim "
-"imenom već postoji. Sve ostale stavke su umetnute."
-
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "Dodaj baznu klasu"
-
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "Dodaj izvedenu klasu"
-
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "Dodaj operaciju"
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Dodaj atribut"
-
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "Dodaj bazni interfejs"
-
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "Dodaj izvedeni interfejs"
-
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "Bazni klasifikatori"
-
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "Izvedeni klasifikatori"
-
-#: tips.cpp:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>Dobrodošli u Umbrello.</p>\n"
-"<p>Pomoću UML dijagrama možete dizajnirati i dokumentisati objektno "
-"orijentisani softver.  <a href=\"help:/umbrello\">Priručnik za Umbrello</a> "
-"je dobar uvod u korišćenje UML-a.</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>Dobrodošli u  Umbrello 1.5.  Novo u ovoj verziji su klase pridruživanja, "
-"generacija Ruby koda, eksternalizacija fascikli, mogućnost pretvaranja "
-"interfejsa u klase i još mnogo toga.</p>\n"
-
-#: tips.cpp:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>Dijagrami sa jezičcima i Spoljne fascikle se međusobno isključuju. Ako vam "
-"trebaju Spoljne fascikle onda demarkirajte &quot;Koristi dijagrame sa "
-"jezičcima&quot; u opštim podešavanjima.</p>\n"
-
-#: tips.cpp:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>Većini dijagramskih stavki ne može da se promeni veličina, već će to učiniti "
-"same da bi se prilagodile svom sadržaju.\n"
-"Kutijama, beleškama i porukama dijagrama sekvence veličina može biti promenjena "
-"klikom na i povlačenjem crvenog kvadrata.</p>\n"
-
-#: tips.cpp:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>Ako želite u dijagram da dodate klasu koja već postoji, samo prevucite njen "
-"unos iz stablolikog prikaza.</p>\n"
-
-#: tips.cpp:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-"<p>Umbrello-ov refaktorizacioni agent vam omogućava da premeštate operacije "
-"između klase i njenih izvedenih i baznih klasa.\n"
-"Desno kliknite na klasu da biste otvorili refaktorizacioni agent.</p>\n"
-
-#: tips.cpp:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>Objekti dijagrama sekvence mogu imati kućicu za razgrađivanje i biti "
-"nacrtani kao akteri. Dvokliknite na neki za dijalog sa svojstvima.</p>\n"
-
-#: tips.cpp:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
-"<p>Poruke dijagrama sekvence mogu imati ulogu konstruktora. Kliknite na kutiju "
-"objekta (umesto na uspravnu liniju) da je učinite konstruktorom.</p>\n"
-
-#: tips.cpp:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
-"<p>Dijagrami sekvence podržavaju poruke za same sebe. Kliknite ponovo na istu "
-"uspravnu liniju da napravite autoporuku.</p>\n"
-
-#: tips.cpp:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
-"<p>Ako se po učitavanju stranog fajla ništa ne pojavi u prikazu liste, "
-"pokušajte da snimite model pod drugim imenom, zatvorite, i ponovo učitate "
-"snimljeni fajl. Obično će tada prikaz liste biti ispravno popunjen.</p>\n"
-
-#: tips.cpp:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>Iseci i kopiraj će takođe izvesti sliku u PNG klipbord, odakle može biti "
-"umetnuta u KWord i druge programe.</p>\n"
-
-#: tips.cpp:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>Pridruživanja ne moraju da budu u pravim linijama, dvoklik na neku će "
-"napraviti pomerljivu tačku.</p>\n"
-
-#: tips.cpp:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>Automatsko snimanje možete uključiti u dijalogu za podešavanje "
-"Umbrello-a.</p>\n"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "Uopštenje"
 
-#: tips.cpp:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>Da li Umbrello nema neku mogućnost koja vam treba? Ako je tako, obavestite "
-"nas.\n"
-"Ili je dodajte u bazu podataka o greškama pomoću prijave grešaka iz menija "
-"Pomoć, ili nam je pošaljite na dospisnu listu uml-devel.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
+#: association.cpp:88
+msgid "Self Association"
+msgstr "Samopridruživanje"
 
-#: tips.cpp:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>Sve izabrane objekte možete obrisati pritiskom na Del ili Backspace.</p>\n"
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "Poruka o saradnji"
 
-#: tips.cpp:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>Ako ste našli grešku u Umbrello-u, obavestite nas.\n"
-"Greške možete poslati alatom za prijavu grešaka iz menija Pomoć.</p>\n"
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "Poruka o sekvenci"
 
-#: tips.cpp:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>Pritiskom na taster Escape postavlja se tekući alat na izabrani alat.\n"
-"Backspace-om se skače na prethodno korišćeni alat.</p>\n"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "Poruka o samosaradnji"
 
-#: tips.cpp:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr ""
-"<p>Možete izabrati sve objekte pritiskom na Ctrl-A.</p>\n"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "Poruka o samosekvenci"
 
-#: tips.cpp:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>Možete napraviti i podesiti novu klasu koristeći čarobnjaka iz menija "
-"Kôd.</p>\n"
+#: association.cpp:95
+msgid "Realization"
+msgstr "Realizacija"
+
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "Jednostrano pridruživanje"
 
 #: statewidget.cpp:176
 msgid "Enter Activity"
 msgstr "Unesite aktivnost"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "Neispravno korišćenje pridruživanja."
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Opšte opcije"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "Greška pridruživanja"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "Paket je imenski prostor"
 
-#: operation.cpp:185
-msgid "new_parameter"
-msgstr "novi_parametar"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "Virtuelni razgrađivač"
+
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "Generiši prazne konstrusktore"
+
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "Generiši pristupne metode"
+
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "Operacije su u liniji"
+
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "Pristupači su u liniji"
+
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "Pristupači su javni"
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -3735,11 +3567,13 @@ msgid "Change State Name..."
 msgstr "Promeni ime stanja..."
 
 #: listpopupmenu.cpp:376
-msgid "Flip Horizontal"
+#, fuzzy
+msgid "FlipQt::Horizontal"
 msgstr "Prevrni vodoravno"
 
 #: listpopupmenu.cpp:378
-msgid "Flip Vertical"
+#, fuzzy
+msgid "FlipQt::Vertical"
 msgstr "Prevrni uspravno"
 
 #: listpopupmenu.cpp:388
@@ -3963,6 +3797,179 @@ msgstr "Uklapaj uz mrežu"
 msgid "Show Grid"
 msgstr "Prikaži mrežu"
 
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "Preimenovanje je otkazano"
+
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr ""
+"Preimenovanje stavke tipa %1 u prikazu liste još uvek nije implementirano."
+
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "Funkcija nije implementirana"
+
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Ime koje ste uneli nije ispravno.\n"
+"Proces promene imena je otkazan."
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "Unesite ime operacije:"
+
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "Unesite ime uloge:"
+
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "Unesite višestrukost:"
+
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "Unesite ime pridruživanja:"
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "Unesite novi tekst:"
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "GREŠKA"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "Izmeni tekst"
+
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "Višestrukost"
+
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "Ime pridruživanja"
+
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "Ime uloge"
+
+#: main.cpp:32 main.cpp:93
+msgid "Umbrello UML Modeller"
+msgstr "Umbrello, UML modelar"
+
+#: main.cpp:40
+msgid "File to open"
+msgstr "fajl za otvaranje"
+
+#: main.cpp:41
+msgid "export diagrams to extension and exit"
+msgstr "izvezi dijagrame u nastavak i izađi"
+
+#: main.cpp:42
+msgid "the local directory to save the exported diagrams in"
+msgstr "lokalna fascikla u koju se snimaju izvezeni dijagrami"
+
+#: main.cpp:42
+msgid "the directory of the file"
+msgstr "fascikla fajla"
+
+#: main.cpp:43
+msgid ""
+"keep the tree structure used to store the views in the document in the target "
+"directory"
+msgstr ""
+"drži u ciljnoj fascikli strukturu stabla koja se koristi za skladištenje "
+"prikaza u dokumentu"
+
+#: main.cpp:95
+msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
+msgstr "© 2001 Pol Hensgen (Paul Hensgen), © 2002-2006 autori Umbrello-a"
+
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "novi_akter"
+
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "novi_slucaj_upotrebe"
+
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "novi_paket"
+
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "nova_komponenta"
+
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "novi_cvor"
+
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "novi_artifakt"
+
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "novi_interfejs"
+
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "novi_tip_podataka"
+
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "novo_nabrajanje"
+
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "novi_entitet"
+
+#: model_utils.cpp:264
+msgid "new_folder"
+msgstr "nova_fascikla"
+
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "novi_objekat"
+
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "Prazno"
+
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "Loše formiran argument"
+
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "Nepoznat tip argumenta"
+
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "Nedozvoljeno ime metoda"
+
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "Nepoznat povratni tip"
+
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "Neodređena greška"
+
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "Neispravno korišćenje pridruživanja."
+
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "Greška pridruživanja"
+
 #~ msgid "new_stereotype"
 #~ msgstr "novi_stereotip"
 
-- 
cgit v1.2.3