Automated l10n update (.po files)

1 files changed, 2683 insertions, 2683 deletions

diff --git a/tde-i18n-rw/messages/tdesdk/umbrello.po b/tde-i18n-rw/messages/tdesdk/umbrello.po
index 3c857fa4dcb..2a8a7cfa823 100644
--- a/tde-i18n-rw/messages/tdesdk/umbrello.po
+++ b/tde-i18n-rw/messages/tdesdk/umbrello.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello 3.4\n"
-"POT-Creation-Date: 2014-09-29 00:48-0500\n"
+"POT-Creation-Date: 2014-09-29 12:05-0500\n"
 "PO-Revision-Date: 2005-05-25 18:12-0600\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -24,6 +24,732 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr ""
+
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "Idosiye Kuri Gufungura "
+
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr ""
+
+#: docgenerators/main.cpp:64
+#, fuzzy
+msgid ""
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "( C ) , ( C ) - "
+
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr ""
+
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#, fuzzy
+msgid "Exporting all views..."
+msgstr "Nka ... "
+
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr ""
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
+#: umlviewimageexportermodel.cpp:158
+#, fuzzy, c-format
+msgid "There was a problem saving file: %1"
+msgstr "A Mu kubika Idosiye : %1 "
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "Bika ikosa"
+
+#: worktoolbar.cpp:245
+msgid "Object"
+msgstr "Igikoresho"
+
+#: worktoolbar.cpp:246
+#, fuzzy
+msgid "Synchronous Message"
+msgstr "Ubutumwa Bubanza"
+
+#: worktoolbar.cpp:247
+#, fuzzy
+msgid "Asynchronous Message"
+msgstr "ikintu kitaboneka ako kanya"
+
+#: association.cpp:87 worktoolbar.cpp:248
+#, fuzzy
+msgid "Association"
+msgstr "Ishyirahamwe"
+
+#: association.cpp:93 worktoolbar.cpp:249
+#, fuzzy
+msgid "Containment"
+msgstr "Kotajante"
+
+#: association.cpp:97 worktoolbar.cpp:250
+msgid "Anchor"
+msgstr "Agafashi"
+
+#: worktoolbar.cpp:251
+msgid "Label"
+msgstr "Akarango"
+
+#: worktoolbar.cpp:252
+msgid "Note"
+msgstr "Igisobanuro"
+
+#: worktoolbar.cpp:253
+msgid "Box"
+msgstr "Agasanduku"
+
+#: listpopupmenu.cpp:545 worktoolbar.cpp:254
+msgid "Actor"
+msgstr "Umukinnyi"
+
+#: association.cpp:86 worktoolbar.cpp:255
+#, fuzzy
+msgid "Dependency"
+msgstr "Kwerekana Ibitigenga"
+
+#: association.cpp:85 worktoolbar.cpp:256
+#, fuzzy
+msgid "Aggregation"
+msgstr "Imimaro rusange"
+
+#: worktoolbar.cpp:257
+#, fuzzy
+msgid "Relationship"
+msgstr "Amasano"
+
+#: worktoolbar.cpp:258
+#, fuzzy
+msgid "Directional Association"
+msgstr "Icapa byerekezobibiri"
+
+#: worktoolbar.cpp:259
+msgid "Implements (Generalisation/Realisation)"
+msgstr ""
+
+#: association.cpp:94 worktoolbar.cpp:260
+msgid "Composition"
+msgstr "ibirindiro"
+
+#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
+#: listpopupmenu.cpp:548 worktoolbar.cpp:261
+#, fuzzy
+msgid "Use Case"
+msgstr "Izinakoresha"
+
+#. i18n: file dialogs/codegenerationwizardbase.ui line 249
+#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
+#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
+#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
+#, no-c-format
+msgid "Class"
+msgstr "ishuri,urwego"
+
+#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
+#, fuzzy
+msgid "Initial State"
+msgstr "Umubare watangiye:"
+
+#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
+#, fuzzy
+msgid "End State"
+msgstr "Impera "
+
+#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
+msgid "Branch/Merge"
+msgstr ""
+
+#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
+#, fuzzy
+msgid "Fork/Join"
+msgstr "Mvamahanga"
+
+#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
+msgid "Package"
+msgstr "Porogaramu"
+
+#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
+#: listpopupmenu.cpp:515 worktoolbar.cpp:268
+#, fuzzy
+msgid "Component"
+msgstr "Umurongo w'inyangingo"
+
+#: listpopupmenu.cpp:525 worktoolbar.cpp:269
+#, fuzzy
+msgid "Node"
+msgstr "Igisobanuro"
+
+#: listpopupmenu.cpp:518 worktoolbar.cpp:270
+#, fuzzy
+msgid "Artifact"
+msgstr "Umuhanzi"
+
+#: listpopupmenu.cpp:610 worktoolbar.cpp:271
+msgid "Interface"
+msgstr "Imigaragarire"
+
+#: listpopupmenu.cpp:611 worktoolbar.cpp:272
+#, fuzzy
+msgid "Datatype"
+msgstr "Ubwoko bw'ibyatanzwe"
+
+#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+#, fuzzy
+msgid "Enum"
+msgstr "Imibare I"
+
+#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+#, fuzzy
+msgid "Entity"
+msgstr "Icyinjijwe"
+
+#: worktoolbar.cpp:275
+#, fuzzy
+msgid "Deep History"
+msgstr "Gusiba Amateka"
+
+#: worktoolbar.cpp:276
+#, fuzzy
+msgid "Shallow History"
+msgstr "Kubika Amateka"
+
+#: worktoolbar.cpp:277
+#, fuzzy
+msgid "Join"
+msgstr "ku"
+
+#: worktoolbar.cpp:278
+#, fuzzy
+msgid "Fork"
+msgstr "Ifishi"
+
+#: worktoolbar.cpp:279
+#, fuzzy
+msgid "Junction"
+msgstr "Umumaro"
+
+#: worktoolbar.cpp:280
+#, fuzzy
+msgid "Choice"
+msgstr "Ijwi"
+
+#: association.cpp:98 worktoolbar.cpp:284
+#, fuzzy
+msgid "State Transition"
+msgstr "Inyuranamo ry'Igice"
+
+#: worktoolbar.cpp:285
+#, fuzzy
+msgid "Activity Transition"
+msgstr "InyuranamoRyikoresha"
+
+#: association.cpp:99 dialogs/activitydialog.cpp:70
+#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
+#: worktoolbar.cpp:286
+msgid "Activity"
+msgstr "Umurimo"
+
+#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
+#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
+msgid "State"
+msgstr "Leta"
+
+#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+#, fuzzy
+msgid "End Activity"
+msgstr "Impera "
+
+#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+#, fuzzy
+msgid "Initial Activity"
+msgstr "Umurimo"
+
+#: worktoolbar.cpp:290
+msgid "Message"
+msgstr "Ubutumwa"
+
+#: worktoolbar.cpp:298
+#, fuzzy
+msgid "UNDEFINED"
+msgstr "Bidasobanuye"
+
+#: worktoolbar.cpp:302
+msgid "Select"
+msgstr "Guhitamo"
+
+#: clipboard/umlclipboard.cpp:687
+#, fuzzy
+msgid ""
+"At least one of the items in the clipboard could not be pasted because an item "
+"of the same name already exists.  Any other items have been pasted."
+msgstr ""
+"Rimwe Bya i Ibigize in i Ububikokoporora OYA Ikintu Bya i Izina: . Ikindi "
+"Ibigize . "
+
+#: clipboard/umlclipboard.cpp:691 uml.cpp:851
+#, fuzzy
+msgid "Paste Error"
+msgstr "Ikosa "
+
+#: codegenerator.cpp:473
+#, fuzzy
+msgid ""
+"Cannot open file %1 for writing. Please make sure the folder exists and you "
+"have permissions to write to it."
+msgstr ""
+"Gufungura Idosiye %1 ya:  . Ubwoko i Ububiko... na Uruhushya Kuri Kwandika Kuri "
+". "
+
+#: codegenerator.cpp:473
+#, fuzzy
+msgid "Cannot Open File"
+msgstr "Gufungura Idosiye "
+
+#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
+#, fuzzy
+msgid ""
+"Cannot create the folder:\n"
+msgstr ""
+"Kurema i Ububiko... : \n"
+
+#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
+#, fuzzy
+msgid ""
+"\n"
+"Please check the access rights"
+msgstr ""
+"\n"
+"Kugenzura i "
+
+#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
+#, fuzzy
+msgid "Cannot Create Folder"
+msgstr "Isubiranyuma: Kurema Ububiko"
+
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+#, fuzzy
+msgid "Enter State Name"
+msgstr "Kwinjiza izina:"
+
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+#, fuzzy
+msgid "Enter the name of the new state:"
+msgstr "i Izina: Bya i Gishya Leta : "
+
+#: statewidget.cpp:176
+#, fuzzy
+msgid "Enter Activity"
+msgstr "Umurimo"
+
+#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
+#: toolbarstateother.cpp:144 umlview.cpp:2546
+#, fuzzy
+msgid "Enter the name of the new activity:"
+msgstr "i Izina: Bya i Gishya Umurimo : "
+
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+#, fuzzy
+msgid "new activity"
+msgstr "Gishya Umurimo "
+
+#: umldoc.cpp:82 umldoc.cpp:1518
+#, fuzzy
+msgid "UML Model"
+msgstr "Urugero"
+
+#: umldoc.cpp:106
+#, fuzzy
+msgid "Logical View"
+msgstr "Bijyanye n'inyurabwenge"
+
+#: umldoc.cpp:107
+#, fuzzy
+msgid "Use Case View"
+msgstr "Gufunga igaragaza Ngenga"
+
+#: umldoc.cpp:108
+#, fuzzy
+msgid "Component View"
+msgstr "Igaragaza ry'ibikubiyemo"
+
+#: umldoc.cpp:109
+#, fuzzy
+msgid "Deployment View"
+msgstr "Igaragaza nyandiko"
+
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr ""
+
+#: umldoc.cpp:117 umldoc.cpp:293
+#, fuzzy
+msgid "Datatypes"
+msgstr "Ubwoko bw'ibyatanzwe"
+
+#: umldoc.cpp:229
+#, fuzzy
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr "Idosiyeirihoyahinduwe."
+
+#: umldoc.cpp:355
+#, fuzzy
+msgid "The file %1 does not exist."
+msgstr "Idosiye\"%1\"ntibaho."
+
+#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
+#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
+#, fuzzy
+msgid "Load Error"
+msgstr "Ikosa "
+
+#: umldoc.cpp:380
+#, fuzzy
+msgid "The file %1 seems to be corrupted."
+msgstr "Idosiye %1 Kuri . "
+
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, fuzzy, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "Oya Idosiye Byabonetse in i Byegeranijwe Idosiye %1 . "
+
+#: umldoc.cpp:448
+#, fuzzy, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "A Ifungura i Idosiye : %1 "
+
+#: umldoc.cpp:472 umldoc.cpp:488
+#, fuzzy, c-format
+msgid "There was a problem loading file: %1"
+msgstr "A Ifungura Idosiye : %1 "
+
+#: umldoc.cpp:641
+#, fuzzy, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "A Koherezayo %1 Idosiye : %1 "
+
+#: umldoc.cpp:934
+#, fuzzy
+msgid "use case diagram"
+msgstr "Koresha "
+
+#: umldoc.cpp:936
+#, fuzzy
+msgid "class diagram"
+msgstr "Urwego: "
+
+#: umldoc.cpp:938
+#, fuzzy
+msgid "sequence diagram"
+msgstr "Igenzura ry'icyiciro"
+
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr ""
+
+#: umldoc.cpp:942
+#, fuzzy
+msgid "state diagram"
+msgstr "Leta "
+
+#: umldoc.cpp:944
+#, fuzzy
+msgid "activity diagram"
+msgstr "Umurimo "
+
+#: umldoc.cpp:946
+#, fuzzy
+msgid "component diagram"
+msgstr "Umurongo w'inyangingo"
+
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr ""
+
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr ""
+
+#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
+#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Name"
+msgstr "Izina"
+
+#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
+#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+#, fuzzy
+msgid "Enter name:"
+msgstr "Izina: : "
+
+#: umldoc.cpp:984 umldoc.cpp:1017
+#, fuzzy
+msgid "That is an invalid name for a diagram."
+msgstr "ni Bitemewe Izina: ya:  A . "
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "Izina si ryo"
+
+#: umldoc.cpp:998 umldoc.cpp:1025
+#, fuzzy
+msgid "A diagram is already using that name."
+msgstr "A ni ikoresha Izina: . "
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
+#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
+#, fuzzy
+msgid "Not a Unique Name"
+msgstr "A "
+
+#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
+#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
+#, fuzzy
+msgid "That is an invalid name."
+msgstr "ni Bitemewe Izina: . "
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
+#: umldoc.cpp:1043 umldoc.cpp:1073
+#, fuzzy
+msgid "That name is already being used."
+msgstr "Izina: ni Byakoreshejwe . "
+
+#: umldoc.cpp:1067 umllistview.cpp:1916
+#, fuzzy
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+msgstr ""
+"Izina: OYA Cyo nyine . \n"
+"iyi ? "
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+#, fuzzy
+msgid "Name Not Unique"
+msgstr "Izina ry'ikibazo"
+
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Use Name"
+msgstr "Izinakoresha"
+
+#: umldoc.cpp:1068 umllistview.cpp:1917
+#, fuzzy
+msgid "Enter New Name"
+msgstr "Kwinjiza izina:"
+
+#: umldoc.cpp:1099
+#, fuzzy
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "Kuri Gusiba %1 ? "
+
+#: umldoc.cpp:1099
+#, fuzzy
+msgid "Delete Diagram"
+msgstr "Gusiba Ikadiri"
+
+#: umldoc.cpp:1573
+#, fuzzy
+msgid "Setting up the document..."
+msgstr "Hejuru i Inyandiko ... "
+
+#: umldoc.cpp:1600
+#, fuzzy
+msgid "Resolving object references..."
+msgstr "Igikoresho Indango ... "
+
+#: umldoc.cpp:1638
+#, fuzzy
+msgid "Loading UML elements..."
+msgstr "Ibintu ... "
+
+#: umldoc.cpp:1811
+#, fuzzy
+msgid "Loading diagrams..."
+msgstr "Mu gufungura imigereka..."
+
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+#, fuzzy
+msgid "kde-uml-Diagram"
+msgstr "kde - - "
+
+#: umldoc.cpp:2104
+#, fuzzy, c-format
+msgid "/autosave%1"
+msgstr "/NyaMwishyingura %1 "
+
+#: umllistview.cpp:348
+#, fuzzy
+msgid "Externalize Folder"
+msgstr "Ububiko bwihariye"
+
+#: umllistview.cpp:416
+#, fuzzy
+msgid "Enter Model Name"
+msgstr "Kwinjiza izina ry'ububiko rishya:"
+
+#: umllistview.cpp:417
+#, fuzzy
+msgid "Enter the new name of the model:"
+msgstr "i Gishya Izina: Bya i Urugero : "
+
+#: umllistview.cpp:1007
+#, fuzzy
+msgid "Views"
+msgstr "Igaragaza"
+
+#: umllistview.cpp:1906
+#, fuzzy
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"Izina: Bitemewe . \n"
+"Kureka . "
+
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+#, fuzzy
+msgid "Name Not Valid"
+msgstr "Izin&a kuri karita:"
+
+#: umllistview.cpp:1923 umllistview.cpp:2160
+#, fuzzy
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"Izina: OYA Cyo nyine ! \n"
+"Kureka . "
+
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+#, fuzzy
+msgid "Creation canceled"
+msgstr "Kureka "
+
+#: umllistview.cpp:2338
+#, fuzzy
+msgid "Loading listview..."
+msgstr "Gufungura Ubutumwa..."
+
+#: umllistview.cpp:2670
+#, fuzzy
+msgid "The folder must be emptied before it can be deleted."
+msgstr "Ububiko... Mbere Kyasibwe: %S . "
+
+#: umllistview.cpp:2671
+#, fuzzy
+msgid "Folder Not Empty"
+msgstr "Ububiko ntibufite ubusa"
+
+#: classifier.cpp:201
+#, fuzzy
+msgid ""
+"An operation with the same name and signature already exists. You can not add "
+"it again."
+msgstr "Igikorwa Na: i Izina: na Isinya . OYA &Ongera Nanone . "
+
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+#, fuzzy
+msgid "Enter Activity Name"
+msgstr "injiza/andika umutwe"
+
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+#, fuzzy
+msgid "new state"
+msgstr "Gishya Leta "
+
+#: association.cpp:84
+#, fuzzy
+msgid "Generalization"
+msgstr "Ibisobanuro rusange"
+
+#: association.cpp:88
+#, fuzzy
+msgid "Self Association"
+msgstr "Ishyirahamwe"
+
+#: association.cpp:89
+#, fuzzy
+msgid "Collaboration Message"
+msgstr "Guhimba Ubutumwa"
+
+#: association.cpp:90
+#, fuzzy
+msgid "Sequence Message"
+msgstr "Kohereza Ubutumwa"
+
+#: association.cpp:91
+#, fuzzy
+msgid "Collaboration Self Message"
+msgstr "Kureka ubutumwa"
+
+#: association.cpp:92
+#, fuzzy
+msgid "Sequence Self Message"
+msgstr "Kureka ubutumwa"
+
+#: association.cpp:95
+#, fuzzy
+msgid "Realization"
+msgstr "Isano"
+
+#: association.cpp:96
+#, fuzzy
+msgid "Uni Association"
+msgstr "Ishyirahamwe"
+
+#. i18n: file umbrelloui.rc line 5
+#: rc.cpp:6
+#, no-c-format
+msgid "&Export"
+msgstr ""
+
+#. i18n: file umbrelloui.rc line 13
+#: rc.cpp:12
+#, fuzzy, no-c-format
+msgid "&Diagram"
+msgstr "Biberamye"
+
+#. i18n: file umbrelloui.rc line 14
+#: rc.cpp:15
+#, no-c-format
+msgid "&New"
+msgstr "Inshya"
+
+#. i18n: file umbrelloui.rc line 31
+#: rc.cpp:18
+#, fuzzy, no-c-format
+msgid "Sh&ow"
+msgstr "Garagaza"
+
+#. i18n: file umbrelloui.rc line 43
+#: rc.cpp:24
+#, fuzzy, no-c-format
+msgid "&Code"
+msgstr "Inyandikoporogaramu"
+
+#. i18n: file umbrelloui.rc line 47
+#: rc.cpp:27
+#, fuzzy, no-c-format
+msgid "Active &Language"
+msgstr "&Ururimi"
+
 #. i18n: file codegenerators/cppcodegenerationformbase.ui line 36
 #: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
 #: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
@@ -36,65 +762,792 @@ msgstr ""
 msgid "Documentation"
 msgstr "Inyandiko"
 
-#: _translatorinfo.cpp:1
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
+#: rc.cpp:33 rc.cpp:156
+#, no-c-format
+msgid "Slash-Slash (//)"
+msgstr ""
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
+#: rc.cpp:36 rc.cpp:159
+#, no-c-format
+msgid "Slash-Star (/**  */)"
+msgstr ""
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
+#: rc.cpp:39 rc.cpp:153 rc.cpp:210
+#, no-c-format
+msgid "Style:"
+msgstr "Imisusire"
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
+#: rc.cpp:42
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">C++ Code Generation</p>"
+msgstr "< p Itunganya = \" Hagati \" > + + </p> "
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
+#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
+#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
+#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
+#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
+#: rc.cpp:225
+#, no-c-format
+msgid "General"
+msgstr "Rusange"
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
+#: rc.cpp:48
+#, no-c-format
+msgid "Method Body Generation"
+msgstr ""
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
+#: rc.cpp:51
+#, fuzzy, no-c-format
+msgid "Use following for classes in generated code:"
+msgstr "ya:  Inzego in Inyandikoporogaramu : "
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
+#: rc.cpp:54
+#, fuzzy, no-c-format
+msgid "QPtrList"
+msgstr "Urutonde"
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
+#: rc.cpp:57 rc.cpp:81
+#, fuzzy, no-c-format
+msgid "vector"
+msgstr "Umukinnyi"
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
+#: rc.cpp:60
+#, fuzzy, no-c-format
+msgid "<b>Variable</b>"
+msgstr "Impinduragaciro"
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
+#: rc.cpp:63 rc.cpp:96
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
+#: rc.cpp:66
+#, fuzzy, no-c-format
+msgid "QString"
+msgstr "Ikurikiranyanyuguti"
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
+#: rc.cpp:69 rc.cpp:90
+#, no-c-format
+msgid "string"
+msgstr "Ikurikiranyanyuguti"
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
+#: rc.cpp:72
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">String</p>"
+msgstr "< p Itunganya = \" Hagati \" > </p> "
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
+#: rc.cpp:75
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">List</p>"
+msgstr "< p Itunganya = \" Hagati \" > </p> "
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
+#: rc.cpp:78
+#, fuzzy, no-c-format
+msgid "qptrlist.h"
+msgstr ". h "
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
+#: rc.cpp:84
+#, fuzzy, no-c-format
+msgid "<i>global?</i>"
+msgstr "<i> &Rusange ? </i> "
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
+#: rc.cpp:87
+#, fuzzy, no-c-format
+msgid "qstring.h"
+msgstr ". h "
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
+#: rc.cpp:93
+#, fuzzy, no-c-format
+msgid "Class name"
+msgstr "izina y'ubwoko"
+
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
+#: rc.cpp:99
+#, fuzzy, no-c-format
+msgid "<i><p align=\"center\">Include file</p></i>"
+msgstr "<i> < p Itunganya = \" Hagati \" > Idosiye </p> </i> "
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
+#: rc.cpp:102
+#, fuzzy, no-c-format
+msgid "Project Generation"
+msgstr "Ibisobanuro by'umushinga"
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
+#: rc.cpp:105
+#, fuzzy, no-c-format
+msgid "Create ANT build document"
+msgstr "Inyandiko "
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
+#: rc.cpp:108 rc.cpp:165
+#, fuzzy, no-c-format
+msgid "Auto-Generate Methods"
+msgstr "&Uburyo bw'Ihamya"
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
+#: rc.cpp:111 rc.cpp:168
+#, no-c-format
+msgid "Empty constructor methods"
+msgstr ""
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
+#: rc.cpp:114 rc.cpp:171
+#, no-c-format
+msgid "Association accessor methods"
+msgstr ""
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
+#: rc.cpp:117 rc.cpp:174
+#, no-c-format
+msgid "Attribute accessor methods"
+msgstr ""
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
+#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
+#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
+#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
+#, no-c-format
+msgid "Public"
+msgstr "Rusange"
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
+#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
+#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
+#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
+#, no-c-format
+msgid "Private"
+msgstr "By'umwihariko"
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
+#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
+#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
+#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
+#, no-c-format
+msgid "Protected"
+msgstr "Rwugawe"
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
+#: rc.cpp:129 rc.cpp:186
+#, fuzzy, no-c-format
+msgid "From Parent Object"
+msgstr "Igikoresho cy'Ifishi"
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
+#: rc.cpp:132 rc.cpp:189
+#, fuzzy, no-c-format
+msgid "Default attribute accessor scope:"
+msgstr "Ikiranga: Ingano: : "
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
+#: rc.cpp:135 rc.cpp:192
+#, fuzzy, no-c-format
+msgid "Default association field scope:"
+msgstr "Ishyirahamwe Umwanya Ingano: : "
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
+#: rc.cpp:147 rc.cpp:204
+#, fuzzy, no-c-format
+msgid "From Parent Role"
+msgstr "Ububiko Mubyeyi"
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
+#: rc.cpp:162
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Java Code Generation</p>"
+msgstr "< p Itunganya = \" Hagati \" > </p> "
+
+#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
+#: rc.cpp:213
+#, fuzzy, no-c-format
+msgid "Hash (#)"
+msgstr "Akanyerezo (Bitsindagiye)"
+
+#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
+#: rc.cpp:216
+#, fuzzy, no-c-format
+msgid "Begin-End (=begin  =end)"
+msgstr "- Impera ( = = Impera ) "
+
+#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
+#: rc.cpp:219
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">Ruby Code Generation</p>"
+msgstr "< p Itunganya = \" Hagati \" > </p> "
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
+#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#, fuzzy, no-c-format
+msgid "Code Generation Options"
+msgstr "Idosiye y'amahitamo y'ikora ry'urusobe"
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
+#: rc.cpp:228
+#, no-c-format
+msgid "Language"
+msgstr "Ururimi"
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
+#: rc.cpp:231
+#, no-c-format
+msgid "Folders"
+msgstr "Ububiko"
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
+#: rc.cpp:234
+#, fuzzy, no-c-format
+msgid "Write all generated files to folder:"
+msgstr "Byose Idosiye Kuri Ububiko... : "
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
+#: rc.cpp:237
+#, fuzzy, no-c-format
+msgid "Bro&wse..."
+msgstr "Gushakisha..."
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
+#: rc.cpp:240
+#, fuzzy, no-c-format
+msgid "B&rowse..."
+msgstr "Gushakisha..."
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
+#: rc.cpp:243
+#, fuzzy, no-c-format
+msgid "&Include heading files from folder:"
+msgstr "Umutwempangano Idosiye Kuva: Ububiko... : "
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
+#: rc.cpp:246
+#, fuzzy, no-c-format
+msgid "Files generated by Code Generator will be written to this folder"
+msgstr "ku Kuri iyi Ububiko... "
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
+#: rc.cpp:249
+#, fuzzy, no-c-format
 msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
+"Files in this folder will be used as heading files in the generated code"
 msgstr ""
-"Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien "
-"NSENGIYUMVA"
+"in iyi Ububiko... Byakoreshejwe Nka Umutwempangano Idosiye in i "
+"Inyandikoporogaramu "
 
-#: _translatorinfo.cpp:3
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
+#: rc.cpp:252
+#, fuzzy, no-c-format
+msgid "Overwrite Policy"
+msgstr "Gusimbuza "
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
+#: rc.cpp:255
+#, fuzzy, no-c-format
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
+"If a file with the same name as the name code \n"
+"generator wants to use as output file already exists:"
 msgstr ""
-"muvia1@yahoo.fr, ngenda_denis@yahoo.co.uk, akiberwa@yahoo.co.uk, "
-"ndonatienuk@yahoo.co.uk"
+"A Idosiye Na: i Izina: Nka i Izina: Inyandikoporogaramu \n"
+"Kuri Koresha Nka Ibisohoka Idosiye : "
 
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "Kuringaniza Ibumoso"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
+#: rc.cpp:259
+#, fuzzy, no-c-format
+msgid "O&verwrite"
+msgstr "Guhindura"
 
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "Kuringaniza Iburyo"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
+#: rc.cpp:262
+#, fuzzy, no-c-format
+msgid "Overwrite existing files if they exist in the destination folder"
+msgstr "Gusimbuza Idosiye NIBA in i Ishyika: Ububiko... "
 
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "Kuringaniza Ahabanza"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
+#: rc.cpp:265
+#, fuzzy, no-c-format
+msgid "As&k"
+msgstr "Kubaza"
 
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "Kuringaniza Impera"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
+#: rc.cpp:268
+#, fuzzy, no-c-format
+msgid "If a file with the same name already exists, ask what to do"
+msgstr "A Idosiye Na: i Izina: , ask Kuri "
 
-#: aligntoolbar.cpp:44
-#, fuzzy
-msgid "AlignQt::Vertical Middle"
-msgstr "Gutondeka hagati impagarike"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
+#: rc.cpp:271
+#, fuzzy, no-c-format
+msgid "&Use a different name"
+msgstr "A Izina: "
 
-#: aligntoolbar.cpp:45
-#, fuzzy
-msgid "AlignQt::Horizontal Middle"
-msgstr "Kuringaniza Hagati mu Butambike"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
+#: rc.cpp:274
+#, fuzzy, no-c-format
+msgid ""
+"If a file already exists in the destination folder, select a different name to "
+"use by adding a suffix to the file name"
+msgstr ""
+"A Idosiye in i Ishyika: Ububiko... , Guhitamo A Izina: Kuri Koresha ku Wongera "
+"A Ingereka Kuri i Idosiye Izina: "
 
-#: aligntoolbar.cpp:46
-#, fuzzy
-msgid "AlignQt::Vertical Distribute"
-msgstr "Gutondeka hagati impagarike"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
+#: rc.cpp:277
+#, no-c-format
+msgid "Formatting"
+msgstr "Ihinduramiterere"
 
-#: aligntoolbar.cpp:47
-#, fuzzy
-msgid "AlignQt::Horizontal Distribute"
-msgstr "Kuringaniza Hagati mu Butambike"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
+#: rc.cpp:280
+#, no-c-format
+msgid "Lines"
+msgstr "Imirongo"
 
-#: aligntoolbar.cpp:383
-#, fuzzy
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
+#: rc.cpp:283
+#, fuzzy, no-c-format
+msgid "Line ending style:"
+msgstr "Imisusire : "
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
+#: rc.cpp:286
+#, fuzzy, no-c-format
+msgid "Indentation type:"
+msgstr "Ubwoko: : "
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
+#: rc.cpp:289
+#, fuzzy, no-c-format
+msgid "Indentation amount:"
+msgstr "Igiteranyo  : "
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
+#: rc.cpp:292
+#, fuzzy, no-c-format
 msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
+"*NIX (\"\\n\")"
 msgstr ""
-"Itunganya Kuri Guhitamo Ku 2 Ibintu nka Inzego Cyangwa . OYA Itunganya . "
+"* ( \" \n"
+"n \" ) "
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
+#: rc.cpp:295
+#, fuzzy, no-c-format
+msgid ""
+"Windows (\"\\r\\n\")"
+msgstr ""
+"( \" \\r \n"
+"n \" ) "
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
+#: rc.cpp:298
+#, fuzzy, no-c-format
+msgid "Mac (\"\\r\")"
+msgstr "MAC"
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
+#: rc.cpp:301
+#, fuzzy, no-c-format
+msgid "No Indentation"
+msgstr "Isunika"
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
+#: rc.cpp:304
+#, no-c-format
+msgid "Tab"
+msgstr "Isimbuka"
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
+#: rc.cpp:307
+#, no-c-format
+msgid "Space"
+msgstr "Umwanya"
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
+#: rc.cpp:310
+#, fuzzy, no-c-format
+msgid "Comment Verbosity"
+msgstr "Ibisobanuro"
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
+#: rc.cpp:313
+#, fuzzy, no-c-format
+msgid ""
+"Write comments &for sections even if section \n"
+"is empty"
+msgstr ""
+"Ibisobanuro ya:  Ibyatoranyijwe ATARIIGIHARWE NIBA Icyiciro \n"
+"ni ubusa "
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
+#: rc.cpp:317
+#, fuzzy, no-c-format
+msgid ""
+"Writes comments to indicate the different sections (public, private etc) in a "
+"class, even if the sections are empty"
+msgstr ""
+"Ibisobanuro Kuri i Ibyatoranyijwe ( public , By'umwihariko ) in A Urwego: , "
+"ATARIIGIHARWE NIBA i Ibyatoranyijwe ubusa "
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
+#: rc.cpp:320
+#, fuzzy, no-c-format
+msgid "&Write documentation comments even if empty"
+msgstr "Inyandiko Ibisobanuro ATARIIGIHARWE NIBA ubusa "
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
+#: rc.cpp:323
+#, fuzzy, no-c-format
+msgid "Write comments &for class and method documentation even if empty"
+msgstr "Ibisobanuro ya:  Urwego: na Uburyo Inyandiko ATARIIGIHARWE NIBA ubusa "
+
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
+#: rc.cpp:326
+#, fuzzy, no-c-format
+msgid "Language Options"
+msgstr "Igice Ururimi"
+
+#. i18n: file dialogs/codegenerationwizardbase.ui line 16
+#: rc.cpp:329
+#, fuzzy, no-c-format
+msgid "Code Generation Wizard"
+msgstr "Nyobora y'iyerekana"
+
+#. i18n: file dialogs/codegenerationwizardbase.ui line 23
+#: rc.cpp:332
+#, fuzzy, no-c-format
+msgid "Select Classes"
+msgstr "Guhitamo idosiye"
+
+#. i18n: file dialogs/codegenerationwizardbase.ui line 41
+#: rc.cpp:335
+#, fuzzy, no-c-format
+msgid ""
+"Place all the classes you want to generate code\n"
+"for in the right hand side list"
+msgstr "Byose i Inzego Kuri in i Iburyo: Urutonde "
+
+#. i18n: file dialogs/codegenerationwizardbase.ui line 78
+#: rc.cpp:339
+#, fuzzy, no-c-format
+msgid "Add class for code generation"
+msgstr "Urwego: ya:  Inyandikoporogaramu "
+
+#. i18n: file dialogs/codegenerationwizardbase.ui line 101
+#: rc.cpp:342
+#, fuzzy, no-c-format
+msgid "Classes Selected"
+msgstr "&Kubika Ibyatoranyijwe"
+
+#. i18n: file dialogs/codegenerationwizardbase.ui line 136
+#: rc.cpp:345
+#, fuzzy, no-c-format
+msgid "Remove class from Code Generation"
+msgstr "Urwego: Kuva: "
+
+#. i18n: file dialogs/codegenerationwizardbase.ui line 159
+#: rc.cpp:348
+#, fuzzy, no-c-format
+msgid "Classes Available"
+msgstr "I(bi)huzagihe (b)ihari"
+
+#. i18n: file dialogs/codegenerationwizardbase.ui line 209
+#: rc.cpp:351
+#, fuzzy, no-c-format
+msgid "Code Generation Status"
+msgstr "Imimerere y'ukwihuza"
+
+#. i18n: file dialogs/codegenerationwizardbase.ui line 226
+#: rc.cpp:354
+#, fuzzy, no-c-format
+msgid "Press the Generation button to start the code generation"
+msgstr "i Akabuto Kuri Tangira &vendorShortName; i Inyandikoporogaramu "
+
+#. i18n: file dialogs/codegenerationwizardbase.ui line 234
+#: rc.cpp:357 rc.cpp:363
+#, fuzzy, no-c-format
+msgid "Generation Status"
+msgstr "Imimerere y'ukwihuza"
+
+#. i18n: file dialogs/codeviewerdialogbase.ui line 21
+#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
+#, fuzzy, no-c-format
+msgid "Code Viewer"
+msgstr "Gufunga Igaragaza"
+
+#. i18n: file dialogs/codeviewerdialogbase.ui line 43
+#: rc.cpp:369
+#, fuzzy, no-c-format
+msgid "Show hidden blocks"
+msgstr "Birahishe "
+
+#. i18n: file dialogs/codeviewerdialogbase.ui line 59
+#: rc.cpp:372
+#, fuzzy, no-c-format
+msgid "<p align=\"center\">component name here</p>"
+msgstr "< p Itunganya = \" Hagati \" > Izina: </p> "
+
+#. i18n: file dialogs/codeviewerdialogbase.ui line 86
+#: rc.cpp:378
+#, fuzzy, no-c-format
+msgid "Show block type"
+msgstr "Funga Ubwoko: "
+
+#. i18n: file dialogs/codevieweroptionsbase.ui line 45
+#: rc.cpp:381
+#, no-c-format
+msgid "Colors"
+msgstr "Amabara"
+
+#. i18n: file dialogs/codevieweroptionsbase.ui line 72
+#: rc.cpp:384
+#, no-c-format
+msgid "Font:"
+msgstr "Imyandikire:"
+
+#. i18n: file dialogs/codevieweroptionsbase.ui line 103
+#: rc.cpp:387
+#, fuzzy, no-c-format
+msgid "Paper:"
+msgstr "urupapuro"
+
+#. i18n: file dialogs/codevieweroptionsbase.ui line 134
+#: rc.cpp:390
+#, fuzzy, no-c-format
+msgid "Selected:"
+msgstr "Byatoranyijwe:"
+
+#. i18n: file dialogs/codevieweroptionsbase.ui line 260
+#: rc.cpp:393
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">UML object block:</p>"
+msgstr "< p Itunganya = \" Iburyo: \" > Igikoresho Funga : </p> "
+
+#. i18n: file dialogs/codevieweroptionsbase.ui line 276
+#: rc.cpp:396
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Hidden block:</p>"
+msgstr "< p Itunganya = \" Iburyo: \" > Funga : </p> "
+
+#. i18n: file dialogs/codevieweroptionsbase.ui line 294
+#: rc.cpp:399
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Uneditable text:</p>"
+msgstr "< p Itunganya = \" Iburyo: \" > Umwandiko : </p> "
+
+#. i18n: file dialogs/codevieweroptionsbase.ui line 333
+#: rc.cpp:402
+#, fuzzy, no-c-format
+msgid "<p align=\"right\">Editable text:</p>"
+msgstr "< p Itunganya = \" Iburyo: \" > Umwandiko : </p> "
+
+#. i18n: file dialogs/diagrampropertiespage.ui line 30
+#: rc.cpp:405
+#, fuzzy, no-c-format
+msgid "Diagram Properties"
+msgstr "Ibiranga Ikadiri"
+
+#. i18n: file dialogs/diagrampropertiespage.ui line 61
+#: dialogs/assocgenpage.cpp:67 rc.cpp:408
+#, no-c-format
+msgid "Name:"
+msgstr "Izina:"
+
+#. i18n: file dialogs/diagrampropertiespage.ui line 92
+#: rc.cpp:411
+#, fuzzy, no-c-format
+msgid "Zoom:"
+msgstr "Ihindurangano..."
+
+#. i18n: file dialogs/diagrampropertiespage.ui line 119
+#: rc.cpp:414
+#, no-c-format
+msgid "%"
+msgstr "%"
+
+#. i18n: file dialogs/diagrampropertiespage.ui line 146
+#: dialogs/settingsdlg.cpp:242 rc.cpp:417
+#, fuzzy, no-c-format
+msgid "Show operation signature"
+msgstr "Igikorwa Isinya "
+
+#. i18n: file dialogs/diagrampropertiespage.ui line 186
+#: rc.cpp:420
+#, fuzzy, no-c-format
+msgid "Show &grid"
+msgstr "Urusobetudirishya "
+
+#. i18n: file dialogs/diagrampropertiespage.ui line 194
+#: rc.cpp:423
+#, fuzzy, no-c-format
+msgid "Snap &to grid"
+msgstr "Gukata ku Rusobe- tudirishya"
+
+#. i18n: file dialogs/diagrampropertiespage.ui line 202
+#: rc.cpp:426
+#, fuzzy, no-c-format
+msgid "Snap component size"
+msgstr "Ingano: "
+
+#. i18n: file dialogs/diagrampropertiespage.ui line 206
+#: rc.cpp:429
+#, fuzzy, no-c-format
+msgid ""
+"Snap the size of the components to be a multiple of the grid spacing.\n"
+"If 'Snap to Grid' is enabled a component will always be aligned with the grid "
+"on all 4 sides."
+msgstr ""
+"i Ingano: Bya i Kuri A Igikubo Bya i Urusobetudirishya Itandukanya: . \n"
+"' Kuri ni Bikora A Buri gihe Na: i Urusobetudirishya ku Byose 4 . "
+
+#. i18n: file dialogs/diagrampropertiespage.ui line 257
+#: rc.cpp:433
+#, fuzzy, no-c-format
+msgid "Grid spacing:  "
+msgstr "Itandukanya: : "
+
+#. i18n: file dialogs/diagrampropertiespage.ui line 265
+#: rc.cpp:436
+#, no-c-format
+msgid "X"
+msgstr "X"
+
+#. i18n: file dialogs/diagrampropertiespage.ui line 284
+#: rc.cpp:439
+#, no-c-format
+msgid "Y"
+msgstr "Y"
+
+#. i18n: file dialogs/diagrampropertiespage.ui line 346
+#: rc.cpp:442
+#, fuzzy, no-c-format
+msgid "Line width:  "
+msgstr "Ubugari bw'Umurongo"
+
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
+#: rc.cpp:448
+#, fuzzy, no-c-format
+msgid "Export all views"
+msgstr "Nka ... "
+
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
+#: rc.cpp:451
+#, no-c-format
+msgid "&Directory to save the diagrams in:"
+msgstr ""
+
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 55
+#: rc.cpp:454 rc.cpp:457
+#, no-c-format
+msgid "The base directory used to save the images"
+msgstr ""
+
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
+#: rc.cpp:460
+#, fuzzy, no-c-format
+msgid "&Image type:"
+msgstr "Ubwoko: : "
+
+#. 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 ""
+
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
+#: rc.cpp:466
+#, fuzzy, no-c-format
+msgid "Use &folders"
+msgstr "Ububiko"
+
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
+#: rc.cpp:469
+#, no-c-format
+msgid ""
+"Create in the target directory the same tree structure used\n"
+"in the document to store the views"
+msgstr ""
+
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
+#: rc.cpp:473
+#, no-c-format
+msgid ""
+"The views are stored in folders in the document. The same tree structure used "
+"in the document to store the views can be created in the selected base "
+"directory with this option.\n"
+"Only the folders made by the user are created in the base directory (Logical "
+"view, use case view and so on aren't created)."
+msgstr ""
+
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
+#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#, fuzzy, no-c-format
+msgid "Role Properties"
+msgstr "Ibiranga ububiko"
+
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
+#, fuzzy, no-c-format
+msgid "Rolename:"
+msgstr "Guhindura izina"
+
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
+#, fuzzy, no-c-format
+msgid "Multiplicity:"
+msgstr "kuba"
+
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
+#: rc.cpp:495
+#, fuzzy, no-c-format
+msgid "Role Changeability"
+msgstr "Guhindura Ubwijime"
+
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
+#, fuzzy, no-c-format
+msgid "Add only"
+msgstr "Kongeraho ibyatanzwe gusa"
+
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
+#, fuzzy, no-c-format
+msgid "Frozen"
+msgstr "Imbere"
+
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
+#, fuzzy, no-c-format
+msgid "Changeable"
+msgstr "Guhindura Urwego"
+
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
+#: rc.cpp:507
+#, fuzzy, no-c-format
+msgid "Role Visibility"
+msgstr "igaragara"
+
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
+#, fuzzy, no-c-format
+msgid "Implementation"
+msgstr "Inyandiko"
 
 #: tips.txt:3
 #, fuzzy
@@ -274,220 +1727,506 @@ msgid ""
 msgstr ""
 "<p> Kurema na Imikorere A Gishya Urwego: ikoresha i in i Ibikubiyemo . </p> \n"
 
-#: umllistview.cpp:348
+#: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 #, fuzzy
-msgid "Externalize Folder"
-msgstr "Ububiko bwihariye"
+msgid "Change Font..."
+msgstr "Guhindura Imyandikire"
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
-#: umlviewimageexportermodel.cpp:158
-#, fuzzy, c-format
-msgid "There was a problem saving file: %1"
-msgstr "A Mu kubika Idosiye : %1 "
+#: listpopupmenu.cpp:233
+msgid "Delete Selected Items"
+msgstr "Gusiba Ibigize byatoranijwe"
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
-#: umllistview.cpp:385
-msgid "Save Error"
-msgstr "Bika ikosa"
+#: listpopupmenu.cpp:240 listpopupmenu.cpp:718
+#, fuzzy
+msgid "Draw as Circle"
+msgstr "Nka "
 
-#: umllistview.cpp:416
+#: listpopupmenu.cpp:243 listpopupmenu.cpp:720
 #, fuzzy
-msgid "Enter Model Name"
-msgstr "Kwinjiza izina ry'ububiko rishya:"
+msgid "Change into Class"
+msgstr "Byahinduwe ku"
 
-#: umllistview.cpp:417
+#: listpopupmenu.cpp:247 listpopupmenu.cpp:726
 #, fuzzy
-msgid "Enter the new name of the model:"
-msgstr "i Gishya Izina: Bya i Urugero : "
+msgid "Change into Interface"
+msgstr "Guhindura Imyandikire y'Imigaragarire y'Ukoresha"
 
-#: umllistview.cpp:1007
+#: listpopupmenu.cpp:281 listpopupmenu.cpp:1155
 #, fuzzy
-msgid "Views"
-msgstr "Igaragaza"
+msgid "Enum Literal..."
+msgstr "Kongera Kwita Urutonde..."
 
-#: umllistview.cpp:1906
+#: listpopupmenu.cpp:292 listpopupmenu.cpp:1143
 #, fuzzy
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"Izina: Bitemewe . \n"
-"Kureka . "
+msgid "Entity Attribute..."
+msgstr "Guhindura Ibijyanye..."
 
-#: umllistview.cpp:1907 umllistviewitem.cpp:479
+#: listpopupmenu.cpp:318
+msgid "Move Up"
+msgstr "Kuzamura"
+
+#: listpopupmenu.cpp:319
+msgid "Move Down"
+msgstr "Kumanura/Kumanuka"
+
+#: listpopupmenu.cpp:325
 #, fuzzy
-msgid "Name Not Valid"
-msgstr "Izin&a kuri karita:"
+msgid "Rename Class..."
+msgstr "Kongera Kwita Urutonde..."
 
-#: umldoc.cpp:1067 umllistview.cpp:1916
+#: listpopupmenu.cpp:326
 #, fuzzy
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"Izina: OYA Cyo nyine . \n"
-"iyi ? "
+msgid "Rename Object..."
+msgstr "Kwita izina ikintu bundi bushya:"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
-#: umllistview.cpp:1924 umllistview.cpp:2161
+#: listpopupmenu.cpp:334 listpopupmenu.cpp:423 listpopupmenu.cpp:564
 #, fuzzy
-msgid "Name Not Unique"
-msgstr "Izina ry'ikibazo"
+msgid "New Operation..."
+msgstr "Isano Rishya..."
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: listpopupmenu.cpp:335 listpopupmenu.cpp:424 listpopupmenu.cpp:1302
 #, fuzzy
-msgid "Use Name"
-msgstr "Izinakoresha"
+msgid "Select Operation..."
+msgstr "Kugena Ibikorwa"
 
-#: umldoc.cpp:1068 umllistview.cpp:1917
+#: listpopupmenu.cpp:346 listpopupmenu.cpp:430
 #, fuzzy
-msgid "Enter New Name"
-msgstr "Kwinjiza izina:"
+msgid "Change Text..."
+msgstr "Guhindura imbonerahamwe..."
 
-#: umllistview.cpp:1923 umllistview.cpp:2160
+#: listpopupmenu.cpp:360 listpopupmenu.cpp:579 listpopupmenu.cpp:1043
 #, fuzzy
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"Izina: OYA Cyo nyine ! \n"
-"Kureka . "
+msgid "Activity..."
+msgstr "Umurimo"
 
-#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+#: listpopupmenu.cpp:366
 #, fuzzy
-msgid "Creation canceled"
-msgstr "Kureka "
+msgid "Change State Name..."
+msgstr "Hindura izina ry'umwanya"
 
-#: umllistview.cpp:2338
+#: listpopupmenu.cpp:376
 #, fuzzy
-msgid "Loading listview..."
-msgstr "Gufungura Ubutumwa..."
+msgid "FlipQt::Horizontal"
+msgstr "Guhindukiza intambike"
 
-#: umllistview.cpp:2670
+#: listpopupmenu.cpp:378
 #, fuzzy
-msgid "The folder must be emptied before it can be deleted."
-msgstr "Ububiko... Mbere Kyasibwe: %S . "
+msgid "FlipQt::Vertical"
+msgstr "Guhindukiza ubuhagarike"
 
-#: umllistview.cpp:2671
+#: listpopupmenu.cpp:388
 #, fuzzy
-msgid "Folder Not Empty"
-msgstr "Ububiko ntibufite ubusa"
+msgid "Change Activity Name..."
+msgstr "Hindura igikorwa..."
 
-#: codegenerator.cpp:473
+#: listpopupmenu.cpp:397 listpopupmenu.cpp:400 listpopupmenu.cpp:1268
+#: listpopupmenu.cpp:1272
 #, fuzzy
-msgid ""
-"Cannot open file %1 for writing. Please make sure the folder exists and you "
-"have permissions to write to it."
-msgstr ""
-"Gufungura Idosiye %1 ya:  . Ubwoko i Ububiko... na Uruhushya Kuri Kwandika Kuri "
-". "
+msgid "Change Multiplicity..."
+msgstr "Guhindura Politike..."
 
-#: codegenerator.cpp:473
+#: listpopupmenu.cpp:403 listpopupmenu.cpp:1276
 #, fuzzy
-msgid "Cannot Open File"
-msgstr "Gufungura Idosiye "
+msgid "Change Name"
+msgstr "Guhindura izina"
 
-#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
+#: listpopupmenu.cpp:406 listpopupmenu.cpp:1260 listpopupmenu.cpp:1282
 #, fuzzy
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"Kurema i Ububiko... : \n"
+msgid "Change Role A Name..."
+msgstr "A ... "
 
-#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
+#: listpopupmenu.cpp:409 listpopupmenu.cpp:1264 listpopupmenu.cpp:1283
 #, fuzzy
-msgid ""
-"\n"
-"Please check the access rights"
+msgid "Change Role B Name..."
+msgstr "Hindura izina ry'umwanya"
+
+#: listpopupmenu.cpp:461
+msgid "New"
+msgstr "Gishya"
+
+#: listpopupmenu.cpp:471 listpopupmenu.cpp:1306
+msgid "Rename..."
+msgstr "Guhindura Izina..."
+
+#: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
+#, fuzzy
+msgid "Line Color..."
+msgstr "Ibara ry'umurongo"
+
+#: listpopupmenu.cpp:492
+#, fuzzy
+msgid "Expand All"
+msgstr "Kwagura"
+
+#: listpopupmenu.cpp:495
+#, fuzzy
+msgid "Collapse All"
+msgstr "Gusenyuka"
+
+#: listpopupmenu.cpp:498
+msgid "Duplicate"
+msgstr "Gusubiramo"
+
+#: listpopupmenu.cpp:501
+#, fuzzy
+msgid "Externalize Folder..."
+msgstr "Hindura izina ry'ububiko..."
+
+#: listpopupmenu.cpp:504
+#, fuzzy
+msgid "Internalize Folder"
+msgstr "Ububiko Butari bwo"
+
+#: listpopupmenu.cpp:507
+#, fuzzy
+msgid "Import Classes..."
+msgstr "Kuzana Inyandirugero..."
+
+#: listpopupmenu.cpp:512
+msgid "Subsystem"
 msgstr ""
-"\n"
-"Kugenzura i "
 
-#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
+#: listpopupmenu.cpp:521 uml.cpp:426
 #, fuzzy
-msgid "Cannot Create Folder"
-msgstr "Isubiranyuma: Kurema Ububiko"
+msgid "Component Diagram..."
+msgstr "Umurongo w'inyangingo"
 
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
+#: listpopupmenu.cpp:528 uml.cpp:427
+#, fuzzy
+msgid "Deployment Diagram..."
+msgstr "Muyobora Nyandiko..."
+
+#: listpopupmenu.cpp:535 listpopupmenu.cpp:608
+msgid "Folder"
+msgstr "Ububiko"
+
+#: listpopupmenu.cpp:541 uml.cpp:428
+#, fuzzy
+msgid "Entity Relationship Diagram..."
+msgstr "Amasano..."
+
+#: listpopupmenu.cpp:551 uml.cpp:423
+msgid "Use Case Diagram..."
 msgstr ""
 
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+#: listpopupmenu.cpp:555
 #, fuzzy
-msgid "Enter State Name"
-msgstr "Kwinjiza izina:"
+msgid "Text Line..."
+msgstr "Umwanya w'inyandiko..."
 
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+#: listpopupmenu.cpp:558
 #, fuzzy
-msgid "Enter the name of the new state:"
-msgstr "i Izina: Bya i Gishya Leta : "
+msgid "Reset Label Positions"
+msgstr "&Gusubizaho uburyo bushaje "
 
-#: toolbarstateother.cpp:148 umlview.cpp:2511
+#: listpopupmenu.cpp:561
 #, fuzzy
-msgid "new state"
-msgstr "Gishya Leta "
+msgid "New Parameter..."
+msgstr "Mucapyi nshya..."
 
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+#: listpopupmenu.cpp:567
 #, fuzzy
-msgid "Enter Activity Name"
-msgstr "injiza/andika umutwe"
+msgid "New Attribute..."
+msgstr "Ibiranga..."
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
+#: listpopupmenu.cpp:570 listpopupmenu.cpp:1232
 #, fuzzy
-msgid "Enter the name of the new activity:"
-msgstr "i Izina: Bya i Gishya Umurimo : "
+msgid "New Template..."
+msgstr "Inyandikorugero nshya"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
+#: listpopupmenu.cpp:573
 #, fuzzy
-msgid "new activity"
-msgstr "Gishya Umurimo "
+msgid "New Literal..."
+msgstr "Urutonde rushya..."
 
-#: umlview.cpp:2578
+#: listpopupmenu.cpp:576
 #, fuzzy
-msgid "Enter Diagram Name"
-msgstr "Kwinjiza irinda zina:"
+msgid "New Entity Attribute..."
+msgstr "Guhindura Ibijyanye..."
 
-#: umlview.cpp:2579
+#: listpopupmenu.cpp:582
 #, fuzzy
-msgid "Enter the new name of the diagram:"
-msgstr "i Gishya Izina: Bya i : "
+msgid "Export as Picture..."
+msgstr "Nka ... "
 
-#: umlview.cpp:2736
+#: listpopupmenu.cpp:615 uml.cpp:420
 #, fuzzy
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr "Urabyemeyekoko."
+msgid "Class Diagram..."
+msgstr "Inzira y'Urwego..."
 
-#: umlview.cpp:2738
+#: listpopupmenu.cpp:616 uml.cpp:424
 #, fuzzy
-msgid "Delete Diagram?"
-msgstr "Gusiba ibyatanzwe?"
+msgid "State Diagram..."
+msgstr "Itangira..."
 
-#: operation.cpp:185
+#: listpopupmenu.cpp:617 uml.cpp:425
 #, fuzzy
-msgid "new_parameter"
-msgstr "Ikintu"
+msgid "Activity Diagram..."
+msgstr "Ikyerekana igikorwa"
+
+#: listpopupmenu.cpp:618 uml.cpp:421
+#, fuzzy
+msgid "Sequence Diagram..."
+msgstr "Igenzura ry'icyiciro"
+
+#: listpopupmenu.cpp:619 uml.cpp:422
+#, fuzzy
+msgid "Collaboration Diagram..."
+msgstr "Ikadiri Ireremba..."
+
+#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
+#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
+msgid "Attributes"
+msgstr "Ibiranga"
+
+#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
+#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
+msgid "Operations"
+msgstr "Ibikorwa"
+
+#: listpopupmenu.cpp:676
+#, fuzzy
+msgid "Public Only"
+msgstr "Ifunguzo ngenga"
+
+#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
+#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
+#: listpopupmenu.cpp:678
+msgid "Visibility"
+msgstr "igaragara"
+
+#: listpopupmenu.cpp:680
+#, fuzzy
+msgid "Operation Signature"
+msgstr "Gushyiraho Umukono"
+
+#: listpopupmenu.cpp:686
+#, fuzzy
+msgid "Attribute Signature"
+msgstr "izina y'ikiranga"
 
 #: listpopupmenu.cpp:695 stereotype.cpp:76
 #, fuzzy
 msgid "Stereotype"
 msgstr "Ubwoko bw'ibyiciro"
 
-#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "Garagaza"
+
+#: listpopupmenu.cpp:707
 #, fuzzy
-msgid "Enter name:"
-msgstr "Izina: : "
+msgid "Attribute..."
+msgstr "Ikiranga:"
 
-#: codeimport/classimport.cpp:34
+#: listpopupmenu.cpp:708
 #, fuzzy
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "Idosiye : %1 "
+msgid "Operation..."
+msgstr "Igikorwa"
+
+#: listpopupmenu.cpp:722
+#, fuzzy
+msgid "Refactor"
+msgstr "impamvu/intandaro"
+
+#: listpopupmenu.cpp:723
+#, fuzzy
+msgid "View Code"
+msgstr "&Uburyo bw'Igaragaza"
+
+#: listpopupmenu.cpp:735 listpopupmenu.cpp:746
+#, fuzzy
+msgid "Fill Color..."
+msgstr "Ibara ryo kuzuza"
+
+#: listpopupmenu.cpp:736 listpopupmenu.cpp:747
+#, fuzzy
+msgid "Use Fill Color"
+msgstr "Kuzuzamo Ibara"
+
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
+#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
+#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
+#: listpopupmenu.cpp:750
+msgid "Color"
+msgstr "Ibara"
+
+#: listpopupmenu.cpp:1007
+#, fuzzy
+msgid "Actor..."
+msgstr "Umukinnyi"
+
+#: listpopupmenu.cpp:1008
+#, fuzzy
+msgid "Use Case..."
+msgstr "Kudatoranya..."
+
+#: listpopupmenu.cpp:1017
+#, fuzzy
+msgid "Class..."
+msgstr "Urwego:"
+
+#: listpopupmenu.cpp:1018
+#, fuzzy
+msgid "Interface..."
+msgstr "Imigaragarire"
+
+#: listpopupmenu.cpp:1019
+#, fuzzy
+msgid "Datatype..."
+msgstr "Ubwoko bw'ibyatanzwe"
+
+#: listpopupmenu.cpp:1020
+#, fuzzy
+msgid "Enum..."
+msgstr "Guhindura Izina..."
+
+#: listpopupmenu.cpp:1021
+#, fuzzy
+msgid "Package..."
+msgstr "Porogaramu"
+
+#: listpopupmenu.cpp:1032
+#, fuzzy
+msgid "State..."
+msgstr "leta:"
+
+#: listpopupmenu.cpp:1053
+#, fuzzy
+msgid "Subsystem..."
+msgstr "leta:"
+
+#: listpopupmenu.cpp:1054
+#, fuzzy
+msgid "Component..."
+msgstr "Igisobanuro..."
+
+#: listpopupmenu.cpp:1055
+#, fuzzy
+msgid "Artifact..."
+msgstr "Kurinda"
+
+#: listpopupmenu.cpp:1063
+#, fuzzy
+msgid "Node..."
+msgstr "Icyitonderwa..."
+
+#: listpopupmenu.cpp:1071
+#, fuzzy
+msgid "Entity..."
+msgstr "Icyinjizwa..."
+
+#: listpopupmenu.cpp:1080
+msgid "Object..."
+msgstr "Ikintu"
+
+#: listpopupmenu.cpp:1089
+msgid "Attribute"
+msgstr "Ikiranga"
+
+#: listpopupmenu.cpp:1090 listpopupmenu.cpp:1099
+msgid "Operation"
+msgstr "Igikorwa"
+
+#: listpopupmenu.cpp:1091 listpopupmenu.cpp:1100
+#, fuzzy
+msgid "Template"
+msgstr "Nyandiko- rugero"
+
+#: listpopupmenu.cpp:1256
+#, fuzzy
+msgid "Delete Anchor"
+msgstr "Gusiba ibara"
+
+#: listpopupmenu.cpp:1281
+#, fuzzy
+msgid "Change Association Name..."
+msgstr "Hindura indanganturo..."
+
+#: listpopupmenu.cpp:1339
+#, fuzzy
+msgid "Clear Diagram"
+msgstr "Gukuraho Ishakisha"
+
+#: listpopupmenu.cpp:1342
+msgid "Snap to Grid"
+msgstr "Gukata ku Rusobe-tudirishya"
+
+#: listpopupmenu.cpp:1344
+#, fuzzy
+msgid "Show Grid"
+msgstr "Kwerekana Itsinda"
+
+#: main.cpp:32 main.cpp:93
+msgid "Umbrello UML Modeller"
+msgstr ""
+
+#: main.cpp:40
+#, fuzzy
+msgid "File to open"
+msgstr "Idosiye Kuri Gufungura "
+
+#: main.cpp:41
+#, fuzzy
+msgid "export diagrams to extension and exit"
+msgstr "Kwohereza hanze... Kuri Umugereka: na &Kuvamo "
+
+#: main.cpp:42
+msgid "the local directory to save the exported diagrams in"
+msgstr ""
+
+#: main.cpp:42
+msgid "the directory of the file"
+msgstr ""
+
+#: main.cpp:43
+msgid ""
+"keep the tree structure used to store the views in the document in the target "
+"directory"
+msgstr ""
+
+#: main.cpp:95
+#, fuzzy
+msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
+msgstr "( C ) , ( C ) - "
+
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+#, fuzzy
+msgid "Incorrect use of associations."
+msgstr "Koresha Bya . "
+
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+#, fuzzy
+msgid "Association Error"
+msgstr "Ikosa "
+
+#: folder.cpp:289
+#, fuzzy
+msgid "The folderfile %1 does not exist."
+msgstr "%1 OYA . "
+
+#: folder.cpp:293
+#, fuzzy
+msgid "The folderfile %1 cannot be opened."
+msgstr "Idosiye ntishobora gufungurwa"
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+"Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien "
+"NSENGIYUMVA"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+"muvia1@yahoo.fr, ngenda_denis@yahoo.co.uk, akiberwa@yahoo.co.uk, "
+"ndonatienuk@yahoo.co.uk"
 
 #: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
 #: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
@@ -497,6 +2236,18 @@ msgstr "Idosiye : %1 "
 msgid "Ready."
 msgstr "Cyiteguye."
 
+#: umlwidgetcontroller.cpp:128
+msgid ""
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
+"Right button click to cancel move."
+msgstr ""
+
+#: umlwidgetcontroller.cpp:379
+msgid ""
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
+"Right button click to cancel resize."
+msgstr ""
+
 #: codeimport/import_utils.cpp:181
 #, fuzzy
 msgid "Is the scope %1 a namespace or a class?"
@@ -511,13 +2262,10 @@ msgstr ""
 msgid "Namespace"
 msgstr "Imyanyazina"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 249
-#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
-#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
-#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
-#, no-c-format
-msgid "Class"
-msgstr "ishuri,urwego"
+#: codeimport/classimport.cpp:34
+#, fuzzy
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "Idosiye : %1 "
 
 #: codeimport/kdevcppparser/errors.cpp:23
 msgid "Internal Error"
@@ -656,6 +2404,139 @@ msgstr "ya:  Itangiza... Ikitezwe: $(ARG1) "
 msgid "catch expected"
 msgstr "Ikitezwe: $(ARG1) "
 
+#: objectwidget.cpp:90
+#, fuzzy
+msgid "Rename Object"
+msgstr "Ongera wite Izina"
+
+#: objectwidget.cpp:91
+#, fuzzy
+msgid "Enter object name:"
+msgstr "Igikoresho Izina: : "
+
+#: operation.cpp:185
+#, fuzzy
+msgid "new_parameter"
+msgstr "Ikintu"
+
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "Amahitamo Rusange"
+
+#: codegenerators/cppcodegenerationform.cpp:38
+#, fuzzy
+msgid "Package is a namespace"
+msgstr "ni A "
+
+#: codegenerators/cppcodegenerationform.cpp:41
+#, fuzzy
+msgid "Virtual destructors"
+msgstr "Name=Ibiro Bitagaragara"
+
+#: codegenerators/cppcodegenerationform.cpp:44
+#, fuzzy
+msgid "Generate empty constructors"
+msgstr "ubusa "
+
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr ""
+
+#: codegenerators/cppcodegenerationform.cpp:50
+#, fuzzy
+msgid "Operations are inline"
+msgstr "Mumurongo "
+
+#: codegenerators/cppcodegenerationform.cpp:53
+#, fuzzy
+msgid "Accessors are inline"
+msgstr "Mumurongo "
+
+#: codegenerators/cppcodegenerationform.cpp:57
+#, fuzzy
+msgid "Accessors are public"
+msgstr "public "
+
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr ""
+
+#: umlview.cpp:2578
+#, fuzzy
+msgid "Enter Diagram Name"
+msgstr "Kwinjiza irinda zina:"
+
+#: umlview.cpp:2579
+#, fuzzy
+msgid "Enter the new name of the diagram:"
+msgstr "i Gishya Izina: Bya i : "
+
+#: umlview.cpp:2736
+#, fuzzy
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr "Urabyemeyekoko."
+
+#: umlview.cpp:2738
+#, fuzzy
+msgid "Delete Diagram?"
+msgstr "Gusiba ibyatanzwe?"
+
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+#, fuzzy
+msgid "Rename canceled"
+msgstr "Kureka "
+
+#: umllistviewitem.cpp:468
+#, fuzzy
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "Ikintu Bya Ubwoko: %1 ni OYA . "
+
+#: umllistviewitem.cpp:469
+#, fuzzy
+msgid "Function Not Implemented"
+msgstr "Igikorwa nticyashobotse"
+
+#: umllistviewitem.cpp:478
+#, fuzzy
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"Izina: Bitemewe . \n"
+"Kureka . "
+
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+#, fuzzy
+msgid "new_association"
+msgstr "Ishyirahamwe"
+
+#: umlcanvasobject.cpp:150
+#, fuzzy
+msgid "new_attribute"
+msgstr "Ibiranga umurongo"
+
+#: umlcanvasobject.cpp:153
+#, fuzzy
+msgid "new_template"
+msgstr "Inyandikorugero nshya"
+
+#: umlcanvasobject.cpp:156
+#, fuzzy
+msgid "new_operation"
+msgstr "Igikorwa"
+
+#: umlcanvasobject.cpp:159
+#, fuzzy
+msgid "new_literal"
+msgstr "By'imbere"
+
+#: umlcanvasobject.cpp:162
+#, fuzzy
+msgid "new_field"
+msgstr "umwanya"
+
 #: uml.cpp:179
 msgid "&Export model to DocBook"
 msgstr ""
@@ -926,50 +2807,6 @@ msgstr "Umwanya w'ibikoresho w'igipapuro"
 msgid "Alignment Toolbar"
 msgstr "Itunganya"
 
-#: listpopupmenu.cpp:615 uml.cpp:420
-#, fuzzy
-msgid "Class Diagram..."
-msgstr "Inzira y'Urwego..."
-
-#: listpopupmenu.cpp:618 uml.cpp:421
-#, fuzzy
-msgid "Sequence Diagram..."
-msgstr "Igenzura ry'icyiciro"
-
-#: listpopupmenu.cpp:619 uml.cpp:422
-#, fuzzy
-msgid "Collaboration Diagram..."
-msgstr "Ikadiri Ireremba..."
-
-#: listpopupmenu.cpp:551 uml.cpp:423
-msgid "Use Case Diagram..."
-msgstr ""
-
-#: listpopupmenu.cpp:616 uml.cpp:424
-#, fuzzy
-msgid "State Diagram..."
-msgstr "Itangira..."
-
-#: listpopupmenu.cpp:617 uml.cpp:425
-#, fuzzy
-msgid "Activity Diagram..."
-msgstr "Ikyerekana igikorwa"
-
-#: listpopupmenu.cpp:521 uml.cpp:426
-#, fuzzy
-msgid "Component Diagram..."
-msgstr "Umurongo w'inyangingo"
-
-#: listpopupmenu.cpp:528 uml.cpp:427
-#, fuzzy
-msgid "Deployment Diagram..."
-msgstr "Muyobora Nyandiko..."
-
-#: listpopupmenu.cpp:541 uml.cpp:428
-#, fuzzy
-msgid "Entity Relationship Diagram..."
-msgstr "Amasano..."
-
 #: uml.cpp:458
 #, fuzzy
 msgid "&Tree View"
@@ -1078,11 +2915,6 @@ msgstr ""
 "OYA Komeka i Ububikokoporora Ibigize . Ibintu in i Ububikokoporora Gicurasi Bya "
 "i Ubwoko: Kuri . "
 
-#: clipboard/umlclipboard.cpp:691 uml.cpp:851
-#, fuzzy
-msgid "Paste Error"
-msgstr "Ikosa "
-
 #: uml.cpp:863
 #, fuzzy
 msgid "Toggling toolbar..."
@@ -1144,627 +2976,233 @@ msgstr "Amadosiye yose"
 msgid "Select Code to Import"
 msgstr "Kuri "
 
-#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
-#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Name"
-msgstr "Izina"
-
-#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
-#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
-#, fuzzy
-msgid "That is an invalid name."
-msgstr "ni Bitemewe Izina: . "
-
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "Izina si ryo"
-
-#: object_factory.cpp:164
-#, fuzzy
-msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "ni A Ijambo-banze ya:  i Ururimi: Bya i Inyandikoporogaramu . "
-
-#: object_factory.cpp:165
-#, fuzzy
-msgid "Reserved Keyword"
-msgstr "Imvugo idakorwaho"
-
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
-#: umldoc.cpp:1043 umldoc.cpp:1073
-#, fuzzy
-msgid "That name is already being used."
-msgstr "Izina: ni Byakoreshejwe . "
-
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
-#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
-#, fuzzy
-msgid "Not a Unique Name"
-msgstr "A "
-
-#: worktoolbar.cpp:245
-msgid "Object"
-msgstr "Igikoresho"
-
-#: worktoolbar.cpp:246
-#, fuzzy
-msgid "Synchronous Message"
-msgstr "Ubutumwa Bubanza"
-
-#: worktoolbar.cpp:247
-#, fuzzy
-msgid "Asynchronous Message"
-msgstr "ikintu kitaboneka ako kanya"
-
-#: association.cpp:87 worktoolbar.cpp:248
-#, fuzzy
-msgid "Association"
-msgstr "Ishyirahamwe"
-
-#: association.cpp:93 worktoolbar.cpp:249
-#, fuzzy
-msgid "Containment"
-msgstr "Kotajante"
-
-#: association.cpp:97 worktoolbar.cpp:250
-msgid "Anchor"
-msgstr "Agafashi"
-
-#: worktoolbar.cpp:251
-msgid "Label"
-msgstr "Akarango"
-
-#: worktoolbar.cpp:252
-msgid "Note"
-msgstr "Igisobanuro"
-
-#: worktoolbar.cpp:253
-msgid "Box"
-msgstr "Agasanduku"
-
-#: listpopupmenu.cpp:545 worktoolbar.cpp:254
-msgid "Actor"
-msgstr "Umukinnyi"
-
-#: association.cpp:86 worktoolbar.cpp:255
-#, fuzzy
-msgid "Dependency"
-msgstr "Kwerekana Ibitigenga"
-
-#: association.cpp:85 worktoolbar.cpp:256
-#, fuzzy
-msgid "Aggregation"
-msgstr "Imimaro rusange"
-
-#: worktoolbar.cpp:257
-#, fuzzy
-msgid "Relationship"
-msgstr "Amasano"
-
-#: worktoolbar.cpp:258
-#, fuzzy
-msgid "Directional Association"
-msgstr "Icapa byerekezobibiri"
-
-#: worktoolbar.cpp:259
-msgid "Implements (Generalisation/Realisation)"
-msgstr ""
-
-#: association.cpp:94 worktoolbar.cpp:260
-msgid "Composition"
-msgstr "ibirindiro"
-
-#: dialogs/diagramprintpage.cpp:92 dialogs/diagramprintpage.cpp:202
-#: listpopupmenu.cpp:548 worktoolbar.cpp:261
-#, fuzzy
-msgid "Use Case"
-msgstr "Izinakoresha"
-
-#: listpopupmenu.cpp:1030 worktoolbar.cpp:263
-#, fuzzy
-msgid "Initial State"
-msgstr "Umubare watangiye:"
-
-#: listpopupmenu.cpp:1031 worktoolbar.cpp:264
-#, fuzzy
-msgid "End State"
-msgstr "Impera "
-
-#: dialogs/activitydialog.cpp:70 listpopupmenu.cpp:1044 worktoolbar.cpp:265
-msgid "Branch/Merge"
-msgstr ""
-
-#: dialogs/activitydialog.cpp:70 worktoolbar.cpp:266
-#, fuzzy
-msgid "Fork/Join"
-msgstr "Mvamahanga"
-
-#: listpopupmenu.cpp:510 listpopupmenu.cpp:692 worktoolbar.cpp:267
-msgid "Package"
-msgstr "Porogaramu"
-
-#: dialogs/diagramprintpage.cpp:97 dialogs/diagramprintpage.cpp:210
-#: listpopupmenu.cpp:515 worktoolbar.cpp:268
-#, fuzzy
-msgid "Component"
-msgstr "Umurongo w'inyangingo"
-
-#: listpopupmenu.cpp:525 worktoolbar.cpp:269
-#, fuzzy
-msgid "Node"
-msgstr "Igisobanuro"
-
-#: listpopupmenu.cpp:518 worktoolbar.cpp:270
-#, fuzzy
-msgid "Artifact"
-msgstr "Umuhanzi"
-
-#: listpopupmenu.cpp:610 worktoolbar.cpp:271
-msgid "Interface"
-msgstr "Imigaragarire"
-
-#: listpopupmenu.cpp:611 worktoolbar.cpp:272
-#, fuzzy
-msgid "Datatype"
-msgstr "Ubwoko bw'ibyatanzwe"
-
-#: listpopupmenu.cpp:612 worktoolbar.cpp:273
+#: dialogs/classgenpage.cpp:50
 #, fuzzy
-msgid "Enum"
-msgstr "Imibare I"
+msgid "Class &name:"
+msgstr "izina y'ubwoko"
 
-#: listpopupmenu.cpp:538 worktoolbar.cpp:274
+#: dialogs/classgenpage.cpp:52
 #, fuzzy
-msgid "Entity"
-msgstr "Icyinjijwe"
+msgid "Actor &name:"
+msgstr "Izina: : "
 
-#: worktoolbar.cpp:275
+#: dialogs/classgenpage.cpp:54
 #, fuzzy
-msgid "Deep History"
-msgstr "Gusiba Amateka"
+msgid "Package &name:"
+msgstr "Izina: : "
 
-#: worktoolbar.cpp:276
+#: dialogs/classgenpage.cpp:56
 #, fuzzy
-msgid "Shallow History"
-msgstr "Kubika Amateka"
+msgid "Use case &name:"
+msgstr "Izina: : "
 
-#: worktoolbar.cpp:277
+#: dialogs/classgenpage.cpp:58
 #, fuzzy
-msgid "Join"
-msgstr "ku"
+msgid "Interface &name:"
+msgstr "Izina: : "
 
-#: worktoolbar.cpp:278
+#: dialogs/classgenpage.cpp:60
 #, fuzzy
-msgid "Fork"
-msgstr "Ifishi"
+msgid "Component &name:"
+msgstr "Izina: : "
 
-#: worktoolbar.cpp:279
+#: dialogs/classgenpage.cpp:62
 #, fuzzy
-msgid "Junction"
-msgstr "Umumaro"
+msgid "Artifact &name:"
+msgstr "Izina: : "
 
-#: worktoolbar.cpp:280
+#: dialogs/classgenpage.cpp:64
 #, fuzzy
-msgid "Choice"
-msgstr "Ijwi"
+msgid "Enum &name:"
+msgstr "Izina: : "
 
-#: association.cpp:98 worktoolbar.cpp:284
+#: dialogs/classgenpage.cpp:66
 #, fuzzy
-msgid "State Transition"
-msgstr "Inyuranamo ry'Igice"
+msgid "Datatype &name:"
+msgstr "Izina: : "
 
-#: worktoolbar.cpp:285
+#: dialogs/classgenpage.cpp:68
 #, fuzzy
-msgid "Activity Transition"
-msgstr "InyuranamoRyikoresha"
-
-#: association.cpp:99 dialogs/activitydialog.cpp:70
-#: dialogs/diagramprintpage.cpp:96 dialogs/diagramprintpage.cpp:208
-#: worktoolbar.cpp:286
-msgid "Activity"
-msgstr "Umurimo"
-
-#: dialogs/diagramprintpage.cpp:95 dialogs/diagramprintpage.cpp:206
-#: dialogs/statedialog.cpp:85 worktoolbar.cpp:287
-msgid "State"
-msgstr "Leta"
+msgid "Entity &name:"
+msgstr "Izina: : "
 
-#: listpopupmenu.cpp:1042 worktoolbar.cpp:288
+#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
 #, fuzzy
-msgid "End Activity"
-msgstr "Impera "
+msgid "&Stereotype name:"
+msgstr "Izina: : "
 
-#: listpopupmenu.cpp:1041 worktoolbar.cpp:289
+#: dialogs/classgenpage.cpp:107
 #, fuzzy
-msgid "Initial Activity"
-msgstr "Umurimo"
-
-#: worktoolbar.cpp:290
-msgid "Message"
-msgstr "Ubutumwa"
+msgid "&Package name:"
+msgstr "Izina: : "
 
-#: worktoolbar.cpp:298
+#: dialogs/classgenpage.cpp:121
 #, fuzzy
-msgid "UNDEFINED"
-msgstr "Bidasobanuye"
-
-#: worktoolbar.cpp:302
-msgid "Select"
-msgstr "Guhitamo"
+msgid "A&bstract class"
+msgstr "Urwego: "
 
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
+#: dialogs/classgenpage.cpp:123
 #, fuzzy
-msgid "new_association"
-msgstr "Ishyirahamwe"
+msgid "A&bstract use case"
+msgstr "Koresha "
 
-#: umlcanvasobject.cpp:150
+#: dialogs/classgenpage.cpp:131
 #, fuzzy
-msgid "new_attribute"
-msgstr "Ibiranga umurongo"
+msgid "&Executable"
+msgstr "Bitangizwa:"
 
-#: umlcanvasobject.cpp:153
+#: dialogs/classgenpage.cpp:138
 #, fuzzy
-msgid "new_template"
-msgstr "Inyandikorugero nshya"
+msgid "Draw As"
+msgstr "Gushushanya"
 
-#: umlcanvasobject.cpp:156
-#, fuzzy
-msgid "new_operation"
-msgstr "Igikorwa"
+#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
+msgid "&Default"
+msgstr "Mburabuzi"
 
-#: umlcanvasobject.cpp:159
+#: dialogs/classgenpage.cpp:149
 #, fuzzy
-msgid "new_literal"
-msgstr "By'imbere"
+msgid "&Library"
+msgstr "Isomero"
 
-#: umlcanvasobject.cpp:162
-#, fuzzy
-msgid "new_field"
-msgstr "umwanya"
+#: dialogs/classgenpage.cpp:152
+msgid "&Table"
+msgstr "Imbonerahamwe"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
 #, fuzzy
-msgid "Exporting all views..."
-msgstr "Nka ... "
-
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr ""
-
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr ""
+msgid "P&ublic"
+msgstr "Rusange"
 
-#: docgenerators/main.cpp:47
+#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
+#: dialogs/umloperationdialog.cpp:109
 #, fuzzy
-msgid "File to transform"
-msgstr "Idosiye Kuri Gufungura "
-
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
+msgid "P&rivate"
+msgstr "By'umwihariko"
 
-#: docgenerators/main.cpp:64
+#: dialogs/classgenpage.cpp:182
 #, fuzzy
-msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "( C ) , ( C ) - "
-
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr ""
+msgid "Pro&tected"
+msgstr "Birinzwe"
 
-#: umlviewimageexporter.cpp:46
+#: dialogs/classgenpage.cpp:186
 #, fuzzy
-msgid "Exporting view..."
-msgstr "Tegereza..."
-
-#: umlviewimageexporter.cpp:50
-msgid ""
-"An error happened when exporting the image:\n"
-msgstr ""
+msgid "Imple&mentation"
+msgstr "Inyandiko"
 
-#: umlviewimageexporter.cpp:66
+#: dialogs/classgenpage.cpp:256
 #, fuzzy
-msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
-msgstr "Wifuzakurisimbura."
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "Idosiye isanzwe ihari"
-
-#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
-msgid "&Overwrite"
-msgstr "Gusimbuza"
+msgid "Class name:"
+msgstr "izina y'ubwoko"
 
-#: clipboard/umlclipboard.cpp:687
+#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
 #, fuzzy
-msgid ""
-"At least one of the items in the clipboard could not be pasted because an item "
-"of the same name already exists.  Any other items have been pasted."
-msgstr ""
-"Rimwe Bya i Ibigize in i Ububikokoporora OYA Ikintu Bya i Izina: . Ikindi "
-"Ibigize . "
+msgid "Instance name:"
+msgstr "Izina ry'Urugero"
 
-#: umldoc.cpp:82 umldoc.cpp:1518
+#: dialogs/classgenpage.cpp:272
 #, fuzzy
-msgid "UML Model"
-msgstr "Urugero"
+msgid "Draw as actor"
+msgstr "Nka Umukinnyi "
 
-#: umldoc.cpp:106
+#: dialogs/classgenpage.cpp:277
 #, fuzzy
-msgid "Logical View"
-msgstr "Bijyanye n'inyurabwenge"
+msgid "Multiple instance"
+msgstr "Urugero "
 
-#: umldoc.cpp:107
+#: dialogs/classgenpage.cpp:284
 #, fuzzy
-msgid "Use Case View"
-msgstr "Gufunga igaragaza Ngenga"
+msgid "Show destruction"
+msgstr "Kwerekana ibiro "
 
-#: umldoc.cpp:108
+#: dialogs/classgenpage.cpp:322
 #, fuzzy
-msgid "Component View"
-msgstr "Igaragaza ry'ibikubiyemo"
+msgid "Component name:"
+msgstr "Izina: : "
 
-#: umldoc.cpp:109
+#: dialogs/classgenpage.cpp:324
 #, fuzzy
-msgid "Deployment View"
-msgstr "Igaragaza nyandiko"
-
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr ""
+msgid "Node name:"
+msgstr "Izina: : "
 
-#: umldoc.cpp:117 umldoc.cpp:293
+#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
+#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
+#: dialogs/umloperationdialog.cpp:84
 #, fuzzy
-msgid "Datatypes"
-msgstr "Ubwoko bw'ibyatanzwe"
+msgid "Stereotype name:"
+msgstr "Izina: : "
 
-#: umldoc.cpp:229
+#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
+#: dialogs/classgenpage.cpp:456
 #, fuzzy
 msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr "Idosiyeirihoyahinduwe."
-
-#: umldoc.cpp:355
-#, fuzzy
-msgid "The file %1 does not exist."
-msgstr "Idosiye\"%1\"ntibaho."
-
-#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
-#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
-#, fuzzy
-msgid "Load Error"
-msgstr "Ikosa "
-
-#: umldoc.cpp:380
-#, fuzzy
-msgid "The file %1 seems to be corrupted."
-msgstr "Idosiye %1 Kuri . "
-
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, fuzzy, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "Oya Idosiye Byabonetse in i Byegeranijwe Idosiye %1 . "
-
-#: umldoc.cpp:448
-#, fuzzy, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "A Ifungura i Idosiye : %1 "
-
-#: umldoc.cpp:472 umldoc.cpp:488
-#, fuzzy, c-format
-msgid "There was a problem loading file: %1"
-msgstr "A Ifungura Idosiye : %1 "
-
-#: umldoc.cpp:641
-#, fuzzy, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "A Koherezayo %1 Idosiye : %1 "
-
-#: umldoc.cpp:934
-#, fuzzy
-msgid "use case diagram"
-msgstr "Koresha "
-
-#: umldoc.cpp:936
-#, fuzzy
-msgid "class diagram"
-msgstr "Urwego: "
-
-#: umldoc.cpp:938
-#, fuzzy
-msgid "sequence diagram"
-msgstr "Igenzura ry'icyiciro"
-
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr ""
-
-#: umldoc.cpp:942
-#, fuzzy
-msgid "state diagram"
-msgstr "Leta "
-
-#: umldoc.cpp:944
-#, fuzzy
-msgid "activity diagram"
-msgstr "Umurimo "
-
-#: umldoc.cpp:946
-#, fuzzy
-msgid "component diagram"
-msgstr "Umurongo w'inyangingo"
-
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr ""
-
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
+"The name you have chosen\n"
+"is already being used.\n"
+"The name has been reset."
 msgstr ""
+"Izina: Byakoreshejwe . \n"
+"Izina: Kugarura . "
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-#, fuzzy
-msgid "That is an invalid name for a diagram."
-msgstr "ni Bitemewe Izina: ya:  A . "
-
-#: umldoc.cpp:998 umldoc.cpp:1025
-#, fuzzy
-msgid "A diagram is already using that name."
-msgstr "A ni ikoresha Izina: . "
-
-#: umldoc.cpp:1099
-#, fuzzy
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "Kuri Gusiba %1 ? "
-
-#: umldoc.cpp:1099
-#, fuzzy
-msgid "Delete Diagram"
-msgstr "Gusiba Ikadiri"
-
-#: umldoc.cpp:1573
-#, fuzzy
-msgid "Setting up the document..."
-msgstr "Hejuru i Inyandiko ... "
-
-#: umldoc.cpp:1600
-#, fuzzy
-msgid "Resolving object references..."
-msgstr "Igikoresho Indango ... "
-
-#: umldoc.cpp:1638
-#, fuzzy
-msgid "Loading UML elements..."
-msgstr "Ibintu ... "
-
-#: umldoc.cpp:1811
-#, fuzzy
-msgid "Loading diagrams..."
-msgstr "Mu gufungura imigereka..."
-
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-#, fuzzy
-msgid "kde-uml-Diagram"
-msgstr "kde - - "
-
-#: umldoc.cpp:2104
-#, fuzzy, c-format
-msgid "/autosave%1"
-msgstr "/NyaMwishyingura %1 "
-
-#: classifier.cpp:201
-#, fuzzy
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr "Igikorwa Na: i Izina: na Isinya . OYA &Ongera Nanone . "
-
-#: refactoring/refactoringassistant.cpp:289
-#, fuzzy
-msgid "Add Base Class"
-msgstr "Base "
-
-#: refactoring/refactoringassistant.cpp:290
+#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
+#: dialogs/classgenpage.cpp:457
 #, fuzzy
-msgid "Add Derived Class"
-msgstr "Kongeraho Mucapyi/Urwego..."
+msgid "Name is Not Unique"
+msgstr "ni "
 
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
+#: dialogs/umlwidgetcolorpage.cpp:58
 #, fuzzy
-msgid "Add Operation"
-msgstr "Ongera amahitamo"
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "Kongeraho Ikiranga"
+msgid "&Line:"
+msgstr "Umurongo:"
 
-#: refactoring/refactoringassistant.cpp:297
+#: dialogs/umlwidgetcolorpage.cpp:68
 #, fuzzy
-msgid "Add Base Interface"
-msgstr "Base "
+msgid "&Fill:"
+msgstr "Kuzuza"
 
-#: refactoring/refactoringassistant.cpp:298
+#: dialogs/umlwidgetcolorpage.cpp:75
 #, fuzzy
-msgid "Add Derived Interface"
-msgstr "Ahagenewe Ukoresha"
+msgid "D&efault"
+msgstr "Mburabuzi"
 
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
+#: dialogs/umlwidgetcolorpage.cpp:78
 #, fuzzy
-msgid "Base Classifiers"
-msgstr "Base "
+msgid "&Use fill"
+msgstr "Kuzuza "
 
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
 #, fuzzy
-msgid "Derived Classifiers"
-msgstr "Ubakoresha Batemerewe"
-
-#: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
-#: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
-msgid "Attributes"
-msgstr "Ibiranga"
-
-#: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
-#: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
-msgid "Operations"
-msgstr "Ibikorwa"
+msgid "Activities"
+msgstr "Umurimo"
 
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+#: dialogs/activitypage.cpp:72
 #, fuzzy
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"Igikorwa Na: Isinya in %1 . \n"
+msgid "New Activity..."
+msgstr "Umurimo"
 
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-#, fuzzy
-msgid "Choose a different name or parameter list."
-msgstr "A Izina: Cyangwa Ikintu Urutonde . "
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "Guhindura izina"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
+#: dialogs/activitypage.cpp:134
 #, fuzzy
-msgid "Operation Name Invalid"
-msgstr "Igikorwa nticyashobotse."
+msgid "New Activity"
+msgstr "Umurimo"
 
-#: folder.cpp:289
+#: dialogs/activitypage.cpp:153
 #, fuzzy
-msgid "The folderfile %1 does not exist."
-msgstr "%1 OYA . "
+msgid "Rename Activity"
+msgstr "Umurimo"
 
-#: folder.cpp:293
+#: dialogs/activitypage.cpp:153
 #, fuzzy
-msgid "The folderfile %1 cannot be opened."
-msgstr "Idosiye ntishobora gufungurwa"
+msgid "Enter the new name of the activity:"
+msgstr "i Gishya Izina: Bya i Umurimo : "
 
 #: dialogs/assocpropdlg.cpp:39
 #, fuzzy
 msgid "Association Properties"
 msgstr "Indangabintu y'ihuriro"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
-#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
-#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
-#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
-#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
-#: rc.cpp:225
-#, no-c-format
-msgid "General"
-msgstr "Rusange"
-
 #: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
 #: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
 #: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
@@ -1792,21 +3230,10 @@ msgstr "Amagenamiterere y'Imyandikire"
 msgid "Association font"
 msgstr "Imyandikire "
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-#, fuzzy
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "< p Itunganya = \" Hagati \" > . </p> "
-
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, fuzzy, no-c-format
-msgid "Code Viewer"
-msgstr "Gufunga Igaragaza"
-
-#: dialogs/umloperationdialog.cpp:50
+#: dialogs/umltemplatedialog.cpp:36
 #, fuzzy
-msgid "Operation Properties"
-msgstr "Indangabintu y'ibuto"
+msgid "Template Properties"
+msgstr "Indangabintu y'ishusho"
 
 #: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
 #: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
@@ -1814,294 +3241,140 @@ msgstr "Indangabintu y'ibuto"
 msgid "General Properties"
 msgstr "Ibirangakintu Rusange"
 
-#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
-#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
-#: dialogs/umltemplatedialog.cpp:61
-msgid "&Name:"
-msgstr "Izina:"
-
 #: dialogs/parmpropdlg.cpp:62 dialogs/umlattributedialog.cpp:60
 #: dialogs/umlentityattributedialog.cpp:61 dialogs/umloperationdialog.cpp:77
 #: dialogs/umltemplatedialog.cpp:53
 msgid "&Type:"
 msgstr "&Ubwoko:"
 
-#: dialogs/classgenpage.cpp:334 dialogs/parmpropdlg.cpp:77
-#: dialogs/umlattributedialog.cpp:76 dialogs/umlentityattributedialog.cpp:77
-#: dialogs/umloperationdialog.cpp:84
-#, fuzzy
-msgid "Stereotype name:"
-msgstr "Izina: : "
-
-#: dialogs/umloperationdialog.cpp:89
-#, fuzzy
-msgid "&Abstract operation"
-msgstr "Igikorwa "
-
-#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
-#, fuzzy
-msgid "Classifier &scope (\"static\")"
-msgstr "Ingano: ( \" \" ) "
-
-#: dialogs/umloperationdialog.cpp:95
-msgid "&Query (\"const\")"
-msgstr ""
-
-#: dialogs/classgenpage.cpp:171 dialogs/settingsdlg.cpp:211
-#: dialogs/umlattributedialog.cpp:87 dialogs/umloperationdialog.cpp:101
-#: listpopupmenu.cpp:678
-msgid "Visibility"
-msgstr "igaragara"
-
-#: dialogs/classgenpage.cpp:176 dialogs/umloperationdialog.cpp:106
-#, fuzzy
-msgid "P&ublic"
-msgstr "Rusange"
-
-#: dialogs/classgenpage.cpp:179 dialogs/umlattributedialog.cpp:94
-#: dialogs/umloperationdialog.cpp:109
-#, fuzzy
-msgid "P&rivate"
-msgstr "By'umwihariko"
-
-#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
-#, fuzzy
-msgid "Prot&ected"
-msgstr "Birinzwe"
-
-#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
-#, fuzzy
-msgid "I&mplementation"
-msgstr "Inyandiko"
-
-#: dialogs/umloperationdialog.cpp:120
-msgid "Parameters"
-msgstr "Ibigenga"
-
-#: dialogs/umloperationdialog.cpp:141
-#, fuzzy
-msgid "Ne&w Parameter..."
-msgstr "Mucapyi nshya..."
-
-#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
-#, fuzzy
-msgid "You have entered an invalid parameter name."
-msgstr "Bitemewe Ikintu Izina: . "
-
-#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
-#, fuzzy
-msgid "Parameter Name Invalid"
-msgstr "Ibigenga Iyingiza"
-
-#: dialogs/umloperationdialog.cpp:339
-#, fuzzy
-msgid ""
-"The parameter name you have chosen\n"
-"is already being used in this operation."
-msgstr "Ikintu Izina: Byakoreshejwe in iyi Igikorwa . "
-
-#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
-msgid "Parameter Name Not Unique"
-msgstr ""
-
-#: dialogs/umloperationdialog.cpp:406
-#, fuzzy
-msgid ""
-"The parameter name you have chosen is already being used in this operation."
-msgstr "Ikintu Izina: ni Byakoreshejwe in iyi Igikorwa . "
-
-#: dialogs/umloperationdialog.cpp:456
-#, fuzzy
-msgid "You have entered an invalid operation name."
-msgstr "Bitemewe Igikorwa Izina: . "
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
+#: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
+#: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
+#: dialogs/umltemplatedialog.cpp:61
+msgid "&Name:"
 msgstr "Izina:"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "Ubwoko:"
-
-#: dialogs/parmpropdlg.cpp:35
-#, fuzzy
-msgid "Parameter Properties"
-msgstr "Indangakintu y'imashini-NshyiraRupapuro"
-
-#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
+#: dialogs/umltemplatedialog.cpp:128
 #, fuzzy
-msgid "&Initial value:"
-msgstr "Umubare watangiye:"
+msgid "You have entered an invalid template name."
+msgstr "Bitemewe Nyandiko-rugero Izina: . "
 
-#: dialogs/parmpropdlg.cpp:82
+#: dialogs/umltemplatedialog.cpp:129
 #, fuzzy
-msgid "Passing Direction"
-msgstr "Icyerekerezo cyo gucapa"
+msgid "Template Name Invalid"
+msgstr "Izina ry'Inyandikorugero:"
 
-#: dialogs/parmpropdlg.cpp:84
+#: dialogs/umltemplatedialog.cpp:138
 #, fuzzy
 msgid ""
-"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
-"is a parameter for reading and writing."
-msgstr ""
-"\" in \" ni A Ikintu , \" Inyuma \" ni A Ikintu na \" \" ni A Ikintu ya:  na . "
-
-#: dialogs/classgenpage.cpp:50
-#, fuzzy
-msgid "Class &name:"
-msgstr "izina y'ubwoko"
-
-#: dialogs/classgenpage.cpp:52
-#, fuzzy
-msgid "Actor &name:"
-msgstr "Izina: : "
-
-#: dialogs/classgenpage.cpp:54
-#, fuzzy
-msgid "Package &name:"
-msgstr "Izina: : "
-
-#: dialogs/classgenpage.cpp:56
-#, fuzzy
-msgid "Use case &name:"
-msgstr "Izina: : "
-
-#: dialogs/classgenpage.cpp:58
-#, fuzzy
-msgid "Interface &name:"
-msgstr "Izina: : "
-
-#: dialogs/classgenpage.cpp:60
-#, fuzzy
-msgid "Component &name:"
-msgstr "Izina: : "
-
-#: dialogs/classgenpage.cpp:62
-#, fuzzy
-msgid "Artifact &name:"
-msgstr "Izina: : "
-
-#: dialogs/classgenpage.cpp:64
-#, fuzzy
-msgid "Enum &name:"
-msgstr "Izina: : "
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "Nyandiko-rugero Ikintu Izina: ni Byakoreshejwe in iyi Igikorwa . "
 
-#: dialogs/classgenpage.cpp:66
+#: dialogs/umltemplatedialog.cpp:139
 #, fuzzy
-msgid "Datatype &name:"
-msgstr "Izina: : "
+msgid "Template Name Not Unique"
+msgstr "Izina ry'Inyandikorugero:"
 
-#: dialogs/classgenpage.cpp:68
+#: dialogs/umlentityattributedialog.cpp:43
 #, fuzzy
-msgid "Entity &name:"
-msgstr "Izina: : "
+msgid "Entity Attribute Properties"
+msgstr "Indangabintu y'Umwanya w'Umwandiko "
 
-#: dialogs/classgenpage.cpp:93 dialogs/umltemplatedialog.cpp:65
+#: dialogs/umlentityattributedialog.cpp:73
 #, fuzzy
-msgid "&Stereotype name:"
-msgstr "Izina: : "
+msgid "&Default value:"
+msgstr "Agaciro mburabuzi"
 
-#: dialogs/classgenpage.cpp:107
+#: dialogs/umlentityattributedialog.cpp:81
 #, fuzzy
-msgid "&Package name:"
-msgstr "Izina: : "
+msgid "Length/Values:"
+msgstr "Uburebure:"
 
-#: dialogs/classgenpage.cpp:121
+#: dialogs/umlentityattributedialog.cpp:84
 #, fuzzy
-msgid "A&bstract class"
-msgstr "Urwego: "
+msgid "&Auto increment"
+msgstr "Iyongeragaciro "
 
-#: dialogs/classgenpage.cpp:123
+#: dialogs/umlentityattributedialog.cpp:88
 #, fuzzy
-msgid "A&bstract use case"
-msgstr "Koresha "
+msgid "Allow &null"
+msgstr "NTAGIHARI "
 
-#: dialogs/classgenpage.cpp:131
+#: dialogs/umlentityattributedialog.cpp:92
 #, fuzzy
-msgid "&Executable"
-msgstr "Bitangizwa:"
+msgid "Attributes:"
+msgstr "Ibiranga..."
 
-#: dialogs/classgenpage.cpp:138
-#, fuzzy
-msgid "Draw As"
-msgstr "Gushushanya"
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "gushyiraho umugereka"
 
-#: dialogs/classgenpage.cpp:143 dialogs/umlwidgetcolorpage.cpp:65
-msgid "&Default"
-msgstr "Mburabuzi"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "Ntana kimwe"
 
-#: dialogs/classgenpage.cpp:149
+#: dialogs/umlentityattributedialog.cpp:115
 #, fuzzy
-msgid "&Library"
-msgstr "Isomero"
+msgid "&Primary"
+msgstr "Agenga"
 
-#: dialogs/classgenpage.cpp:152
-msgid "&Table"
-msgstr "Imbonerahamwe"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "Umubarendanga"
 
-#: dialogs/classgenpage.cpp:182
+#: dialogs/umlentityattributedialog.cpp:121
 #, fuzzy
-msgid "Pro&tected"
-msgstr "Birinzwe"
+msgid "&Unique"
+msgstr "Cyo nyine"
 
-#: dialogs/classgenpage.cpp:186
+#: dialogs/umlentityattributedialog.cpp:184
 #, fuzzy
-msgid "Imple&mentation"
-msgstr "Inyandiko"
+msgid "You have entered an invalid entity attribute name."
+msgstr "Bitemewe Ikiranga: Izina: . "
 
-#: dialogs/classgenpage.cpp:256
+#: dialogs/umlentityattributedialog.cpp:185
 #, fuzzy
-msgid "Class name:"
-msgstr "izina y'ubwoko"
+msgid "Entity Attribute Name Invalid"
+msgstr "Guhindura Ikiranga"
 
-#: dialogs/classgenpage.cpp:264 dialogs/classgenpage.cpp:344
+#: dialogs/umlentityattributedialog.cpp:192
 #, fuzzy
-msgid "Instance name:"
-msgstr "Izina ry'Urugero"
+msgid ""
+"The entity attribute name you have chosen is already being used in this "
+"operation."
+msgstr "Ikiranga: Izina: ni Byakoreshejwe in iyi Igikorwa . "
 
-#: dialogs/classgenpage.cpp:272
-#, fuzzy
-msgid "Draw as actor"
-msgstr "Nka Umukinnyi "
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr ""
 
-#: dialogs/classgenpage.cpp:277
-#, fuzzy
-msgid "Multiple instance"
-msgstr "Urugero "
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "Kugaragaza"
 
-#: dialogs/classgenpage.cpp:284
+#: dialogs/umlviewdialog.cpp:93
 #, fuzzy
-msgid "Show destruction"
-msgstr "Kwerekana ibiro "
+msgid "Classes Display Options"
+msgstr "Kwerekana amahitamo"
 
-#: dialogs/classgenpage.cpp:322
+#: dialogs/umlviewdialog.cpp:100
 #, fuzzy
-msgid "Component name:"
-msgstr "Izina: : "
+msgid "Diagram Colors"
+msgstr "Dim Color"
 
-#: dialogs/classgenpage.cpp:324
+#: dialogs/umlviewdialog.cpp:164
 #, fuzzy
-msgid "Node name:"
-msgstr "Izina: : "
+msgid "The name you have entered is invalid."
+msgstr "Izina: ni Bitemewe . "
 
-#: dialogs/classgenpage.cpp:398 dialogs/classgenpage.cpp:445
-#: dialogs/classgenpage.cpp:456
+#: dialogs/umlviewdialog.cpp:170
 #, fuzzy
-msgid ""
-"The name you have chosen\n"
-"is already being used.\n"
-"The name has been reset."
-msgstr ""
-"Izina: Byakoreshejwe . \n"
-"Izina: Kugarura . "
+msgid "The name you have entered is not unique."
+msgstr "Izina: ni OYA Cyo nyine . "
 
-#: dialogs/classgenpage.cpp:399 dialogs/classgenpage.cpp:446
-#: dialogs/classgenpage.cpp:457
-#, fuzzy
-msgid "Name is Not Unique"
-msgstr "ni "
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "Ubwoko:"
 
 #: dialogs/settingsdlg.cpp:30
 #, fuzzy
@@ -2117,14 +3390,6 @@ msgstr "Ahagenewe Ukoresha"
 msgid "User Interface Settings"
 msgstr "Amagenamiterere y'Imigaragarire"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
-#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
-#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
-#: listpopupmenu.cpp:750
-msgid "Color"
-msgstr "Ibara"
-
 #: dialogs/settingsdlg.cpp:54
 #, fuzzy
 msgid "Line color:"
@@ -2313,12 +3578,6 @@ msgstr "Ikiranga: Isinya "
 msgid "Show package"
 msgstr "Porogaramu "
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 146
-#: dialogs/settingsdlg.cpp:242 rc.cpp:417
-#, fuzzy, no-c-format
-msgid "Show operation signature"
-msgstr "Igikorwa Isinya "
-
 #: dialogs/settingsdlg.cpp:247
 #, fuzzy
 msgid "Starting Scope"
@@ -2334,30 +3593,6 @@ msgstr "Ikiranga: Ingano: : "
 msgid "Default operation scope:"
 msgstr "Igikorwa Ingano: : "
 
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "Rusange"
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "By'umwihariko"
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "Rwugawe"
-
 #: dialogs/settingsdlg.cpp:294
 #, fuzzy
 msgid "Code Generation"
@@ -2373,309 +3608,253 @@ msgstr "Igenamiterere ry'ihuza"
 msgid "Code Viewer Settings"
 msgstr "Amagenamiterere y'Igaragaza ry'Urutonde"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-#, fuzzy
-msgid "Associations"
-msgstr "Ishyirahamwe"
-
-#: dialogs/pkgcontentspage.cpp:29
-#, fuzzy
-msgid "Contained Items"
-msgstr "Kirimo"
-
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-#, fuzzy
-msgid "Widget Colors"
-msgstr "&Ibara rya Wijeti"
-
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "Kugaragaza"
-
-#: dialogs/classpropdlg.cpp:118
+#: dialogs/umloperationdialog.cpp:50
 #, fuzzy
-msgid "Display Options"
-msgstr "Kwerekana amahitamo"
+msgid "Operation Properties"
+msgstr "Indangabintu y'ibuto"
 
-#: dialogs/classpropdlg.cpp:179
+#: dialogs/umloperationdialog.cpp:89
 #, fuzzy
-msgid "Attribute Settings"
-msgstr "Imikorereshereje Ya Mucapyi"
+msgid "&Abstract operation"
+msgstr "Igikorwa "
 
-#: dialogs/classpropdlg.cpp:187
+#: dialogs/umlattributedialog.cpp:79 dialogs/umloperationdialog.cpp:92
 #, fuzzy
-msgid "Operation Settings"
-msgstr "Amagenamiterere mburabuzi"
+msgid "Classifier &scope (\"static\")"
+msgstr "Ingano: ( \" \" ) "
 
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "Inyandikorugero"
+#: dialogs/umloperationdialog.cpp:95
+msgid "&Query (\"const\")"
+msgstr ""
 
-#: dialogs/classpropdlg.cpp:195
+#: dialogs/umlattributedialog.cpp:97 dialogs/umloperationdialog.cpp:112
 #, fuzzy
-msgid "Templates Settings"
-msgstr "Amagenamiterere y'Umwandiko"
+msgid "Prot&ected"
+msgstr "Birinzwe"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+#: dialogs/umlattributedialog.cpp:100 dialogs/umloperationdialog.cpp:115
 #, fuzzy
-msgid "Enum Literals"
-msgstr "Impishanyandiko y'inyuguti"
+msgid "I&mplementation"
+msgstr "Inyandiko"
 
-#: dialogs/classpropdlg.cpp:202
-#, fuzzy
-msgid "Enum Literals Settings"
-msgstr "Igenamiterere rusange"
+#: dialogs/umloperationdialog.cpp:120
+msgid "Parameters"
+msgstr "Ibigenga"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+#: dialogs/umloperationdialog.cpp:141
 #, fuzzy
-msgid "Entity Attributes"
-msgstr "Guhindura Ikiranga"
+msgid "Ne&w Parameter..."
+msgstr "Mucapyi nshya..."
 
-#: dialogs/classpropdlg.cpp:209
+#: dialogs/umloperationdialog.cpp:323 dialogs/umloperationdialog.cpp:376
 #, fuzzy
-msgid "Entity Attributes Settings"
-msgstr "Guhindura ibyashizweho bishiraho ikizere:"
+msgid "You have entered an invalid parameter name."
+msgstr "Bitemewe Ikintu Izina: . "
 
-#: dialogs/classpropdlg.cpp:216
+#: dialogs/umloperationdialog.cpp:324 dialogs/umloperationdialog.cpp:377
 #, fuzzy
-msgid "Contents Settings"
-msgstr "Amagenamiterere y'Imyandikire"
+msgid "Parameter Name Invalid"
+msgstr "Ibigenga Iyingiza"
 
-#: dialogs/classpropdlg.cpp:222
+#: dialogs/umloperationdialog.cpp:339
 #, fuzzy
-msgid "Class Associations"
-msgstr "aho ishuri riri"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
-#, fuzzy, no-c-format
-msgid "Role Properties"
-msgstr "Ibiranga ububiko"
+msgid ""
+"The parameter name you have chosen\n"
+"is already being used in this operation."
+msgstr "Ikintu Izina: Byakoreshejwe in iyi Igikorwa . "
 
-#: dialogs/umlentityattributedialog.cpp:43
-#, fuzzy
-msgid "Entity Attribute Properties"
-msgstr "Indangabintu y'Umwanya w'Umwandiko "
+#: dialogs/umloperationdialog.cpp:340 dialogs/umloperationdialog.cpp:407
+msgid "Parameter Name Not Unique"
+msgstr ""
 
-#: dialogs/umlentityattributedialog.cpp:73
+#: dialogs/umloperationdialog.cpp:406
 #, fuzzy
-msgid "&Default value:"
-msgstr "Agaciro mburabuzi"
+msgid ""
+"The parameter name you have chosen is already being used in this operation."
+msgstr "Ikintu Izina: ni Byakoreshejwe in iyi Igikorwa . "
 
-#: dialogs/umlentityattributedialog.cpp:81
+#: dialogs/umloperationdialog.cpp:456
 #, fuzzy
-msgid "Length/Values:"
-msgstr "Uburebure:"
+msgid "You have entered an invalid operation name."
+msgstr "Bitemewe Igikorwa Izina: . "
 
-#: dialogs/umlentityattributedialog.cpp:84
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
 #, fuzzy
-msgid "&Auto increment"
-msgstr "Iyongeragaciro "
+msgid "Operation Name Invalid"
+msgstr "Igikorwa nticyashobotse."
 
-#: dialogs/umlentityattributedialog.cpp:88
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
 #, fuzzy
-msgid "Allow &null"
-msgstr "NTAGIHARI "
+msgid ""
+"An operation with that signature already exists in %1.\n"
+msgstr ""
+"Igikorwa Na: Isinya in %1 . \n"
 
-#: dialogs/umlentityattributedialog.cpp:92
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
 #, fuzzy
-msgid "Attributes:"
-msgstr "Ibiranga..."
-
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "gushyiraho umugereka"
-
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "Ntana kimwe"
+msgid "Choose a different name or parameter list."
+msgstr "A Izina: Cyangwa Ikintu Urutonde . "
 
-#: dialogs/umlentityattributedialog.cpp:115
+#: dialogs/assocrolepage.cpp:50
 #, fuzzy
-msgid "&Primary"
-msgstr "Agenga"
-
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "Umubarendanga"
+msgid "Role A Properties"
+msgstr "A "
 
-#: dialogs/umlentityattributedialog.cpp:121
+#: dialogs/assocrolepage.cpp:51
 #, fuzzy
-msgid "&Unique"
-msgstr "Cyo nyine"
+msgid "Role B Properties"
+msgstr "Ibiranga ububiko"
 
-#: dialogs/umlentityattributedialog.cpp:184
+#: dialogs/assocrolepage.cpp:68
 #, fuzzy
-msgid "You have entered an invalid entity attribute name."
-msgstr "Bitemewe Ikiranga: Izina: . "
+msgid "Role A Visibility"
+msgstr "A "
 
-#: dialogs/umlentityattributedialog.cpp:185
+#: dialogs/assocrolepage.cpp:69
 #, fuzzy
-msgid "Entity Attribute Name Invalid"
-msgstr "Guhindura Ikiranga"
+msgid "Role B Visibility"
+msgstr "igaragara"
 
-#: dialogs/umlentityattributedialog.cpp:192
+#: dialogs/assocrolepage.cpp:70
 #, fuzzy
-msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "Ikiranga: Izina: ni Byakoreshejwe in iyi Igikorwa . "
+msgid "Role A Changeability"
+msgstr "A "
 
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
 msgstr ""
 
-#: dialogs/umlwidgetcolorpage.cpp:58
+#: dialogs/pkgcontentspage.cpp:29
 #, fuzzy
-msgid "&Line:"
-msgstr "Umurongo:"
+msgid "Contained Items"
+msgstr "Kirimo"
 
-#: dialogs/umlwidgetcolorpage.cpp:68
+#: dialogs/notedialog.cpp:25
 #, fuzzy
-msgid "&Fill:"
-msgstr "Kuzuza"
+msgid "Note Documentation"
+msgstr "icyitonderwa "
 
-#: dialogs/umlwidgetcolorpage.cpp:75
+#: dialogs/classifierlistpage.cpp:39
 #, fuzzy
-msgid "D&efault"
-msgstr "Mburabuzi"
+msgid "N&ew Attribute..."
+msgstr "Guhindura Ibiranga..."
 
-#: dialogs/umlwidgetcolorpage.cpp:78
+#: dialogs/classifierlistpage.cpp:42
 #, fuzzy
-msgid "&Use fill"
-msgstr "Kuzuza "
+msgid "N&ew Operation..."
+msgstr "Isano Rishya..."
 
-#: dialogs/overwritedialogue.cpp:27
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "Inyandikorugero"
+
+#: dialogs/classifierlistpage.cpp:45
 #, fuzzy
-msgid "Destination File Already Exists"
-msgstr "Idosiye "
+msgid "N&ew Template..."
+msgstr "Inyandikorugero nshya"
 
-#: dialogs/overwritedialogue.cpp:31
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
 #, fuzzy
-msgid ""
-"The file %1 already exists in %2.\n"
-"\n"
-"Umbrello can overwrite the file, generate a similar\n"
-"file name or not generate this file."
-msgstr ""
-"Idosiye %1 in %2 . \n"
-"\n"
-"Guhindura i Idosiye , A Izina: Cyangwa OYA iyi Idosiye . "
+msgid "Enum Literals"
+msgstr "Impishanyandiko y'inyuguti"
 
-#: dialogs/overwritedialogue.cpp:34
+#: dialogs/classifierlistpage.cpp:48
 #, fuzzy
-msgid "&Apply to all remaining files"
-msgstr "Kuri Byose Idosiye "
+msgid "N&ew Enum Literal..."
+msgstr "Mucapyi nshya..."
 
-#: dialogs/overwritedialogue.cpp:39
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
 #, fuzzy
-msgid "&Generate Similar File Name"
-msgstr "Idosiye "
+msgid "Entity Attributes"
+msgstr "Guhindura Ikiranga"
 
-#: dialogs/overwritedialogue.cpp:40
+#: dialogs/classifierlistpage.cpp:51
 #, fuzzy
-msgid "&Do Not Generate File"
-msgstr "Idosiye "
+msgid "N&ew Entity Attribute..."
+msgstr "Guhindura Ibiranga..."
 
-#: dialogs/statedialog.cpp:85
+#: dialogs/activitydialog.cpp:70
 #, fuzzy
-msgid "Initial state"
-msgstr "Leta "
+msgid "Initial activity"
+msgstr "Umurimo "
 
-#: dialogs/statedialog.cpp:85
+#: dialogs/activitydialog.cpp:70
 #, fuzzy
-msgid "End state"
-msgstr "Impera Leta "
+msgid "End activity"
+msgstr "Impera Umurimo "
 
-#: dialogs/statedialog.cpp:96
+#: dialogs/activitydialog.cpp:82
 #, fuzzy
-msgid "State type:"
+msgid "Activity type:"
 msgstr "Ubwoko: : "
 
-#: dialogs/statedialog.cpp:101
+#: dialogs/activitydialog.cpp:87
 #, fuzzy
-msgid "State name:"
+msgid "Activity name:"
 msgstr "Izina: : "
 
-#: dialogs/statedialog.cpp:130
-#, fuzzy
-msgid "Widget Color"
-msgstr "Ibara rya Wijeti"
-
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-#, fuzzy
-msgid "Activities"
-msgstr "Umurimo"
-
-#: dialogs/classifierlistpage.cpp:39
-#, fuzzy
-msgid "N&ew Attribute..."
-msgstr "Guhindura Ibiranga..."
-
-#: dialogs/classifierlistpage.cpp:42
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
 #, fuzzy
-msgid "N&ew Operation..."
-msgstr "Isano Rishya..."
+msgid "Widget Colors"
+msgstr "&Ibara rya Wijeti"
 
-#: dialogs/classifierlistpage.cpp:45
+#: dialogs/umlattributedialog.cpp:42
 #, fuzzy
-msgid "N&ew Template..."
-msgstr "Inyandikorugero nshya"
+msgid "Attribute Properties"
+msgstr "Indangakintu y'imashini-NshyiraRupapuro"
 
-#: dialogs/classifierlistpage.cpp:48
+#: dialogs/parmpropdlg.cpp:74 dialogs/umlattributedialog.cpp:72
 #, fuzzy
-msgid "N&ew Enum Literal..."
-msgstr "Mucapyi nshya..."
+msgid "&Initial value:"
+msgstr "Umubare watangiye:"
 
-#: dialogs/classifierlistpage.cpp:51
+#: dialogs/umlattributedialog.cpp:91
 #, fuzzy
-msgid "N&ew Entity Attribute..."
-msgstr "Guhindura Ibiranga..."
+msgid "&Public"
+msgstr "Rusange"
 
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+#: dialogs/umlattributedialog.cpp:155
 #, fuzzy
-msgid "new_class"
-msgstr "Icyiciro cy'igerageza"
+msgid "You have entered an invalid attribute name."
+msgstr "Bitemewe Ikiranga: Izina: . "
 
-#: dialogs/classwizard.cpp:54
+#: dialogs/umlattributedialog.cpp:156
 #, fuzzy
-msgid "New Class"
-msgstr "Icyiciro cy'Igerageza"
+msgid "Attribute Name Invalid"
+msgstr "izina y'ikiranga"
 
-#: dialogs/classwizard.cpp:59
+#: dialogs/umlattributedialog.cpp:163
 #, fuzzy
-msgid "Class Attributes"
-msgstr "Ibiranga akadirishya"
+msgid ""
+"The attribute name you have chosen is already being used in this operation."
+msgstr "Ikiranga: Izina: ni Byakoreshejwe in iyi Igikorwa . "
 
-#: dialogs/classwizard.cpp:63
+#: dialogs/umlattributedialog.cpp:164
 #, fuzzy
-msgid "Class Operations"
-msgstr "Ibikorwa"
+msgid "Attribute Name Not Unique"
+msgstr "izina y'ikiranga"
 
-#: dialogs/activitypage.cpp:72
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
 #, fuzzy
-msgid "New Activity..."
-msgstr "Umurimo"
-
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "Guhindura izina"
+msgid "Select Operation"
+msgstr "Kugena Ibikorwa"
 
-#: dialogs/activitypage.cpp:134
+#: dialogs/selectopdlg.cpp:43
 #, fuzzy
-msgid "New Activity"
-msgstr "Umurimo"
+msgid "Sequence number:"
+msgstr "Umubare : "
 
-#: dialogs/activitypage.cpp:153
+#: dialogs/selectopdlg.cpp:46
 #, fuzzy
-msgid "Rename Activity"
-msgstr "Umurimo"
+msgid "Class operation:"
+msgstr "Igikorwa : "
 
-#: dialogs/activitypage.cpp:153
+#: dialogs/selectopdlg.cpp:54
 #, fuzzy
-msgid "Enter the new name of the activity:"
-msgstr "i Gishya Izina: Bya i Umurimo : "
+msgid "Custom operation:"
+msgstr "Kunozaidosiyeya Igikorwa : "
 
 #: dialogs/diagramprintpage.cpp:35
 #, fuzzy
@@ -2730,106 +3909,50 @@ msgstr "ikigize"
 msgid "No diagrams selected."
 msgstr "Byahiswemo . "
 
-#: dialogs/assocrolepage.cpp:50
-#, fuzzy
-msgid "Role A Properties"
-msgstr "A "
-
-#: dialogs/assocrolepage.cpp:51
-#, fuzzy
-msgid "Role B Properties"
-msgstr "Ibiranga ububiko"
-
-#: dialogs/assocrolepage.cpp:68
+#: dialogs/classpropdlg.cpp:118
 #, fuzzy
-msgid "Role A Visibility"
-msgstr "A "
+msgid "Display Options"
+msgstr "Kwerekana amahitamo"
 
-#: dialogs/assocrolepage.cpp:69
+#: dialogs/classpropdlg.cpp:179
 #, fuzzy
-msgid "Role B Visibility"
-msgstr "igaragara"
+msgid "Attribute Settings"
+msgstr "Imikorereshereje Ya Mucapyi"
 
-#: dialogs/assocrolepage.cpp:70
+#: dialogs/classpropdlg.cpp:187
 #, fuzzy
-msgid "Role A Changeability"
-msgstr "A "
-
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr ""
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, fuzzy, no-c-format
-msgid "Rolename:"
-msgstr "Guhindura izina"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, fuzzy, no-c-format
-msgid "Multiplicity:"
-msgstr "kuba"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, fuzzy, no-c-format
-msgid "Implementation"
-msgstr "Inyandiko"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, fuzzy, no-c-format
-msgid "Changeable"
-msgstr "Guhindura Urwego"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, fuzzy, no-c-format
-msgid "Frozen"
-msgstr "Imbere"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, fuzzy, no-c-format
-msgid "Add only"
-msgstr "Kongeraho ibyatanzwe gusa"
+msgid "Operation Settings"
+msgstr "Amagenamiterere mburabuzi"
 
-#: dialogs/umlattributedialog.cpp:42
+#: dialogs/classpropdlg.cpp:195
 #, fuzzy
-msgid "Attribute Properties"
-msgstr "Indangakintu y'imashini-NshyiraRupapuro"
+msgid "Templates Settings"
+msgstr "Amagenamiterere y'Umwandiko"
 
-#: dialogs/umlattributedialog.cpp:91
+#: dialogs/classpropdlg.cpp:202
 #, fuzzy
-msgid "&Public"
-msgstr "Rusange"
+msgid "Enum Literals Settings"
+msgstr "Igenamiterere rusange"
 
-#: dialogs/umlattributedialog.cpp:155
+#: dialogs/classpropdlg.cpp:209
 #, fuzzy
-msgid "You have entered an invalid attribute name."
-msgstr "Bitemewe Ikiranga: Izina: . "
+msgid "Entity Attributes Settings"
+msgstr "Guhindura ibyashizweho bishiraho ikizere:"
 
-#: dialogs/umlattributedialog.cpp:156
+#: dialogs/classpropdlg.cpp:216
 #, fuzzy
-msgid "Attribute Name Invalid"
-msgstr "izina y'ikiranga"
+msgid "Contents Settings"
+msgstr "Amagenamiterere y'Imyandikire"
 
-#: dialogs/umlattributedialog.cpp:163
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
 #, fuzzy
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "Ikiranga: Izina: ni Byakoreshejwe in iyi Igikorwa . "
+msgid "Associations"
+msgstr "Ishyirahamwe"
 
-#: dialogs/umlattributedialog.cpp:164
+#: dialogs/classpropdlg.cpp:222
 #, fuzzy
-msgid "Attribute Name Not Unique"
-msgstr "izina y'ikiranga"
-
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "Garagaza"
+msgid "Class Associations"
+msgstr "aho ishuri riri"
 
 #: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
 #, fuzzy
@@ -2871,31 +3994,68 @@ msgstr "Isinya "
 msgid "Draw as circle"
 msgstr "Nka Uruziga "
 
-#: dialogs/umlviewdialog.cpp:93
+#: dialogs/statedialog.cpp:85
 #, fuzzy
-msgid "Classes Display Options"
-msgstr "Kwerekana amahitamo"
+msgid "Initial state"
+msgstr "Leta "
 
-#: dialogs/umlviewdialog.cpp:100
+#: dialogs/statedialog.cpp:85
 #, fuzzy
-msgid "Diagram Colors"
-msgstr "Dim Color"
+msgid "End state"
+msgstr "Impera Leta "
 
-#: dialogs/umlviewdialog.cpp:164
+#: dialogs/statedialog.cpp:96
 #, fuzzy
-msgid "The name you have entered is invalid."
-msgstr "Izina: ni Bitemewe . "
+msgid "State type:"
+msgstr "Ubwoko: : "
 
-#: dialogs/umlviewdialog.cpp:170
+#: dialogs/statedialog.cpp:101
 #, fuzzy
-msgid "The name you have entered is not unique."
-msgstr "Izina: ni OYA Cyo nyine . "
+msgid "State name:"
+msgstr "Izina: : "
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, fuzzy, no-c-format
-msgid "Code Generation Options"
-msgstr "Idosiye y'amahitamo y'ikora ry'urusobe"
+#: dialogs/statedialog.cpp:130
+#, fuzzy
+msgid "Widget Color"
+msgstr "Ibara rya Wijeti"
+
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+#, fuzzy
+msgid "new_class"
+msgstr "Icyiciro cy'igerageza"
+
+#: dialogs/classwizard.cpp:54
+#, fuzzy
+msgid "New Class"
+msgstr "Icyiciro cy'Igerageza"
+
+#: dialogs/classwizard.cpp:59
+#, fuzzy
+msgid "Class Attributes"
+msgstr "Ibiranga akadirishya"
+
+#: dialogs/classwizard.cpp:63
+#, fuzzy
+msgid "Class Operations"
+msgstr "Ibikorwa"
+
+#: dialogs/parmpropdlg.cpp:35
+#, fuzzy
+msgid "Parameter Properties"
+msgstr "Indangakintu y'imashini-NshyiraRupapuro"
+
+#: dialogs/parmpropdlg.cpp:82
+#, fuzzy
+msgid "Passing Direction"
+msgstr "Icyerekerezo cyo gucapa"
+
+#: dialogs/parmpropdlg.cpp:84
+#, fuzzy
+msgid ""
+"\"in\" is a readonly parameter, \"out\" is a writeonly parameter and \"inout\" "
+"is a parameter for reading and writing."
+msgstr ""
+"\" in \" ni A Ikintu , \" Inyuma \" ni A Ikintu na \" \" ni A Ikintu ya:  na . "
 
 #: dialogs/codegenerationwizard.cpp:70
 #, fuzzy
@@ -2984,1317 +4144,80 @@ msgstr "%1 OYA Kuri A Ububiko... . Hitamo... A Byemewe Ububiko... . "
 msgid "Please Choose Valid Folder"
 msgstr "Usabwe guhitamo akamenyetso."
 
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-#, fuzzy
-msgid "Select Operation"
-msgstr "Kugena Ibikorwa"
-
-#: dialogs/selectopdlg.cpp:43
-#, fuzzy
-msgid "Sequence number:"
-msgstr "Umubare : "
-
-#: dialogs/selectopdlg.cpp:46
-#, fuzzy
-msgid "Class operation:"
-msgstr "Igikorwa : "
-
-#: dialogs/selectopdlg.cpp:54
-#, fuzzy
-msgid "Custom operation:"
-msgstr "Kunozaidosiyeya Igikorwa : "
-
-#: dialogs/umltemplatedialog.cpp:36
-#, fuzzy
-msgid "Template Properties"
-msgstr "Indangabintu y'ishusho"
-
-#: dialogs/umltemplatedialog.cpp:128
-#, fuzzy
-msgid "You have entered an invalid template name."
-msgstr "Bitemewe Nyandiko-rugero Izina: . "
-
-#: dialogs/umltemplatedialog.cpp:129
-#, fuzzy
-msgid "Template Name Invalid"
-msgstr "Izina ry'Inyandikorugero:"
-
-#: dialogs/umltemplatedialog.cpp:138
-#, fuzzy
-msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "Nyandiko-rugero Ikintu Izina: ni Byakoreshejwe in iyi Igikorwa . "
-
-#: dialogs/umltemplatedialog.cpp:139
-#, fuzzy
-msgid "Template Name Not Unique"
-msgstr "Izina ry'Inyandikorugero:"
-
-#: dialogs/notedialog.cpp:25
-#, fuzzy
-msgid "Note Documentation"
-msgstr "icyitonderwa "
-
-#: dialogs/activitydialog.cpp:70
-#, fuzzy
-msgid "Initial activity"
-msgstr "Umurimo "
-
-#: dialogs/activitydialog.cpp:70
-#, fuzzy
-msgid "End activity"
-msgstr "Impera Umurimo "
-
-#: dialogs/activitydialog.cpp:82
-#, fuzzy
-msgid "Activity type:"
-msgstr "Ubwoko: : "
-
-#: dialogs/activitydialog.cpp:87
-#, fuzzy
-msgid "Activity name:"
-msgstr "Izina: : "
-
-#. 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 ""
-
-#: objectwidget.cpp:90
-#, fuzzy
-msgid "Rename Object"
-msgstr "Ongera wite Izina"
-
-#: objectwidget.cpp:91
+#: dialogs/overwritedialogue.cpp:27
 #, fuzzy
-msgid "Enter object name:"
-msgstr "Igikoresho Izina: : "
-
-#: umlwidgetcontroller.cpp:128
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel move."
-msgstr ""
-
-#: umlwidgetcontroller.cpp:379
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel resize."
-msgstr ""
-
-#: umlviewimageexportermodel.cpp:126
-#, fuzzy, c-format
-msgid "Can not create directory: %1"
-msgstr "Isubiranyuma: Kurema Ububiko"
+msgid "Destination File Already Exists"
+msgstr "Idosiye "
 
-#: umlviewimageexportermodel.cpp:145
+#: dialogs/overwritedialogue.cpp:31
 #, fuzzy
-msgid "Can not save an empty diagram"
-msgstr "OYA Kubika ubusa "
-
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr ""
-
-#. i18n: file umbrelloui.rc line 5
-#: rc.cpp:6
-#, no-c-format
-msgid "&Export"
-msgstr ""
-
-#. i18n: file umbrelloui.rc line 13
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "&Diagram"
-msgstr "Biberamye"
-
-#. i18n: file umbrelloui.rc line 14
-#: rc.cpp:15
-#, no-c-format
-msgid "&New"
-msgstr "Inshya"
-
-#. i18n: file umbrelloui.rc line 31
-#: rc.cpp:18
-#, fuzzy, no-c-format
-msgid "Sh&ow"
-msgstr "Garagaza"
-
-#. i18n: file umbrelloui.rc line 43
-#: rc.cpp:24
-#, fuzzy, no-c-format
-msgid "&Code"
-msgstr "Inyandikoporogaramu"
-
-#. i18n: file umbrelloui.rc line 47
-#: rc.cpp:27
-#, fuzzy, no-c-format
-msgid "Active &Language"
-msgstr "&Ururimi"
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 53
-#: rc.cpp:33 rc.cpp:156
-#, no-c-format
-msgid "Slash-Slash (//)"
-msgstr ""
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 58
-#: rc.cpp:36 rc.cpp:159
-#, no-c-format
-msgid "Slash-Star (/**  */)"
-msgstr ""
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 70
-#: rc.cpp:39 rc.cpp:153 rc.cpp:210
-#, no-c-format
-msgid "Style:"
-msgstr "Imisusire"
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 98
-#: rc.cpp:42
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">C++ Code Generation</p>"
-msgstr "< p Itunganya = \" Hagati \" > + + </p> "
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 136
-#: rc.cpp:48
-#, no-c-format
-msgid "Method Body Generation"
-msgstr ""
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 164
-#: rc.cpp:51
-#, fuzzy, no-c-format
-msgid "Use following for classes in generated code:"
-msgstr "ya:  Inzego in Inyandikoporogaramu : "
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 201
-#: rc.cpp:54
-#, fuzzy, no-c-format
-msgid "QPtrList"
-msgstr "Urutonde"
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 202
-#: rc.cpp:57 rc.cpp:81
-#, fuzzy, no-c-format
-msgid "vector"
-msgstr "Umukinnyi"
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 211
-#: rc.cpp:60
-#, fuzzy, no-c-format
-msgid "<b>Variable</b>"
-msgstr "Impinduragaciro"
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 233
-#: rc.cpp:63 rc.cpp:96
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 273
-#: rc.cpp:66
-#, fuzzy, no-c-format
-msgid "QString"
-msgstr "Ikurikiranyanyuguti"
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 274
-#: rc.cpp:69 rc.cpp:90
-#, no-c-format
-msgid "string"
-msgstr "Ikurikiranyanyuguti"
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 325
-#: rc.cpp:72
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">String</p>"
-msgstr "< p Itunganya = \" Hagati \" > </p> "
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 341
-#: rc.cpp:75
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">List</p>"
-msgstr "< p Itunganya = \" Hagati \" > </p> "
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 364
-#: rc.cpp:78
-#, fuzzy, no-c-format
-msgid "qptrlist.h"
-msgstr ". h "
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 374
-#: rc.cpp:84
-#, fuzzy, no-c-format
-msgid "<i>global?</i>"
-msgstr "<i> &Rusange ? </i> "
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 397
-#: rc.cpp:87
-#, fuzzy, no-c-format
-msgid "qstring.h"
-msgstr ". h "
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 418
-#: rc.cpp:93
-#, fuzzy, no-c-format
-msgid "Class name"
-msgstr "izina y'ubwoko"
-
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 448
-#: rc.cpp:99
-#, fuzzy, no-c-format
-msgid "<i><p align=\"center\">Include file</p></i>"
-msgstr "<i> < p Itunganya = \" Hagati \" > Idosiye </p> </i> "
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 40
-#: rc.cpp:102
-#, fuzzy, no-c-format
-msgid "Project Generation"
-msgstr "Ibisobanuro by'umushinga"
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 51
-#: rc.cpp:105
-#, fuzzy, no-c-format
-msgid "Create ANT build document"
-msgstr "Inyandiko "
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 69
-#: rc.cpp:108 rc.cpp:165
-#, fuzzy, no-c-format
-msgid "Auto-Generate Methods"
-msgstr "&Uburyo bw'Ihamya"
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 88
-#: rc.cpp:111 rc.cpp:168
-#, no-c-format
-msgid "Empty constructor methods"
-msgstr ""
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 99
-#: rc.cpp:114 rc.cpp:171
-#, no-c-format
-msgid "Association accessor methods"
-msgstr ""
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 110
-#: rc.cpp:117 rc.cpp:174
-#, no-c-format
-msgid "Attribute accessor methods"
-msgstr ""
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 144
-#: rc.cpp:129 rc.cpp:186
-#, fuzzy, no-c-format
-msgid "From Parent Object"
-msgstr "Igikoresho cy'Ifishi"
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 159
-#: rc.cpp:132 rc.cpp:189
-#, fuzzy, no-c-format
-msgid "Default attribute accessor scope:"
-msgstr "Ikiranga: Ingano: : "
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 177
-#: rc.cpp:135 rc.cpp:192
-#, fuzzy, no-c-format
-msgid "Default association field scope:"
-msgstr "Ishyirahamwe Umwanya Ingano: : "
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 198
-#: rc.cpp:147 rc.cpp:204
-#, fuzzy, no-c-format
-msgid "From Parent Role"
-msgstr "Ububiko Mubyeyi"
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 269
-#: rc.cpp:162
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Java Code Generation</p>"
-msgstr "< p Itunganya = \" Hagati \" > </p> "
-
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 213
-#: rc.cpp:213
-#, fuzzy, no-c-format
-msgid "Hash (#)"
-msgstr "Akanyerezo (Bitsindagiye)"
-
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 218
-#: rc.cpp:216
-#, fuzzy, no-c-format
-msgid "Begin-End (=begin  =end)"
-msgstr "- Impera ( = = Impera ) "
-
-#. i18n: file codegenerators/rubycodegenerationformbase.ui line 240
-#: rc.cpp:219
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">Ruby Code Generation</p>"
-msgstr "< p Itunganya = \" Hagati \" > </p> "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 69
-#: rc.cpp:228
-#, no-c-format
-msgid "Language"
-msgstr "Ururimi"
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 93
-#: rc.cpp:231
-#, no-c-format
-msgid "Folders"
-msgstr "Ububiko"
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 110
-#: rc.cpp:234
-#, fuzzy, no-c-format
-msgid "Write all generated files to folder:"
-msgstr "Byose Idosiye Kuri Ububiko... : "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 118
-#: rc.cpp:237
-#, fuzzy, no-c-format
-msgid "Bro&wse..."
-msgstr "Gushakisha..."
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 126
-#: rc.cpp:240
-#, fuzzy, no-c-format
-msgid "B&rowse..."
-msgstr "Gushakisha..."
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 134
-#: rc.cpp:243
-#, fuzzy, no-c-format
-msgid "&Include heading files from folder:"
-msgstr "Umutwempangano Idosiye Kuva: Ububiko... : "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 145
-#: rc.cpp:246
-#, fuzzy, no-c-format
-msgid "Files generated by Code Generator will be written to this folder"
-msgstr "ku Kuri iyi Ububiko... "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 153
-#: rc.cpp:249
-#, fuzzy, no-c-format
-msgid ""
-"Files in this folder will be used as heading files in the generated code"
-msgstr ""
-"in iyi Ububiko... Byakoreshejwe Nka Umutwempangano Idosiye in i "
-"Inyandikoporogaramu "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 197
-#: rc.cpp:252
-#, fuzzy, no-c-format
-msgid "Overwrite Policy"
-msgstr "Gusimbuza "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 215
-#: rc.cpp:255
-#, fuzzy, no-c-format
-msgid ""
-"If a file with the same name as the name code \n"
-"generator wants to use as output file already exists:"
-msgstr ""
-"A Idosiye Na: i Izina: Nka i Izina: Inyandikoporogaramu \n"
-"Kuri Koresha Nka Ibisohoka Idosiye : "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 223
-#: rc.cpp:259
-#, fuzzy, no-c-format
-msgid "O&verwrite"
-msgstr "Guhindura"
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 226
-#: rc.cpp:262
-#, fuzzy, no-c-format
-msgid "Overwrite existing files if they exist in the destination folder"
-msgstr "Gusimbuza Idosiye NIBA in i Ishyika: Ububiko... "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 234
-#: rc.cpp:265
-#, fuzzy, no-c-format
-msgid "As&k"
-msgstr "Kubaza"
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 240
-#: rc.cpp:268
-#, fuzzy, no-c-format
-msgid "If a file with the same name already exists, ask what to do"
-msgstr "A Idosiye Na: i Izina: , ask Kuri "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 248
-#: rc.cpp:271
-#, fuzzy, no-c-format
-msgid "&Use a different name"
-msgstr "A Izina: "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 251
-#: rc.cpp:274
-#, fuzzy, no-c-format
 msgid ""
-"If a file already exists in the destination folder, select a different name to "
-"use by adding a suffix to the file name"
-msgstr ""
-"A Idosiye in i Ishyika: Ububiko... , Guhitamo A Izina: Kuri Koresha ku Wongera "
-"A Ingereka Kuri i Idosiye Izina: "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 265
-#: rc.cpp:277
-#, no-c-format
-msgid "Formatting"
-msgstr "Ihinduramiterere"
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 284
-#: rc.cpp:280
-#, no-c-format
-msgid "Lines"
-msgstr "Imirongo"
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 346
-#: rc.cpp:283
-#, fuzzy, no-c-format
-msgid "Line ending style:"
-msgstr "Imisusire : "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 354
-#: rc.cpp:286
-#, fuzzy, no-c-format
-msgid "Indentation type:"
-msgstr "Ubwoko: : "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 362
-#: rc.cpp:289
-#, fuzzy, no-c-format
-msgid "Indentation amount:"
-msgstr "Igiteranyo  : "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 368
-#: rc.cpp:292
-#, fuzzy, no-c-format
-msgid ""
-"*NIX (\"\\n\")"
-msgstr ""
-"* ( \" \n"
-"n \" ) "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 373
-#: rc.cpp:295
-#, fuzzy, no-c-format
-msgid ""
-"Windows (\"\\r\\n\")"
-msgstr ""
-"( \" \\r \n"
-"n \" ) "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 378
-#: rc.cpp:298
-#, fuzzy, no-c-format
-msgid "Mac (\"\\r\")"
-msgstr "MAC"
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 388
-#: rc.cpp:301
-#, fuzzy, no-c-format
-msgid "No Indentation"
-msgstr "Isunika"
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 393
-#: rc.cpp:304
-#, no-c-format
-msgid "Tab"
-msgstr "Isimbuka"
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 398
-#: rc.cpp:307
-#, no-c-format
-msgid "Space"
-msgstr "Umwanya"
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 417
-#: rc.cpp:310
-#, fuzzy, no-c-format
-msgid "Comment Verbosity"
-msgstr "Ibisobanuro"
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 433
-#: rc.cpp:313
-#, fuzzy, no-c-format
-msgid ""
-"Write comments &for sections even if section \n"
-"is empty"
-msgstr ""
-"Ibisobanuro ya:  Ibyatoranyijwe ATARIIGIHARWE NIBA Icyiciro \n"
-"ni ubusa "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 436
-#: rc.cpp:317
-#, fuzzy, no-c-format
-msgid ""
-"Writes comments to indicate the different sections (public, private etc) in a "
-"class, even if the sections are empty"
-msgstr ""
-"Ibisobanuro Kuri i Ibyatoranyijwe ( public , By'umwihariko ) in A Urwego: , "
-"ATARIIGIHARWE NIBA i Ibyatoranyijwe ubusa "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 452
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "&Write documentation comments even if empty"
-msgstr "Inyandiko Ibisobanuro ATARIIGIHARWE NIBA ubusa "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 455
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Write comments &for class and method documentation even if empty"
-msgstr "Ibisobanuro ya:  Urwego: na Uburyo Inyandiko ATARIIGIHARWE NIBA ubusa "
-
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 468
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Language Options"
-msgstr "Igice Ururimi"
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 16
-#: rc.cpp:329
-#, fuzzy, no-c-format
-msgid "Code Generation Wizard"
-msgstr "Nyobora y'iyerekana"
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 23
-#: rc.cpp:332
-#, fuzzy, no-c-format
-msgid "Select Classes"
-msgstr "Guhitamo idosiye"
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 41
-#: rc.cpp:335
-#, fuzzy, no-c-format
-msgid ""
-"Place all the classes you want to generate code\n"
-"for in the right hand side list"
-msgstr "Byose i Inzego Kuri in i Iburyo: Urutonde "
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 78
-#: rc.cpp:339
-#, fuzzy, no-c-format
-msgid "Add class for code generation"
-msgstr "Urwego: ya:  Inyandikoporogaramu "
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 101
-#: rc.cpp:342
-#, fuzzy, no-c-format
-msgid "Classes Selected"
-msgstr "&Kubika Ibyatoranyijwe"
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 136
-#: rc.cpp:345
-#, fuzzy, no-c-format
-msgid "Remove class from Code Generation"
-msgstr "Urwego: Kuva: "
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 159
-#: rc.cpp:348
-#, fuzzy, no-c-format
-msgid "Classes Available"
-msgstr "I(bi)huzagihe (b)ihari"
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 209
-#: rc.cpp:351
-#, fuzzy, no-c-format
-msgid "Code Generation Status"
-msgstr "Imimerere y'ukwihuza"
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 226
-#: rc.cpp:354
-#, fuzzy, no-c-format
-msgid "Press the Generation button to start the code generation"
-msgstr "i Akabuto Kuri Tangira &vendorShortName; i Inyandikoporogaramu "
-
-#. i18n: file dialogs/codegenerationwizardbase.ui line 234
-#: rc.cpp:357 rc.cpp:363
-#, fuzzy, no-c-format
-msgid "Generation Status"
-msgstr "Imimerere y'ukwihuza"
-
-#. i18n: file dialogs/codeviewerdialogbase.ui line 43
-#: rc.cpp:369
-#, fuzzy, no-c-format
-msgid "Show hidden blocks"
-msgstr "Birahishe "
-
-#. i18n: file dialogs/codeviewerdialogbase.ui line 59
-#: rc.cpp:372
-#, fuzzy, no-c-format
-msgid "<p align=\"center\">component name here</p>"
-msgstr "< p Itunganya = \" Hagati \" > Izina: </p> "
-
-#. i18n: file dialogs/codeviewerdialogbase.ui line 86
-#: rc.cpp:378
-#, fuzzy, no-c-format
-msgid "Show block type"
-msgstr "Funga Ubwoko: "
-
-#. i18n: file dialogs/codevieweroptionsbase.ui line 45
-#: rc.cpp:381
-#, no-c-format
-msgid "Colors"
-msgstr "Amabara"
-
-#. i18n: file dialogs/codevieweroptionsbase.ui line 72
-#: rc.cpp:384
-#, no-c-format
-msgid "Font:"
-msgstr "Imyandikire:"
-
-#. i18n: file dialogs/codevieweroptionsbase.ui line 103
-#: rc.cpp:387
-#, fuzzy, no-c-format
-msgid "Paper:"
-msgstr "urupapuro"
-
-#. i18n: file dialogs/codevieweroptionsbase.ui line 134
-#: rc.cpp:390
-#, fuzzy, no-c-format
-msgid "Selected:"
-msgstr "Byatoranyijwe:"
-
-#. i18n: file dialogs/codevieweroptionsbase.ui line 260
-#: rc.cpp:393
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">UML object block:</p>"
-msgstr "< p Itunganya = \" Iburyo: \" > Igikoresho Funga : </p> "
-
-#. i18n: file dialogs/codevieweroptionsbase.ui line 276
-#: rc.cpp:396
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Hidden block:</p>"
-msgstr "< p Itunganya = \" Iburyo: \" > Funga : </p> "
-
-#. i18n: file dialogs/codevieweroptionsbase.ui line 294
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Uneditable text:</p>"
-msgstr "< p Itunganya = \" Iburyo: \" > Umwandiko : </p> "
-
-#. i18n: file dialogs/codevieweroptionsbase.ui line 333
-#: rc.cpp:402
-#, fuzzy, no-c-format
-msgid "<p align=\"right\">Editable text:</p>"
-msgstr "< p Itunganya = \" Iburyo: \" > Umwandiko : </p> "
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 30
-#: rc.cpp:405
-#, fuzzy, no-c-format
-msgid "Diagram Properties"
-msgstr "Ibiranga Ikadiri"
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 92
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Zoom:"
-msgstr "Ihindurangano..."
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 119
-#: rc.cpp:414
-#, no-c-format
-msgid "%"
-msgstr "%"
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 186
-#: rc.cpp:420
-#, fuzzy, no-c-format
-msgid "Show &grid"
-msgstr "Urusobetudirishya "
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 194
-#: rc.cpp:423
-#, fuzzy, no-c-format
-msgid "Snap &to grid"
-msgstr "Gukata ku Rusobe- tudirishya"
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 202
-#: rc.cpp:426
-#, fuzzy, no-c-format
-msgid "Snap component size"
-msgstr "Ingano: "
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 206
-#: rc.cpp:429
-#, fuzzy, no-c-format
-msgid ""
-"Snap the size of the components to be a multiple of the grid spacing.\n"
-"If 'Snap to Grid' is enabled a component will always be aligned with the grid "
-"on all 4 sides."
-msgstr ""
-"i Ingano: Bya i Kuri A Igikubo Bya i Urusobetudirishya Itandukanya: . \n"
-"' Kuri ni Bikora A Buri gihe Na: i Urusobetudirishya ku Byose 4 . "
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 257
-#: rc.cpp:433
-#, fuzzy, no-c-format
-msgid "Grid spacing:  "
-msgstr "Itandukanya: : "
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 265
-#: rc.cpp:436
-#, no-c-format
-msgid "X"
-msgstr "X"
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 284
-#: rc.cpp:439
-#, no-c-format
-msgid "Y"
-msgstr "Y"
-
-#. i18n: file dialogs/diagrampropertiespage.ui line 346
-#: rc.cpp:442
-#, fuzzy, no-c-format
-msgid "Line width:  "
-msgstr "Ubugari bw'Umurongo"
-
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 16
-#: rc.cpp:448
-#, fuzzy, no-c-format
-msgid "Export all views"
-msgstr "Nka ... "
-
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 49
-#: rc.cpp:451
-#, no-c-format
-msgid "&Directory to save the diagrams in:"
-msgstr ""
-
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 55
-#: rc.cpp:454 rc.cpp:457
-#, no-c-format
-msgid "The base directory used to save the images"
-msgstr ""
-
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 84
-#: rc.cpp:460
-#, fuzzy, no-c-format
-msgid "&Image type:"
-msgstr "Ubwoko: : "
-
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 100
-#: rc.cpp:466
-#, fuzzy, no-c-format
-msgid "Use &folders"
-msgstr "Ububiko"
-
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 104
-#: rc.cpp:469
-#, no-c-format
-msgid ""
-"Create in the target directory the same tree structure used\n"
-"in the document to store the views"
-msgstr ""
-
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 108
-#: rc.cpp:473
-#, no-c-format
-msgid ""
-"The views are stored in folders in the document. The same tree structure used "
-"in the document to store the views can be created in the selected base "
-"directory with this option.\n"
-"Only the folders made by the user are created in the base directory (Logical "
-"view, use case view and so on aren't created)."
-msgstr ""
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 106
-#: rc.cpp:495
-#, fuzzy, no-c-format
-msgid "Role Changeability"
-msgstr "Guhindura Ubwijime"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 156
-#: rc.cpp:507
-#, fuzzy, no-c-format
-msgid "Role Visibility"
-msgstr "igaragara"
-
-#: association.cpp:84
-#, fuzzy
-msgid "Generalization"
-msgstr "Ibisobanuro rusange"
-
-#: association.cpp:88
-#, fuzzy
-msgid "Self Association"
-msgstr "Ishyirahamwe"
-
-#: association.cpp:89
-#, fuzzy
-msgid "Collaboration Message"
-msgstr "Guhimba Ubutumwa"
-
-#: association.cpp:90
-#, fuzzy
-msgid "Sequence Message"
-msgstr "Kohereza Ubutumwa"
-
-#: association.cpp:91
-#, fuzzy
-msgid "Collaboration Self Message"
-msgstr "Kureka ubutumwa"
-
-#: association.cpp:92
-#, fuzzy
-msgid "Sequence Self Message"
-msgstr "Kureka ubutumwa"
-
-#: association.cpp:95
-#, fuzzy
-msgid "Realization"
-msgstr "Isano"
-
-#: association.cpp:96
-#, fuzzy
-msgid "Uni Association"
-msgstr "Ishyirahamwe"
-
-#: statewidget.cpp:176
-#, fuzzy
-msgid "Enter Activity"
-msgstr "Umurimo"
-
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "Amahitamo Rusange"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-#, fuzzy
-msgid "Package is a namespace"
-msgstr "ni A "
-
-#: codegenerators/cppcodegenerationform.cpp:41
-#, fuzzy
-msgid "Virtual destructors"
-msgstr "Name=Ibiro Bitagaragara"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-#, fuzzy
-msgid "Generate empty constructors"
-msgstr "ubusa "
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
+"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 ""
+"Idosiye %1 in %2 . \n"
+"\n"
+"Guhindura i Idosiye , A Izina: Cyangwa OYA iyi Idosiye . "
 
-#: codegenerators/cppcodegenerationform.cpp:50
-#, fuzzy
-msgid "Operations are inline"
-msgstr "Mumurongo "
-
-#: codegenerators/cppcodegenerationform.cpp:53
-#, fuzzy
-msgid "Accessors are inline"
-msgstr "Mumurongo "
-
-#: codegenerators/cppcodegenerationform.cpp:57
-#, fuzzy
-msgid "Accessors are public"
-msgstr "public "
-
-#: listpopupmenu.cpp:231 listpopupmenu.cpp:486
-#, fuzzy
-msgid "Change Font..."
-msgstr "Guhindura Imyandikire"
-
-#: listpopupmenu.cpp:233
-msgid "Delete Selected Items"
-msgstr "Gusiba Ibigize byatoranijwe"
-
-#: listpopupmenu.cpp:240 listpopupmenu.cpp:718
-#, fuzzy
-msgid "Draw as Circle"
-msgstr "Nka "
-
-#: listpopupmenu.cpp:243 listpopupmenu.cpp:720
-#, fuzzy
-msgid "Change into Class"
-msgstr "Byahinduwe ku"
-
-#: listpopupmenu.cpp:247 listpopupmenu.cpp:726
-#, fuzzy
-msgid "Change into Interface"
-msgstr "Guhindura Imyandikire y'Imigaragarire y'Ukoresha"
-
-#: listpopupmenu.cpp:281 listpopupmenu.cpp:1155
-#, fuzzy
-msgid "Enum Literal..."
-msgstr "Kongera Kwita Urutonde..."
-
-#: listpopupmenu.cpp:292 listpopupmenu.cpp:1143
-#, fuzzy
-msgid "Entity Attribute..."
-msgstr "Guhindura Ibijyanye..."
-
-#: listpopupmenu.cpp:318
-msgid "Move Up"
-msgstr "Kuzamura"
-
-#: listpopupmenu.cpp:319
-msgid "Move Down"
-msgstr "Kumanura/Kumanuka"
-
-#: listpopupmenu.cpp:325
-#, fuzzy
-msgid "Rename Class..."
-msgstr "Kongera Kwita Urutonde..."
-
-#: listpopupmenu.cpp:326
-#, fuzzy
-msgid "Rename Object..."
-msgstr "Kwita izina ikintu bundi bushya:"
-
-#: listpopupmenu.cpp:334 listpopupmenu.cpp:423 listpopupmenu.cpp:564
-#, fuzzy
-msgid "New Operation..."
-msgstr "Isano Rishya..."
-
-#: listpopupmenu.cpp:335 listpopupmenu.cpp:424 listpopupmenu.cpp:1302
-#, fuzzy
-msgid "Select Operation..."
-msgstr "Kugena Ibikorwa"
-
-#: listpopupmenu.cpp:346 listpopupmenu.cpp:430
-#, fuzzy
-msgid "Change Text..."
-msgstr "Guhindura imbonerahamwe..."
-
-#: listpopupmenu.cpp:360 listpopupmenu.cpp:579 listpopupmenu.cpp:1043
-#, fuzzy
-msgid "Activity..."
-msgstr "Umurimo"
-
-#: listpopupmenu.cpp:366
-#, fuzzy
-msgid "Change State Name..."
-msgstr "Hindura izina ry'umwanya"
-
-#: listpopupmenu.cpp:376
-#, fuzzy
-msgid "FlipQt::Horizontal"
-msgstr "Guhindukiza intambike"
-
-#: listpopupmenu.cpp:378
-#, fuzzy
-msgid "FlipQt::Vertical"
-msgstr "Guhindukiza ubuhagarike"
-
-#: listpopupmenu.cpp:388
-#, fuzzy
-msgid "Change Activity Name..."
-msgstr "Hindura igikorwa..."
-
-#: listpopupmenu.cpp:397 listpopupmenu.cpp:400 listpopupmenu.cpp:1268
-#: listpopupmenu.cpp:1272
-#, fuzzy
-msgid "Change Multiplicity..."
-msgstr "Guhindura Politike..."
-
-#: listpopupmenu.cpp:403 listpopupmenu.cpp:1276
-#, fuzzy
-msgid "Change Name"
-msgstr "Guhindura izina"
-
-#: listpopupmenu.cpp:406 listpopupmenu.cpp:1260 listpopupmenu.cpp:1282
-#, fuzzy
-msgid "Change Role A Name..."
-msgstr "A ... "
-
-#: listpopupmenu.cpp:409 listpopupmenu.cpp:1264 listpopupmenu.cpp:1283
-#, fuzzy
-msgid "Change Role B Name..."
-msgstr "Hindura izina ry'umwanya"
-
-#: listpopupmenu.cpp:461
-msgid "New"
-msgstr "Gishya"
-
-#: listpopupmenu.cpp:471 listpopupmenu.cpp:1306
-msgid "Rename..."
-msgstr "Guhindura Izina..."
-
-#: listpopupmenu.cpp:489 listpopupmenu.cpp:734 listpopupmenu.cpp:745
+#: dialogs/overwritedialogue.cpp:34
 #, fuzzy
-msgid "Line Color..."
-msgstr "Ibara ry'umurongo"
+msgid "&Apply to all remaining files"
+msgstr "Kuri Byose Idosiye "
 
-#: listpopupmenu.cpp:492
-#, fuzzy
-msgid "Expand All"
-msgstr "Kwagura"
+#: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
+msgid "&Overwrite"
+msgstr "Gusimbuza"
 
-#: listpopupmenu.cpp:495
+#: dialogs/overwritedialogue.cpp:39
 #, fuzzy
-msgid "Collapse All"
-msgstr "Gusenyuka"
-
-#: listpopupmenu.cpp:498
-msgid "Duplicate"
-msgstr "Gusubiramo"
+msgid "&Generate Similar File Name"
+msgstr "Idosiye "
 
-#: listpopupmenu.cpp:501
+#: dialogs/overwritedialogue.cpp:40
 #, fuzzy
-msgid "Externalize Folder..."
-msgstr "Hindura izina ry'ububiko..."
+msgid "&Do Not Generate File"
+msgstr "Idosiye "
 
-#: listpopupmenu.cpp:504
+#: dialogs/defaultcodegenpolicypage.cpp:36
 #, fuzzy
-msgid "Internalize Folder"
-msgstr "Ububiko Butari bwo"
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "< p Itunganya = \" Hagati \" > . </p> "
 
-#: listpopupmenu.cpp:507
+#: associationwidget.cpp:2328
 #, fuzzy
-msgid "Import Classes..."
-msgstr "Kuzana Inyandirugero..."
+msgid "Multiplicity"
+msgstr "kuba"
 
-#: listpopupmenu.cpp:512
-msgid "Subsystem"
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
 msgstr ""
 
-#: listpopupmenu.cpp:535 listpopupmenu.cpp:608
-msgid "Folder"
-msgstr "Ububiko"
-
-#: listpopupmenu.cpp:555
-#, fuzzy
-msgid "Text Line..."
-msgstr "Umwanya w'inyandiko..."
-
-#: listpopupmenu.cpp:558
-#, fuzzy
-msgid "Reset Label Positions"
-msgstr "&Gusubizaho uburyo bushaje "
-
-#: listpopupmenu.cpp:561
-#, fuzzy
-msgid "New Parameter..."
-msgstr "Mucapyi nshya..."
-
-#: listpopupmenu.cpp:567
-#, fuzzy
-msgid "New Attribute..."
-msgstr "Ibiranga..."
-
-#: listpopupmenu.cpp:570 listpopupmenu.cpp:1232
-#, fuzzy
-msgid "New Template..."
-msgstr "Inyandikorugero nshya"
-
-#: listpopupmenu.cpp:573
-#, fuzzy
-msgid "New Literal..."
-msgstr "Urutonde rushya..."
-
-#: listpopupmenu.cpp:576
-#, fuzzy
-msgid "New Entity Attribute..."
-msgstr "Guhindura Ibijyanye..."
-
-#: listpopupmenu.cpp:582
-#, fuzzy
-msgid "Export as Picture..."
-msgstr "Nka ... "
-
-#: listpopupmenu.cpp:676
-#, fuzzy
-msgid "Public Only"
-msgstr "Ifunguzo ngenga"
-
-#: listpopupmenu.cpp:680
-#, fuzzy
-msgid "Operation Signature"
-msgstr "Gushyiraho Umukono"
-
-#: listpopupmenu.cpp:686
-#, fuzzy
-msgid "Attribute Signature"
-msgstr "izina y'ikiranga"
-
-#: listpopupmenu.cpp:707
-#, fuzzy
-msgid "Attribute..."
-msgstr "Ikiranga:"
-
-#: listpopupmenu.cpp:708
-#, fuzzy
-msgid "Operation..."
-msgstr "Igikorwa"
-
-#: listpopupmenu.cpp:722
-#, fuzzy
-msgid "Refactor"
-msgstr "impamvu/intandaro"
-
-#: listpopupmenu.cpp:723
-#, fuzzy
-msgid "View Code"
-msgstr "&Uburyo bw'Igaragaza"
-
-#: listpopupmenu.cpp:735 listpopupmenu.cpp:746
-#, fuzzy
-msgid "Fill Color..."
-msgstr "Ibara ryo kuzuza"
-
-#: listpopupmenu.cpp:736 listpopupmenu.cpp:747
-#, fuzzy
-msgid "Use Fill Color"
-msgstr "Kuzuzamo Ibara"
-
-#: listpopupmenu.cpp:1007
-#, fuzzy
-msgid "Actor..."
-msgstr "Umukinnyi"
-
-#: listpopupmenu.cpp:1008
-#, fuzzy
-msgid "Use Case..."
-msgstr "Kudatoranya..."
-
-#: listpopupmenu.cpp:1017
-#, fuzzy
-msgid "Class..."
-msgstr "Urwego:"
-
-#: listpopupmenu.cpp:1018
-#, fuzzy
-msgid "Interface..."
-msgstr "Imigaragarire"
-
-#: listpopupmenu.cpp:1019
-#, fuzzy
-msgid "Datatype..."
-msgstr "Ubwoko bw'ibyatanzwe"
-
-#: listpopupmenu.cpp:1020
-#, fuzzy
-msgid "Enum..."
-msgstr "Guhindura Izina..."
-
-#: listpopupmenu.cpp:1021
-#, fuzzy
-msgid "Package..."
-msgstr "Porogaramu"
-
-#: listpopupmenu.cpp:1032
-#, fuzzy
-msgid "State..."
-msgstr "leta:"
-
-#: listpopupmenu.cpp:1053
-#, fuzzy
-msgid "Subsystem..."
-msgstr "leta:"
-
-#: listpopupmenu.cpp:1054
-#, fuzzy
-msgid "Component..."
-msgstr "Igisobanuro..."
-
-#: listpopupmenu.cpp:1055
-#, fuzzy
-msgid "Artifact..."
-msgstr "Kurinda"
-
-#: listpopupmenu.cpp:1063
-#, fuzzy
-msgid "Node..."
-msgstr "Icyitonderwa..."
-
-#: listpopupmenu.cpp:1071
-#, fuzzy
-msgid "Entity..."
-msgstr "Icyinjizwa..."
-
-#: listpopupmenu.cpp:1080
-msgid "Object..."
-msgstr "Ikintu"
-
-#: listpopupmenu.cpp:1089
-msgid "Attribute"
-msgstr "Ikiranga"
-
-#: listpopupmenu.cpp:1090 listpopupmenu.cpp:1099
-msgid "Operation"
-msgstr "Igikorwa"
-
-#: listpopupmenu.cpp:1091 listpopupmenu.cpp:1100
-#, fuzzy
-msgid "Template"
-msgstr "Nyandiko- rugero"
-
-#: listpopupmenu.cpp:1256
-#, fuzzy
-msgid "Delete Anchor"
-msgstr "Gusiba ibara"
-
-#: listpopupmenu.cpp:1281
-#, fuzzy
-msgid "Change Association Name..."
-msgstr "Hindura indanganturo..."
-
-#: listpopupmenu.cpp:1339
-#, fuzzy
-msgid "Clear Diagram"
-msgstr "Gukuraho Ishakisha"
-
-#: listpopupmenu.cpp:1342
-msgid "Snap to Grid"
-msgstr "Gukata ku Rusobe-tudirishya"
-
-#: listpopupmenu.cpp:1344
-#, fuzzy
-msgid "Show Grid"
-msgstr "Kwerekana Itsinda"
-
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-#, fuzzy
-msgid "Rename canceled"
-msgstr "Kureka "
-
-#: umllistviewitem.cpp:468
-#, fuzzy
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "Ikintu Bya Ubwoko: %1 ni OYA . "
-
-#: umllistviewitem.cpp:469
+#: associationwidget.cpp:2346
 #, fuzzy
-msgid "Function Not Implemented"
-msgstr "Igikorwa nticyashobotse"
+msgid "Association Name"
+msgstr "Ishyirahamwe"
 
-#: umllistviewitem.cpp:478
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
 #, fuzzy
-msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"Izina: Bitemewe . \n"
-"Kureka . "
+msgid "Enter association name:"
+msgstr "Ishyirahamwe Izina: : "
 
-#: floatingtextwidget.cpp:112
+#: associationwidget.cpp:2366
 #, fuzzy
-msgid "Enter operation name:"
-msgstr "Igikorwa Izina: : "
+msgid "Role Name"
+msgstr "Izina ry'idosiye"
 
 #: associationwidget.cpp:2367 floatingtextwidget.cpp:162
 #, fuzzy
 msgid "Enter role name:"
 msgstr "Inshingano Izina: : "
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr ""
-
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+#: floatingtextwidget.cpp:112
 #, fuzzy
-msgid "Enter association name:"
-msgstr "Ishyirahamwe Izina: : "
+msgid "Enter operation name:"
+msgstr "Igikorwa Izina: : "
 
 #: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
 #, fuzzy
@@ -4310,53 +4233,81 @@ msgstr "IKOSA"
 msgid "Change Text"
 msgstr "Guhindura itagi"
 
-#: associationwidget.cpp:2328
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "Kuringaniza Ibumoso"
+
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "Kuringaniza Iburyo"
+
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "Kuringaniza Ahabanza"
+
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "Kuringaniza Impera"
+
+#: aligntoolbar.cpp:44
 #, fuzzy
-msgid "Multiplicity"
-msgstr "kuba"
+msgid "AlignQt::Vertical Middle"
+msgstr "Gutondeka hagati impagarike"
 
-#: associationwidget.cpp:2346
+#: aligntoolbar.cpp:45
 #, fuzzy
-msgid "Association Name"
-msgstr "Ishyirahamwe"
+msgid "AlignQt::Horizontal Middle"
+msgstr "Kuringaniza Hagati mu Butambike"
 
-#: associationwidget.cpp:2366
+#: aligntoolbar.cpp:46
 #, fuzzy
-msgid "Role Name"
-msgstr "Izina ry'idosiye"
+msgid "AlignQt::Vertical Distribute"
+msgstr "Gutondeka hagati impagarike"
 
-#: main.cpp:32 main.cpp:93
-msgid "Umbrello UML Modeller"
-msgstr ""
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "AlignQt::Horizontal Distribute"
+msgstr "Kuringaniza Hagati mu Butambike"
 
-#: main.cpp:40
+#: aligntoolbar.cpp:383
 #, fuzzy
-msgid "File to open"
-msgstr "Idosiye Kuri Gufungura "
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. You "
+"can not align associations."
+msgstr ""
+"Itunganya Kuri Guhitamo Ku 2 Ibintu nka Inzego Cyangwa . OYA Itunganya . "
 
-#: main.cpp:41
+#: object_factory.cpp:164
 #, fuzzy
-msgid "export diagrams to extension and exit"
-msgstr "Kwohereza hanze... Kuri Umugereka: na &Kuvamo "
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr "ni A Ijambo-banze ya:  i Ururimi: Bya i Inyandikoporogaramu . "
 
-#: main.cpp:42
-msgid "the local directory to save the exported diagrams in"
-msgstr ""
+#: object_factory.cpp:165
+#, fuzzy
+msgid "Reserved Keyword"
+msgstr "Imvugo idakorwaho"
 
-#: main.cpp:42
-msgid "the directory of the file"
-msgstr ""
+#: umlviewimageexporter.cpp:46
+#, fuzzy
+msgid "Exporting view..."
+msgstr "Tegereza..."
 
-#: main.cpp:43
+#: umlviewimageexporter.cpp:50
 msgid ""
-"keep the tree structure used to store the views in the document in the target "
-"directory"
+"An error happened when exporting the image:\n"
 msgstr ""
 
-#: main.cpp:95
+#: umlviewimageexporter.cpp:66
 #, fuzzy
-msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
-msgstr "( C ) , ( C ) - "
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr "Wifuzakurisimbura."
+
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "Idosiye isanzwe ihari"
 
 #: model_utils.cpp:244
 #, fuzzy
@@ -4446,15 +4397,64 @@ msgstr "Garuka Ubwoko: "
 msgid "Unspecified error"
 msgstr "Ikosa "
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+#: refactoring/refactoringassistant.cpp:289
 #, fuzzy
-msgid "Incorrect use of associations."
-msgstr "Koresha Bya . "
+msgid "Add Base Class"
+msgstr "Base "
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+#: refactoring/refactoringassistant.cpp:290
 #, fuzzy
-msgid "Association Error"
-msgstr "Ikosa "
+msgid "Add Derived Class"
+msgstr "Kongeraho Mucapyi/Urwego..."
+
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+#, fuzzy
+msgid "Add Operation"
+msgstr "Ongera amahitamo"
+
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "Kongeraho Ikiranga"
+
+#: refactoring/refactoringassistant.cpp:297
+#, fuzzy
+msgid "Add Base Interface"
+msgstr "Base "
+
+#: refactoring/refactoringassistant.cpp:298
+#, fuzzy
+msgid "Add Derived Interface"
+msgstr "Ahagenewe Ukoresha"
+
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+#, fuzzy
+msgid "Base Classifiers"
+msgstr "Base "
+
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+#, fuzzy
+msgid "Derived Classifiers"
+msgstr "Ubakoresha Batemerewe"
+
+#: umlviewimageexportermodel.cpp:126
+#, fuzzy, c-format
+msgid "Can not create directory: %1"
+msgstr "Isubiranyuma: Kurema Ububiko"
+
+#: umlviewimageexportermodel.cpp:145
+#, fuzzy
+msgid "Can not save an empty diagram"
+msgstr "OYA Kubika ubusa "
+
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Enables/disables the toolbar"