diff --git a/tde-i18n-af/messages/tdeedu/keduca.po b/tde-i18n-af/messages/tdeedu/keduca.po
index 466da5a2bed..4a96d5d472c 100644
--- a/tde-i18n-af/messages/tdeedu/keduca.po
+++ b/tde-i18n-af/messages/tdeedu/keduca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca VERSION\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2002-11-07 11:31+0200\n"
 "Last-Translator: WEB-Translator <http://kde.af.org.za>\n"
 "Language-Team: AFRIKAANS <AF@lia.org.za>\n"
@@ -14,18 +14,237 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: keducabuilder/main.cpp:26
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "WEB-Vertaler (http://kde.af.org.za)"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "frix@expertron.co.za"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr ""
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Open Educa Lêer"
+
+#: keduca/keduca_part.cpp:59
 #, fuzzy
-msgid "Form-based tests and exams builder"
+msgid "KEducaPart"
+msgstr "Keduca"
+
+#: keduca/keduca_part.cpp:60
+#, fuzzy
+msgid "KEduca KParts Component"
+msgstr "Keduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Algemeen"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Verskeie Instellings"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Vertoon resultate van die antwoord na druk volgende"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Vertoon resultate wanneer einde die toets"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr ""
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr ""
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr ""
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr ""
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "Volgende >>"
+
+#: keduca/keducaview.cpp:89
+#, fuzzy
+msgid "&Save Results..."
+msgstr "Stoor Dokument As"
+
+#: keduca/keducaview.cpp:151
+#, fuzzy
+msgid "Save Results As"
+msgstr "Stoor Dokument As"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"'n dokument met hierdie naam alreeds bestaan.\n"
+"Doen jy wil hê na oorskryf dit?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr ""
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr ""
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Vraag %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Punte"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+
+#: keduca/keducaview.cpp:376
+#, fuzzy
+msgid "Result"
+msgstr "Toets"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr ""
+
+#: keduca/keducaview.cpp:446
+#, fuzzy
+msgid "Correct questions"
+msgstr "Die korrek antwoord is:"
+
+#: keduca/keducaview.cpp:448
+#, fuzzy
+msgid "Incorrect questions"
+msgstr "Die korrek antwoord is:"
+
+#: keduca/keducaview.cpp:452
+#, fuzzy
+msgid "Total points"
+msgstr "Die korrek antwoord is:"
+
+#: keduca/keducaview.cpp:453
+#, fuzzy
+msgid "Correct points"
+msgstr "Die korrek antwoord is:"
+
+#: keduca/keducaview.cpp:455
+#, fuzzy
+msgid "Incorrect points"
+msgstr "Die korrek antwoord is:"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+#, fuzzy
+msgid "Time"
+msgstr "Tyd:"
+
+#: keduca/keducaview.cpp:460
+#, fuzzy
+msgid "Total time"
+msgstr "Die antwoord is:"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr ""
+
+#: keduca/keducaview.cpp:487
+#, fuzzy
+msgid "The answer is: "
+msgstr "Die antwoord is:"
+
+#: keduca/keducaview.cpp:489
+#, fuzzy
+msgid "The correct answer is: "
+msgstr "Die korrek antwoord is:"
+
+#: keduca/keducaview.cpp:495
+#, fuzzy
+msgid "Your answer was: "
+msgstr "Jou antwoord was:"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Dokument Informasie"
+
+#: keduca/keducaview.cpp:550
+#, fuzzy
+msgid "Title"
+msgstr "Titel:"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, fuzzy, no-c-format
+msgid "Category"
+msgstr "Kategorie:"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, fuzzy, no-c-format
+msgid "Type"
+msgstr "Tipe:"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, fuzzy, no-c-format
+msgid "Language"
+msgstr "Taal:"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Antwoorde"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr ""
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr "Form-based toetse en eksamens"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Lêer na las"
 
-#: keducabuilder/main.cpp:37
-#, fuzzy
-msgid "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
 msgstr "Keduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
@@ -36,6 +255,11 @@ msgstr ""
 msgid "Maintainer 2002-2004"
 msgstr ""
 
+#: keduca/main.cpp:41
+#, fuzzy
+msgid "Current Maintainer"
+msgstr "Die korrek antwoord is:"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr ""
@@ -44,11 +268,6 @@ msgstr ""
 msgid "Icons"
 msgstr ""
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Jy benodig na spesifiseer die lêer na open!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Verander Vraag"
@@ -57,31 +276,151 @@ msgstr "Verander Vraag"
 msgid "Add Questions"
 msgstr "Voeg by Vrae"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Waar"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Vals"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, fuzzy, no-c-format
 msgid "&Add"
 msgstr "Voeg by..."
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Dokument Informasie"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, fuzzy, no-c-format
+msgid "Description and rules of the project."
+msgstr "Beskrywing en reëls van die projek. "
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Beskrywing"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Tipe:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Vlak:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Taal:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategorie:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Titel:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Prent"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, fuzzy, no-c-format
+msgid "Default picture:"
+msgstr "Verstek prent:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Outeur"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Web bladsy:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-pos:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Naam:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Rekenaars"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Toets"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, fuzzy, no-c-format
+msgid "Test with Question Points"
+msgstr "Toets met Vraag Punte"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, fuzzy, no-c-format
+msgid "Test with Answers Points"
+msgstr "Toets met Antwoorde Punte"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
 msgstr ""
 
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Maklike"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normale"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Ervare"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Beste"
+
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
 msgstr "Dokument Inligting"
@@ -96,6 +435,11 @@ msgstr "Voeg by..."
 msgid "&Edit..."
 msgstr "Redigeer..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 #, fuzzy
 msgid "&Up"
@@ -116,14 +460,6 @@ msgid ""
 "above."
 msgstr ""
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Open Educa Lêer"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Antwoorde"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Vraag Beeld"
@@ -133,11 +469,6 @@ msgstr "Vraag Beeld"
 msgid "Question point"
 msgstr "Vraag punt:"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-#, fuzzy
-msgid "Time"
-msgstr "Tyd:"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sekondes</p>"
@@ -174,22 +505,10 @@ msgstr ""
 msgid "Save Document As"
 msgstr "Stoor Dokument As"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"'n dokument met hierdie naam alreeds bestaan.\n"
-"Doen jy wil hê na oorskryf dit?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 
@@ -201,13 +520,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Toets"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -244,550 +556,257 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Voeg by Vraag"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Dokument Informasie"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, fuzzy, no-c-format
-msgid "Description and rules of the project."
-msgstr "Beskrywing en reëls van die projek. "
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Beskrywing"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Tipe:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Vlak:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Taal:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategorie:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Titel:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Prent"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, fuzzy, no-c-format
-msgid "Default picture:"
-msgstr "Verstek prent:"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Jy benodig na spesifiseer die lêer na open!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Outeur"
+#: keducabuilder/main.cpp:26
+#, fuzzy
+msgid "Form-based tests and exams builder"
+msgstr "Form-based toetse en eksamens"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Web bladsy:"
+#: keducabuilder/main.cpp:37
+#, fuzzy
+msgid "KEducaBuilder"
+msgstr "Keduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, no-c-format
-msgid "Email:"
-msgstr "E-pos:"
+#: libkeduca/kgallerydialog.cpp:168
+#, fuzzy
+msgid "You need to specify a server!"
+msgstr "Jy benodig na spesifiseer die lêer na open!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Name:"
-msgstr "Naam:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Rekenaars"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
-#, fuzzy, no-c-format
-msgid "Test with Question Points"
-msgstr "Toets met Vraag Punte"
+msgid "KEduca Config Dialog"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:27
 #, fuzzy, no-c-format
-msgid "Test with Answers Points"
-msgstr "Toets met Antwoorde Punte"
+msgid "Show Results"
+msgstr "Toets"
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
+#: keduca/configdialogbase.ui:38
+#, no-c-format
+msgid "At the end of the test"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
+#: keduca/configdialogbase.ui:46
+#, no-c-format
+msgid "After answering each question"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Maklike"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, no-c-format
+msgid "Display answers in random order."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normale"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Vertoon resultate wanneer einde die toets"
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Ervare"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Beste"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Verskeie Instellings"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
+
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Vraag"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, fuzzy, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr "<p><b>Vraag</b></p><hr><p>Slegs die Vraag en tipe is benodig.</p>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, fuzzy, no-c-format
 msgid "&Question:"
 msgstr "Vraag:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, fuzzy, no-c-format
 msgid "&Type:"
 msgstr "Tipe:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, fuzzy, no-c-format
 msgid "&Picture:"
 msgstr "Prent:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, fuzzy, no-c-format
 msgid "P&oint:"
 msgstr "Punt:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, fuzzy, no-c-format
 msgid "Ti&me:"
 msgstr "Tyd:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, fuzzy, no-c-format
 msgid "T&ip:"
 msgstr "Leidraad:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, fuzzy, no-c-format
 msgid "&Explain:"
 msgstr "Verduidelik:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Antwoord"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, fuzzy, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
-"<p><b>Antwoorde</b></p>"
-"<hr>"
-"<p>Slegs die Antwoord en Waarde is benodig.</p>"
+"<p><b>Antwoorde</b></p><hr><p>Slegs die Antwoord en Waarde is benodig.</p>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, fuzzy, no-c-format
 msgid "&Answer:"
 msgstr "Antwoord:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, fuzzy, no-c-format
 msgid "&Value:"
 msgstr "Waarde:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, fuzzy, no-c-format
 msgid "&Points:"
 msgstr "Punte:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Waarde"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Punte"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Redigeer..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, fuzzy, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Keduca Redigeerder Verkry Beginne"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, fuzzy, no-c-format
 msgid "Open an &existing document:"
 msgstr "Open 'n bestaande dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, fuzzy, no-c-format
 msgid "Open a &recent document:"
 msgstr "Open 'n onlangse dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, fuzzy, no-c-format
 msgid "Start a &new document"
 msgstr "Begin 'n nuwe dokument"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgid "&Help"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, fuzzy, no-c-format
 msgid "Address:"
 msgstr "Voeg by Vrae"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, fuzzy, no-c-format
 msgid "Address"
 msgstr "Voeg by Vrae"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, fuzzy, no-c-format
-msgid "Language"
-msgstr "Taal:"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, fuzzy, no-c-format
-msgid "Category"
-msgstr "Kategorie:"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, fuzzy, no-c-format
-msgid "Type"
-msgstr "Tipe:"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr ""
 
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, fuzzy, no-c-format
-msgid "Show Results"
-msgstr "Toets"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "WEB-Vertaler (http://kde.af.org.za)"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "frix@expertron.co.za"
-
-#: libkeduca/kgallerydialog.cpp:168
-#, fuzzy
-msgid "You need to specify a server!"
-msgstr "Jy benodig na spesifiseer die lêer na open!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr ""
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "Volgende >>"
-
-#: keduca/keducaview.cpp:89
-#, fuzzy
-msgid "&Save Results..."
-msgstr "Stoor Dokument As"
-
-#: keduca/keducaview.cpp:151
-#, fuzzy
-msgid "Save Results As"
-msgstr "Stoor Dokument As"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr ""
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Vraag %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-
-#: keduca/keducaview.cpp:376
-#, fuzzy
-msgid "Result"
-msgstr "Toets"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr ""
-
-#: keduca/keducaview.cpp:446
-#, fuzzy
-msgid "Correct questions"
-msgstr "Die korrek antwoord is:"
-
-#: keduca/keducaview.cpp:448
-#, fuzzy
-msgid "Incorrect questions"
-msgstr "Die korrek antwoord is:"
-
-#: keduca/keducaview.cpp:452
-#, fuzzy
-msgid "Total points"
-msgstr "Die korrek antwoord is:"
-
-#: keduca/keducaview.cpp:453
-#, fuzzy
-msgid "Correct points"
-msgstr "Die korrek antwoord is:"
-
-#: keduca/keducaview.cpp:455
-#, fuzzy
-msgid "Incorrect points"
-msgstr "Die korrek antwoord is:"
-
-#: keduca/keducaview.cpp:460
-#, fuzzy
-msgid "Total time"
-msgstr "Die antwoord is:"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr ""
-
-#: keduca/keducaview.cpp:487
-#, fuzzy
-msgid "The answer is: "
-msgstr "Die antwoord is:"
-
-#: keduca/keducaview.cpp:489
-#, fuzzy
-msgid "The correct answer is: "
-msgstr "Die korrek antwoord is:"
-
-#: keduca/keducaview.cpp:495
-#, fuzzy
-msgid "Your answer was: "
-msgstr "Jou antwoord was:"
-
-#: keduca/keducaview.cpp:550
-#, fuzzy
-msgid "Title"
-msgstr "Titel:"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Form-based toetse en eksamens"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "Keduca"
-
-#: keduca/main.cpp:41
-#, fuzzy
-msgid "Current Maintainer"
-msgstr "Die korrek antwoord is:"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr ""
-
-#: keduca/keduca_part.cpp:59
-#, fuzzy
-msgid "KEducaPart"
-msgstr "Keduca"
-
-#: keduca/keduca_part.cpp:60
-#, fuzzy
-msgid "KEduca KParts Component"
-msgstr "Keduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Algemeen"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Verskeie Instellings"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Vertoon resultate van die antwoord na druk volgende"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Vertoon resultate wanneer einde die toets"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr ""
-
 #, fuzzy
 #~ msgid "1.2.0"
 #~ msgstr "1.1"
diff --git a/tde-i18n-ar/messages/tdeedu/keduca.po b/tde-i18n-ar/messages/tdeedu/keduca.po
index 46ce1e24683..747561e3db5 100644
--- a/tde-i18n-ar/messages/tdeedu/keduca.po
+++ b/tde-i18n-ar/messages/tdeedu/keduca.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2006-12-14 20:22+0100\n"
 "Last-Translator: محمد سعد  Mohamed SAAD <metehyi@free.fr>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -19,18 +19,233 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: keducabuilder/main.cpp:26
+#: _translatorinfo:1
 #, fuzzy
-msgid "Form-based tests and exams builder"
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "محمد جمال,Isam Bayazidi"
+
+#: _translatorinfo:2
+#, fuzzy
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "f2c2001@yahoo.com,bayazidi@arabeyes.org"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+#, fuzzy
+msgid "Open &Gallery..."
+msgstr "إفتح معرض..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "افتح ملف Educa"
+
+#: keduca/keduca_part.cpp:59
+#, fuzzy
+msgid "KEducaPart"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:60
+#, fuzzy
+msgid "KEduca KParts Component"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "عام"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "إعدادات متعدده"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "أظهر نتائج السؤال بعد النقر على التالي"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "أظهر النتائج عند الإنتهاء من الإمتحان"
+
+#: keduca/keducaprefs.cpp:64
+#, fuzzy
+msgid "Order"
+msgstr "أطلب"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "أظهر الأسئلة بترتيب عشوائي"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "أظهر الأجوبة بترتيب عشوائي"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr ""
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "ال&تالي>>"
+
+#: keduca/keducaview.cpp:89
+#, fuzzy
+msgid "&Save Results..."
+msgstr "إ&حفظ النتائج"
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "إحفظ النتائج باسم"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"هناك مستند بنفس الاسم.\n"
+"هل تريد إعادة الكتابة عليه؟"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr ""
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "فشل الحفظ"
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "السؤال : %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "العلامات"
+
+#: keduca/keducaview.cpp:267
+#, fuzzy
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"لديك %1 ثواني لتكمل هذا السؤال. \n"
+"\n"
+"إضغط موافق عندما تستعد"
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "النتيحة"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "إحصائيات"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "الأسئلة الصحيحة"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "الأسئلة غير الصحيحة"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "مجموع النقاط"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "النقاط الصحيحة"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "النقاط الخاطئة"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "الوقت"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "الوقت الكلي"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "الوقت في الامتحانات "
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "الإجابة هي:"
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "الإجابة الصحيحة هي:"
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "اجابتك كانت:"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "معلومات المستند"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "العنوان"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "الفئة"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "النوع"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "اللغة"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "الأجوبة"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr ""
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr "امتحانات مبنية على النماذج"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "الملف المطلوب فتحه"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -40,6 +255,10 @@ msgstr ""
 msgid "Maintainer 2002-2004"
 msgstr ""
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr ""
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr ""
@@ -48,11 +267,6 @@ msgstr ""
 msgid "Icons"
 msgstr ""
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "عليك تحديد ملف للفتح"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "عدّل السؤال"
@@ -61,31 +275,150 @@ msgstr "عدّل السؤال"
 msgid "Add Questions"
 msgstr "أضف أسئلة"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "صح"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "خطأ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&أضف"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-#, fuzzy
-msgid "Open &Gallery..."
-msgstr "إفتح معرض..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "معلومات المستند"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, fuzzy, no-c-format
+msgid "Description and rules of the project."
+msgstr "وصف و قواعد المشروع"
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "الوصف"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, fuzzy, no-c-format
+msgid "Type:"
+msgstr "النوع :"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, fuzzy, no-c-format
+msgid "Level:"
+msgstr "المستوى"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, fuzzy, no-c-format
+msgid "Language:"
+msgstr "اللغة :"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, fuzzy, no-c-format
+msgid "Category:"
+msgstr "الفئة :"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, fuzzy, no-c-format
+msgid "Title:"
+msgstr "العنوان"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "الصورة"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, fuzzy, no-c-format
+msgid "Default picture:"
+msgstr "الصورة الإفتراضية"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "المؤلف"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, fuzzy, no-c-format
+msgid "Web page:"
+msgstr "صفحة الويب"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, fuzzy, no-c-format
+msgid "Email:"
+msgstr "البريد الألكتروني"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, fuzzy, no-c-format
+msgid "Name:"
+msgstr "الإسم :"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "كمبيوترات"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "امتحن"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, fuzzy, no-c-format
+msgid "Test with Question Points"
+msgstr "امتحن مع علامات الأسئلة"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, fuzzy, no-c-format
+msgid "Test with Answers Points"
+msgstr "امتحن مع علامات الأجوبة"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "امتحان"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "سهل"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "عادي"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "خبير"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "متفوق"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -101,6 +434,11 @@ msgstr "إضافة..."
 msgid "&Edit..."
 msgstr "تحرير..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 #, fuzzy
 msgid "&Up"
@@ -121,14 +459,6 @@ msgid ""
 "above."
 msgstr "أضف سؤال جديد باستخدام قائمة حرر أو باختيار واحده من الأيقونات بالأعلى"
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "افتح ملف Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "الأجوبة"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "صورة السؤال"
@@ -137,10 +467,6 @@ msgstr "صورة السؤال"
 msgid "Question point"
 msgstr "علامة السؤال"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "الوقت"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " الثواني</p>"
@@ -173,23 +499,11 @@ msgstr ""
 msgid "Save Document As"
 msgstr "حفظ المستند باسم"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"هناك مستند بنفس الاسم.\n"
-"هل تريد إعادة الكتابة عليه؟"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:462
 #, fuzzy
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "إذا أردت استخدام هذا المستند من الأفضل نسخ الصور إلى نفس مجلد المستند. \n"
@@ -203,13 +517,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "امتحن"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -246,540 +553,254 @@ msgstr ""
 msgid "Insert Question"
 msgstr "أدخل سؤال"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "معلومات المستند"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, fuzzy, no-c-format
-msgid "Description and rules of the project."
-msgstr "وصف و قواعد المشروع"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "الوصف"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, fuzzy, no-c-format
-msgid "Type:"
-msgstr "النوع :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, fuzzy, no-c-format
-msgid "Level:"
-msgstr "المستوى"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, fuzzy, no-c-format
-msgid "Language:"
-msgstr "اللغة :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, fuzzy, no-c-format
-msgid "Category:"
-msgstr "الفئة :"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "عليك تحديد ملف للفتح"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, fuzzy, no-c-format
-msgid "Title:"
-msgstr "العنوان"
+#: keducabuilder/main.cpp:26
+#, fuzzy
+msgid "Form-based tests and exams builder"
+msgstr "امتحانات مبنية على النماذج"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "الصورة"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, fuzzy, no-c-format
-msgid "Default picture:"
-msgstr "الصورة الإفتراضية"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "يجب أن تحدد خادم !"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Author"
-msgstr "المؤلف"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, fuzzy, no-c-format
-msgid "Web page:"
-msgstr "صفحة الويب"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, fuzzy, no-c-format
-msgid "Email:"
-msgstr "البريد الألكتروني"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
-#, fuzzy, no-c-format
-msgid "Name:"
-msgstr "الإسم :"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "كمبيوترات"
+msgid "KEduca Config Dialog"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:27
 #, fuzzy, no-c-format
-msgid "Test with Question Points"
-msgstr "امتحن مع علامات الأسئلة"
+msgid "Show Results"
+msgstr "النتيحة"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
-#, fuzzy, no-c-format
-msgid "Test with Answers Points"
-msgstr "امتحن مع علامات الأجوبة"
+#: keduca/configdialogbase.ui:38
+#, no-c-format
+msgid "At the end of the test"
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
+#: keduca/configdialogbase.ui:46
+#, no-c-format
+msgid "After answering each question"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "امتحان"
+#: keduca/configdialogbase.ui:56
+#, fuzzy, no-c-format
+msgid "Ordering"
+msgstr "أطلب"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr ""
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "أظهر الأجوبة بترتيب عشوائي"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "سهل"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "أظهر النتائج عند الإنتهاء من الإمتحان"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "عادي"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "خبير"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "إعدادات متعدده"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "متفوق"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "السؤال"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, fuzzy, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr "<p><b>السؤال</b></p><hr><p>يُحتاج الى السؤال و النوع فقط.</p>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, fuzzy, no-c-format
 msgid "&Question:"
 msgstr "السؤال :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, fuzzy, no-c-format
 msgid "&Type:"
 msgstr "النوع :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, fuzzy, no-c-format
 msgid "&Picture:"
 msgstr "الصورة :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, fuzzy, no-c-format
 msgid "P&oint:"
 msgstr "الدرجة :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, fuzzy, no-c-format
 msgid "Ti&me:"
 msgstr "الوقت :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, fuzzy, no-c-format
 msgid "T&ip:"
 msgstr "تلميح :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, fuzzy, no-c-format
 msgid "&Explain:"
 msgstr "اشرح"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "الجواب"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, fuzzy, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr "<p><b>الجواب</b></p><hr><p>يُحتاج الى الجواب و القيمة فقط.</p>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, fuzzy, no-c-format
 msgid "&Answer:"
 msgstr "الجواب :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, fuzzy, no-c-format
 msgid "&Value:"
 msgstr "القيمة :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, fuzzy, no-c-format
 msgid "&Points:"
 msgstr "العلامات :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "القيمة"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "العلامات"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "تحرير..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, fuzzy, no-c-format
 msgid "Editor - Getting Started"
 msgstr "يتم تشغيل محرر ك اختبار"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, fuzzy, no-c-format
 msgid "Open an &existing document:"
 msgstr "فتح ملف"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, fuzzy, no-c-format
 msgid "Open a &recent document:"
 msgstr "فتح ملف حديث"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, fuzzy, no-c-format
 msgid "Start a &new document"
 msgstr "يدء مستند جديد"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgid "&Help"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, fuzzy, no-c-format
 msgid "Gallery"
 msgstr "إفتح معرض..."
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, fuzzy, no-c-format
 msgid "Address:"
 msgstr "أضف أسئلة"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, fuzzy, no-c-format
 msgid "Address"
 msgstr "أضف أسئلة"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "اللغة"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "الفئة"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "النوع"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr ""
 
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, fuzzy, no-c-format
-msgid "Show Results"
-msgstr "النتيحة"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, fuzzy, no-c-format
-msgid "Ordering"
-msgstr "أطلب"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "أظهر الأسئلة بترتيب عشوائي"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "أظهر الأجوبة بترتيب عشوائي"
-
-#: _translatorinfo.cpp:1
-#, fuzzy
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "محمد جمال,Isam Bayazidi"
-
-#: _translatorinfo.cpp:3
-#, fuzzy
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "f2c2001@yahoo.com,bayazidi@arabeyes.org"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "يجب أن تحدد خادم !"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr ""
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "ال&تالي>>"
-
-#: keduca/keducaview.cpp:89
-#, fuzzy
-msgid "&Save Results..."
-msgstr "إ&حفظ النتائج"
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "إحفظ النتائج باسم"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "فشل الحفظ"
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "السؤال : %1"
-
-#: keduca/keducaview.cpp:267
-#, fuzzy
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"لديك %1 ثواني لتكمل هذا السؤال. \n"
-"\n"
-"إضغط موافق عندما تستعد"
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "النتيحة"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "إحصائيات"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "الأسئلة الصحيحة"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "الأسئلة غير الصحيحة"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "مجموع النقاط"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "النقاط الصحيحة"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "النقاط الخاطئة"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "الوقت الكلي"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "الوقت في الامتحانات "
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "الإجابة هي:"
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "الإجابة الصحيحة هي:"
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "اجابتك كانت:"
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "العنوان"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "امتحانات مبنية على النماذج"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr ""
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr ""
-
-#: keduca/keduca_part.cpp:59
-#, fuzzy
-msgid "KEducaPart"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:60
-#, fuzzy
-msgid "KEduca KParts Component"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "عام"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "إعدادات متعدده"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "أظهر نتائج السؤال بعد النقر على التالي"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "أظهر النتائج عند الإنتهاء من الإمتحان"
-
-#: keduca/keducaprefs.cpp:64
-#, fuzzy
-msgid "Order"
-msgstr "أطلب"
-
 #~ msgid "1.2.0"
 #~ msgstr "1.2.0"
 
diff --git a/tde-i18n-az/messages/tdeedu/keduca.po b/tde-i18n-az/messages/tdeedu/keduca.po
index 11519d25d96..aeb6c1dafa7 100644
--- a/tde-i18n-az/messages/tdeedu/keduca.po
+++ b/tde-i18n-az/messages/tdeedu/keduca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2001-12-31 01:39GMT+0200\n"
 "Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
 "Language-Team: Azərbaycan Türkcəsi <linuxaz@azerimail.net>\n"
@@ -15,18 +15,237 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: keducabuilder/main.cpp:26
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Vasif İsmayıloğlu MD"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "azerb_linux@hotmail.com"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr ""
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
 #, fuzzy
-msgid "Form-based tests and exams builder"
+msgid "Open Educa File"
+msgstr "Educa faylı aç"
+
+#: keduca/keduca_part.cpp:59
+#, fuzzy
+msgid "KEducaPart"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:60
+#, fuzzy
+msgid "KEduca KParts Component"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Ümumi"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+#, fuzzy
+msgid "Various Settings"
+msgstr "Müxtəlif qurğular"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Sonrakı basılandan sonra cavabın nəticəsini göstər"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Nəticəni sınaq bitdikdən sonra göstər"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr ""
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr ""
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr ""
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr ""
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Sonrakı >>"
+
+#: keduca/keducaview.cpp:89
+#, fuzzy
+msgid "&Save Results..."
+msgstr "Sənəd İnfosu"
+
+#: keduca/keducaview.cpp:151
+#, fuzzy
+msgid "Save Results As"
+msgstr "Sənəd İnfosu"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr ""
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr ""
+
+#: keduca/keducaview.cpp:212
+#, fuzzy, c-format
+msgid "Question %1"
+msgstr "Sual"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Hədəflər"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+
+#: keduca/keducaview.cpp:376
+#, fuzzy
+msgid "Result"
+msgstr "Sınaq"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr ""
+
+#: keduca/keducaview.cpp:446
+#, fuzzy
+msgid "Correct questions"
+msgstr "Doğru Cavabı :"
+
+#: keduca/keducaview.cpp:448
+#, fuzzy
+msgid "Incorrect questions"
+msgstr "Doğru Cavabı :"
+
+#: keduca/keducaview.cpp:452
+#, fuzzy
+msgid "Total points"
+msgstr "Doğru Cavabı :"
+
+#: keduca/keducaview.cpp:453
+#, fuzzy
+msgid "Correct points"
+msgstr "Doğru Cavabı :"
+
+#: keduca/keducaview.cpp:455
+#, fuzzy
+msgid "Incorrect points"
+msgstr "Doğru Cavabı :"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+#, fuzzy
+msgid "Time"
+msgstr "Vaxt :"
+
+#: keduca/keducaview.cpp:460
+#, fuzzy
+msgid "Total time"
+msgstr "Cavabı :"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr ""
+
+#: keduca/keducaview.cpp:487
+#, fuzzy
+msgid "The answer is: "
+msgstr "Cavabı :"
+
+#: keduca/keducaview.cpp:489
+#, fuzzy
+msgid "The correct answer is: "
+msgstr "Doğru Cavabı :"
+
+#: keduca/keducaview.cpp:495
+#, fuzzy
+msgid "Your answer was: "
+msgstr "Sizin Cavabınız :"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Sənəd Mə'lumatı"
+
+#: keduca/keducaview.cpp:550
+#, fuzzy
+msgid "Title"
+msgstr "Başlıq :"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, fuzzy, no-c-format
+msgid "Category"
+msgstr "Kateqoriya :"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, fuzzy, no-c-format
+msgid "Type"
+msgstr "Növ:"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, fuzzy, no-c-format
+msgid "Language"
+msgstr "Dil :"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Cavablar"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr ""
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr "Form əsaslı sınaq və imtahanlar"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Yüklənəcək fayl"
 
-#: keducabuilder/main.cpp:37
-#, fuzzy
-msgid "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
 msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
@@ -37,6 +256,11 @@ msgstr ""
 msgid "Maintainer 2002-2004"
 msgstr ""
 
+#: keduca/main.cpp:41
+#, fuzzy
+msgid "Current Maintainer"
+msgstr "Doğru Cavabı :"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr ""
@@ -45,11 +269,6 @@ msgstr ""
 msgid "Icons"
 msgstr ""
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr ""
-
 #: keducabuilder/kcontroladdedit.cpp:56
 #, fuzzy
 msgid "Modify Question"
@@ -60,31 +279,151 @@ msgstr "Sualı təkmilləşdir"
 msgid "Add Questions"
 msgstr "Sual əlavə et"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Doğru"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Yanlış"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr ""
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Sənəd Mə'lumatı"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, fuzzy, no-c-format
+msgid "Description and rules of the project."
+msgstr "Layihənin izahı və qaydaları."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "İzah"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, fuzzy, no-c-format
+msgid "Type:"
+msgstr "Növ:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, fuzzy, no-c-format
+msgid "Level:"
+msgstr "Səviyyə :"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, fuzzy, no-c-format
+msgid "Language:"
+msgstr "Dil :"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, fuzzy, no-c-format
+msgid "Category:"
+msgstr "Kateqoriya :"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, fuzzy, no-c-format
+msgid "Title:"
+msgstr "Başlıq :"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Rəsm"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, fuzzy, no-c-format
+msgid "Default picture:"
+msgstr "Əsas şəkil:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Müəllif"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, fuzzy, no-c-format
+msgid "Web page:"
+msgstr "Veb Səhifəsi :"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, fuzzy, no-c-format
+msgid "Email:"
+msgstr "ePoçt :"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, fuzzy, no-c-format
+msgid "Name:"
+msgstr "Ad :"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Kompüterlər"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Sınaq"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, fuzzy, no-c-format
+msgid "Test with Question Points"
+msgstr "Suallarla Sına"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, fuzzy, no-c-format
+msgid "Test with Answers Points"
+msgstr "Cavablarla Sına"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
 msgstr ""
 
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Asand"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normal"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Usta"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Suprem"
+
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
 msgstr "Sənəd İnfosu"
@@ -97,6 +436,11 @@ msgstr ""
 msgid "&Edit..."
 msgstr ""
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 #, fuzzy
 msgid "&Up"
@@ -117,15 +461,6 @@ msgid ""
 "above."
 msgstr ""
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-#, fuzzy
-msgid "Open Educa File"
-msgstr "Educa faylı aç"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Cavablar"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Sual Şəkli"
@@ -135,11 +470,6 @@ msgstr "Sual Şəkli"
 msgid "Question point"
 msgstr "Sual nöqtəsi :"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-#, fuzzy
-msgid "Time"
-msgstr "Vaxt :"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " saniyə</p>"
@@ -174,20 +504,10 @@ msgstr ""
 msgid "Save Document As"
 msgstr "Sənəd İnfosu"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 
@@ -199,13 +519,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Sınaq"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -245,547 +558,255 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Sual"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Sənəd Mə'lumatı"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, fuzzy, no-c-format
-msgid "Description and rules of the project."
-msgstr "Layihənin izahı və qaydaları."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "İzah"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, fuzzy, no-c-format
-msgid "Type:"
-msgstr "Növ:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, fuzzy, no-c-format
-msgid "Level:"
-msgstr "Səviyyə :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, fuzzy, no-c-format
-msgid "Language:"
-msgstr "Dil :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, fuzzy, no-c-format
-msgid "Category:"
-msgstr "Kateqoriya :"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, fuzzy, no-c-format
-msgid "Title:"
-msgstr "Başlıq :"
+#: keducabuilder/main.cpp:26
+#, fuzzy
+msgid "Form-based tests and exams builder"
+msgstr "Form əsaslı sınaq və imtahanlar"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Rəsm"
+#: keducabuilder/main.cpp:37
+#, fuzzy
+msgid "KEducaBuilder"
+msgstr "KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, fuzzy, no-c-format
-msgid "Default picture:"
-msgstr "Əsas şəkil:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Author"
-msgstr "Müəllif"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, fuzzy, no-c-format
-msgid "Web page:"
-msgstr "Veb Səhifəsi :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, fuzzy, no-c-format
-msgid "Email:"
-msgstr "ePoçt :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
-#, fuzzy, no-c-format
-msgid "Name:"
-msgstr "Ad :"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Kompüterlər"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
-#, fuzzy, no-c-format
-msgid "Test with Question Points"
-msgstr "Suallarla Sına"
+msgid "KEduca Config Dialog"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:27
 #, fuzzy, no-c-format
-msgid "Test with Answers Points"
-msgstr "Cavablarla Sına"
+msgid "Show Results"
+msgstr "Sınaq"
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
+#: keduca/configdialogbase.ui:38
+#, no-c-format
+msgid "At the end of the test"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
+#: keduca/configdialogbase.ui:46
+#, no-c-format
+msgid "After answering each question"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Asand"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, no-c-format
+msgid "Display answers in random order."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normal"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Nəticəni sınaq bitdikdən sonra göstər"
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Usta"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Suprem"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Müxtəlif qurğular"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
+
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Sual"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, fuzzy, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr "<p><b>Sual</b></p><hr><p>Təkcə sual və növü lazımdır.</p>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, fuzzy, no-c-format
 msgid "&Question:"
 msgstr "Sual :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, fuzzy, no-c-format
 msgid "&Type:"
 msgstr "Növ:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, fuzzy, no-c-format
 msgid "&Picture:"
 msgstr "Rəsm :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, fuzzy, no-c-format
 msgid "P&oint:"
 msgstr "Hədəf :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, fuzzy, no-c-format
 msgid "Ti&me:"
 msgstr "Vaxt :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, fuzzy, no-c-format
 msgid "T&ip:"
 msgstr "İp Ucu :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, fuzzy, no-c-format
 msgid "&Explain:"
 msgstr "Danış :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Cavab"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, fuzzy, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr "<p><b>Cavablar</b></p><hr><p>Təkcə Cavab və Qiymət lazımdır.</p>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, fuzzy, no-c-format
 msgid "&Answer:"
 msgstr "Cavab :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, fuzzy, no-c-format
 msgid "&Value:"
 msgstr "Qiymət:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, fuzzy, no-c-format
 msgid "&Points:"
 msgstr "Hədəflər :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Qiymət"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Hədəflər"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, no-c-format
+msgid "&Edit"
+msgstr ""
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, fuzzy, no-c-format
 msgid "Open a &recent document:"
 msgstr "Sənəd İnfosu"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, fuzzy, no-c-format
 msgid "Start a &new document"
 msgstr "Sənəd İnfosu"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgid "&Help"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, fuzzy, no-c-format
 msgid "Address:"
 msgstr "Sual əlavə et"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, fuzzy, no-c-format
 msgid "Address"
 msgstr "Sual əlavə et"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, fuzzy, no-c-format
-msgid "Language"
-msgstr "Dil :"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, fuzzy, no-c-format
-msgid "Category"
-msgstr "Kateqoriya :"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, fuzzy, no-c-format
-msgid "Type"
-msgstr "Növ:"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr ""
 
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, fuzzy, no-c-format
-msgid "Show Results"
-msgstr "Sınaq"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Vasif İsmayıloğlu MD"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "azerb_linux@hotmail.com"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr ""
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr ""
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Sonrakı >>"
-
-#: keduca/keducaview.cpp:89
-#, fuzzy
-msgid "&Save Results..."
-msgstr "Sənəd İnfosu"
-
-#: keduca/keducaview.cpp:151
-#, fuzzy
-msgid "Save Results As"
-msgstr "Sənəd İnfosu"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr ""
-
-#: keduca/keducaview.cpp:212
-#, fuzzy, c-format
-msgid "Question %1"
-msgstr "Sual"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-
-#: keduca/keducaview.cpp:376
-#, fuzzy
-msgid "Result"
-msgstr "Sınaq"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr ""
-
-#: keduca/keducaview.cpp:446
-#, fuzzy
-msgid "Correct questions"
-msgstr "Doğru Cavabı :"
-
-#: keduca/keducaview.cpp:448
-#, fuzzy
-msgid "Incorrect questions"
-msgstr "Doğru Cavabı :"
-
-#: keduca/keducaview.cpp:452
-#, fuzzy
-msgid "Total points"
-msgstr "Doğru Cavabı :"
-
-#: keduca/keducaview.cpp:453
-#, fuzzy
-msgid "Correct points"
-msgstr "Doğru Cavabı :"
-
-#: keduca/keducaview.cpp:455
-#, fuzzy
-msgid "Incorrect points"
-msgstr "Doğru Cavabı :"
-
-#: keduca/keducaview.cpp:460
-#, fuzzy
-msgid "Total time"
-msgstr "Cavabı :"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr ""
-
-#: keduca/keducaview.cpp:487
-#, fuzzy
-msgid "The answer is: "
-msgstr "Cavabı :"
-
-#: keduca/keducaview.cpp:489
-#, fuzzy
-msgid "The correct answer is: "
-msgstr "Doğru Cavabı :"
-
-#: keduca/keducaview.cpp:495
-#, fuzzy
-msgid "Your answer was: "
-msgstr "Sizin Cavabınız :"
-
-#: keduca/keducaview.cpp:550
-#, fuzzy
-msgid "Title"
-msgstr "Başlıq :"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Form əsaslı sınaq və imtahanlar"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-#, fuzzy
-msgid "Current Maintainer"
-msgstr "Doğru Cavabı :"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr ""
-
-#: keduca/keduca_part.cpp:59
-#, fuzzy
-msgid "KEducaPart"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:60
-#, fuzzy
-msgid "KEduca KParts Component"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Ümumi"
-
-#: keduca/keducaprefs.cpp:41
-#, fuzzy
-msgid "Various Settings"
-msgstr "Müxtəlif qurğular"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Sonrakı basılandan sonra cavabın nəticəsini göstər"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Nəticəni sınaq bitdikdən sonra göstər"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr ""
-
 #, fuzzy
 #~ msgid "1.2.0"
 #~ msgstr "1.0"
diff --git a/tde-i18n-bg/messages/tdeedu/keduca.po b/tde-i18n-bg/messages/tdeedu/keduca.po
index 24f2ac37dcc..8c69a50bc2b 100644
--- a/tde-i18n-bg/messages/tdeedu/keduca.po
+++ b/tde-i18n-bg/messages/tdeedu/keduca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2007-04-15 09:07+0000\n"
 "Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -18,17 +18,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Генератор на тестове и изпити"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Красимира Минчева"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "krasimira_m@yahoo.com"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Отваряне на &галерия..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Отваряне на файл на Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "Модул KParts на KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Общи"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Други настройки"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Показване на резултатите при преминаване към следващия въпрос"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Показване на резултатите след завършването на теста"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Ред"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Показване на въпросите в произволен ред"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Показване на отговорите в произволен ред"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Начало на тест"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "Нап&ред >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Запис на резултатите..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Запис на резултатите като"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Вече има документ с такова име.\n"
+"Сигурни ли сте, че искате да бъде презаписан?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Презапис"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Грешка при запис."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Въпрос %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Точки"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Имате %1 секунди за отговор.\n"
+"\n"
+"Натиснете бутона \"Напред\", когато сте готови."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Резултат"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Статистика"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Верни отговори"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Грешни отговори"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Общ брой точки"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Точки за верни отговори"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Точки за грешни отговори"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Време"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Общо време"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Време по тестове"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Отговорът е: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Верният отговор е: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Вашият отговор: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Информация за документа"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Заглавие"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Категория"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Тип"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Език"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Отговори"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "остават %v секунди"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Тестове и изпити"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Файл за отваряне"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -38,6 +246,10 @@ msgstr "Original Author"
 msgid "Maintainer 2002-2004"
 msgstr "Maintainer 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Current Maintainer"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Various fixes and cleanups"
@@ -46,11 +258,6 @@ msgstr "Various fixes and cleanups"
 msgid "Icons"
 msgstr "Icons"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Трябва да зададете файл, който да бъде отворен!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Промяна на въпрос"
@@ -59,30 +266,150 @@ msgstr "Промяна на въпрос"
 msgid "Add Questions"
 msgstr "Добавяне на въпроси"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Вярно"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Грешно"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "До&бавяне"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Отваряне на &галерия..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Информация за документа"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Описание и правила на проекта."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Описание"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Тип:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Ниво:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Език:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Категория:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Заглавие:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Изображение"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Изображение по подразбиране:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Автор"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Уеб страница:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Е-поща:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Име:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Компютри"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Тест"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Тест с точки за въпроси"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Тест с точки за отговори"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Слайдове"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Изпит"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Психологически тест"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Лесно"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Нормално"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Трудно"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Много трудно"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -96,6 +423,11 @@ msgstr "До&бавяне..."
 msgid "&Edit..."
 msgstr "&Редактиране..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "На&горе"
@@ -116,14 +448,6 @@ msgstr ""
 "Добавете нов въпрос чрез менюто \"Редактиране\" или иконите на лентата за "
 "инструменти."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Отваряне на файл на Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Отговори"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Изображение към въпроса"
@@ -132,10 +456,6 @@ msgstr "Изображение към въпроса"
 msgid "Question point"
 msgstr "Точки за въпроса"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Време"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " секунди</p>"
@@ -168,26 +488,14 @@ msgstr "Компресиране на документа"
 msgid "Save Document As"
 msgstr "Запис на документа под друго име"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Вече има документ с такова име.\n"
-"Сигурни ли сте, че искате да бъде презаписан?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Презапис"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Ако искате да споделите този документ, по-добре е да копирате изображенията в "
-"същата директория, където се намира документ.\n"
+"Ако искате да споделите този документ, по-добре е да копирате изображенията "
+"в същата директория, където се намира документ.\n"
 "Копиране на изображенията в директорията на документа?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -198,13 +506,6 @@ msgstr "Копиране"
 msgid "Do Not Copy"
 msgstr "Без копиране"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Тест"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -240,543 +541,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Добавяне на въпрос"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Информация за документа"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Описание и правила на проекта."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Описание"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Тип:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Ниво:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Език:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Категория:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Заглавие:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Изображение"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Трябва да зададете файл, който да бъде отворен!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Изображение по подразбиране:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Генератор на тестове и изпити"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Автор"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Уеб страница:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Необходимо е да зададете сървър!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Е-поща:"
+msgid "KEduca Config Dialog"
+msgstr "Настройване на KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Име:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Компютри"
+msgid "Show Results"
+msgstr "Показване на резултатите"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Тест с точки за въпроси"
+msgid "At the end of the test"
+msgstr "В края на теста"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Тест с точки за отговори"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Слайдове"
+msgid "After answering each question"
+msgstr "След всеки отговор"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Изпит"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Ред"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Психологически тест"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Показване на отговорите в произволен ред"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Лесно"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Показване на резултатите след завършването на теста"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Нормално"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Трудно"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Други настройки"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Много трудно"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Въпрос"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Въпрос</b></p>\n"
+"  <p><b>Въпрос</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Задължителни са само въпросът и типът.</p>\n"
+"  <p>Задължителни са само въпросът и типът.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Въпрос:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Тип:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Изображение:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "То&чки:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Вре&ме:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "По&дсказка:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "По&яснение:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Отговор"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Отговори</b></p>\n"
+"  <p><b>Отговори</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Задължителни са само отговорът и стойността.</p>\n"
+"  <p>Задължителни са само отговорът и стойността.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "От&говор:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Стойност:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "То&чки:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Стойност"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Точки"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "На&горе"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "На&долу"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Информация</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Редактиране..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Редактор - начало"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Отваряне на &съществуващ документ:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Отваряне на &предишен документ:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Отваряне с браузъра на галерии в Интернет"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Създаване на &нов документ"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Информация</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Галерия"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Адрес:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "До&бавяне на сървър"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Сървъри"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Адрес"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Език"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Категория"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Тип"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Отваряне"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Настройване на KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Показване на резултатите"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "В края на теста"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "След всеки отговор"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Ред"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Показване на въпросите в произволен ред"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Показване на отговорите в произволен ред"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Красимира Минчева"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "krasimira_m@yahoo.com"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Необходимо е да зададете сървър!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Начало на тест"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "Нап&ред >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Запис на резултатите..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Запис на резултатите като"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Грешка при запис."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Въпрос %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Имате %1 секунди за отговор.\n"
-"\n"
-"Натиснете бутона \"Напред\", когато сте готови."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Резултат"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Статистика"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Верни отговори"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Грешни отговори"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Общ брой точки"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Точки за верни отговори"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Точки за грешни отговори"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Общо време"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Време по тестове"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Отговорът е: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Верният отговор е: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Вашият отговор: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Заглавие"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Тестове и изпити"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Current Maintainer"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "остават %v секунди"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "Модул KParts на KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Общи"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Други настройки"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Показване на резултатите при преминаване към следващия въпрос"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Показване на резултатите след завършването на теста"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Ред"
diff --git a/tde-i18n-bn/messages/tdeedu/keduca.po b/tde-i18n-bn/messages/tdeedu/keduca.po
index 931cd3241b0..b6809b6b917 100644
--- a/tde-i18n-bn/messages/tdeedu/keduca.po
+++ b/tde-i18n-bn/messages/tdeedu/keduca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2006-04-24 01:23-0500\n"
 "Last-Translator: Progga <progga@BengaLinux.Org>\n"
 "Language-Team: Bengali <kde-translation@bengalinux.org>\n"
@@ -18,17 +18,226 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "ফর্মভিত্তিক পরীক্ষা প্রস্তুতকারক"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "প্রজ্ঞা"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "progga@BengaLinux.Org"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "গ্যালারী খোলো... (&গ)"
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "এডুকা ফাইল খোলো"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "কে-এডুকা-পার্ট"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "কে-এডুকা কে-পার্ট উপাদান"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "সাধারণ"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "বিবিধ বৈশিষ্ট্য"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "'পরবর্তী' চাপার পর উত্তর দেখাও"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "পরীক্ষা শেষ হওয়ার পর উত্তর দেখাও"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "ধারা"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "এলোমেলো ধারায় প্রশ্ন দেখাও"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "এলোমেলো ধারায় উত্তর দেখাও"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "পরীক্ষা &আরম্ভ করো"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&পরবর্তী >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "উত্তর &সংরক্ষণ করো..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "যে নামে ফলাফল সংরক্ষণ করা হবে"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"এই নামে ইতিমধ্যেই একটি ডকুমেন্ট বিদ্যমান।\n"
+"আপনি কি সেটির ওপর দিয়েই লিখতে চান?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "ওপর দিয়ে লিখো"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "সংরক্ষণের প্রচেষ্টা ব্যর্থ হয়েছে।"
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "প্রশ্ন %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "নম্বর"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"এই প্রশ্নের উত্তরে দেওয়ার জন্য আপনার হাতে রয়েছে %1 সেকেন্ড সময়।\n"
+"\n"
+"প্রস্তুত হওয়ার পর 'ঠিক আছে' চাপুন।"
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "ফলাফল"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "পরিসংখ্যান"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "সঠিক প্রশ্নাবলী"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "বেঠিক প্রশ্নাবলী"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "মোট নম্বর"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "সঠিক নম্বর"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "বেঠিক নম্বর"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "সময়"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "মোট সময়"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "পরীক্ষায় ব্যয়িত সময়"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "উত্তর হল: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "সঠিক উত্তরটি হল: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "আপনার উত্তর ছিল: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "ডকুমেন্ট সংক্রান্ত তথ্য"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "শিরোনাম"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "শ্রেণী"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "ধরন"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "ভাষা"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "উত্তর"
+
+# msgstr "আরো %v সেকেন্ড বাকি"
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "আর %v সেকেন্ড বাকি"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "ফর্মভিত্তিক পরীক্ষা"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "যে ফাইলটি লোড করা হবে"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "কে-এডুকা-বিল্ডার"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "কে-এডুকা"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -38,6 +247,10 @@ msgstr "প্রথম লেখক"
 msgid "Maintainer 2002-2004"
 msgstr "২০০২-২০০৪ সাল পর্যন্ত রক্ষণাবেক্ষণকারী"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "বর্তমান রক্ষণাবেক্ষণকারী"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "বিভিন্ন সংশোধনী ও সামঞ্জস্য আনয়ন"
@@ -46,11 +259,6 @@ msgstr "বিভিন্ন সংশোধনী ও সামঞ্জস্
 msgid "Icons"
 msgstr "আইকন"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "আপনাকে উল্লেখ করতে হবে যে কোন ফাইলটি খোলা হবে!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "প্রশ্ন পরিবর্তন করো"
@@ -59,30 +267,150 @@ msgstr "প্রশ্ন পরিবর্তন করো"
 msgid "Add Questions"
 msgstr "প্রশ্ন যোগ করো"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "সত্য"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "মিথ্যা"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "যোগ (&য)"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "গ্যালারী খোলো... (&গ)"
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "ডকুমেন্ট সংক্রান্ত তথ্য"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "প্রকল্পের বিবরণ ও নিয়মাবলী"
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "বিবরণ"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "ধরন:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "স্তর:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "ভাষা:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "শ্রেণী:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "শিরোনাম:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "ছবি"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "ডিফল্ট ছবি:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "লেখক"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "ওয়েবপেজ:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "ই-মেইল:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "নাম:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "কম্পিউটার"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "পরীক্ষা"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "প্রশ্নের নম্বর দ্বারা পরীক্ষা করো"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "উত্তরের নম্বর দ্বারা পরীক্ষা করো"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "স্লাইডার-প্রদর্শনী"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "পরীক্ষা"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "সাইকোটেকনিক পরীক্ষা"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "সহজ"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "স্বাভাবিক"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "অভিজ্ঞ"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "সর্বোচ্চ"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -96,6 +424,11 @@ msgstr "যোগ করো... (&য)"
 msgid "&Edit..."
 msgstr "&সম্পাদন..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&উপর"
@@ -112,16 +445,7 @@ msgstr "কে-এডুকা'র পক্ষ থেকে স্বাগত
 msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
-msgstr ""
-"নতুন প্রশ্ন যোগ করার জন্য সম্পাদন মেনু বা উপরের কোন একটি আইকন ব্যবহার করুন।"
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "এডুকা ফাইল খোলো"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "উত্তর"
+msgstr "নতুন প্রশ্ন যোগ করার জন্য সম্পাদন মেনু বা উপরের কোন একটি আইকন ব্যবহার করুন।"
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -131,10 +455,6 @@ msgstr "প্রশ্নের ছবি"
 msgid "Question point"
 msgstr "প্রশ্নের নম্বর"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "সময়"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " সেকেন্ড</p>"
@@ -167,22 +487,10 @@ msgstr "ফাইলটিকে কম্প্রেস করো"
 msgid "Save Document As"
 msgstr "ডকুমেন্ট যে নামে সংরক্ষণ করা হবে"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"এই নামে ইতিমধ্যেই একটি ডকুমেন্ট বিদ্যমান।\n"
-"আপনি কি সেটির ওপর দিয়েই লিখতে চান?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "ওপর দিয়ে লিখো"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "আপনি যদি এই ডকুমেন্টটি সংরক্ষণ করতে চান তবে ভাল হয় যে ডকুমেন্ট যে ফোল্ডারে আছে "
@@ -197,13 +505,6 @@ msgstr "ছবি কপি করো"
 msgid "Do Not Copy"
 msgstr "কপি করবে না"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "পরীক্ষা"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -239,544 +540,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "প্রশ্ন ঢোকাও"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "ডকুমেন্ট সংক্রান্ত তথ্য"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "প্রকল্পের বিবরণ ও নিয়মাবলী"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "বিবরণ"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "ধরন:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "স্তর:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "ভাষা:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "শ্রেণী:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "শিরোনাম:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "ছবি"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "ডিফল্ট ছবি:"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "আপনাকে উল্লেখ করতে হবে যে কোন ফাইলটি খোলা হবে!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "লেখক"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "ফর্মভিত্তিক পরীক্ষা প্রস্তুতকারক"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "ওয়েবপেজ:"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "কে-এডুকা-বিল্ডার"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, no-c-format
-msgid "Email:"
-msgstr "ই-মেইল:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "আপনাকে একটি সার্ভার উল্লেখ করতে হবে!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Name:"
-msgstr "নাম:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "কম্পিউটার"
+msgid "KEduca Config Dialog"
+msgstr "কে-এডুকা কনফিগ ডায়ালগ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "প্রশ্নের নম্বর দ্বারা পরীক্ষা করো"
+msgid "Show Results"
+msgstr "ফলাফল প্রদর্শন করো"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "উত্তরের নম্বর দ্বারা পরীক্ষা করো"
+msgid "At the end of the test"
+msgstr "পরীক্ষার শেষে"
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "স্লাইডার-প্রদর্শনী"
+#: keduca/configdialogbase.ui:46
+#, no-c-format
+msgid "After answering each question"
+msgstr "প্রতিটি প্রশ্নের উত্তর দেওয়ার পর"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "পরীক্ষা"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "সাজানোর ধারা"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "সাইকোটেকনিক পরীক্ষা"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "এলোমেলো ধারায় উত্তর দেখাও"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "সহজ"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "পরীক্ষা শেষ হওয়ার পর উত্তর দেখাও"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "স্বাভাবিক"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "অভিজ্ঞ"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "বিবিধ বৈশিষ্ট্য"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "সর্বোচ্চ"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "প্রশ্ন"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>প্রশ্ন</b></p>\n"
+"  <p><b>প্রশ্ন</b></p>\n"
 "<hr>\n"
-"  "
-"<p>শুধুমাত্র প্রশ্ন ও ধরন প্রয়োজন।</p>\n"
+"  <p>শুধুমাত্র প্রশ্ন ও ধরন প্রয়োজন।</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "প্রশ্ন (&প):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&ধরন:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&ছবি:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "&নম্বর:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&সময়:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&ইঙ্গিত:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "ব্যাখ্যা (&ব):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "উত্তর"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>উত্তর</b></p>\n"
+"  <p><b>উত্তর</b></p>\n"
 "<hr>\n"
-"  "
-"<p>শুধুমাত্র উত্তর ও মান প্রয়োজন।</p>\n"
+"  <p>শুধুমাত্র উত্তর ও মান প্রয়োজন।</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&উত্তর:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "মান (&ম):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&নম্বর:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "মান"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "নম্বর"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "&উপরে যাও"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "নিচে যা&ও"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">তথ্য</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&সম্পাদন..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "সম্পাদক - প্রথম পাঠ"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "বিদ্যমা&ন কোন ডকুমেন্ট খোলো:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "সাম্প্রতি&ক কোন ডকুমেন্ট খোলো:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "ইন্টারনেট গ্যালারী ব্রাউজারের সাহায্যে খোলো"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "&নতুন কোন ডকুমেন্ট আরম্ভ করো"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">তথ্য</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "গ্যালারী"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "ঠিকানা:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "সার্ভার যোগ করো (&য)"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "সার্ভার"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "ঠিকানা"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "ভাষা"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "শ্রেণী"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "ধরন"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "খোলো (&খ)"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "কে-এডুকা কনফিগ ডায়ালগ"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "ফলাফল প্রদর্শন করো"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "পরীক্ষার শেষে"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "প্রতিটি প্রশ্নের উত্তর দেওয়ার পর"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "সাজানোর ধারা"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "এলোমেলো ধারায় প্রশ্ন দেখাও"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "এলোমেলো ধারায় উত্তর দেখাও"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "প্রজ্ঞা"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "progga@BengaLinux.Org"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "আপনাকে একটি সার্ভার উল্লেখ করতে হবে!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "পরীক্ষা &আরম্ভ করো"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&পরবর্তী >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "উত্তর &সংরক্ষণ করো..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "যে নামে ফলাফল সংরক্ষণ করা হবে"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "সংরক্ষণের প্রচেষ্টা ব্যর্থ হয়েছে।"
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "প্রশ্ন %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"এই প্রশ্নের উত্তরে দেওয়ার জন্য আপনার হাতে রয়েছে %1 সেকেন্ড সময়।\n"
-"\n"
-"প্রস্তুত হওয়ার পর 'ঠিক আছে' চাপুন।"
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "ফলাফল"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "পরিসংখ্যান"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "সঠিক প্রশ্নাবলী"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "বেঠিক প্রশ্নাবলী"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "মোট নম্বর"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "সঠিক নম্বর"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "বেঠিক নম্বর"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "মোট সময়"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "পরীক্ষায় ব্যয়িত সময়"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "উত্তর হল: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "সঠিক উত্তরটি হল: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "আপনার উত্তর ছিল: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "শিরোনাম"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "ফর্মভিত্তিক পরীক্ষা"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "কে-এডুকা"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "বর্তমান রক্ষণাবেক্ষণকারী"
-
-# msgstr "আরো %v সেকেন্ড বাকি"
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "আর %v সেকেন্ড বাকি"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "কে-এডুকা-পার্ট"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "কে-এডুকা কে-পার্ট উপাদান"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "সাধারণ"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "বিবিধ বৈশিষ্ট্য"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "'পরবর্তী' চাপার পর উত্তর দেখাও"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "পরীক্ষা শেষ হওয়ার পর উত্তর দেখাও"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "ধারা"
diff --git a/tde-i18n-br/messages/tdeedu/keduca.po b/tde-i18n-br/messages/tdeedu/keduca.po
index 0d545e2de31..8def05d358d 100644
--- a/tde-i18n-br/messages/tdeedu/keduca.po
+++ b/tde-i18n-br/messages/tdeedu/keduca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2004-07-19 11:13+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: Brezhoneg <Suav.Icb@wanadoo.fr>\n"
@@ -14,17 +14,226 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Thierry Vignaud, Jañ-Mai Drapier"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "tvignaud@mandriva.com, jdrapier@club-internet.fr"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Digeriñ ar &garidell ..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Digeriñ ur restr Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+#, fuzzy
+msgid "KEduca KParts Component"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Pennañ"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Kefluniadur a bep seurt"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Urzhiañ"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Diskouez ar goullennoù dre zegouezh"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Diskouez ar respontoù dre zegouezh"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr ""
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&A heul >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Enrollañ an disoc'hoù ..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Enrollañ an disoc'hoù e"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Un teul gant an anv-se a zo c'hoazh.\n"
+"C'hoant ho peus e rasklañ ?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Rasklañ"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Enrollañ sac'het."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Goulenn %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Pikoù"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Disoc'h"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Stadegoù"
+
+#: keduca/keducaview.cpp:446
+#, fuzzy
+msgid "Correct questions"
+msgstr "N'eo ket mat ar goulennoù"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "N'eo ket mat ar goulennoù"
+
+#: keduca/keducaview.cpp:452
+#, fuzzy
+msgid "Total points"
+msgstr "N'eo ket mad ar pikoù"
+
+#: keduca/keducaview.cpp:453
+#, fuzzy
+msgid "Correct points"
+msgstr "N'eo ket mad ar pikoù"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "N'eo ket mad ar pikoù"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Eur"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Amzer hollek"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr ""
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "An eilger a zo : "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Ar respont mad eo :"
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "ho respont a oa :"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Titouroù diwar-benn an teul"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Titl"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Rumm"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Seurt"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Yezh"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Eilgeroù"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr ""
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr ""
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Restr da kargañ"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -34,6 +243,10 @@ msgstr "Oberour kentañ"
 msgid "Maintainer 2002-2004"
 msgstr "Ratreer 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Ratreer red"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr ""
@@ -42,11 +255,6 @@ msgstr ""
 msgid "Icons"
 msgstr "Arlunioù"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Ret eo deoc'h reiñ ar restr da zigeriñ !"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Kemmañ ar goulenn"
@@ -55,30 +263,150 @@ msgstr "Kemmañ ar goulenn"
 msgid "Add Questions"
 msgstr "Ouzhpennañ goulennoù"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Gwir"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "N'eo ket gwir"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Ouzhpennañ"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Digeriñ ar &garidell ..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Titouroù diwar-benn an teul"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Deskrivadur ha reolinnoù ar raktres."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Deskrivadur"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Seurt :"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Live :"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Yezh :"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Rumm :"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Titl :"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Skeudenn"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Skeudenn dre ziouer :"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Oberour"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Pajenn gwiad :"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Mailh :"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Anv :"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Urzhiataerien"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Arnodiñ"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr ""
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Aes"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Boas"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Mailh"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr ""
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -92,6 +420,11 @@ msgstr "&Ouzhpennañ ..."
 msgid "&Edit..."
 msgstr "&Aozañ ..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Huel"
@@ -110,14 +443,6 @@ msgid ""
 "above."
 msgstr ""
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Digeriñ ur restr Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Eilgeroù"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Skeudenn ar c'houlenn"
@@ -126,10 +451,6 @@ msgstr "Skeudenn ar c'houlenn"
 msgid "Question point"
 msgstr ""
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Eur"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " eilennoù</p>"
@@ -160,22 +481,10 @@ msgstr "Moustrañ ar restr"
 msgid "Save Document As"
 msgstr "Enrollañ an teul e"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Un teul gant an anv-se a zo c'hoazh.\n"
-"C'hoant ho peus e rasklañ ?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Rasklañ"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 
@@ -187,13 +496,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr "Ne eilit ket"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Arnodiñ"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -222,535 +524,254 @@ msgstr ""
 msgid "Insert Question"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Titouroù diwar-benn an teul"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Deskrivadur ha reolinnoù ar raktres."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Deskrivadur"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Seurt :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Live :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Yezh :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Rumm :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Titl :"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Ret eo deoc'h reiñ ar restr da zigeriñ !"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Skeudenn"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Skeudenn dre ziouer :"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Oberour"
+#: libkeduca/kgallerydialog.cpp:168
+#, fuzzy
+msgid "You need to specify a server!"
+msgstr "Ret eo deoc'h reiñ ar restr da zigeriñ !"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Web page:"
-msgstr "Pajenn gwiad :"
+msgid "KEduca Config Dialog"
+msgstr "Kendiviz gefluniardur KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Email:"
-msgstr "Mailh :"
+msgid "Show Results"
+msgstr "Diskouez an disoc'hoù"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Name:"
-msgstr "Anv :"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Urzhiataerien"
+msgid "At the end of the test"
+msgstr "Pa vez echu an testañ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Question Points"
+msgid "After answering each question"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:56
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr ""
+msgid "Ordering"
+msgstr "Emaon oc'h urzhiañ"
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr ""
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Diskouez ar respontoù dre zegouezh"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr ""
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Pa vez echu an testañ"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Aes"
-
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Boas"
-
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Mailh"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Kefluniadur a bep seurt"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Goulenn"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Goulenn :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Seurt :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Skeudenn :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "P&ik :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&Amzer :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Displegañ :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Eilger"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Eilger :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Gwerzh :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Pikoù :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Gwerzh"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Pikoù"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "&Pignit"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "&Diskennit"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Titouroù</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Aozañ ..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Digeriñ un teul a zo &c'hoazh :"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Digeriñ un teul &nevez :"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Loc'hañ un teul &nevez"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Titouroù</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Garidell"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Chomlec'h :"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Ouzhpennañ ur servijer"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Servijerien"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Chomlec'h"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Yezh"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Rumm"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Seurt"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Digoriñ"
 
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Kendiviz gefluniardur KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Diskouez an disoc'hoù"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Pa vez echu an testañ"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Emaon oc'h urzhiañ"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Diskouez ar goullennoù dre zegouezh"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Diskouez ar respontoù dre zegouezh"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Thierry Vignaud, Jañ-Mai Drapier"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "tvignaud@mandriva.com, jdrapier@club-internet.fr"
-
-#: libkeduca/kgallerydialog.cpp:168
-#, fuzzy
-msgid "You need to specify a server!"
-msgstr "Ret eo deoc'h reiñ ar restr da zigeriñ !"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr ""
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&A heul >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Enrollañ an disoc'hoù ..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Enrollañ an disoc'hoù e"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Enrollañ sac'het."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Goulenn %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Disoc'h"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Stadegoù"
-
-#: keduca/keducaview.cpp:446
-#, fuzzy
-msgid "Correct questions"
-msgstr "N'eo ket mat ar goulennoù"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "N'eo ket mat ar goulennoù"
-
-#: keduca/keducaview.cpp:452
-#, fuzzy
-msgid "Total points"
-msgstr "N'eo ket mad ar pikoù"
-
-#: keduca/keducaview.cpp:453
-#, fuzzy
-msgid "Correct points"
-msgstr "N'eo ket mad ar pikoù"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "N'eo ket mad ar pikoù"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Amzer hollek"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr ""
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "An eilger a zo : "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Ar respont mad eo :"
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "ho respont a oa :"
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Titl"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr ""
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Ratreer red"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr ""
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-#, fuzzy
-msgid "KEduca KParts Component"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Pennañ"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Kefluniadur a bep seurt"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr ""
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr ""
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Urzhiañ"
-
 #~ msgid "1.2.0"
 #~ msgstr "1.2.0"
 
diff --git a/tde-i18n-bs/messages/tdeedu/keduca.po b/tde-i18n-bs/messages/tdeedu/keduca.po
index 9ad7b5e0d6e..5c7f12bc9eb 100644
--- a/tde-i18n-bs/messages/tdeedu/keduca.po
+++ b/tde-i18n-bs/messages/tdeedu/keduca.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2004-08-14 18:31+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosanski <lokal@lugbih.org>\n"
@@ -19,17 +19,228 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Pravljenje testova i ispita baziranih na formularu"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+#, fuzzy
+msgid "Open &Gallery..."
+msgstr "Otvori galeriju..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Otvori Educa datoteku"
+
+#: keduca/keduca_part.cpp:59
+#, fuzzy
+msgid "KEducaPart"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:60
+#, fuzzy
+msgid "KEduca KParts Component"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Opće"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Razne postavke"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Prikaži rezultate odgovora poslije pritiska na Dalje"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Prikaži rezultate nakon završetka testa"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Poredak"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Prikaži pitanja u slučajnom poretku"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Prikaži odgovore u slučajnom poretku"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr ""
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Dalje >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Snimi rezultate..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Snimi rezultate kao"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Dokument pod ovim imenom već postoji.\n"
+"Želite li pisati preko njega?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr ""
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Snimanje nije uspjelo."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Pitanje %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Bodova"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Imate %1 sekundi da dovršite ovo pitanje.\n"
+"\n"
+"Kada ste spremni, kliknite na dugme Prihvati."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Rezultat"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistike"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Tačna pitanja"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Netačna pitanja"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Ukupno bodova"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Tačnih bodova"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Netačnih bodova"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Vrijeme"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Ukupno vrijeme"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Vrijeme u testovima"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Odgovor je: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Tačan odgovor je: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Vaš odgovor je bio: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Informacije o dokumentu"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Naslov"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategorija"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Vrsta"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Jezik"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Odgovori"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr ""
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Testovi i ispiti bazirani na formularu"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Datoteka za učitavanje"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -39,6 +250,10 @@ msgstr ""
 msgid "Maintainer 2002-2004"
 msgstr ""
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr ""
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr ""
@@ -47,11 +262,6 @@ msgstr ""
 msgid "Icons"
 msgstr ""
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Morate navesti datoteku za otvaranje!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Promijeni pitanje"
@@ -60,31 +270,150 @@ msgstr "Promijeni pitanje"
 msgid "Add Questions"
 msgstr "Dodaj pitanja"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Tačno"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Netačno"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Dodaj"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-#, fuzzy
-msgid "Open &Gallery..."
-msgstr "Otvori galeriju..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Informacije o dokumentu"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Opis i pravila projekta."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Opis"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Vrsta:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Nivo:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Jezik:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategorija:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Naslov:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Slika"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Uobičajena slika:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autor"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Web stranica:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Email:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Ime:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Kompjuteri"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Test"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Test sa bodovima pitanja"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Test sa bodovima odgovora"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Slidershow"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Ispit"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psihotehnički test"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Lagan"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normalan"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Za eksperte"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Vrhunski"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -100,6 +429,11 @@ msgstr "Dodaj..."
 msgid "&Edit..."
 msgstr "Izmijeni..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 #, fuzzy
 msgid "&Up"
@@ -119,15 +453,8 @@ msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 msgstr ""
-"Dodajte novo pitanje koristeći meni Izmijeni ili birajući jednu od ikona iznad."
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Otvori Educa datoteku"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Odgovori"
+"Dodajte novo pitanje koristeći meni Izmijeni ili birajući jednu od ikona "
+"iznad."
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -137,10 +464,6 @@ msgstr "Slika pitanja"
 msgid "Question point"
 msgstr "Bodovi pitanja"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Vrijeme"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sekundi</p>"
@@ -173,26 +496,14 @@ msgstr ""
 msgid "Save Document As"
 msgstr "Snimi dokument kao"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Dokument pod ovim imenom već postoji.\n"
-"Želite li pisati preko njega?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Ako želite dijeliti ovaj dokument, bolje je da kopirate slike u isti direktorij "
-"kao i dokument.\n"
+"Ako želite dijeliti ovaj dokument, bolje je da kopirate slike u isti "
+"direktorij kao i dokument.\n"
 "Želite li kopirati slike?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -203,13 +514,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Test"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -246,549 +550,263 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Unesite pitanje"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Informacije o dokumentu"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Opis i pravila projekta."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Opis"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Vrsta:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Nivo:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Jezik:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategorija:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Naslov:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Slika"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Uobičajena slika:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autor"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Web stranica:"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Morate navesti datoteku za otvaranje!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, no-c-format
-msgid "Email:"
-msgstr "Email:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Pravljenje testova i ispita baziranih na formularu"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
-#, no-c-format
-msgid "Name:"
-msgstr "Ime:"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Kompjuteri"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Morate navesti server!"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Test sa bodovima pitanja"
+msgid "KEduca Config Dialog"
+msgstr ""
+
+#: keduca/configdialogbase.ui:27
+#, fuzzy, no-c-format
+msgid "Show Results"
+msgstr "Rezultat"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Test sa bodovima odgovora"
+msgid "At the end of the test"
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Slidershow"
+#: keduca/configdialogbase.ui:46
+#, no-c-format
+msgid "After answering each question"
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Ispit"
+#: keduca/configdialogbase.ui:56
+#, fuzzy, no-c-format
+msgid "Ordering"
+msgstr "Poredak"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psihotehnički test"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Prikaži odgovore u slučajnom poretku"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Lagan"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Prikaži rezultate nakon završetka testa"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normalan"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Za eksperte"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Razne postavke"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Vrhunski"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Pitanje"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Pitanje</b></p>\n"
+"  <p><b>Pitanje</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Samo pitanje i vrsta se moraju unijeti.</p>\n"
+"  <p>Samo pitanje i vrsta se moraju unijeti.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Pitanje:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Vrsta:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Slika:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "B&odova:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&Vrijeme:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "T&ip:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Objasni:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Odgovor"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Odgovori</b></p>\n"
+"  <p><b>Odgovori</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Morate unijeti samo samo odgovor i vrijednost.</p>\n"
+"  <p>Morate unijeti samo samo odgovor i vrijednost.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Odgovor:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Vrijednost:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Bodova:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Vrijednost"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Bodova"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Pomjeri &gore"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Pomjeri &dolje"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Informacije</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Izmijeni..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Editor - Kako započeti"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Otvori &postojeći dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Otvori &skorašnji dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Otvori preglednik Internet galerije"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Započni &novi dokumen"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Informacije</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galerija"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adresa:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Dodaj server"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Serveri"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adresa"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Jezik"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategorija"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Vrsta"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Otvori"
 
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, fuzzy, no-c-format
-msgid "Show Results"
-msgstr "Rezultat"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, fuzzy, no-c-format
-msgid "Ordering"
-msgstr "Poredak"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Prikaži pitanja u slučajnom poretku"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Prikaži odgovore u slučajnom poretku"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Morate navesti server!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr ""
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Dalje >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Snimi rezultate..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Snimi rezultate kao"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Snimanje nije uspjelo."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Pitanje %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Imate %1 sekundi da dovršite ovo pitanje.\n"
-"\n"
-"Kada ste spremni, kliknite na dugme Prihvati."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Rezultat"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistike"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Tačna pitanja"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Netačna pitanja"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Ukupno bodova"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Tačnih bodova"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Netačnih bodova"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Ukupno vrijeme"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Vrijeme u testovima"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Odgovor je: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Tačan odgovor je: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Vaš odgovor je bio: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Naslov"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Testovi i ispiti bazirani na formularu"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr ""
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr ""
-
-#: keduca/keduca_part.cpp:59
-#, fuzzy
-msgid "KEducaPart"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:60
-#, fuzzy
-msgid "KEduca KParts Component"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Opće"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Razne postavke"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Prikaži rezultate odgovora poslije pritiska na Dalje"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Prikaži rezultate nakon završetka testa"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Poredak"
-
 #~ msgid "1.2.0"
 #~ msgstr "1.2.0"
 
diff --git a/tde-i18n-ca/messages/tdeedu/keduca.po b/tde-i18n-ca/messages/tdeedu/keduca.po
index 1dcffe41ab0..8c56fd2903d 100644
--- a/tde-i18n-ca/messages/tdeedu/keduca.po
+++ b/tde-i18n-ca/messages/tdeedu/keduca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-02-13 13:14+0100\n"
 "Last-Translator: David Gil <al016950@yahoo.es>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -17,17 +17,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Constructor de tests i exàmens basats en formularis"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Albert Astals Cid,David Gil Oliva"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "astals11@terra.es,al016950@yahoo.es"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Obre &galeria..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Obre un fitxer Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "Component KParts de KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "General"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Arranjament divers"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Mostra els resultats de les respostes després de prémer Següent"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Mostra els resultats en finalitzar el test"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Ordre"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Mostra les preguntes en ordre aleatori"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Mostra les respostes en ordre aleatori"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Inicia el test"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Següent >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "De&sa els resultats..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Desa els resultats com a"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Ja existeix un document amb aquest nom.\n"
+"Desitgeu sobreescriure'l?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Sobreescriu"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "El desat ha fallat."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Pregunta %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Punts"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Disposeu de %1 segons per completar aquesta pregunta.\n"
+"\n"
+"Quan estigueu preparat premeu Bé."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Resultat"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Estadístiques"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Preguntes correctes"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Preguntes incorrectes"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Punts totals"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Punts correctes"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Punts incorrectes"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Temps"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Temps total"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Temps en les proves"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "La resposta és: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "La resposta correcta és: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "La vostra resposta ha estat: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Informació del document"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Títol"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Categoria"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Tipus"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Idioma"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Respostes"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "Us queden %v"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Tests i exàmens basats en formularis"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Fitxer a carregar"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -37,6 +245,10 @@ msgstr "Autor original"
 msgid "Maintainer 2002-2004"
 msgstr "Mantenidor 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Mantenidor actual"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Algunes correccions i neteges"
@@ -45,11 +257,6 @@ msgstr "Algunes correccions i neteges"
 msgid "Icons"
 msgstr "Icones"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "És necessari que especifiqueu el fitxer a obrir!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Modifica la pregunta"
@@ -58,30 +265,150 @@ msgstr "Modifica la pregunta"
 msgid "Add Questions"
 msgstr "Afegeix preguntes"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Cert"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Fals"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Afegeix"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Obre &galeria..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Informació del document"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Descripció i regles del projecte."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Descripció"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Tipus:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Nivell:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Idioma:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Categoria:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Títol:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Imatge"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Imatge per omissió:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autor"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Pàgina web:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Correu electrònic:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Nom:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Ordinadors"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Test"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Test amb preguntes puntuades"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Test amb respostes puntuades"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Presentació"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Examen"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Test psicotècnic"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Fàcil"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normal"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Expert"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Suprem"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -95,6 +422,11 @@ msgstr "&Afegeix..."
 msgid "&Edit..."
 msgstr "&Edita..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "A&munt"
@@ -112,16 +444,8 @@ msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 msgstr ""
-"Afegiu una nova pregunta emprant el menú Edita o seleccionant una de les icones "
-"de la part superior."
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Obre un fitxer Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Respostes"
+"Afegiu una nova pregunta emprant el menú Edita o seleccionant una de les "
+"icones de la part superior."
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -131,10 +455,6 @@ msgstr "Imatge de la pregunta"
 msgid "Question point"
 msgstr "Punt de la pregunta"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Temps"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " segons</p>"
@@ -167,22 +487,10 @@ msgstr "Comprimeix el fitxer"
 msgid "Save Document As"
 msgstr "Desa el document com a"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Ja existeix un document amb aquest nom.\n"
-"Desitgeu sobreescriure'l?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Sobreescriu"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Si desitgeu compartir aquest document, és millor que copieu les imatges a la "
@@ -197,13 +505,6 @@ msgstr "Copia imatges"
 msgid "Do Not Copy"
 msgstr "No les copiïs"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Test"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -239,543 +540,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Insereix pregunta"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Informació del document"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Descripció i regles del projecte."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Descripció"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Tipus:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Nivell:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Idioma:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Categoria:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Títol:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Imatge"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "És necessari que especifiqueu el fitxer a obrir!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Imatge per omissió:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Constructor de tests i exàmens basats en formularis"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autor"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Pàgina web:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "És necessari que especifiqueu un servidor!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Correu electrònic:"
+msgid "KEduca Config Dialog"
+msgstr "Diàleg de configuració de KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Nom:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Ordinadors"
+msgid "Show Results"
+msgstr "Mostra els resultats"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Test amb preguntes puntuades"
+msgid "At the end of the test"
+msgstr "Al final del test"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Test amb respostes puntuades"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Presentació"
+msgid "After answering each question"
+msgstr "Després de contestar cada pregunta"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Examen"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "S'està ordenant"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Test psicotècnic"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Mostra les respostes en ordre aleatori"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Fàcil"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Mostra els resultats en finalitzar el test"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normal"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Expert"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Arranjament divers"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Suprem"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Pregunta"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Pregunta</b></p>\n"
+"  <p><b>Pregunta</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Només la pregunta i el tipus són obligatoris.</p>\n"
+"  <p>Només la pregunta i el tipus són obligatoris.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Pregunta:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Tipus:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "I&matge:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "Pu&nt:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Te&mps:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "P&ista:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Explicació:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Resposta"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Respostes</b></p>\n"
+"  <p><b>Respostes</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Només la resposta i el valor són obligatoris.</p>\n"
+"  <p>Només la resposta i el valor són obligatoris.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Resposta:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Valor:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Punts:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Valor"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Punts"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Mou am&unt"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Mou a&vall"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Informació</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Edita..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Editor - Inici"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Obre un document &existent:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Obre un document &recent:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Obre amb el navegador de galeries d'internet"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Inicia un &nou document"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Informació</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galeria"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adreça:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Afegeix servidor"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Servidors"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adreça"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Idioma"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Categoria"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Tipus"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Obre"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Diàleg de configuració de KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Mostra els resultats"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Al final del test"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Després de contestar cada pregunta"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "S'està ordenant"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Mostra les preguntes en ordre aleatori"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Mostra les respostes en ordre aleatori"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Albert Astals Cid,David Gil Oliva"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "astals11@terra.es,al016950@yahoo.es"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "És necessari que especifiqueu un servidor!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Inicia el test"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Següent >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "De&sa els resultats..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Desa els resultats com a"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "El desat ha fallat."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Pregunta %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Disposeu de %1 segons per completar aquesta pregunta.\n"
-"\n"
-"Quan estigueu preparat premeu Bé."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Resultat"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Estadístiques"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Preguntes correctes"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Preguntes incorrectes"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Punts totals"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Punts correctes"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Punts incorrectes"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Temps total"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Temps en les proves"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "La resposta és: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "La resposta correcta és: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "La vostra resposta ha estat: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Títol"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Tests i exàmens basats en formularis"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Mantenidor actual"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "Us queden %v"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "Component KParts de KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "General"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Arranjament divers"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Mostra els resultats de les respostes després de prémer Següent"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Mostra els resultats en finalitzar el test"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Ordre"
diff --git a/tde-i18n-cs/messages/tdeedu/keduca.po b/tde-i18n-cs/messages/tdeedu/keduca.po
index 23153c0f6ed..0228ef2adca 100644
--- a/tde-i18n-cs/messages/tdeedu/keduca.po
+++ b/tde-i18n-cs/messages/tdeedu/keduca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-11-02 15:29+0100\n"
 "Last-Translator: Jakub Friedl <jfriedl@suse.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -19,17 +19,225 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Klára Cihlářová"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "koty@seznam.cz"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Otevřít &galerii..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Otevřít Educa soubor"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEduca part"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca KParts komponenta"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Hlavní"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Různé nastavení"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Ukázat výsledky odpovědi po stisku další"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Ukázat výsledky když test skončí"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Pořadí"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Ukázat otázky v náhodném pořadí"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Ukázat odpovědi v náhodném pořadí"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Spustit test"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Další >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "Uložit vý&sledky..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Uložit výsledky jako"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Dokument s tímto jménem již existuje.\n"
+"Chcete jej přepsat?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Přepsat"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Ukládání selhalo."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Otázka %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Body"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Máte %1 vteřin k dokončení této otázky.\n"
+"\n"
+"Stiskněte OK, pokud jste připraveni."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Výsledek"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistiky"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Správné otázky"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Nesprávné odpovědi"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Bodů celkem"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Správné body"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Chybné body"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Čas"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Celkový čas"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Čas v testech"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Odpověď je: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Správná odpověď je: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Vaše odpověď byla: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Informace o dokumentu"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Název"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategorie"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Typ"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Jazyk"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Odpovědi"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "zbývá %v s"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr "Testy a zkoušky založené na formulářích"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Soubor k načtení"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -39,6 +247,10 @@ msgstr "Původní autor"
 msgid "Maintainer 2002-2004"
 msgstr "Správce 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Současný správce"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Různé opravy a čištění"
@@ -47,11 +259,6 @@ msgstr "Různé opravy a čištění"
 msgid "Icons"
 msgstr "Ikony"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Musíte zvolit soubor k otevření!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Upravit otázku"
@@ -60,30 +267,150 @@ msgstr "Upravit otázku"
 msgid "Add Questions"
 msgstr "Přidat otázku"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Pravdivý"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Chybný"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Přidat"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Otevřít &galerii..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Informace o dokumentu"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Popis a pravidla projektu."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Popis"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Typ:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Úroveň:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Jazyk:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategorie:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Název:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Obrázek"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Výchozí obrázek:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autor"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Webová stránka:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Email:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Jméno:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Počítače"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Test"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Test s otázkami"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Test s odpověďmi"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Sled obrázků"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Zkouška"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psychotechnický test"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Snadná"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normální"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Expert"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Nejvyšší"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -97,6 +424,11 @@ msgstr "&Přidat..."
 msgid "&Edit..."
 msgstr "&Upravit..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Nahoru"
@@ -116,14 +448,6 @@ msgid ""
 msgstr ""
 "Přidejte novou otázku pomocí menu Změnit nebo vybráním jedné z ikon nahoře."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Otevřít Educa soubor"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Odpovědi"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Podoba otázky"
@@ -132,10 +456,6 @@ msgstr "Podoba otázky"
 msgid "Question point"
 msgstr "Otázka"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Čas"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " vteřiny</p>"
@@ -168,22 +488,10 @@ msgstr "Komprimace souboru"
 msgid "Save Document As"
 msgstr "Uložit dokument jako"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Dokument s tímto jménem již existuje.\n"
-"Chcete jej přepsat?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Přepsat"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Pokud chcete sdílet tento dokument, je lepší zkopírovat obrázky do stejné "
@@ -198,13 +506,6 @@ msgstr "Kopírovat obrázky"
 msgid "Do Not Copy"
 msgstr "Nekopírovat"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Test"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -240,543 +541,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Vložit otázku"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Informace o dokumentu"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Popis a pravidla projektu."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Popis"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Typ:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Úroveň:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Jazyk:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategorie:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Název:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Obrázek"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Musíte zvolit soubor k otevření!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Výchozí obrázek:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Testy a zkoušky založené na formulářích"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autor"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Webová stránka:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Musíte určit server!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Email:"
+msgid "KEduca Config Dialog"
+msgstr "Konfigurační dialog KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Jméno:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Počítače"
+msgid "Show Results"
+msgstr "Zobrazení výsledků"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Test s otázkami"
+msgid "At the end of the test"
+msgstr "Na konci testu"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Test s odpověďmi"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Sled obrázků"
+msgid "After answering each question"
+msgstr "Po zodpovězení všech otázek"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Zkouška"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Pořadí"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psychotechnický test"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Ukázat odpovědi v náhodném pořadí"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Snadná"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Ukázat výsledky když test skončí"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normální"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Expert"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Různé nastavení"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Nejvyšší"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Otázka"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Otázka</b></p>\n"
+"  <p><b>Otázka</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Požadována je pouze otázka a typ.</p>\n"
+"  <p>Požadována je pouze otázka a typ.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Otázka:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Typ:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Obrázek:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "B&ody:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Č&as:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&Tip:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Vysvětlení:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Odpověd"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Odpovědi</b></p>\n"
+"  <p><b>Odpovědi</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Požadována je pouze odpověď a hodnota.</p>\n"
+"  <p>Požadována je pouze odpověď a hodnota.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Odpověď:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Hodnota:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Body:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Hodnota"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Body"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Posunout nahor&u"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Posunout &dolů"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Informace</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Upravit..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Editor - začínáme"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Otevřít existující dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Otevřít &nedávný dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Otevřít v prohlížeči internetové galerie"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Začít s &novým dokumentem"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Informace</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galerie"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adresa:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Přidat server"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Servery"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adresa"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Jazyk"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategorie"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Typ"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Otevřít"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Konfigurační dialog KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Zobrazení výsledků"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Na konci testu"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Po zodpovězení všech otázek"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Pořadí"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Ukázat otázky v náhodném pořadí"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Ukázat odpovědi v náhodném pořadí"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Klára Cihlářová"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "koty@seznam.cz"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Musíte určit server!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Spustit test"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Další >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "Uložit vý&sledky..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Uložit výsledky jako"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Ukládání selhalo."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Otázka %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Máte %1 vteřin k dokončení této otázky.\n"
-"\n"
-"Stiskněte OK, pokud jste připraveni."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Výsledek"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistiky"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Správné otázky"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Nesprávné odpovědi"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Bodů celkem"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Správné body"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Chybné body"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Celkový čas"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Čas v testech"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Odpověď je: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Správná odpověď je: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Vaše odpověď byla: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Název"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Testy a zkoušky založené na formulářích"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Současný správce"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "zbývá %v s"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEduca part"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca KParts komponenta"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Hlavní"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Různé nastavení"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Ukázat výsledky odpovědi po stisku další"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Ukázat výsledky když test skončí"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Pořadí"
diff --git a/tde-i18n-cy/messages/tdeedu/keduca.po b/tde-i18n-cy/messages/tdeedu/keduca.po
index 79f4a802a6d..749c087e142 100644
--- a/tde-i18n-cy/messages/tdeedu/keduca.po
+++ b/tde-i18n-cy/messages/tdeedu/keduca.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeedu/keduca.po\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandrakesoft.com>\n"
 "Language-Team: cy <LL@li.org>\n"
@@ -10,17 +10,225 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KD wrth KGyfieithu"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr ""
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr ""
+
+#: keduca/keduca_part.cpp:59
+#, fuzzy
+msgid "KEducaPart"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr ""
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Cyffredinol"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Gosodiadau Amrywiol"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Trefn"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr ""
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr ""
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr ""
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Nesaf >>"
+
+#: keduca/keducaview.cpp:89
+#, fuzzy
+msgid "&Save Results..."
+msgstr "Cadw'r Canlyniadau Fel"
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Cadw'r Canlyniadau Fel"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Mae dogfen efo'r enw hwn yn bodoli eisoes.\n"
+"Ydych eisiau ei throsysgrifo?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Trosysgrifo"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Methodd y cadw."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Cwestiwn %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Pwyntiau:"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Canlyniad"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Ystadegau"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr ""
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr ""
+
+#: keduca/keducaview.cpp:452
+#, fuzzy
+msgid "Total points"
+msgstr "Cyfanswm amser"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr ""
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr ""
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Amser"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Cyfanswm amser"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr ""
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr ""
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr ""
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr ""
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Gwybodaeth am y Ddogfen"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Teitl"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Categori"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Math"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Iaith"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr ""
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr ""
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr ""
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Ffeil i lwytho"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr ""
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -30,6 +238,10 @@ msgstr "Awdur Gwreiddiol"
 msgid "Maintainer 2002-2004"
 msgstr ""
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Cynhaliwr Cyfredol"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr ""
@@ -38,11 +250,6 @@ msgstr ""
 msgid "Icons"
 msgstr "Eiconau"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr ""
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr ""
@@ -51,29 +258,149 @@ msgstr ""
 msgid "Add Questions"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Gwir"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Ffug"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Ychwanegu"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Gwybodaeth am y Ddogfen"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Disgrifiad"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Math:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Lefel :"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Iaith:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Categori :"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Teitl:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Llun"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Awdur"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Tudalen wê:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Ebost:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Enw:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Cyfrifiaduron"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Profi"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr ""
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Hawdd"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Arferol"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Hen law"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
 msgstr ""
 
 #: keducabuilder/keducabuilder.cpp:121
@@ -88,6 +415,11 @@ msgstr "Ychw&anegu..."
 msgid "&Edit..."
 msgstr "&Golygu..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "I &Fyny"
@@ -106,14 +438,6 @@ msgid ""
 "above."
 msgstr ""
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr ""
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr ""
@@ -122,10 +446,6 @@ msgstr ""
 msgid "Question point"
 msgstr ""
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Amser"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr ""
@@ -156,22 +476,10 @@ msgstr ""
 msgid "Save Document As"
 msgstr "Cadw'r Ddogfen Fel"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Mae dogfen efo'r enw hwn yn bodoli eisoes.\n"
-"Ydych eisiau ei throsysgrifo?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Trosysgrifo"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 
@@ -183,13 +491,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Profi"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -218,532 +519,252 @@ msgstr ""
 msgid "Insert Question"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Gwybodaeth am y Ddogfen"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Disgrifiad"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Math:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Lefel :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Iaith:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Categori :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Teitl:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Llun"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Author"
-msgstr "Awdur"
+msgid "KEduca Config Dialog"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Tudalen wê:"
+#: keduca/configdialogbase.ui:27
+#, fuzzy, no-c-format
+msgid "Show Results"
+msgstr "Canlyniad"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Email:"
-msgstr "Ebost:"
+msgid "At the end of the test"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Name:"
-msgstr "Enw:"
+msgid "After answering each question"
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Cyfrifiaduron"
+#: keduca/configdialogbase.ui:56
+#, fuzzy, no-c-format
+msgid "Ordering"
+msgstr "Trefn"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
 #, no-c-format
-msgid "Test with Question Points"
+msgid "Display answers in random order."
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/keduca.kcfg:17
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr ""
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr ""
-
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
+msgid "Show results only at the end of the test."
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Hawdd"
-
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Arferol"
-
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Hen law"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Gosodiadau Amrywiol"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Cwestiwn"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Cwestiwn :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Math:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "Llu&n:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Am&ser:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Ateb"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Ateb :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Gwerth:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Pwyntiau:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Gwerth"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Pwyntiau:"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Symud i &Fyny"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Symud i &Lawr"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Golygu..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgid "&Help"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Cyfeiriad:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Ychwanegu gweinydd"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Gweinyddion"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Cyfeiriad"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Iaith"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Categori"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Math"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "A&gor"
 
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, fuzzy, no-c-format
-msgid "Show Results"
-msgstr "Canlyniad"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, fuzzy, no-c-format
-msgid "Ordering"
-msgstr "Trefn"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KD wrth KGyfieithu"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr ""
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr ""
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Nesaf >>"
-
-#: keduca/keducaview.cpp:89
-#, fuzzy
-msgid "&Save Results..."
-msgstr "Cadw'r Canlyniadau Fel"
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Cadw'r Canlyniadau Fel"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Methodd y cadw."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Cwestiwn %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Canlyniad"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Ystadegau"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr ""
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr ""
-
-#: keduca/keducaview.cpp:452
-#, fuzzy
-msgid "Total points"
-msgstr "Cyfanswm amser"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr ""
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr ""
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Cyfanswm amser"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr ""
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr ""
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr ""
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr ""
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Teitl"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr ""
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Cynhaliwr Cyfredol"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr ""
-
-#: keduca/keduca_part.cpp:59
-#, fuzzy
-msgid "KEducaPart"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr ""
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Cyffredinol"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Gosodiadau Amrywiol"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr ""
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr ""
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Trefn"
-
 #~ msgid "Main Window"
 #~ msgstr "Prif Ffenestr"
diff --git a/tde-i18n-da/messages/tdeedu/keduca.po b/tde-i18n-da/messages/tdeedu/keduca.po
index ffca137419c..3d833d3bdb5 100644
--- a/tde-i18n-da/messages/tdeedu/keduca.po
+++ b/tde-i18n-da/messages/tdeedu/keduca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-09-21 21:51-0400\n"
 "Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -16,17 +16,225 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms: \n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Form-baseret test- og eksamensbygger"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Erik Kjær Pedersen"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "erik@binghamton.edu"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Åbn &galleri..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Åbn Educa-fil"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca KParts-komponent"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Generelt"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Forskellige indstillinger"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Vis resultaterne af svar efter at have trykket på 'næste'"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Vis resultater når testen er slut"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Rækkefølge"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Vis spørgsmålene i tilfældig rækkefølge"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Vis svarene i tilfældig rækkefølge"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Start test"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Næste >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Gem resultater..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Gem resultater som"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Et dokument med dette navn findes allerede.\n"
+"Ønsker du at overskrive det?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Overskriv"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Mislykkedes at gemme."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Spørgsmål %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Point"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Du har %1 sekunder til at gøre dette spørgsmål færdigt.\n"
+"\n"
+"Tryk på o.k. når du er parat."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Resultat"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistik"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Rigtige spørgsmål"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Forkerte spørgsmål"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Totalt antal point"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Rigtige points"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Forkerte points"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Tid"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Tid i alt"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Tid i tester"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Svaret er: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Det rigtige svar er: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Dit svar var: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Dokument Information"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Titel"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategori"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Type"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Sprog"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Svar"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v sekunder tilbage"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Form-baseret test og eksaminer"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Fil der skal indlæses"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -36,6 +244,10 @@ msgstr "Oprindelig forfatter"
 msgid "Maintainer 2002-2004"
 msgstr "Vedligeholder 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Nuværende vedligeholder"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Forskellige rettelser og oprydninger"
@@ -44,11 +256,6 @@ msgstr "Forskellige rettelser og oprydninger"
 msgid "Icons"
 msgstr "Ikoner"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Du skal angive en fil der skal åbnes!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Ændr spørgsmål"
@@ -57,30 +264,150 @@ msgstr "Ændr spørgsmål"
 msgid "Add Questions"
 msgstr "Tilføj spørgsmål"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Sand"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Falsk"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Tilføj"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Åbn &galleri..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Dokument Information"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Beskrivelse af regler for projektet."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Type:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Niveau:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Sprog:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategori:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Titel:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Billede"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Standardbillede:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Forfatter"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Netside:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-mail:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Navn:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Computere"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Test"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Test med spørgsmålspoint"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Test med svarpoint"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Dias-show"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Eksamen"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psychoteknisk test"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Nem"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normal"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Ekspert"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Geni"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -94,6 +421,11 @@ msgstr "&Tilføj..."
 msgid "&Edit..."
 msgstr "R&edigér..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Op"
@@ -111,16 +443,8 @@ msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 msgstr ""
-"Tilføj et nyt spørgsmål  bed at bruge redigeringsmenuen eller ved at vælge en "
-"af ikonerne ovenfor."
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Åbn Educa-fil"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Svar"
+"Tilføj et nyt spørgsmål  bed at bruge redigeringsmenuen eller ved at vælge "
+"en af ikonerne ovenfor."
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -130,10 +454,6 @@ msgstr "Spørgsmål til billede"
 msgid "Question point"
 msgstr "Spørgsmålspoint"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Tid"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sekunder</p>"
@@ -166,26 +486,14 @@ msgstr "Komprimér filen"
 msgid "Save Document As"
 msgstr "Gem dokument som"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Et dokument med dette navn findes allerede.\n"
-"Ønsker du at overskrive det?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Overskriv"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Hvis du ønsker at dele dette dokument, er det bedre at kopiere billederne til "
-"samme mappe som dokumentet.\n"
+"Hvis du ønsker at dele dette dokument, er det bedre at kopiere billederne "
+"til samme mappe som dokumentet.\n"
 "Ønsker du at kopiere billederne?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -196,13 +504,6 @@ msgstr "Kopiér billeder"
 msgid "Do Not Copy"
 msgstr "Kopiér ikke"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Test"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -238,543 +539,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Indsæt spørgsmål"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Dokument Information"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Beskrivelse af regler for projektet."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Beskrivelse"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Type:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Niveau:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Sprog:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategori:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Titel:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Billede"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Du skal angive en fil der skal åbnes!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Standardbillede:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Form-baseret test- og eksamensbygger"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Forfatter"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Netside:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Du skal angive en server!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "E-mail:"
+msgid "KEduca Config Dialog"
+msgstr "KEduca's indstillingsdialog"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Navn:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Computere"
+msgid "Show Results"
+msgstr "Vis resultater"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Test med spørgsmålspoint"
+msgid "At the end of the test"
+msgstr "Ved slutningen af testen"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Test med svarpoint"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Dias-show"
+msgid "After answering each question"
+msgstr "Efter at have svaret hvert spørgsmål"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Eksamen"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Rækkefølge"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psychoteknisk test"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Vis svarene i tilfældig rækkefølge"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Nem"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Vis resultater når testen er slut"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normal"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Ekspert"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Forskellige indstillinger"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Geni"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Spørgsmål"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Spørgsmål</b></p>\n"
+"  <p><b>Spørgsmål</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Kun spørgsmålet og typen er krævet.</p>\n"
+"  <p>Kun spørgsmålet og typen er krævet.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "S&pørgsmål:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Type:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Billede:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "P&oints:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "T&id:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&Vink:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Forklar:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Svar"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Svar</b></p>\n"
+"  <p><b>Svar</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Kun svaret og værdien er krævet.</p>\n"
+"  <p>Kun svaret og værdien er krævet.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "S&var:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Værdi:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Points:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Værdi"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Point"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Flyt &op"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Flyt &ned"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Information</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "R&edigér..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Editor - Kom i gang"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Åbn et &eksisterende dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Åbn et &nyligt dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Åbn med Internet galleri-browser"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Start et &nyt dokument"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Information</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galleri"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adresse:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Tilføj Server"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Servere"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adresse"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Sprog"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategori"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Type"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "Å&bn"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca's indstillingsdialog"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Vis resultater"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Ved slutningen af testen"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Efter at have svaret hvert spørgsmål"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Rækkefølge"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Vis spørgsmålene i tilfældig rækkefølge"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Vis svarene i tilfældig rækkefølge"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Erik Kjær Pedersen"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "erik@binghamton.edu"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Du skal angive en server!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Start test"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Næste >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Gem resultater..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Gem resultater som"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Mislykkedes at gemme."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Spørgsmål %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Du har %1 sekunder til at gøre dette spørgsmål færdigt.\n"
-"\n"
-"Tryk på o.k. når du er parat."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Resultat"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistik"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Rigtige spørgsmål"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Forkerte spørgsmål"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Totalt antal point"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Rigtige points"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Forkerte points"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Tid i alt"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Tid i tester"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Svaret er: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Det rigtige svar er: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Dit svar var: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Titel"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Form-baseret test og eksaminer"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Nuværende vedligeholder"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v sekunder tilbage"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca KParts-komponent"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Generelt"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Forskellige indstillinger"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Vis resultaterne af svar efter at have trykket på 'næste'"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Vis resultater når testen er slut"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Rækkefølge"
diff --git a/tde-i18n-de/messages/tdeedu/keduca.po b/tde-i18n-de/messages/tdeedu/keduca.po
index de4834c1a3b..a335fbc5f98 100644
--- a/tde-i18n-de/messages/tdeedu/keduca.po
+++ b/tde-i18n-de/messages/tdeedu/keduca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2006-07-08 17:24+0200\n"
 "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -19,17 +19,225 @@ msgstr ""
 "X-Generator: KBabel 1.11.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Thorsten Mürell"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "thorsten@muerell.de"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "&Galerie öffnen ..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Educa-Datei öffnen"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca-Komponente"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Allgemein"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Verschiedene Einstellungen"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Resultate der Antwort nach dem Drücken von \"Nächste\" zeigen"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Ergebnisse anzeigen, wenn der Test beendet wurde"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Reihenfolge"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Fragen in zufälliger Reihenfolge zeigen"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Antworten in zufälliger Reihenfolge zeigen"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "Test &starten"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Nächste >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "Ergebnisse &speichern ..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Ergebnisse speichern unter"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Ein Dokument mit diesem Namen existiert bereits.\n"
+"Möchten Sie es überschreiben?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Überschreiben"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Speichern fehlgeschlagen."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Frage %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Punkte"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Sie haben %1 Sekunden, um die Frage zu bearbeiten.\n"
+"\n"
+"Drücken Sie OK, wenn Sie bereit sind."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Ergebnis"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistiken"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Richtig beantwortet"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Falsch beantwortet"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Gesamtpunktzahl"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Korrekte Punkte"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Falsche Punkte"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Zeit"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Gesamtzeit"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Testzeit"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Die Antwort lautet: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Die korrekte Antwort lautet: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Ihre Antwort lautete: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Dokument-Info"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Titel"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategorie"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Typ"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Sprache"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Antworten"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v Sekunden verbleibend"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr "Formularbasierte Tests und Prüfungen"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Zu ladende Datei"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -39,6 +247,10 @@ msgstr "Ursprünglicher Autor"
 msgid "Maintainer 2002-2004"
 msgstr "Betreuer 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Aktueller Betreuer"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Verschiedene Verbesserungen und Aufräumarbeiten"
@@ -47,11 +259,6 @@ msgstr "Verschiedene Verbesserungen und Aufräumarbeiten"
 msgid "Icons"
 msgstr "Symbole"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Sie müssen die zu öffnende Datei angeben!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Frage ändern"
@@ -60,30 +267,150 @@ msgstr "Frage ändern"
 msgid "Add Questions"
 msgstr "Fragen hinzufügen"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Wahr"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Falsch"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Hinzufügen"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "&Galerie öffnen ..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Dokument-Info"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Beschreibung und Regeln des Projekts."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Beschreibung"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Typ:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Stufe:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Sprache:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategorie:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Titel:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Bild"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Standardbild:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autor"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Webseite:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-Mail:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Name:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Rechner"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Test"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Test mit Fragepunkten"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Test mit Antwortpunkten"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Diashow"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Prüfung"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psychologischer Test"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Leicht"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normal"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Experte"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Anspruchsvoll"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -97,6 +424,11 @@ msgstr "&Hinzufügen ..."
 msgid "&Edit..."
 msgstr "&Bearbeiten ..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Nach oben"
@@ -117,14 +449,6 @@ msgstr ""
 "Fügen Sie eine neue Frage über das Menü \"Bearbeiten\" hinzu oder wählen Sie "
 "ein Symbol aus."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Educa-Datei öffnen"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Antworten"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Bild zur Frage"
@@ -133,10 +457,6 @@ msgstr "Bild zur Frage"
 msgid "Question point"
 msgstr "Punkte der Frage"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Zeit"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " Sekunden</p>"
@@ -169,26 +489,14 @@ msgstr "Datei komprimieren"
 msgid "Save Document As"
 msgstr "Dokument speichern unter"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Ein Dokument mit diesem Namen existiert bereits.\n"
-"Möchten Sie es überschreiben?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Überschreiben"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Wenn Sie dieses Dokument gemeinsam mit anderen benutzen wollen, sollten Sie die "
-"Bilder in den Ordner kopieren, in dem auch das Dokument liegt.\n"
+"Wenn Sie dieses Dokument gemeinsam mit anderen benutzen wollen, sollten Sie "
+"die Bilder in den Ordner kopieren, in dem auch das Dokument liegt.\n"
 "Wollen Sie die Bilder kopieren?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -199,13 +507,6 @@ msgstr "Bilder kopieren"
 msgid "Do Not Copy"
 msgstr "Nicht kopieren"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Test"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -241,543 +542,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Frage einfügen"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Dokument-Info"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Beschreibung und Regeln des Projekts."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Beschreibung"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Typ:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Stufe:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Sprache:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategorie:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Titel:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Bild"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Sie müssen die zu öffnende Datei angeben!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Standardbild:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Formularbasierte Tests und Prüfungen"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autor"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Webseite:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Sie müssen einen Server angeben!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "E-Mail:"
+msgid "KEduca Config Dialog"
+msgstr "KEduca-Einstellungsdialog"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Name:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Rechner"
+msgid "Show Results"
+msgstr "Ergebnisse zeigen"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Test mit Fragepunkten"
+msgid "At the end of the test"
+msgstr "Am Ende des Tests"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Test mit Antwortpunkten"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Diashow"
+msgid "After answering each question"
+msgstr "Nach der Beantwortung jeder Frage"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Prüfung"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Sortierung"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psychologischer Test"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Antworten in zufälliger Reihenfolge zeigen"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Leicht"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Ergebnisse anzeigen, wenn der Test beendet wurde"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normal"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Experte"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Verschiedene Einstellungen"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Anspruchsvoll"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Frage"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Frage</b></p>\n"
+"  <p><b>Frage</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Nur die Frage und der Typ werden benötigt.</p>\n"
+"  <p>Nur die Frage und der Typ werden benötigt.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Frage:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Typ:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Bild:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "P&unkte:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&Zeit:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "T&ipp:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Erklärung:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Antwort"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Antworten</b></p>\n"
+"  <p><b>Antworten</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Nur eine Antwort und der Wert werden benötigt.</p>\n"
+"  <p>Nur eine Antwort und der Wert werden benötigt.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Antwort:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Wert:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Punkte:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Wert"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Punkte"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Nach &oben"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Nach &unten"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b style=\"text-decoration:underline;\">Informationen</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Bearbeiten ..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Editor - So geht's los"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Ein &bestehendes Dokument öffnen:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Ein kürzlich be&arbeitetes Dokument öffnen:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Mit einem Internetbrowser öffnen"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Ein &neues Dokument erstellen"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b style=\"text-decoration:underline;\">Informationen</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galerie"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adresse:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Server hinzufügen"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Server"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adresse"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Sprache"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategorie"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Typ"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "Ö&ffnen"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca-Einstellungsdialog"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Ergebnisse zeigen"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Am Ende des Tests"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Nach der Beantwortung jeder Frage"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Sortierung"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Fragen in zufälliger Reihenfolge zeigen"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Antworten in zufälliger Reihenfolge zeigen"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Thorsten Mürell"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "thorsten@muerell.de"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Sie müssen einen Server angeben!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "Test &starten"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Nächste >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "Ergebnisse &speichern ..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Ergebnisse speichern unter"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Speichern fehlgeschlagen."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Frage %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Sie haben %1 Sekunden, um die Frage zu bearbeiten.\n"
-"\n"
-"Drücken Sie OK, wenn Sie bereit sind."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Ergebnis"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistiken"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Richtig beantwortet"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Falsch beantwortet"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Gesamtpunktzahl"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Korrekte Punkte"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Falsche Punkte"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Gesamtzeit"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Testzeit"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Die Antwort lautet: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Die korrekte Antwort lautet: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Ihre Antwort lautete: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Titel"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Formularbasierte Tests und Prüfungen"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Aktueller Betreuer"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v Sekunden verbleibend"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca-Komponente"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Allgemein"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Verschiedene Einstellungen"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Resultate der Antwort nach dem Drücken von \"Nächste\" zeigen"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Ergebnisse anzeigen, wenn der Test beendet wurde"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Reihenfolge"
diff --git a/tde-i18n-el/messages/tdeedu/keduca.po b/tde-i18n-el/messages/tdeedu/keduca.po
index d57a86d0cfb..b6a4b1c2630 100644
--- a/tde-i18n-el/messages/tdeedu/keduca.po
+++ b/tde-i18n-el/messages/tdeedu/keduca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2007-03-10 11:29+0200\n"
 "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -15,17 +15,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Δημιουργός δοκιμασιών και εξετάσεων βασισμένων σε φόρμες"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Σπύρος Γεωργαράς, Νίκος Χατζηδάκης"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "sng@hellug.gr, nikhatzi@yahoo.com"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Άνοιγμα &συλλογής..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Άνοιγμα αρχείου του Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "Συστατικό KParts του KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Γενικά"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Διάφορες ρυθμίσεις"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Εμφάνιση των αποτελεσμάτων της ερώτησης μετά το πάτημα του επόμενο"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Εμφάνιση των αποτελεσμάτων όταν ολοκληρωθεί η δοκιμή"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Διάταξη"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Εμφάνιση ερωτήσεων με τυχαία σειρά"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Εμφάνιση απαντήσεων με τυχαία σειρά"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "Έναρξη &δοκιμής"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Επόμενο >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Αποθήκευση αποτελεσμάτων..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Αποθήκευση αποτελεσμάτων ως"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Ένα έγγραφο με αυτό το όνομα υπάρχει ήδη.\n"
+"Θέλετε να το αντικαταστήσετε;"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Αντικατάσταση"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Η αποθήκευση απέτυχε."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Ερώτηση %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Σημεία"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Έχετε %1 δευτερόλεπτα για να ολοκληρώσετε αυτή την ερώτηση.\n"
+"\n"
+"Πατήστε Εντάξει όταν είστε έτοιμοι."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Αποτέλεσμα"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Στατιστικά"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Σωστές ερωτήσεις"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Λανθασμένες ερωτήσεις"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Συνολικά σημεία"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Σωστά σημεία"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Λανθασμένα σημεία"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Χρόνος"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Συνολικός χρόνος"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Χρόνος στις δοκιμές"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Η απάντηση είναι: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Η σωστή απάντηση είναι: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Η απάντησή σας ήταν: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Πληροφορίες εγγράφου"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Τίτλος"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Κατηγορία"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Τύπος"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Γλώσσα"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Απαντήσεις"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "απομένουν %v δευτερόλεπτα"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Δοκιμασίες και εξετάσεις βασισμένες σε φόρμες"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Αρχείο για φόρτωση"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -35,6 +243,10 @@ msgstr "Αρχικός συγγραφέας"
 msgid "Maintainer 2002-2004"
 msgstr "Συντηρητής 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Τρέχων συντηρητής"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Διάφορες διορθώσεις και βελτιώσεις"
@@ -43,11 +255,6 @@ msgstr "Διάφορες διορθώσεις και βελτιώσεις"
 msgid "Icons"
 msgstr "Εικονίδια"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Πρέπει να καθορίσετε το αρχείο που θα ανοιχτεί!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Τροποποίηση ερώτησης"
@@ -56,30 +263,150 @@ msgstr "Τροποποίηση ερώτησης"
 msgid "Add Questions"
 msgstr "Προσθήκη ερωτήσεων"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Αληθές"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Ψευδές"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Προσθήκη"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Άνοιγμα &συλλογής..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Πληροφορίες εγγράφου"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Περιγραφή και κανόνες του έργου."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Περιγραφή"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Τύπος:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Επίπεδο:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Γλώσσα:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Κατηγορία:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Τίτλος:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Εικόνα"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Προκαθορισμένη εικόνα:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Συγγραφέας"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Ιστοσελίδα:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Email:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Όνομα:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Υπολογιστές"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Δοκιμή"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Δοκιμή με βαθμούς ερωτήσεων"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Δοκιμασία με πόντους απαντήσεων"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Παρουσίαση"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Εξέταση"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Ψυχοτεχνικό δοκιμή"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Εύκολο"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Κανονικό"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Δύσκολο"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Ανώτερος"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -93,6 +420,11 @@ msgstr "&Προσθήκη..."
 msgid "&Edit..."
 msgstr "&Επεξεργασία..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Πάνω"
@@ -113,14 +445,6 @@ msgstr ""
 "Προσθέστε μία νέα Ερώτηση χρησιμοποιώντας το μενού Επεξεργασία ή επιλέγοντας "
 "ένα από τα παραπάνω εικονίδια."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Άνοιγμα αρχείου του Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Απαντήσεις"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Εικόνα ερώτησης"
@@ -129,10 +453,6 @@ msgstr "Εικόνα ερώτησης"
 msgid "Question point"
 msgstr "Σημείο ερώτησης"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Χρόνος"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " δευτερόλεπτα</p>"
@@ -165,22 +485,10 @@ msgstr "Συμπίεση του αρχείου"
 msgid "Save Document As"
 msgstr "Αποθήκευση εγγράφου ως"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Ένα έγγραφο με αυτό το όνομα υπάρχει ήδη.\n"
-"Θέλετε να το αντικαταστήσετε;"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Αντικατάσταση"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Αν θέλετε να μοιραστείτε αυτό το έγγραφο, είναι καλύτερα να αντιγράψετε τις "
@@ -195,13 +503,6 @@ msgstr "Αντιγραφή εικόνων"
 msgid "Do Not Copy"
 msgstr "Να μην αντιγραφεί"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Δοκιμή"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -237,543 +538,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Εισαγωγή ερώτησης"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Πληροφορίες εγγράφου"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Περιγραφή και κανόνες του έργου."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Περιγραφή"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Τύπος:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Επίπεδο:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Γλώσσα:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Κατηγορία:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Τίτλος:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Εικόνα"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Πρέπει να καθορίσετε το αρχείο που θα ανοιχτεί!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Προκαθορισμένη εικόνα:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Δημιουργός δοκιμασιών και εξετάσεων βασισμένων σε φόρμες"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Συγγραφέας"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Ιστοσελίδα:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Πρέπει να καθορίσετε έναν εξυπηρετητή!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Email:"
+msgid "KEduca Config Dialog"
+msgstr "Διάλογος ρύθμισης του KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Όνομα:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Υπολογιστές"
+msgid "Show Results"
+msgstr "Εμφάνιση αποτελεσμάτων"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Δοκιμή με βαθμούς ερωτήσεων"
+msgid "At the end of the test"
+msgstr "Στο τέλος της δοκιμής"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Δοκιμασία με πόντους απαντήσεων"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Παρουσίαση"
+msgid "After answering each question"
+msgstr "Μετά την απάντηση κάθε ερώτησης"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Εξέταση"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Σειρά"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Ψυχοτεχνικό δοκιμή"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Εμφάνιση απαντήσεων με τυχαία σειρά"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Εύκολο"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Εμφάνιση των αποτελεσμάτων όταν ολοκληρωθεί η δοκιμή"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Κανονικό"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Δύσκολο"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Διάφορες ρυθμίσεις"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Ανώτερος"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Ερώτηση"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Ερώτηση</b></p>\n"
+"  <p><b>Ερώτηση</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Απαιτείται μόνο η ερώτηση και ο τύπος.</p>\n"
+"  <p>Απαιτείται μόνο η ερώτηση και ο τύπος.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Ερώτηση:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Τύπος:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Εικόνα:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "&Σημείο:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&Χρόνος:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&Υπόδειξη:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "Ε&ξήγηση:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Απάντηση"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Απαντήσεις</b></p>\n"
+"  <p><b>Απαντήσεις</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Απαιτείται μόνο η απάντηση και η τιμή.</p>\n"
+"  <p>Απαιτείται μόνο η απάντηση και η τιμή.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Απάντηση:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Τιμή:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "Σ&ημεία:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Τιμή"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Σημεία"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Μετακίνηση &πάνω"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Μετακίνηση &κάτω"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Πληροφορίες</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Επεξεργασία..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Επεξεργαστής - Εκκίνηση"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Άνοιγμα &υπάρχοντος εγγράφου:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Άνοιγμα &πρόσφατου εγγράφου:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Άνοιγμα με τον περιηγητή Διαδικτυακής συλλογής"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Δημιουργία &νέου εγγράφου"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Πληροφορίες</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Συλλογή"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Διεύθυνση:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Προσθήκη εξυπηρετητή"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Διακομιστές"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Γλώσσα"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Κατηγορία"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Τύπος"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "Ά&νοιγμα"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Διάλογος ρύθμισης του KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Εμφάνιση αποτελεσμάτων"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Στο τέλος της δοκιμής"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Μετά την απάντηση κάθε ερώτησης"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Σειρά"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Εμφάνιση ερωτήσεων με τυχαία σειρά"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Εμφάνιση απαντήσεων με τυχαία σειρά"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Σπύρος Γεωργαράς, Νίκος Χατζηδάκης"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "sng@hellug.gr, nikhatzi@yahoo.com"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Πρέπει να καθορίσετε έναν εξυπηρετητή!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "Έναρξη &δοκιμής"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Επόμενο >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Αποθήκευση αποτελεσμάτων..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Αποθήκευση αποτελεσμάτων ως"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Η αποθήκευση απέτυχε."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Ερώτηση %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Έχετε %1 δευτερόλεπτα για να ολοκληρώσετε αυτή την ερώτηση.\n"
-"\n"
-"Πατήστε Εντάξει όταν είστε έτοιμοι."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Αποτέλεσμα"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Στατιστικά"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Σωστές ερωτήσεις"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Λανθασμένες ερωτήσεις"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Συνολικά σημεία"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Σωστά σημεία"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Λανθασμένα σημεία"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Συνολικός χρόνος"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Χρόνος στις δοκιμές"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Η απάντηση είναι: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Η σωστή απάντηση είναι: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Η απάντησή σας ήταν: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Τίτλος"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Δοκιμασίες και εξετάσεις βασισμένες σε φόρμες"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Τρέχων συντηρητής"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "απομένουν %v δευτερόλεπτα"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "Συστατικό KParts του KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Γενικά"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Διάφορες ρυθμίσεις"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Εμφάνιση των αποτελεσμάτων της ερώτησης μετά το πάτημα του επόμενο"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Εμφάνιση των αποτελεσμάτων όταν ολοκληρωθεί η δοκιμή"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Διάταξη"
diff --git a/tde-i18n-en_GB/messages/tdeedu/keduca.po b/tde-i18n-en_GB/messages/tdeedu/keduca.po
index e7c5e73eb0e..c7581589bf3 100644
--- a/tde-i18n-en_GB/messages/tdeedu/keduca.po
+++ b/tde-i18n-en_GB/messages/tdeedu/keduca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-11-06 00:18+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -16,17 +16,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Form-based tests and exams builder"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Andrew Coles"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "andrew_coles@yahoo.co.uk"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Open &Gallery..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Open Educa File"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca KParts Component"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "General"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Various Settings"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Show results of the answer after press next"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Show results when finish the test"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Order"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Show questions in random order"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Show answers in random order"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Start Test"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Next >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Save Results..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Save Results As"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Overwrite"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Save failed."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Question %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Points"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Result"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistics"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Correct questions"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Incorrect questions"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Total points"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Correct points"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Incorrect points"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Time"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Total time"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Time in tests"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "The answer is: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "The correct answer is: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Your answer was: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Document Information"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Title"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Category"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Type"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Language"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Answers"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v seconds left"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Form-based tests and exams"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "File to load"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -36,6 +244,10 @@ msgstr "Original Author"
 msgid "Maintainer 2002-2004"
 msgstr "Maintainer 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Current Maintainer"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Various fixes and cleanups"
@@ -44,11 +256,6 @@ msgstr "Various fixes and cleanups"
 msgid "Icons"
 msgstr "Icons"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "You need to specify the file to open!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Modify Question"
@@ -57,30 +264,150 @@ msgstr "Modify Question"
 msgid "Add Questions"
 msgstr "Add Questions"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "True"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "False"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Add"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Open &Gallery..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Document Information"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Description and rules of the project."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Description"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Type:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Level:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Language:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Category:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Title:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Picture"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Default picture:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Author"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Web page:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Email:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Name:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Computers"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Test"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Test with Question Points"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Test with Answers Points"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Slidershow"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Exam"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psychotechnic Test"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Easy"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normal"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Expert"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Supreme"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -94,6 +421,11 @@ msgstr "&Add..."
 msgid "&Edit..."
 msgstr "&Edit..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Up"
@@ -114,14 +446,6 @@ msgstr ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Open Educa File"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Answers"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Question Image"
@@ -130,10 +454,6 @@ msgstr "Question Image"
 msgid "Question point"
 msgstr "Question point"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Time"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " seconds</p>"
@@ -166,26 +486,14 @@ msgstr "Compress the file"
 msgid "Save Document As"
 msgstr "Save Document As"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Overwrite"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -196,13 +504,6 @@ msgstr "Copy Images"
 msgid "Do Not Copy"
 msgstr "Do Not Copy"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Test"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -238,543 +539,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Insert Question"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Document Information"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Description and rules of the project."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Description"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Type:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Level:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Language:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Category:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Title:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Picture"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "You need to specify the file to open!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Default picture:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Form-based tests and exams builder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Author"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Web page:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "You need to specify a server!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Email:"
+msgid "KEduca Config Dialog"
+msgstr "KEduca Config Dialogue"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Name:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Computers"
+msgid "Show Results"
+msgstr "Show Results"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Test with Question Points"
+msgid "At the end of the test"
+msgstr "At the end of the test"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Test with Answers Points"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Slidershow"
+msgid "After answering each question"
+msgstr "After answering each question"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Exam"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Ordering"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psychotechnic Test"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Show answers in random order"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Easy"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Show results when finish the test"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normal"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Expert"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Various Settings"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Supreme"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Question"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Question:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Type:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Picture:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "P&oint:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Ti&me:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "T&ip:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Explain:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Answer"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Answer:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Value:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Points:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Value"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Points"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Move &Up"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Move &Down"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Information</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Edit..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Editor - Getting Started"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Open an &existing document:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Open a &recent document:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Open with Internet gallery browser"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Start a &new document"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Information</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Gallery"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Address:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Add Server"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Servers"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Address"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Language"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Category"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Type"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Open"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca Config Dialogue"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Show Results"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "At the end of the test"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "After answering each question"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Ordering"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Show questions in random order"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Show answers in random order"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Andrew Coles"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "andrew_coles@yahoo.co.uk"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "You need to specify a server!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Start Test"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Next >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Save Results..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Save Results As"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Save failed."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Question %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Result"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistics"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Correct questions"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Incorrect questions"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Total points"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Correct points"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Incorrect points"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Total time"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Time in tests"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "The answer is: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "The correct answer is: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Your answer was: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Title"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Form-based tests and exams"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Current Maintainer"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v seconds left"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca KParts Component"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "General"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Various Settings"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Show results of the answer after press next"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Show results when finish the test"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Order"
diff --git a/tde-i18n-eo/messages/tdeedu/keduca.po b/tde-i18n-eo/messages/tdeedu/keduca.po
index e3764d8a1c7..d021d50cabb 100644
--- a/tde-i18n-eo/messages/tdeedu/keduca.po
+++ b/tde-i18n-eo/messages/tdeedu/keduca.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: KEduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2007-04-02 14:09+0100\n"
 "Last-Translator: Axel Rousseau <axel@esperanto-jeunes.org>\n"
 "Language-Team: esperanto <kde-i18n-eo@kde.org>\n"
@@ -14,17 +14,223 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Esperanto\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Testoj bazita sur formularo kaj Ekzamena konstruilo"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Axel Rousseau"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "axel@esperanto-jeunes.org"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Malfermu &Galerion..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Malfermu Educa-n dosieron"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca KParts Komponanto"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Ĝenerale"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Diversaj Agordoj"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Montru rezulton de la respondo post premado de sekva"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Montru rezulton kiam finiĝis la testo"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Ordo"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Montru demandojn laŭ hazarda ordo"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Montru respondojn laŭ hazarda ordo"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Komencu Teston"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Sekva >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Konservu rezultojn..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Konservu rezultojn kiel"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Anstataŭigu"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Konservado malsukcesis."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Demando %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Poentoj"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Vi havas %1 sekundojn por respondi tiun demandon.\n"
+"\n"
+"Premu Konsentite kiam vi pretas."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Rezulto"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistiko"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Korektaj demandoj"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Nekorektaj demandoj"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Akumulitaj poentoj"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Korektaj poentoj"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Nekorektaj poentoj"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Tempo"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Akumulita tempo"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Tempo en testoj"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "La respondo estas:"
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "La ĝusta respondo estas:"
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Via respondo estis:"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Dokumentaj informadoj"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Titolo"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategorio"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Tipo"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Lingvo"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Respondoj"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v sekundoj restas"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Testoj bazita sur formularo kaj Ekzamenoj"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Dosiero por ŝarĝi"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -34,6 +240,10 @@ msgstr "Originala aŭtoro"
 msgid "Maintainer 2002-2004"
 msgstr "Fleganto 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Aktuala Fleganto"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Diversaj sencimigoj kaj purigoj"
@@ -42,11 +252,6 @@ msgstr "Diversaj sencimigoj kaj purigoj"
 msgid "Icons"
 msgstr "Piktogramoj"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Vi devas indiki la dosieron por malfermi!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Ŝanĝu Demandon"
@@ -55,30 +260,150 @@ msgstr "Ŝanĝu Demandon"
 msgid "Add Questions"
 msgstr "Aldonu Demandon"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Vera"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Malĝusta"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Aldonu"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Malfermu &Galerion..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Dokumentaj informadoj"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Priskribo kaj reguloj de la projekto."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Priskribo"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Tipo:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Nivelo:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Lingvo:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategorio:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Titolo:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Bildo"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Apriora bildo:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Aŭtoro"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "TTT-paĝo:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Retpoŝto:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Nomo:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Komputiloj"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Testo"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Testo kun demandaj poentoj"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Testoj kun respondaj poentoj"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Ekzameno"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Facila"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normala"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Spertula"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Plej malfacila"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -92,6 +417,11 @@ msgstr "&Aldonu..."
 msgid "&Edit..."
 msgstr "&Redaktu..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Supren"
@@ -110,14 +440,6 @@ msgid ""
 "above."
 msgstr ""
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Malfermu Educa-n dosieron"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Respondoj"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Demanda Bildo"
@@ -126,10 +448,6 @@ msgstr "Demanda Bildo"
 msgid "Question point"
 msgstr "Demanda poento"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Tempo"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr "Sekundoj</p>"
@@ -160,20 +478,10 @@ msgstr "Kompaktigu la dosieron"
 msgid "Save Document As"
 msgstr "Konservu dokumenton kiel"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Anstataŭigu"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 
@@ -185,13 +493,6 @@ msgstr "Kopiu Bildojn"
 msgid "Do Not Copy"
 msgstr "&Ne konservu"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Testo"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -227,529 +528,249 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Aldonu Demandon"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Dokumentaj informadoj"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Priskribo kaj reguloj de la projekto."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Priskribo"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Tipo:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Nivelo:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Lingvo:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategorio:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Titolo:"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Vi devas indiki la dosieron por malfermi!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Bildo"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Testoj bazita sur formularo kaj Ekzamena konstruilo"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Apriora bildo:"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Aŭtoro"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Vi bezonas indiki servilon"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Web page:"
-msgstr "TTT-paĝo:"
+msgid "KEduca Config Dialog"
+msgstr "KEduca Agorddialogon"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Email:"
-msgstr "Retpoŝto:"
+msgid "Show Results"
+msgstr "Montru Rezultojn"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Name:"
-msgstr "Nomo:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Komputiloj"
+msgid "At the end of the test"
+msgstr "Je le fino de la testo"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Testo kun demandaj poentoj"
+msgid "After answering each question"
+msgstr "Post respondado al ĉiuj demando"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:56
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Testoj kun respondaj poentoj"
+msgid "Ordering"
+msgstr "Ordiganta"
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr ""
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Montru respondojn laŭ hazarda ordo"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Ekzameno"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Montru rezulton kiam finiĝis la testo"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Facila"
-
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normala"
-
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Spertula"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Diversaj Agordoj"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Plej malfacila"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Demando"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Demando:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Tipo:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Bildo:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "P&oentoj:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Te&mpo:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "Konsileto:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Klarigu:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Respondo"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Respondo:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Valoro:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "Poentoj:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Valoro"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Poentoj"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Movu &supren"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Movu &malsupren"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Informado</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Redaktu..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Malfermenda ekzistanta dokumento:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Laste uzita dokumento"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Malfermu per Interreta galeria foliumilo"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Kreu &novan dokumenton"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Informado</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galerio"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adreso:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Aldonu Servilon"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Serviloj"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adreso"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Lingvo"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategorio"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Tipo"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Malfermu"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca Agorddialogon"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Montru Rezultojn"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Je le fino de la testo"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Post respondado al ĉiuj demando"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Ordiganta"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Montru demandojn laŭ hazarda ordo"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Montru respondojn laŭ hazarda ordo"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Axel Rousseau"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "axel@esperanto-jeunes.org"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Vi bezonas indiki servilon"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Komencu Teston"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Sekva >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Konservu rezultojn..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Konservu rezultojn kiel"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Konservado malsukcesis."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Demando %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Vi havas %1 sekundojn por respondi tiun demandon.\n"
-"\n"
-"Premu Konsentite kiam vi pretas."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Rezulto"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistiko"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Korektaj demandoj"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Nekorektaj demandoj"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Akumulitaj poentoj"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Korektaj poentoj"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Nekorektaj poentoj"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Akumulita tempo"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Tempo en testoj"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "La respondo estas:"
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "La ĝusta respondo estas:"
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Via respondo estis:"
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Titolo"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Testoj bazita sur formularo kaj Ekzamenoj"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Aktuala Fleganto"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v sekundoj restas"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca KParts Komponanto"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Ĝenerale"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Diversaj Agordoj"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Montru rezulton de la respondo post premado de sekva"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Montru rezulton kiam finiĝis la testo"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Ordo"
diff --git a/tde-i18n-es/messages/tdeedu/keduca.po b/tde-i18n-es/messages/tdeedu/keduca.po
index 5324b934d36..f105ca19596 100644
--- a/tde-i18n-es/messages/tdeedu/keduca.po
+++ b/tde-i18n-es/messages/tdeedu/keduca.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2007-08-05 11:53+0200\n"
 "Last-Translator: Santiago Fernández Sancho <santi@kde-es.org>\n"
 "Language-Team: Español <kde-es@kybs.de>\n"
@@ -22,17 +22,225 @@ msgstr ""
 "First-Translator: Miguel Revilla Rodríguez <yo@miguelrevilla.com>\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Constructor de pruebas y exámenes basados en formularios"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Miguel Revilla Rodríguez,Juan Manuel Garcia Molina,Rafael Beccar"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "yo@miguelrevilla.com,juanma@superiodico.net,rafael.beccar@kdemail.net"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Abrir &galería..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Abrir un archivo Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "Componente de KEduca KParts"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "General"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Preferencias varias"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Mostrar los resultados de las respuestas tras pulsar siguiente"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Mostrar los resultados al finalizar la prueba"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Orden"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Mostrar preguntas en orden aleatorio"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Mostrar respuestas en orden aleatorio"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "Comenzar con el cue&stionario"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Siguiente >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Guardar resultados..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Guardar resultados como"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Ya existe un documento con ese nombre.\n"
+"¿Desea sobrescribirlo?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Sobrescribir"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Error al guardar."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Pregunta %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Puntos"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Usted dispone de %1 segundos para completar esta pregunta.\n"
+"\n"
+"Pulse Aceptar cuando esté listo."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Resultado"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Estadísticas"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Preguntas correctas"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Preguntas incorrectas"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Puntos totales"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Puntos correctos"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Puntos incorrectos"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Tiempo"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Tiempo total"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Tiempo en las pruebas"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "La respuesta es: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "La respuesta correcta es: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Su respuesta fue: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Información del documento"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Título"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Categoría"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Tipo"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Idioma"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Respuestas"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "Quedan %v segundos"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Pruebas y exámenes basados en formularios"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Archivo a cargar"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -42,6 +250,10 @@ msgstr "Autor original"
 msgid "Maintainer 2002-2004"
 msgstr "Responsable 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Responsable actual"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Varios arreglos y correcciones"
@@ -50,11 +262,6 @@ msgstr "Varios arreglos y correcciones"
 msgid "Icons"
 msgstr "Íconos"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Es necesario especificar el archivo a abrir."
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Modificar pregunta"
@@ -63,30 +270,150 @@ msgstr "Modificar pregunta"
 msgid "Add Questions"
 msgstr "Añadir preguntas"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Verdadero"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Falso"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Añadir"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Abrir &galería..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Información del documento"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Descripción y reglas del proyecto."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Descripción"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Tipo:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Nivel:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Idioma:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Categoría:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Título:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Imagen"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Imagen predeterminada:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autor"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Página web:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Correo electrónico:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Nombre:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Equipos informáticos"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Prueba"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Prueba con preguntas puntuadas"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Prueba con respuestas puntuadas"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Presentación"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Examen"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Prueba psicotécnica"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Fácil"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Medio"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Experta/o"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Superior"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -100,6 +427,11 @@ msgstr "&Añadir..."
 msgid "&Edit..."
 msgstr "&Editar..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "A&rriba"
@@ -120,14 +452,6 @@ msgstr ""
 "Puede comenzar a añadir preguntas mediante el menú editar o utilizando los "
 "iconos correspondientes en la barra de tareas."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Abrir un archivo Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Respuestas"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Imagen de la pregunta"
@@ -136,10 +460,6 @@ msgstr "Imagen de la pregunta"
 msgid "Question point"
 msgstr "Puntuación  de la pregunta"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Tiempo"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " segundos</p>"
@@ -172,22 +492,10 @@ msgstr "Comprimir el archivo"
 msgid "Save Document As"
 msgstr "Guardar documento como"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Ya existe un documento con ese nombre.\n"
-"¿Desea sobrescribirlo?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Sobrescribir"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Si desea compartir este documento, es mejor que copie las imágenes y el el "
@@ -202,13 +510,6 @@ msgstr "Copiar imágenes"
 msgid "Do Not Copy"
 msgstr "No copiar"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Prueba"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -244,543 +545,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Insertar pregunta"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Información del documento"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Descripción y reglas del proyecto."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Descripción"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Tipo:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Nivel:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Idioma:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Categoría:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Título:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Imagen"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Es necesario especificar el archivo a abrir."
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Imagen predeterminada:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Constructor de pruebas y exámenes basados en formularios"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autor"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Página web:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Es necesario especificar un servidor."
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Correo electrónico:"
+msgid "KEduca Config Dialog"
+msgstr "Diálogo de configuración de KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Nombre:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Equipos informáticos"
+msgid "Show Results"
+msgstr "Mostrar resultados"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Prueba con preguntas puntuadas"
+msgid "At the end of the test"
+msgstr "Al final del cuestionario"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Prueba con respuestas puntuadas"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Presentación"
+msgid "After answering each question"
+msgstr "Luego de cada respuesta"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Examen"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Ordenar"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Prueba psicotécnica"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Mostrar respuestas en orden aleatorio"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Fácil"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Mostrar los resultados al finalizar la prueba"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Medio"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Experta/o"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Preferencias varias"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Superior"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Pregunta"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Pregunta</b></p>\n"
+"  <p><b>Pregunta</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Sólo se requiere la pregunta y el tipo.</p>\n"
+"  <p>Sólo se requiere la pregunta y el tipo.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Pregunta:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Tipo:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "Im&agen:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "Punt&o:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Tie&mpo:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "P&ista:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Explicación:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Respuesta"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Respuestas</b></p>\n"
+"  <p><b>Respuestas</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Sólo se requieren respuesta y valor.</p>\n"
+"  <p>Sólo se requieren respuesta y valor.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Respuesta:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Valor:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Puntos:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Valor"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Puntos"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "S&ubir"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "&Bajar"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Información</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Editar..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Editor - Inicio"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Abrir un documento &existente:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Abrir un documento &reciente:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Abrir con el explorador de galerías de Internet"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Iniciar un &nuevo documento"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Información</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galería"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Dirección:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Añadir servidor"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Servidores"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Dirección"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Idioma"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Categoría"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Tipo"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Abrir"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Diálogo de configuración de KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Mostrar resultados"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Al final del cuestionario"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Luego de cada respuesta"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Ordenar"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Mostrar preguntas en orden aleatorio"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Mostrar respuestas en orden aleatorio"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Miguel Revilla Rodríguez,Juan Manuel Garcia Molina,Rafael Beccar"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "yo@miguelrevilla.com,juanma@superiodico.net,rafael.beccar@kdemail.net"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Es necesario especificar un servidor."
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "Comenzar con el cue&stionario"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Siguiente >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Guardar resultados..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Guardar resultados como"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Error al guardar."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Pregunta %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Usted dispone de %1 segundos para completar esta pregunta.\n"
-"\n"
-"Pulse Aceptar cuando esté listo."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Resultado"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Estadísticas"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Preguntas correctas"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Preguntas incorrectas"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Puntos totales"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Puntos correctos"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Puntos incorrectos"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Tiempo total"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Tiempo en las pruebas"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "La respuesta es: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "La respuesta correcta es: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Su respuesta fue: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Título"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Pruebas y exámenes basados en formularios"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Responsable actual"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "Quedan %v segundos"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "Componente de KEduca KParts"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "General"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Preferencias varias"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Mostrar los resultados de las respuestas tras pulsar siguiente"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Mostrar los resultados al finalizar la prueba"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Orden"
diff --git a/tde-i18n-et/messages/tdeedu/keduca.po b/tde-i18n-et/messages/tdeedu/keduca.po
index eb731d8d137..fd962acff9a 100644
--- a/tde-i18n-et/messages/tdeedu/keduca.po
+++ b/tde-i18n-et/messages/tdeedu/keduca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-07-24 12:46+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -16,17 +16,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Lünktestide ja eksamite loomine"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Marek Laane"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "bald@starman.ee"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Ava &galerii..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Educa faili avamine"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEduca komponent"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca KParts komponent"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Üldine"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Mitmesugused seadistused"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Tulemusi näidatakse pärast vajutamist nupule 'Järgmine'."
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Tulemusi näidatakse testi lõpetamisel"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Järjekord"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Küsimusi näidatakse suvalises järjekorras"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Vastuseid näidatakse suvalises järjekorras"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Käivita test"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "Järgmi&ne >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Salvesta tulemused..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Salvesta tulemused kui..."
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Selle nimega dokument on juba olemas.\n"
+"Kas soovid selle üle kirjutada?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Kirjuta üle"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Salvestamine ebaõnnestus"
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Küsimus %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Punktid"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Sul on veel %1 sekundit küsimusele vastamiseks.\n"
+"\n"
+"Vajuta OK, kui oled valmis."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Tulemus"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistika"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Õigeid küsimusi"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Valesid küsimusi"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Punkte kokku"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Õigeid punkte"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Valesid punkte"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Aeg"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Aeg kokku"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Aeg testidele"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Vastus on: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Õige vastus on: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Sinu vastus oli: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Dokumendiinfo"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Pealkiri"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategooria"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Tüüp"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Keel"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Vastused"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v sekundit jäänud"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Lünktestid ja eksamid"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Avatav fail"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEduca Ehitaja"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -36,6 +244,10 @@ msgstr "Originaali autor"
 msgid "Maintainer 2002-2004"
 msgstr "Hooldaja 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Praegune hooldaja"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Mitmed parandused ja koodi puhastamine"
@@ -44,11 +256,6 @@ msgstr "Mitmed parandused ja koodi puhastamine"
 msgid "Icons"
 msgstr "Ikoonid"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Sa pead valima faili, mida tahad avada!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Küsimuse muutmine"
@@ -57,30 +264,150 @@ msgstr "Küsimuse muutmine"
 msgid "Add Questions"
 msgstr "Küsimuse lisamine"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Õige"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Vale"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "Lis&a"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Ava &galerii..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Dokumendiinfo"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Projekti kirjeldus ja reeglid."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Kirjeldus"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Tüüp:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Tase:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Keel:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategooria:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Pealkiri:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Pilt"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Vaikimisi pilt:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autor"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Veebilehekülg:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-posti aadress:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Nimi:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Arvutid"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Test"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Test küsimusepunktidega"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Test vastusepunktidega"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Slaidishow"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Eksam"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psühhotehniline test"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Kerge"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normaalne"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Raske"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Raskeim"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -94,6 +421,11 @@ msgstr "Lis&a..."
 msgid "&Edit..."
 msgstr "&Muuda..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Üles"
@@ -112,14 +444,6 @@ msgid ""
 "above."
 msgstr "Lisa uus küsimus redigeerimismenüü või mõne ülal paikneva ikooni abil."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Educa faili avamine"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Vastused"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Küsimuspilt"
@@ -128,10 +452,6 @@ msgstr "Küsimuspilt"
 msgid "Question point"
 msgstr "Küsimuspunkt"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Aeg"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sek</p>"
@@ -164,22 +484,10 @@ msgstr "Faili tihendamine"
 msgid "Save Document As"
 msgstr "Dokumendi salvestamine kui..."
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Selle nimega dokument on juba olemas.\n"
-"Kas soovid selle üle kirjutada?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Kirjuta üle"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Kui soovid seda dokumenti jagada, on mõistlikum kopeerida pildid dokumendiga "
@@ -194,13 +502,6 @@ msgstr "Kopeeri pildid"
 msgid "Do Not Copy"
 msgstr "Ära kopeeri"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Test"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -236,543 +537,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Sisesta küsimus"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Dokumendiinfo"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Projekti kirjeldus ja reeglid."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Kirjeldus"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Tüüp:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Tase:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Keel:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategooria:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Pealkiri:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Pilt"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Sa pead valima faili, mida tahad avada!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Vaikimisi pilt:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Lünktestide ja eksamite loomine"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autor"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEduca Ehitaja"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Veebilehekülg:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Sa pead määrama serveri!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "E-posti aadress:"
+msgid "KEduca Config Dialog"
+msgstr "KEduca seadistustedialoog"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Nimi:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Arvutid"
+msgid "Show Results"
+msgstr "Tulemuste näitamine"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Test küsimusepunktidega"
+msgid "At the end of the test"
+msgstr "Testi lõpetamisel"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Test vastusepunktidega"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Slaidishow"
+msgid "After answering each question"
+msgstr "Pärast iga küsimuse vastamist"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Eksam"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Nõudmisel"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psühhotehniline test"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Vastuseid näidatakse suvalises järjekorras"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Kerge"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Tulemusi näidatakse testi lõpetamisel"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normaalne"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Raske"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Mitmesugused seadistused"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Raskeim"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Küsimus"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Küsimus</b></p>\n"
+"  <p><b>Küsimus</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Vajalikud on ainult küsimus ja tüüp.</p>\n"
+"  <p>Vajalikud on ainult küsimus ja tüüp.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Küsimus:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Tüüp:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Pilt:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "P&unktid:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Ae&g:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "Vi&hje:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "S&elgitus:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Vastus"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Vastused</b></p>\n"
+"  <p><b>Vastused</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Vajalikud on ainult vastus ja väärtus.</p>\n"
+"  <p>Vajalikud on ainult vastus ja väärtus.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Vastus:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "Vää&rtus:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Punktid:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Väärtus"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Punktid"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Liigu&ta üles"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "&Liiguta alla"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Info</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Muuda..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Redaktor - alustamine"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Ol&emasoleva dokumendi avamine:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "&Viimati kasutatud dokumendi avamine:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Avamine internetigalerii lehitsejaga"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Käivita &uus dokument"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Info</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galerii"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Aadress:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "L&isa server"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Serverid"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Aadress"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Keel"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategooria"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Tüüp"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Ava"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca seadistustedialoog"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Tulemuste näitamine"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Testi lõpetamisel"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Pärast iga küsimuse vastamist"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Nõudmisel"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Küsimusi näidatakse suvalises järjekorras"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Vastuseid näidatakse suvalises järjekorras"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Marek Laane"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "bald@starman.ee"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Sa pead määrama serveri!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Käivita test"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "Järgmi&ne >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Salvesta tulemused..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Salvesta tulemused kui..."
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Salvestamine ebaõnnestus"
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Küsimus %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Sul on veel %1 sekundit küsimusele vastamiseks.\n"
-"\n"
-"Vajuta OK, kui oled valmis."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Tulemus"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistika"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Õigeid küsimusi"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Valesid küsimusi"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Punkte kokku"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Õigeid punkte"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Valesid punkte"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Aeg kokku"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Aeg testidele"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Vastus on: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Õige vastus on: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Sinu vastus oli: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Pealkiri"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Lünktestid ja eksamid"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Praegune hooldaja"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v sekundit jäänud"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEduca komponent"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca KParts komponent"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Üldine"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Mitmesugused seadistused"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Tulemusi näidatakse pärast vajutamist nupule 'Järgmine'."
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Tulemusi näidatakse testi lõpetamisel"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Järjekord"
diff --git a/tde-i18n-eu/messages/tdeedu/keduca.po b/tde-i18n-eu/messages/tdeedu/keduca.po
index 84efe06c5cf..cd5490ed06a 100644
--- a/tde-i18n-eu/messages/tdeedu/keduca.po
+++ b/tde-i18n-eu/messages/tdeedu/keduca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-08-25 18:25+0200\n"
 "Last-Translator: Ion Gaztañaga <igaztanaga@gmail.com>\n"
 "Language-Team: Basque <kdeuskaraz@euskalgnu.org>\n"
@@ -18,17 +18,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Formularioetan oinarritutako test eta azterketa eraikitzailea"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Ion Gaztañaga"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "igaztanaga@gmail.com"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Ireki &galeria..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Ireki Educa fitxategia"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca KParts osagaia"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Orokorra"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Hainbat ezarpen"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Erakutsi erantzunaren emaitza \"Hurrengoa\" sakatzean"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Erakutsi emaitzak testa amaitzean"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Ordena"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Erakutsi galderak ausazko ordenean"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Erakutsi erantzunak ausazko ordenean"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Hasi testa"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Hurrengoa >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Gorde emaitzak..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Gorde emaitza honela"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Izen bereko dokumentu bat existitzen da dagoeneko.\n"
+"Gainidatzi nahi al duzu?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Gainidatzi"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Errorea gordetzean"
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "%1. galdera"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Puntuak"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"%1 segundu dituzu galdera hau burutzeko.\n"
+"\n"
+"Sakatu \"Ados\" prest zaudenean."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Emaitza"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Estatistikak"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Galdera zuzenak"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Galdera okerrak"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Guztizko puntuak"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Puntu zuzenak"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Puntu okerrak"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Denbora"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Guztizko denbora"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Denbora testetan"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Erantzuna: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Erantzun zuzena: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Zure erantzuna: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Dokumentuaren informazioa"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Izenburua"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategoria"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Mota"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Hizkuntza"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Erantzunak"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v segundu gelditzen dira"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Formularioetan-oinarritutako testak eta azterketak"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Kargatzeko fitxategia"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -38,6 +246,10 @@ msgstr "Jatorrizko egilea"
 msgid "Maintainer 2002-2004"
 msgstr "Mantentzailea 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Uneko mantentzailea"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Hainbat konponketa eta garbiketa"
@@ -46,11 +258,6 @@ msgstr "Hainbat konponketa eta garbiketa"
 msgid "Icons"
 msgstr "Ikonoak"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Irekitzeko fitxategia zehaztu behar duzu!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Aldatu galdera"
@@ -59,30 +266,150 @@ msgstr "Aldatu galdera"
 msgid "Add Questions"
 msgstr "Gehitu galderak"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Egia"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Gezurra"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Gehitu"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Ireki &galeria..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Dokumentuaren informazioa"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Proiektuaren deskribapen eta arauak."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Deskribapena"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Mota:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Maila:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Hizkuntza:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategoria:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Izenburua:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Irudia"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Irudi lehenetsia:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Egilea"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Web-orria:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-posta:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Izena:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Ordenagailuak"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Testa"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Puntuaziodun galderak"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Puntuaziodun erantzunak"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Aurkezpena"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Azterketa"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Test psikoteknikoa"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Erraza"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Arrunta"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Aditua"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Gorena"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -96,6 +423,11 @@ msgstr "&Gehitu..."
 msgid "&Edit..."
 msgstr "&Editatu..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Gorantz"
@@ -116,14 +448,6 @@ msgstr ""
 "Gehitu galdera berri bat Editatu menua erabiliz edo goiko ikonoren bat "
 "hautatuz."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Ireki Educa fitxategia"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Erantzunak"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Galderaren irudia"
@@ -132,10 +456,6 @@ msgstr "Galderaren irudia"
 msgid "Question point"
 msgstr "Galderaren puntua"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Denbora"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " segundu</p>"
@@ -168,22 +488,10 @@ msgstr "Konprimatu fitxategia"
 msgid "Save Document As"
 msgstr "Gorde dokumentua honela"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Izen bereko dokumentu bat existitzen da dagoeneko.\n"
-"Gainidatzi nahi al duzu?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Gainidatzi"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Dokumentu hau partekatu nahi baduzu, hobe duzu irudiak dokumentuaren karpeta "
@@ -198,13 +506,6 @@ msgstr "Kopiatu irudiak"
 msgid "Do Not Copy"
 msgstr "Ez kopiatu"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Testa"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -240,544 +541,260 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Sartu galdera"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Dokumentuaren informazioa"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Proiektuaren deskribapen eta arauak."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Deskribapena"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Mota:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Maila:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Hizkuntza:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategoria:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Izenburua:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Irudia"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Irudi lehenetsia:"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Irekitzeko fitxategia zehaztu behar duzu!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Egilea"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Formularioetan oinarritutako test eta azterketa eraikitzailea"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Web-orria:"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, no-c-format
-msgid "Email:"
-msgstr "E-posta:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Zerbitzari bat zehaztu behar duzu!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Name:"
-msgstr "Izena:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Ordenagailuak"
+msgid "KEduca Config Dialog"
+msgstr "KEduca konfigurazio elkarrizketa-koadroa"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Puntuaziodun galderak"
+msgid "Show Results"
+msgstr "Erakutsi emaitzak"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Puntuaziodun erantzunak"
+msgid "At the end of the test"
+msgstr "Testaren amaieran"
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Aurkezpena"
+#: keduca/configdialogbase.ui:46
+#, no-c-format
+msgid "After answering each question"
+msgstr "Galdera bakoitza erantzutean"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Azterketa"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Ordenazioa"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Test psikoteknikoa"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Erakutsi erantzunak ausazko ordenean"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Erraza"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Erakutsi emaitzak testa amaitzean"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Arrunta"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Aditua"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Hainbat ezarpen"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Gorena"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Galdera"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Galdera</b></p>\n"
+"  <p><b>Galdera</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Galdea eta mota bakarrik behar dira.</p>\n"
+"  <p>Galdea eta mota bakarrik behar dira.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Galdera."
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Mota:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Irudia:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "P&untua:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "De&nbora:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "A&rgibidea:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Azaldu:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Erantzuna"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Erantzunak</b></p>\n"
+"  <p><b>Erantzunak</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Erantzuna eta balio bakarrik behar Only the answer and value is required.</p>"
-"\n"
+"  <p>Erantzuna eta balio bakarrik behar Only the answer and value is "
+"required.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Erantzuna."
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Balioa"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Puntuak"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Balioa"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Puntuak"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Mugitu &gorantz"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Mugitu &behera"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Informazioa</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Editatu..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Editorea - Lehenengo pausoak"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Ireki &dokumentu bat:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Ireki &oraintsuko dokumentua:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Ireki Interneteko galeria arakatzailea"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Abiatu dokumentu &berri bat"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Informazioa</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galeria"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Helbidea:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Gehitu zerbitzaria"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Zerbitzariak"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Helbidea"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Hizkuntza"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategoria"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Mota"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Ireki"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca konfigurazio elkarrizketa-koadroa"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Erakutsi emaitzak"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Testaren amaieran"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Galdera bakoitza erantzutean"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Ordenazioa"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Erakutsi galderak ausazko ordenean"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Erakutsi erantzunak ausazko ordenean"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Ion Gaztañaga"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "igaztanaga@gmail.com"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Zerbitzari bat zehaztu behar duzu!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Hasi testa"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Hurrengoa >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Gorde emaitzak..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Gorde emaitza honela"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Errorea gordetzean"
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "%1. galdera"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"%1 segundu dituzu galdera hau burutzeko.\n"
-"\n"
-"Sakatu \"Ados\" prest zaudenean."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Emaitza"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Estatistikak"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Galdera zuzenak"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Galdera okerrak"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Guztizko puntuak"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Puntu zuzenak"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Puntu okerrak"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Guztizko denbora"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Denbora testetan"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Erantzuna: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Erantzun zuzena: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Zure erantzuna: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Izenburua"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Formularioetan-oinarritutako testak eta azterketak"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Uneko mantentzailea"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v segundu gelditzen dira"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca KParts osagaia"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Orokorra"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Hainbat ezarpen"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Erakutsi erantzunaren emaitza \"Hurrengoa\" sakatzean"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Erakutsi emaitzak testa amaitzean"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Ordena"
diff --git a/tde-i18n-fa/messages/tdeedu/keduca.po b/tde-i18n-fa/messages/tdeedu/keduca.po
index fce88180785..cc02cd92e75 100644
--- a/tde-i18n-fa/messages/tdeedu/keduca.po
+++ b/tde-i18n-fa/messages/tdeedu/keduca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2007-02-10 09:11+0330\n"
 "Last-Translator: Nazanin Kazemi <kazemi@itland.ir>\n"
 "Language-Team: Persian <kde-i18n-fa@kde.org>\n"
@@ -17,17 +17,226 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "آزمونها و سازندۀ امتحانات مبنی بر شکل"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "نسیم دانیارزاده"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "daniarzadeh@itland.ir"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "باز کردن &گالری...‌"
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "باز کردن پروندۀ Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "مؤلفۀ KEduca KParts"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "عمومی"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "تنظیمات گوناگون"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "نمایش نتایج سؤال بعد از فشار بعدی"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "نمایش نتایج در پایان آزمون"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "ترتیب"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "نمایش سؤالها با ترتیب تصادفی"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "نمایش پاسخها با ترتیب تصادفی"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&آغاز آزمون‌"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&بعدی <<‌"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&ذخیرۀ نتایج...‌"
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "ذخیرۀ نتایج به عنوان"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"در حال حاضر سندی با این نام موجود می‌باشد.\n"
+"می‌خواهید آن را جای‌نوشت کنید؟"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "جای‌نوشت"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "خرابی در ذخیره‌."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "سؤال %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "نکته‌ها"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"برای تکمیل این سؤال %1 ثانیه وقت دارید.\n"
+"\n"
+"زمانی که آماده‌اید، تأیید را فشار دهید."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "نتیجه"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "آمار"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "سؤالهای درست"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "سؤالهای نادرست"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "کل نکته‌ها"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "نکته‌های درست"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "نکته‌های نادرست"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "زمان"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "کل زمان"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "زمان در آزمونها"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "پاسخ این است: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "پاسخ درست این است: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "پاسخ شما این بود: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "اطلاعات سند"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "عنوان"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "دسته"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "نوع"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "زبان"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "پاسخها"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v ثانیه باقی ماند"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "آزمونها و امتحانات مبنی بر شکل"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "پرونده برای بارگذاری"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr ""
+#: keduca/main.cpp:36
+#, fuzzy
+msgid "KEduca"
+msgstr "‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -37,6 +246,10 @@ msgstr "نویسندۀ اصلی"
 msgid "Maintainer 2002-2004"
 msgstr "نگه‌دارندۀ ۲۰۰۴-۲۰۰۲"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "نگه‌دارندۀ جاری"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "ثابتهای گوناگون و پاک‌سازیها"
@@ -45,11 +258,6 @@ msgstr "ثابتهای گوناگون و پاک‌سازیها"
 msgid "Icons"
 msgstr "شمایلها"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "برای باز کردن پرونده نیاز به مشخص کردن آن دارید!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "تغییر سؤال"
@@ -58,30 +266,150 @@ msgstr "تغییر سؤال"
 msgid "Add Questions"
 msgstr "افزودن سؤالها"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "صحیح"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "اشتباه"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&افزودن‌"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "باز کردن &گالری...‌"
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "اطلاعات سند"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "توصیف و قواعد پروژه."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "توصیف"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "نوع:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "سطح:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "زبان:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "دسته:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "عنوان:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "عکس"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "عکس پیش‌فرض:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "نویسنده"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "صفحۀ وب:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "رایانامه:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "نام:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "رایانه‌ها"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "آزمون"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "آزمون با نکته‌های سؤالی"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "آزمون با نکته‌های پاسخ"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "نمایش لغزان"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "امتحان"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "آزمون فنی روانی"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "آسان"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "عادی"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "تخصصی"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "عالی"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -95,6 +423,11 @@ msgstr "&افزودن...‌"
 msgid "&Edit..."
 msgstr "&ویرایش...‌"
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&بالا‌"
@@ -112,16 +445,8 @@ msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 msgstr ""
-"افزودن یک سؤال جدید با استفاده از گزینگان ویرایش، یا با انتخاب یکی از شمایلهای "
-"بالا."
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "باز کردن پروندۀ Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "پاسخها"
+"افزودن یک سؤال جدید با استفاده از گزینگان ویرایش، یا با انتخاب یکی از "
+"شمایلهای بالا."
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -131,10 +456,6 @@ msgstr "تصویر سؤال"
 msgid "Question point"
 msgstr "نکتۀ سؤال"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "زمان"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " ثانیه</p>"
@@ -167,26 +488,14 @@ msgstr "فشردن پرونده"
 msgid "Save Document As"
 msgstr "ذخیرۀ سند به عنوان"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"در حال حاضر سندی با این نام موجود می‌باشد.\n"
-"می‌خواهید آن را جای‌نوشت کنید؟"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "جای‌نوشت"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"اگر می‌خواهید این سند را به اشتراک بگذراید، بهتر است که تصاویر را در همین پوشه "
-"به عنوان سند رونوشت کنید.\n"
+"اگر می‌خواهید این سند را به اشتراک بگذراید، بهتر است که تصاویر را در همین "
+"پوشه به عنوان سند رونوشت کنید.\n"
 "می‌خواهید تصاویر را رونوشت کنید؟"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -197,13 +506,6 @@ msgstr "رونوشت تصاویر"
 msgid "Do Not Copy"
 msgstr "رونوشت نشود"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "آزمون"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -239,544 +541,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "درج سؤال"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "اطلاعات سند"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "توصیف و قواعد پروژه."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "توصیف"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "نوع:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "سطح:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "زبان:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "دسته:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "عنوان:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "عکس"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "عکس پیش‌فرض:"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "برای باز کردن پرونده نیاز به مشخص کردن آن دارید!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "نویسنده"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "آزمونها و سازندۀ امتحانات مبنی بر شکل"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "صفحۀ وب:"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, no-c-format
-msgid "Email:"
-msgstr "رایانامه:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "نیاز به مشخص کردن کارساز دارید!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Name:"
-msgstr "نام:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "رایانه‌ها"
+msgid "KEduca Config Dialog"
+msgstr "محاورۀ پیکربندی KEduca"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "آزمون با نکته‌های سؤالی"
+msgid "Show Results"
+msgstr "نمایش نتایج"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "آزمون با نکته‌های پاسخ"
+msgid "At the end of the test"
+msgstr "در پایان آزمون"
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "نمایش لغزان"
+#: keduca/configdialogbase.ui:46
+#, no-c-format
+msgid "After answering each question"
+msgstr "بعد از پاسخ به هر سؤال"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "امتحان"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "مرتب‌سازی"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "آزمون فنی روانی"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "نمایش پاسخها با ترتیب تصادفی"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "آسان"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "نمایش نتایج در پایان آزمون"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "عادی"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "تخصصی"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "تنظیمات گوناگون"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "عالی"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "سؤال"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>سؤال</b></p>\n"
+"  <p><b>سؤال</b></p>\n"
 "<hr>\n"
-"  "
-"<p>فقط سؤال و نوع نیاز می‌شود.</p>\n"
+"  <p>فقط سؤال و نوع نیاز می‌شود.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&سؤال:‌"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&نوع:‌"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&عکس:‌"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "&نکته:‌"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&زمان:‌"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&نکته:‌"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&توضیح:‌"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "پاسخ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>پاسخها</b></p>\n"
+"  <p><b>پاسخها</b></p>\n"
 "<hr>\n"
-"  "
-"<p>فقط پاسخ و مقدار نیاز می‌شود.</p>\n"
+"  <p>فقط پاسخ و مقدار نیاز می‌شود.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&پاسخ:‌"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&مقدار:‌"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&نقاط:‌"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "مقدار"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "نکته‌ها"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "حرکت &به بالا‌"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "حرکت &به پایین‌"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">اطلاعات</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&ویرایش...‌"
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "ویرایشگر - آغاز شد"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "باز کردن یک سند &موجود:‌"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "باز کردن یک سند &اخیر:‌"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "باز کردن با مرورگر گالری اینترنت"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "آغاز یک سند &جدید‌"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">اطلاعات</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "گالری"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "نشانی:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&افزودن کارساز‌"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "کارسازها"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "نشانی"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "زبان"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "دسته"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "نوع"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&باز کردن‌"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "محاورۀ پیکربندی KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "نمایش نتایج"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "در پایان آزمون"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "بعد از پاسخ به هر سؤال"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "مرتب‌سازی"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "نمایش سؤالها با ترتیب تصادفی"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "نمایش پاسخها با ترتیب تصادفی"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "نسیم دانیارزاده"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "daniarzadeh@itland.ir"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "نیاز به مشخص کردن کارساز دارید!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&آغاز آزمون‌"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&بعدی <<‌"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&ذخیرۀ نتایج...‌"
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "ذخیرۀ نتایج به عنوان"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "خرابی در ذخیره‌."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "سؤال %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"برای تکمیل این سؤال %1 ثانیه وقت دارید.\n"
-"\n"
-"زمانی که آماده‌اید، تأیید را فشار دهید."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "نتیجه"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "آمار"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "سؤالهای درست"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "سؤالهای نادرست"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "کل نکته‌ها"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "نکته‌های درست"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "نکته‌های نادرست"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "کل زمان"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "زمان در آزمونها"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "پاسخ این است: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "پاسخ درست این است: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "پاسخ شما این بود: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "عنوان"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "آزمونها و امتحانات مبنی بر شکل"
-
-#: keduca/main.cpp:36
-#, fuzzy
-msgid "KEduca"
-msgstr "‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "نگه‌دارندۀ جاری"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v ثانیه باقی ماند"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "مؤلفۀ KEduca KParts"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "عمومی"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "تنظیمات گوناگون"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "نمایش نتایج سؤال بعد از فشار بعدی"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "نمایش نتایج در پایان آزمون"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "ترتیب"
diff --git a/tde-i18n-fi/messages/tdeedu/keduca.po b/tde-i18n-fi/messages/tdeedu/keduca.po
index a4cb51ae6b4..2fe26eaa679 100644
--- a/tde-i18n-fi/messages/tdeedu/keduca.po
+++ b/tde-i18n-fi/messages/tdeedu/keduca.po
@@ -8,28 +8,234 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-10-16 02:24+0300\n"
 "Last-Translator: Ilpo Kantonen <ilpo@iki.fi>\n"
-"Language-Team: finnish <Finnish <kde-i18n-fi-discussion@lists.sourceforge.net>>"
-"\n"
+"Language-Team: finnish <Finnish <kde-i18n-fi-discussion@lists.sourceforge."
+"net>>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.1\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Mikko Ikola,Ilpo Kantonen"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "ikola@iki.fi,ilpo@iki.fi"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Avaa &Galleria..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Avaa Educa-tiedosto"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca KPartin komponentti"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Yleiset"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Sekalaiset asetukset"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Näytä vastauksen tulokset Seuraava-näppäimen painamisen jälkeen."
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Näytä tulokset tutkinnon lopuksi"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Järjestys"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Näytä kysymykset satunnaisessa järjestyksessä"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Näytä vastaukset satunnaisessa järjestyksessä"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Aloita testi"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Seuraava >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Tallenna tulokset"
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Tallenna tulokset nimellä"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr "Tiedosto on jo olemassa. Haluatko korvata sen?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Korvaa"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Tallennus epäonnistui."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Kysymys %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Pisteet"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Sinull on %1 sekuntia aikaa vastata tähän kysymykseen.\n"
+"\n"
+"Paina OK kun olet valmis."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Tulos"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Tilastot"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Oikeinvastatut kysymykset"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Väärinvastatut kysymykset"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Kokonaispisteet"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Oikeinvastatut pisteet"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Väärinvastatut pisteet"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Aika"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Kokonaisaika"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Testien aika"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Vastaus on:Vastaus on: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Oikea vastaus on: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Vastauksesi oli: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Dokumentin tiedot"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Otsikko"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategoria"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Tyyppi"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Kieli"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Vastaukset"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v sekuntia jäljellä"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr "Kaavakkeisiin perustuvat testit ja tutkinnot"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Ladattava tiedosto"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -39,6 +245,10 @@ msgstr "Alkuperäinen tekijä"
 msgid "Maintainer 2002-2004"
 msgstr "Ylläpitäjä 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Nykyinen ylläpitäjä"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Erilaisia bugikorjauksia ja koodinsiistimisiä"
@@ -47,11 +257,6 @@ msgstr "Erilaisia bugikorjauksia ja koodinsiistimisiä"
 msgid "Icons"
 msgstr "Kuvakkeet"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Sinun täytyy määrittää avattava tiedosto!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Muokkaa kysymystä"
@@ -60,30 +265,150 @@ msgstr "Muokkaa kysymystä"
 msgid "Add Questions"
 msgstr "Lisää kysymyksiä"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Oikein"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Väärin"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "%Lisää"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Avaa &Galleria..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Dokumentin tiedot"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Projektin kuvaus ja säännöt."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Kuvaus"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Tyyppi:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Taso:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Kieli:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategoria:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Otsikko:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Kuva:"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Oletuskuva:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Tekijä"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Www-sivu:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Sähköposti:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Nimi:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Tietokoneet"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Testi"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Testi kysymyspisteineen"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Testi vastauspisteineen:"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Diaesitys"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Tutkinto"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psykotekninen testi"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Helppo"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normaali"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Vaikea"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Erittäin vaikea"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -97,6 +422,11 @@ msgstr "&Lisää..."
 msgid "&Edit..."
 msgstr "&Muokkaa..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Ylös"
@@ -114,16 +444,8 @@ msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 msgstr ""
-"Lisää uusi kysymys käyttämällä Muokkaa-valikkoa tai valitsemalla ylläolevista "
-"kuvakkeista."
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Avaa Educa-tiedosto"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Vastaukset"
+"Lisää uusi kysymys käyttämällä Muokkaa-valikkoa tai valitsemalla "
+"ylläolevista kuvakkeista."
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -133,10 +455,6 @@ msgstr "Kysymyksen kuva"
 msgid "Question point"
 msgstr "Kysymyksen pisteet"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Aika"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sekuntia</p>"
@@ -169,20 +487,10 @@ msgstr "Pakkaa tiedosto"
 msgid "Save Document As"
 msgstr "Tallenna dokumentti nimellä"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr "Tiedosto on jo olemassa. Haluatko korvata sen?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Korvaa"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Jos haluat jakaa tämän asiakirjan, on parempi kopioida kuvat samaan kansioon "
@@ -197,13 +505,6 @@ msgstr "Kopioi kuvia"
 msgid "Do Not Copy"
 msgstr "Älä kopioi"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Testi"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -239,543 +540,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Lisää kysymys"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Dokumentin tiedot"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Projektin kuvaus ja säännöt."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Kuvaus"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Tyyppi:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Taso:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Kieli:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategoria:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Otsikko:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Kuva:"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Sinun täytyy määrittää avattava tiedosto!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Oletuskuva:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Kaavakkeisiin perustuvat testit ja tutkinnot"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Tekijä"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Www-sivu:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Sinun täytyy määrittää palvelin!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Sähköposti:"
+msgid "KEduca Config Dialog"
+msgstr "KEduca asetusikkuna"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Nimi:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Tietokoneet"
+msgid "Show Results"
+msgstr "Näytä tulokset"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Testi kysymyspisteineen"
+msgid "At the end of the test"
+msgstr "Testin lopuksi"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Testi vastauspisteineen:"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Diaesitys"
+msgid "After answering each question"
+msgstr "Jokaisen kysymyksen vastaamisen jälkeen"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Tutkinto"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Järjestäminen"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psykotekninen testi"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Näytä vastaukset satunnaisessa järjestyksessä"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Helppo"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Näytä tulokset tutkinnon lopuksi"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normaali"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Vaikea"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Sekalaiset asetukset"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Erittäin vaikea"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Kysymys"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Kysynys</b></p>\n"
+"  <p><b>Kysynys</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Vain kysymys ja tyyppi riittää.</p>\n"
+"  <p>Vain kysymys ja tyyppi riittää.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Kysymys:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Tyyppi:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Kuva:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "&Piste:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&Aika:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&Vihje:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Selitys:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Vastaus"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Vastaukset</b></p>\n"
+"  <p><b>Vastaukset</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Vain vastaus ja arvo riittävät.</p>\n"
+"  <p>Vain vastaus ja arvo riittävät.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Vastaus:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Arvo:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Pisteet:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Arvo"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Pisteet"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Siirry &ylös"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Siirry &alas"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Tiedot</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Muokkaa..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "KEduca Muokkain - alkuun pääseminen"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Avaa &olemassa oleva asiakirja:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Avaa &viimeaikainen asiakirja:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Avaa Internet-gallerian muokkaimella"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Aloita &uusi asiakirja"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Tiedot</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galleria"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Osoite:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Lisää palvelin"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Palvelimet"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Osoite"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Kieli"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategoria"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Tyyppi"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Avaa"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca asetusikkuna"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Näytä tulokset"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Testin lopuksi"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Jokaisen kysymyksen vastaamisen jälkeen"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Järjestäminen"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Näytä kysymykset satunnaisessa järjestyksessä"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Näytä vastaukset satunnaisessa järjestyksessä"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Mikko Ikola,Ilpo Kantonen"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "ikola@iki.fi,ilpo@iki.fi"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Sinun täytyy määrittää palvelin!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Aloita testi"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Seuraava >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Tallenna tulokset"
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Tallenna tulokset nimellä"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Tallennus epäonnistui."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Kysymys %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Sinull on %1 sekuntia aikaa vastata tähän kysymykseen.\n"
-"\n"
-"Paina OK kun olet valmis."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Tulos"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Tilastot"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Oikeinvastatut kysymykset"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Väärinvastatut kysymykset"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Kokonaispisteet"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Oikeinvastatut pisteet"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Väärinvastatut pisteet"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Kokonaisaika"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Testien aika"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Vastaus on:Vastaus on: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Oikea vastaus on: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Vastauksesi oli: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Otsikko"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Kaavakkeisiin perustuvat testit ja tutkinnot"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Nykyinen ylläpitäjä"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v sekuntia jäljellä"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca KPartin komponentti"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Yleiset"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Sekalaiset asetukset"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Näytä vastauksen tulokset Seuraava-näppäimen painamisen jälkeen."
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Näytä tulokset tutkinnon lopuksi"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Järjestys"
diff --git a/tde-i18n-fr/messages/tdeedu/keduca.po b/tde-i18n-fr/messages/tdeedu/keduca.po
index b5c487e57e0..83535f0d341 100644
--- a/tde-i18n-fr/messages/tdeedu/keduca.po
+++ b/tde-i18n-fr/messages/tdeedu/keduca.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-08-06 02:24+0200\n"
 "Last-Translator: Nicolas Ternisien <nicolas.ternisien@gmail.com>\n"
 "Language-Team:  <kde-francophone@kde.org>\n"
@@ -22,17 +22,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.1\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Constructeur de tests et examens basés sur des formulaires"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Matthieu Robin,Nicolas Ternisien"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kde@macolu.org,nicolas.ternisien@gmail.com"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Ouvrir une &galerie..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Ouvrir un document Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "Composant KParts KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Général"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Réglages divers"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Afficher les résultats après avoir cliqué sur suivant"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Afficher les résultats une fois le test terminé"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Ordre"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Afficher les questions en ordre aléatoire"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Afficher les réponses en ordre aléatoire"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Démarrer le test"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Suivant >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "Enregi&strer les résultats..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Enregistrer les résultats sous"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Un document portant ce nom existe déjà.\n"
+"Voulez-vous l'écraser ?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Écraser"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Échec de l'enregistrement."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Question %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Points"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Vous avez %1 secondes pour répondre à la question.\n"
+"\n"
+"Appuyez sur « OK » lorsque vous êtes prêt(e)."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Résultat"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistiques"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Questions correctes"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Questions incorrectes"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Total des points"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Points corrects"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Points incorrects"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Temps"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Temps total"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Temps dans les tests"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "La réponse est : "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "La réponse correcte est : "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Votre réponse était : "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Informations sur le document"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Titre"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Catégorie"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Type"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Langue"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Réponses"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v secondes restantes"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Tests et examens basés sur des formulaires"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Document à ouvrir"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -42,6 +250,10 @@ msgstr "Auteur original"
 msgid "Maintainer 2002-2004"
 msgstr "Mainteneur entre 2002 et 2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Mainteneur actuel"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Corrections diverses et nettoyage"
@@ -50,11 +262,6 @@ msgstr "Corrections diverses et nettoyage"
 msgid "Icons"
 msgstr "Icônes"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Vous devez spécifier le fichier à ouvrir !"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Modifier la question"
@@ -63,30 +270,150 @@ msgstr "Modifier la question"
 msgid "Add Questions"
 msgstr "Ajouter des questions"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Vrai"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Faux"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Ajouter"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Ouvrir une &galerie..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Informations sur le document"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Description et règles du projet."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Description"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Type :"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Niveau :"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Langue :"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Catégorie :"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Titre :"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Image"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Image par défaut :"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Auteur"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Site web :"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Adresse électronique :"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Nom :"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Ordinateurs"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Test"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Test avec questions à points"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Test avec réponses à points"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Diaporama"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Examen"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Test psychotechnique"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Facile"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normal"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Expert"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Suprême"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -100,6 +427,11 @@ msgstr "&Ajouter..."
 msgid "&Edit..."
 msgstr "Édit&er..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Haut"
@@ -117,16 +449,8 @@ msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 msgstr ""
-"Ajouter une question en utilisant l'éditeur de menus ou en choisissant une des "
-"icônes ci-dessus."
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Ouvrir un document Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Réponses"
+"Ajouter une question en utilisant l'éditeur de menus ou en choisissant une "
+"des icônes ci-dessus."
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -136,10 +460,6 @@ msgstr "Image de la question"
 msgid "Question point"
 msgstr "Point de la question"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Temps"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " secondes</p>"
@@ -172,22 +492,10 @@ msgstr "Compacter le fichier"
 msgid "Save Document As"
 msgstr "Enregistrer le document sous"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Un document portant ce nom existe déjà.\n"
-"Voulez-vous l'écraser ?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Écraser"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Si vous voulez partager ce document, il est préférable de copier les images "
@@ -202,13 +510,6 @@ msgstr "Copier les images"
 msgid "Do Not Copy"
 msgstr "Ne pas copier"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Test"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -244,543 +545,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Insérer une question"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Informations sur le document"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Description et règles du projet."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Description"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Type :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Niveau :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Langue :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Catégorie :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Titre :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Image"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Vous devez spécifier le fichier à ouvrir !"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Image par défaut :"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Constructeur de tests et examens basés sur des formulaires"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Auteur"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Site web :"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Vous devez indiquer un serveur !"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Adresse électronique :"
+msgid "KEduca Config Dialog"
+msgstr "Fenêtre de configuration de KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Nom :"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Ordinateurs"
+msgid "Show Results"
+msgstr "Afficher les résultats"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Test avec questions à points"
+msgid "At the end of the test"
+msgstr "À la fin du test"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Test avec réponses à points"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Diaporama"
+msgid "After answering each question"
+msgstr "Après chaque réponse"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Examen"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Mise en ordre"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Test psychotechnique"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Afficher les réponses en ordre aléatoire"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Facile"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Afficher les résultats une fois le test terminé"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normal"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Expert"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Réglages divers"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Suprême"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Question"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Seuls la question et le type sont exigés.</p>\n"
+"  <p>Seuls la question et le type sont exigés.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Question :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Type :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Image :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "&Point :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&Temps :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&Astuce :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Expliquer :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Réponse"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Réponses</b></p>\n"
+"  <p><b>Réponses</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Seules la réponse et la valeur sont nécessaires.</p>\n"
+"  <p>Seules la réponse et la valeur sont nécessaires.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Réponse :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Valeur :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Points :"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Valeur"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Points"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "&Monter"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "&Descendre"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b style=\"text-decoration:underline;\">Informations</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Édit&er..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Éditeur - Premiers pas"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Ouvrir un document &existant :"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Ouvrir un document &récent :"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Ouvrir avec le navigateur de galerie Internet"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Commencer un &nouveau document"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b style=\"text-decoration:underline;\">Informations</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galerie"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adresse :"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Ajouter un serveur"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Serveurs"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adresse"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Langue"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Catégorie"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Type"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Ouvrir"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Fenêtre de configuration de KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Afficher les résultats"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "À la fin du test"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Après chaque réponse"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Mise en ordre"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Afficher les questions en ordre aléatoire"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Afficher les réponses en ordre aléatoire"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Matthieu Robin,Nicolas Ternisien"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kde@macolu.org,nicolas.ternisien@gmail.com"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Vous devez indiquer un serveur !"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Démarrer le test"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Suivant >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "Enregi&strer les résultats..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Enregistrer les résultats sous"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Échec de l'enregistrement."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Question %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Vous avez %1 secondes pour répondre à la question.\n"
-"\n"
-"Appuyez sur « OK » lorsque vous êtes prêt(e)."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Résultat"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistiques"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Questions correctes"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Questions incorrectes"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Total des points"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Points corrects"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Points incorrects"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Temps total"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Temps dans les tests"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "La réponse est : "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "La réponse correcte est : "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Votre réponse était : "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Titre"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Tests et examens basés sur des formulaires"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Mainteneur actuel"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v secondes restantes"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "Composant KParts KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Général"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Réglages divers"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Afficher les résultats après avoir cliqué sur suivant"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Afficher les résultats une fois le test terminé"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Ordre"
diff --git a/tde-i18n-ga/messages/tdeedu/keduca.po b/tde-i18n-ga/messages/tdeedu/keduca.po
index 10a13f88bbc..c09fb2b68b2 100644
--- a/tde-i18n-ga/messages/tdeedu/keduca.po
+++ b/tde-i18n-ga/messages/tdeedu/keduca.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeedu/keduca.po\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: ga <LL@li.org>\n"
@@ -10,17 +10,228 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Séamus Ó Ciardhuáin,Kevin Scannell"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "seoc at iolfree dot ie,scannell at slu dot edu"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Oscail &Gailearaí..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Oscail Comhad Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+#, fuzzy
+msgid "KEduca KParts Component"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Ginearálta"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Socruithe Éagsúla"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Ord"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr ""
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr ""
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "To&saigh an Scrúdú"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Ar Aghaidh >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Sábháil na Torthaí..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Sábháil na Torthaí Mar"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Tá comhad ann cheana agus an ainm seo air.\n"
+"An mian leat scríobh air?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Forscríobh"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Theip ar an tsábháil."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Ceist %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Pointí"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Toradh"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Staitisticí"
+
+#: keduca/keducaview.cpp:446
+#, fuzzy
+msgid "Correct questions"
+msgstr "Ionsáigh Ceist"
+
+#: keduca/keducaview.cpp:448
+#, fuzzy
+msgid "Incorrect questions"
+msgstr "Ionsáigh Ceist"
+
+#: keduca/keducaview.cpp:452
+#, fuzzy
+msgid "Total points"
+msgstr "Am Iomlán"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr ""
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr ""
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Am"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Am Iomlán"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr ""
+
+#: keduca/keducaview.cpp:487
+#, fuzzy
+msgid "The answer is: "
+msgstr "Do fhreagra: "
+
+#: keduca/keducaview.cpp:489
+#, fuzzy
+msgid "The correct answer is: "
+msgstr "Do fhreagra: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Do fhreagra: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Eolas faoin Cháipéis"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Teideal"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Catagóir"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Cineál"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Teanga"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Freagraí"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr ""
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr ""
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Comhad le luchtú"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -30,6 +241,10 @@ msgstr "An Chéad Údar"
 msgid "Maintainer 2002-2004"
 msgstr ""
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Cothaitheoir Reatha"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr ""
@@ -38,11 +253,6 @@ msgstr ""
 msgid "Icons"
 msgstr "Deilbhíní"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr ""
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Athraigh Ceist"
@@ -51,30 +261,150 @@ msgstr "Athraigh Ceist"
 msgid "Add Questions"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Fíor"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Falsa"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "C&uir Leis"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Oscail &Gailearaí..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Eolas faoin Cháipéis"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Cur Síos"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Cineál:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Leibhéal:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Teanga:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Catagóir:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Teideal:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Pictiúr"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Pictiúr réamhshocraithe:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Údar"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Leathanach Gréasáin:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Ríomhphost:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Ainm:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Ríomhairí"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Tástáil"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr ""
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Taispeántas Sleamhnán"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Scrúdú"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Éasca"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Gnách"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Saineolaí"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr ""
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -88,6 +418,11 @@ msgstr "&Cuir Leis..."
 msgid "&Edit..."
 msgstr "&Eagar..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "S&uas"
@@ -106,14 +441,6 @@ msgid ""
 "above."
 msgstr ""
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Oscail Comhad Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Freagraí"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr ""
@@ -122,10 +449,6 @@ msgstr ""
 msgid "Question point"
 msgstr ""
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Am"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " soicind</p>"
@@ -158,22 +481,10 @@ msgstr "Comhbhrúigh an comhad"
 msgid "Save Document As"
 msgstr "Sábháil an Cháipéis Mar"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Tá comhad ann cheana agus an ainm seo air.\n"
-"An mian leat scríobh air?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Forscríobh"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 
@@ -185,13 +496,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr "Ná Cóipeáil"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Tástáil"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -220,536 +524,253 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Ionsáigh Ceist"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Eolas faoin Cháipéis"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Cur Síos"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Cineál:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Leibhéal:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Teanga:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Catagóir:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Teideal:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Pictiúr"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Pictiúr réamhshocraithe:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Údar"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Leathanach Gréasáin:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Is gá ainm freastalaí a sholáthar!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Ríomhphost:"
+msgid "KEduca Config Dialog"
+msgstr "Dialóg Chumraíochta KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Ainm:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Ríomhairí"
+msgid "Show Results"
+msgstr "Taispeáin na Torthaí"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
+msgid "At the end of the test"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
+msgid "After answering each question"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Taispeántas Sleamhnán"
-
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Scrúdú"
+#: keduca/configdialogbase.ui:56
+#, fuzzy, no-c-format
+msgid "Ordering"
+msgstr "Ord"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, no-c-format
+msgid "Display answers in random order."
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Éasca"
+#: keduca/keduca.kcfg:17
+#, no-c-format
+msgid "Show results only at the end of the test."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Gnách"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Saineolaí"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Socruithe Éagsúla"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Ceist"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Ceist:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Cineál:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Pictiúr:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "P&ointe:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "A&m:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "Le&id:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Mínigh:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Freagra"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "Fre&agra:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Luach:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Pointí:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Luach"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Pointí"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Bog S&uas"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Bog Sí&os"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Eolas</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Eagar..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Oscail cáipéis atá ann ch&eana:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Cáipéis &nua"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Eolas</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Gailearaí"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Seoladh:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Freastalaí Nua"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Freastalaithe"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Seoladh"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Teanga"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Catagóir"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Cineál"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Oscail"
 
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Dialóg Chumraíochta KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Taispeáin na Torthaí"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, fuzzy, no-c-format
-msgid "Ordering"
-msgstr "Ord"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Séamus Ó Ciardhuáin,Kevin Scannell"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "seoc at iolfree dot ie,scannell at slu dot edu"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Is gá ainm freastalaí a sholáthar!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "To&saigh an Scrúdú"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Ar Aghaidh >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Sábháil na Torthaí..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Sábháil na Torthaí Mar"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Theip ar an tsábháil."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Ceist %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Toradh"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Staitisticí"
-
-#: keduca/keducaview.cpp:446
-#, fuzzy
-msgid "Correct questions"
-msgstr "Ionsáigh Ceist"
-
-#: keduca/keducaview.cpp:448
-#, fuzzy
-msgid "Incorrect questions"
-msgstr "Ionsáigh Ceist"
-
-#: keduca/keducaview.cpp:452
-#, fuzzy
-msgid "Total points"
-msgstr "Am Iomlán"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr ""
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr ""
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Am Iomlán"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr ""
-
-#: keduca/keducaview.cpp:487
-#, fuzzy
-msgid "The answer is: "
-msgstr "Do fhreagra: "
-
-#: keduca/keducaview.cpp:489
-#, fuzzy
-msgid "The correct answer is: "
-msgstr "Do fhreagra: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Do fhreagra: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Teideal"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr ""
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Cothaitheoir Reatha"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr ""
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-#, fuzzy
-msgid "KEduca KParts Component"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Ginearálta"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Socruithe Éagsúla"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr ""
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr ""
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Ord"
-
 #~ msgid "1.2.0"
 #~ msgstr "1.2.0"
 
diff --git a/tde-i18n-gl/messages/tdeedu/keduca.po b/tde-i18n-gl/messages/tdeedu/keduca.po
index 73103de19eb..14bf084ce54 100644
--- a/tde-i18n-gl/messages/tdeedu/keduca.po
+++ b/tde-i18n-gl/messages/tdeedu/keduca.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2006-06-02 14:09+0200\n"
 "Last-Translator: Xabi G. Feal <xabigf@gmx.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -21,17 +21,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Constructor de probas e exames baseados en formularios"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Manuel Alberto Vázquez Diz"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "xixirei@yahoo.es"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Abrir &galería..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Abrir ficheiro de Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "Parte de KEduca"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca Componente de KParts "
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Xeral"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Varios parámetros"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Amosar resultado da resposta despois de premer seguinte"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Amosar resultados despois de rematar a proba"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Orde"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Amosar preguntas en orde aleatorio"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Amosar respostas en orde aleatorio"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Comezar proba"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Seguinte >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Gravar resultados..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Gravar resultados como"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Xa existe un documento con este nome.\n"
+"¿Quere sobreescribilo?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Sobreescribir"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Erro ó gardar"
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Pregunta %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Puntos"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Ten %1 segundos para completar esta pregunta.\n"
+"\n"
+"Prema Aceptar cando estea listo."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Resultado"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Preguntas correctas"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Preguntas incorrectas"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Puntos totales"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Puntos correctos"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Puntos incorrectos"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Tempo"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Tempo total"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Tempo nas probas"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "A resposta é:"
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "A resposta correcta é:"
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "A súa resposta foi:"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Información do documento"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Título"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Categoría"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Tipo"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Idioma"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Respostas"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v segundos despois"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Probas e exames baseados en formularios"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Ficheiro a cargar"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -41,6 +249,10 @@ msgstr "Autor orixinal"
 msgid "Maintainer 2002-2004"
 msgstr "Mantedor 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Mantedor actual"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Varias correccións e limpezas"
@@ -49,11 +261,6 @@ msgstr "Varias correccións e limpezas"
 msgid "Icons"
 msgstr "Iconas"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "¡É necesario espeficiar o ficheiro a abrir!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Modificar pregunta "
@@ -62,30 +269,150 @@ msgstr "Modificar pregunta "
 msgid "Add Questions"
 msgstr "Engadir preguntas"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Verdadeiro"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Falso"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Engadir"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Abrir &galería..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Información do documento"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Descrición e regras do proxecto"
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Descrición"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Tipo:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Nivel:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Idioma:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Categoría:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Título:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Imaxe"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Imaxe predeterminada"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autor"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Páxina web"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Correo electrónico"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Nome:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Ordenadores"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Proba"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Proba con puntos de pregunta"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Proba con puntos de resposta"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Presentación"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Exame"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Proba psicotécnica"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Doado"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normal"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Experto"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Supremo"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -99,6 +426,11 @@ msgstr "&Engadir..."
 msgid "&Edit..."
 msgstr "&Editar..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Arriba"
@@ -119,14 +451,6 @@ msgstr ""
 "Engadir unha nova pregunta empregando o menú edición ou elixindo unha das "
 "iconas da parte de arriba."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Abrir ficheiro de Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Respostas"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Imaxe da pregunta"
@@ -135,10 +459,6 @@ msgstr "Imaxe da pregunta"
 msgid "Question point"
 msgstr "Punto de pregunta"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Tempo"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr "segundos</p>"
@@ -171,22 +491,10 @@ msgstr "Ficheiro comprimido"
 msgid "Save Document As"
 msgstr "Gravar documento como"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Xa existe un documento con este nome.\n"
-"¿Quere sobreescribilo?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Sobreescribir"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Se desexa compartir este documento, é mellor que copie as imaxes no mesmo "
@@ -201,13 +509,6 @@ msgstr "Copiar imaxes"
 msgid "Do Not Copy"
 msgstr "Non copiar"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Proba"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -243,543 +544,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Inserir pregunta"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Información do documento"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Descrición e regras do proxecto"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Descrición"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Tipo:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Nivel:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Idioma:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Categoría:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Título:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Imaxe"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "¡É necesario espeficiar o ficheiro a abrir!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Imaxe predeterminada"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Constructor de probas e exames baseados en formularios"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autor"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Páxina web"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "¡Debe especificar un servidor!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Correo electrónico"
+msgid "KEduca Config Dialog"
+msgstr "Xanela de configuración de KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Nome:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Ordenadores"
+msgid "Show Results"
+msgstr "Amosar resultados"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Proba con puntos de pregunta"
+msgid "At the end of the test"
+msgstr "Ir ao final da proba"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Proba con puntos de resposta"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Presentación"
+msgid "After answering each question"
+msgstr "Despois de contestar cada pregunta"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Exame"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Ordenando"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Proba psicotécnica"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Amosar respostas en orde aleatorio"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Doado"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Amosar resultados despois de rematar a proba"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normal"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Experto"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Varios parámetros"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Supremo"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Pregunta"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Pregunta</b></p>\n"
+"  <p><b>Pregunta</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Só é preciso a pregunta e o tipo</p>\n"
+"  <p>Só é preciso a pregunta e o tipo</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Pregunta"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Tipo:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Imaxe"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "P&untos"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Te&mpo"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "P&ista"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Explicación"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Resposta"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Respostas</b></p>\n"
+"  <p><b>Respostas</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Só é preciso a resposta e o tipo.</p>\n"
+"  <p>Só é preciso a resposta e o tipo.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Respostas"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Valor:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Puntos"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Valor"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Puntos"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "S&ubir"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "&Baixar"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Información</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Editar..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Editor - Inicio"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Abrir un documento &existente"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Abrir un documento &recente:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Abrir co explorador de  galerías de Internet"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Iniciar un &novo documento"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Información</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galería"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Dirección:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Engadir servidor"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Servidores"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Direccións"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Idioma"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Categoría"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Tipo"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Abrir"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Xanela de configuración de KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Amosar resultados"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Ir ao final da proba"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Despois de contestar cada pregunta"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Ordenando"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Amosar preguntas en orde aleatorio"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Amosar respostas en orde aleatorio"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Manuel Alberto Vázquez Diz"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "xixirei@yahoo.es"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "¡Debe especificar un servidor!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Comezar proba"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Seguinte >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Gravar resultados..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Gravar resultados como"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Erro ó gardar"
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Pregunta %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Ten %1 segundos para completar esta pregunta.\n"
-"\n"
-"Prema Aceptar cando estea listo."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Resultado"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Estatísticas"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Preguntas correctas"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Preguntas incorrectas"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Puntos totales"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Puntos correctos"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Puntos incorrectos"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Tempo total"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Tempo nas probas"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "A resposta é:"
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "A resposta correcta é:"
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "A súa resposta foi:"
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Título"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Probas e exames baseados en formularios"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Mantedor actual"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v segundos despois"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "Parte de KEduca"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca Componente de KParts "
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Xeral"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Varios parámetros"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Amosar resultado da resposta despois de premer seguinte"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Amosar resultados despois de rematar a proba"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Orde"
diff --git a/tde-i18n-he/messages/tdeedu/keduca.po b/tde-i18n-he/messages/tdeedu/keduca.po
index 7810d5d1c6a..899c2090047 100644
--- a/tde-i18n-he/messages/tdeedu/keduca.po
+++ b/tde-i18n-he/messages/tdeedu/keduca.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2006-08-19 17:05+0300\n"
 "Last-Translator: tahmar1900 <tahmar1900@gmail.com>\n"
 "Language-Team: hebrew <kde-il@yahoogroups.com>\n"
@@ -27,17 +27,226 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "בונה מבחנים מבוססי טפסים "
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "tahmar1900 צוות התרגום של TDE ישראל"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "tahmar1900@gmail.comkde-il@yahoogroups.com"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "פתח &גלרייה..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "פתיחת קובץ Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+#, fuzzy
+msgid "KEduca KParts Component"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "כללי"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "הגדרות שונות"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "הצג את תוצאות התשובה לאחר הלחיצה על \"הבא\""
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "הצג את תוצאות התשובה בסיום המבחן"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "סֶדר"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "הצג שאלות בסדר אקראי"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "הצג תשובות בסדר אקראי"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&התחל מבחן"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "ה&בא >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&שמור תשובות..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "שמירת תשובות בשם"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"כבר קיים מסמך בשם זה.\n"
+"האם ברצונך לשכתב אותו?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "שכתוב"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "שמירה נכשלה."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "שאלה %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "ניקוד"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"יש לך %1 שניות בשביל לענות על השאלה הזאת. \n"
+"\n"
+"לחץ על אישור כאשר אתה מוכן."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "תוצאה"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "סטאטיסטיקה"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "תשובות נכונות"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "תשובות לא נכונות"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "ניקוד כללי"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "נקודות נכונות"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "נקודות לא נכונות"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "זמן"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "זמן כולל"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "זמן בבחינות"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "התשובה היא:"
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "התשובה הנכונה היא: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "התשובה שלך הייתה: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "מידע מסמך"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "כותרת"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "קטגוריה"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "סוג"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "שפה"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "תשובות"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "נשארו %v שניות"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "מבחנים מבוססי טפסים"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "קובץ לטעינה"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -47,6 +256,10 @@ msgstr "מפתח מקורי"
 msgid "Maintainer 2002-2004"
 msgstr "מתחזק 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "מתחזק נוכחי"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "תיקונים ושינויים"
@@ -55,11 +268,6 @@ msgstr "תיקונים ושינויים"
 msgid "Icons"
 msgstr "סמלים"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "יש לציין את הקובץ לפתיחה."
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "שינוי שאלה"
@@ -68,30 +276,150 @@ msgstr "שינוי שאלה"
 msgid "Add Questions"
 msgstr "הוספת שאלות"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "נכון"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "שקר"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&הוספה"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "פתח &גלרייה..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "מידע מסמך"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "תיאור הפרויקט והכללים שלו. "
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "תיאור"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "סוג:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "רמה:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "שפה:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "קטגוריה:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "כותרת:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "תמונה"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "תמונת ברירת מחדל:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "מחבר"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "אתר אינטרנט:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "דוא\"ל:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "שם:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "מחשבים"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "מבחן"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "מבחן עם ניקוד על השאלה"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "מבחן עם ניקוד לתשובות"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "שקופיות"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "מבחן"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "מבחן פסיכוטכני"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "קל"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "רגיל"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "מומחה"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "מומחה־על"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -105,6 +433,11 @@ msgstr "&הוספה..."
 msgid "&Edit..."
 msgstr "&עריכה..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&למעלה"
@@ -123,14 +456,6 @@ msgid ""
 "above."
 msgstr "הוסף שאלה חדשה בעזרת עריכת התפריט או בבחירת אחד מהסמלים למעלה."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "פתיחת קובץ Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "תשובות"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "תמונה לשאלה"
@@ -139,10 +464,6 @@ msgstr "תמונה לשאלה"
 msgid "Question point"
 msgstr "ניקוד על השאלה"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "זמן"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " שניות</p>"
@@ -175,25 +496,14 @@ msgstr "דחוס את הקובץ"
 msgid "Save Document As"
 msgstr "שמירת מסמך בשם"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"כבר קיים מסמך בשם זה.\n"
-"האם ברצונך לשכתב אותו?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "שכתוב"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"אם ברצונך לשתף את המסמך הזה, עדיף להעתיק את התמונות לתקייה המכילה את המסמך. \n"
+"אם ברצונך לשתף את המסמך הזה, עדיף להעתיק את התמונות לתקייה המכילה את "
+"המסמך. \n"
 "האם ברצונך להעתיק את התמונות?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -204,13 +514,6 @@ msgstr "העתק תמונות"
 msgid "Do Not Copy"
 msgstr "אל תעתיק"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "מבחן"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -246,148 +549,85 @@ msgstr ""
 msgid "Insert Question"
 msgstr "הוסף שאלה"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "מידע מסמך"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "תיאור הפרויקט והכללים שלו. "
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "תיאור"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "סוג:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "רמה:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "שפה:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "קטגוריה:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "כותרת:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "תמונה"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "תמונת ברירת מחדל:"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "יש לציין את הקובץ לפתיחה."
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "מחבר"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "בונה מבחנים מבוססי טפסים "
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "אתר אינטרנט:"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, no-c-format
-msgid "Email:"
-msgstr "דוא\"ל:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "יש לציין שרת"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Name:"
-msgstr "שם:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "מחשבים"
+msgid "KEduca Config Dialog"
+msgstr "עורך הדיאלוגים של KEduca"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "מבחן עם ניקוד על השאלה"
+msgid "Show Results"
+msgstr "הראה תוצאות"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "מבחן עם ניקוד לתשובות"
+msgid "At the end of the test"
+msgstr "בסוף המבחן"
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "שקופיות"
+#: keduca/configdialogbase.ui:46
+#, no-c-format
+msgid "After answering each question"
+msgstr "אחרי שעונים על כל שאלה"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "מבחן"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "סדר"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "מבחן פסיכוטכני"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "הצג תשובות בסדר אקראי"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "קל"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "הצג את תוצאות התשובה בסיום המבחן"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "רגיל"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "מומחה"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "הגדרות שונות"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "מומחה־על"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "שאלה"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
@@ -396,392 +636,172 @@ msgstr ""
 "<p>רק השאלה והסוג דרושים.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&שאלה:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&סוג:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&תמונה:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "&ניקוד:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&זמן:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&עצה:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&הסבר:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "תשובה"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>תשובות</b></p>\n"
+"  <p><b>תשובות</b></p>\n"
 "<hr>\n"
-"  "
-"<p>רק התשובה והערך דרושים.</p>\n"
+"  <p>רק התשובה והערך דרושים.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&תשובה:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&ערך:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&ניקוד:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "ערך"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "ניקוד"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "מ&עלה"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "מ&טה"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">מידע</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&עריכה..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "עורך - מתחילים"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "פתח מסמך &קיים:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "פתח &מסמך שנפתח לאחרונה:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "פתח בגלריה האינטרנטית"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "התחל מסמך &חדש"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">מידע</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "גלרייה"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "כתובת:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&הוסף שרת"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "שרתים"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "כתובת"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "שפה"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "קטגוריה"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "סוג"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&פתח"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "עורך הדיאלוגים של KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "הראה תוצאות"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "בסוף המבחן"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "אחרי שעונים על כל שאלה"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "סדר"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "הצג שאלות בסדר אקראי"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "הצג תשובות בסדר אקראי"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "tahmar1900 צוות התרגום של TDE ישראל"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "tahmar1900@gmail.comkde-il@yahoogroups.com"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "יש לציין שרת"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&התחל מבחן"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "ה&בא >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&שמור תשובות..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "שמירת תשובות בשם"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "שמירה נכשלה."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "שאלה %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"יש לך %1 שניות בשביל לענות על השאלה הזאת. \n"
-"\n"
-"לחץ על אישור כאשר אתה מוכן."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "תוצאה"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "סטאטיסטיקה"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "תשובות נכונות"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "תשובות לא נכונות"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "ניקוד כללי"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "נקודות נכונות"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "נקודות לא נכונות"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "זמן כולל"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "זמן בבחינות"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "התשובה היא:"
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "התשובה הנכונה היא: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "התשובה שלך הייתה: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "כותרת"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "מבחנים מבוססי טפסים"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "מתחזק נוכחי"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "נשארו %v שניות"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-#, fuzzy
-msgid "KEduca KParts Component"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "כללי"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "הגדרות שונות"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "הצג את תוצאות התשובה לאחר הלחיצה על \"הבא\""
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "הצג את תוצאות התשובה בסיום המבחן"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "סֶדר"
diff --git a/tde-i18n-hi/messages/tdeedu/keduca.po b/tde-i18n-hi/messages/tdeedu/keduca.po
index 1ad7584a8bc..014430fc37f 100644
--- a/tde-i18n-hi/messages/tdeedu/keduca.po
+++ b/tde-i18n-hi/messages/tdeedu/keduca.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-01-05 13:14+0530\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@gmail.com>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -14,17 +14,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "फ़ॉर्म आधारित परीक्षा तथा जाँच बिल्डर"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "रविशंकर श्रीवास्तव "
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "raviratlami@yahoo.com"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "गैलरी खोलें...(&G)"
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "एजुका फ़ाइल खोलें"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "के-एज़ुका-पार्ट"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "के-एज़ुका के-पार्ट्स अवयव"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "सामान्य"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "भिन्न विन्यास"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "अगला दबाने के पश्चात् उत्तर का परिणाम दिखाएँ"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "जब जाँच ख़त्म हो तो परिणाम दिखाएँ"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "अनुक्रम"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "प्रश्न बेतरतीब क्रम में दिखाएँ"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "उत्तर बेतरतीब क्रम में दिखाएँ"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "परीक्षा प्रारंभ करें (&S)"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "अगला (&N) >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "परिणाम सहेजें... (&S)"
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "परिणाम ऐसे सहेजें"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"इस नाम की फ़ाइल पहले से ही मौजूद है. \n"
+"क्या आप इसके ऊपर लिखना चाहते हैं?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr ""
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "सहेजना असफल"
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "प्रश्न %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "अंक"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"आपके पास इस प्रश्न को पूर्ण करने के लिए %1 सेकण्ड हैं.\n"
+"\n"
+"जब आप तैयार हों तो ठीक बटन दबाएँ."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "परिणाम"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "आंकड़े"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "सही प्रश्न"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "गलत प्रश्न"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "कुल अंक"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "सही अंक"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "गलत अंक"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "समय"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "कुल समय"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "परीक्षणोंस्ट में समय"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "उत्तर हैः"
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "सही उत्तर हैः"
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "आपका उत्तर थाः"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "दस्तावेज़ जानकारी"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "शीर्षक"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "श्रेणी"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "प्रकार"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "भाषा"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "उत्तर"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v सेकण्ड बाकी"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "फ़ॉर्म-आधारित टेस्ट तथा परीक्षाएँ"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "लोड करने के लिए फ़ाइल"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "के-एजुका-बिल्डर"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "के-एज़ुका"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -34,6 +242,10 @@ msgstr ""
 msgid "Maintainer 2002-2004"
 msgstr ""
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr ""
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr ""
@@ -42,11 +254,6 @@ msgstr ""
 msgid "Icons"
 msgstr ""
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "आपको खोलने के लिए फ़ाइल उल्लेखित करना होगा!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "प्रश्न परिवर्धित करें"
@@ -55,30 +262,150 @@ msgstr "प्रश्न परिवर्धित करें"
 msgid "Add Questions"
 msgstr "प्रश्न जोड़ें"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "सही"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "गलत"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "जोड़ें (&A)"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "गैलरी खोलें...(&G)"
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "दस्तावेज़ जानकारी"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "परियोजना का वर्णन तथा नियम."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "वर्णन"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "क़िस्मः"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "स्तरः"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "भाषा:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "वर्गः"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "शीर्षक:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "छवि"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "डिफ़ॉल्ट छविः"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "लेखक"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "वेब पृष्ठः"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "ईमेल:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "नाम:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "कम्प्यूटर्स"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "टेस्ट"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "प्रश्न अंकों के साथ टेस्ट"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "उत्तर अंकों के साथ टेस्ट"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "स्लाइडरशो"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "परीक्षा"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "सायकोटेक्निक परीक्षा"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "आसान"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "सामान्य"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "विशेषज्ञ"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "सुप्रीम"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -92,6 +419,11 @@ msgstr "जोड़ें...(&A)"
 msgid "&Edit..."
 msgstr "संपादन... (&E)"
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "ऊपर (&U)"
@@ -108,17 +440,7 @@ msgstr "के-एज़ुका में आपका स्वागत ह
 msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
-msgstr ""
-"नया प्रश्न जोड़ें संपादन मेन्यू के उपयोग से या ऊपर दिए प्रतीक में से एक का "
-"चुनाव करके."
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "एजुका फ़ाइल खोलें"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "उत्तर"
+msgstr "नया प्रश्न जोड़ें संपादन मेन्यू के उपयोग से या ऊपर दिए प्रतीक में से एक का चुनाव करके."
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -128,10 +450,6 @@ msgstr "प्रश्न इमेज"
 msgid "Question point"
 msgstr "प्रश्न अंक"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "समय"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr "सेकण्ड</p>"
@@ -164,26 +482,14 @@ msgstr "फ़ाइल को संपीडित करें"
 msgid "Save Document As"
 msgstr "दस्तावेज़ ऐसे सहेजें"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"इस नाम की फ़ाइल पहले से ही मौजूद है. \n"
-"क्या आप इसके ऊपर लिखना चाहते हैं?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"यदि आप इस दस्तावेज़ का साझेदारी करना चाहते हैं तो यह अच्छा होगा कि छवि को उसी "
-"फ़ोल्डर में दस्तावेज़ जैसे सहेजें\n"
+"यदि आप इस दस्तावेज़ का साझेदारी करना चाहते हैं तो यह अच्छा होगा कि छवि को उसी फ़ोल्डर "
+"में दस्तावेज़ जैसे सहेजें\n"
 "क्या आप छवियों की नक़ल करना चाहते हैं?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -194,13 +500,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "टेस्ट"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -237,547 +536,263 @@ msgstr ""
 msgid "Insert Question"
 msgstr "प्रश्न प्रविष्ट करें"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "दस्तावेज़ जानकारी"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "परियोजना का वर्णन तथा नियम."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "वर्णन"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "क़िस्मः"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "स्तरः"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "भाषा:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "वर्गः"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "शीर्षक:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "छवि"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "डिफ़ॉल्ट छविः"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "लेखक"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "वेब पृष्ठः"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "आपको खोलने के लिए फ़ाइल उल्लेखित करना होगा!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, no-c-format
-msgid "Email:"
-msgstr "ईमेल:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "फ़ॉर्म आधारित परीक्षा तथा जाँच बिल्डर"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
-#, no-c-format
-msgid "Name:"
-msgstr "नाम:"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "के-एजुका-बिल्डर"
 
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "कम्प्यूटर्स"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "आपको एक सर्वर उल्लेखित करना होगा!"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "प्रश्न अंकों के साथ टेस्ट"
+msgid "KEduca Config Dialog"
+msgstr "के-एज़ुका कॉन्फ़िग संवाद"
+
+#: keduca/configdialogbase.ui:27
+#, fuzzy, no-c-format
+msgid "Show Results"
+msgstr "परिणाम दिखाएँ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "उत्तर अंकों के साथ टेस्ट"
+msgid "At the end of the test"
+msgstr "परीक्षा के अंत में"
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "स्लाइडरशो"
+#: keduca/configdialogbase.ui:46
+#, no-c-format
+msgid "After answering each question"
+msgstr "प्रत्येक प्रश्न का उत्तर देने के बाद"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "परीक्षा"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "आदेशित"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "सायकोटेक्निक परीक्षा"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "उत्तर बेतरतीब क्रम में दिखाएँ"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "आसान"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "जब जाँच ख़त्म हो तो परिणाम दिखाएँ"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "सामान्य"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "विशेषज्ञ"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "भिन्न विन्यास"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "सुप्रीम"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "प्रश्न"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>प्रश्न</b></p>\n"
+"  <p><b>प्रश्न</b></p>\n"
 "<hr>\n"
-"  "
-"<p>सिर्फ प्रश्न तथा प्रकार वांछित है.</p>\n"
+"  <p>सिर्फ प्रश्न तथा प्रकार वांछित है.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "प्रश्नः (&Q)"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "क़िस्मः (&T)"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "छविः (&P)"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "पाइंटः (&o)"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "समयः (&m)"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "नुस्ख़ा: (&i)"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "समझाइये: (&E)"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "उत्तर"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>उत्तर</b></p>\n"
+"  <p><b>उत्तर</b></p>\n"
 "<hr>\n"
-"  "
-"<p>सिर्फ उत्तर तथा मूल्य वांछित है.</p>\n"
+"  <p>सिर्फ उत्तर तथा मूल्य वांछित है.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "उत्तर: (&A)"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "मान: (&V)"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "अंकः (&P)"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "मान"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "अंक"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "ऊपर जाएं (&U)"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "नीचे जाएं (&D)"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  शैली=\"पाठ-सजावट:रेखांकित;\">जानकारी</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "संपादन... (&E)"
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "संपादक- प्रारंभ होते हैं"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "एक उपलब्ध दस्तावेज़ खोलें: (&e)"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "एक मौज़ूदा दस्तावेज़ खोलें: (&r)"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "इंटरनेट गैलरी ब्राउज़र द्वारा खोले"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "नया दस्तावेज़ खोलें: (&n)"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  शैली=\"पाठ-सजावट:रेखांकित;\">जानकारी</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "गैलरी"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "पताः"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "सर्वर जोड़ें (&A)"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "सर्वर्स"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "पता"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "भाषा"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "श्रेणी"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "प्रकार"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "खोलें (&O)"
 
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "के-एज़ुका कॉन्फ़िग संवाद"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, fuzzy, no-c-format
-msgid "Show Results"
-msgstr "परिणाम दिखाएँ"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "परीक्षा के अंत में"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "प्रत्येक प्रश्न का उत्तर देने के बाद"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "आदेशित"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "प्रश्न बेतरतीब क्रम में दिखाएँ"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "उत्तर बेतरतीब क्रम में दिखाएँ"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "रविशंकर श्रीवास्तव "
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "raviratlami@yahoo.com"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "आपको एक सर्वर उल्लेखित करना होगा!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "परीक्षा प्रारंभ करें (&S)"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "अगला (&N) >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "परिणाम सहेजें... (&S)"
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "परिणाम ऐसे सहेजें"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "सहेजना असफल"
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "प्रश्न %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"आपके पास इस प्रश्न को पूर्ण करने के लिए %1 सेकण्ड हैं.\n"
-"\n"
-"जब आप तैयार हों तो ठीक बटन दबाएँ."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "परिणाम"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "आंकड़े"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "सही प्रश्न"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "गलत प्रश्न"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "कुल अंक"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "सही अंक"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "गलत अंक"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "कुल समय"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "परीक्षणोंस्ट में समय"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "उत्तर हैः"
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "सही उत्तर हैः"
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "आपका उत्तर थाः"
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "शीर्षक"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "फ़ॉर्म-आधारित टेस्ट तथा परीक्षाएँ"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "के-एज़ुका"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr ""
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v सेकण्ड बाकी"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "के-एज़ुका-पार्ट"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "के-एज़ुका के-पार्ट्स अवयव"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "सामान्य"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "भिन्न विन्यास"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "अगला दबाने के पश्चात् उत्तर का परिणाम दिखाएँ"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "जब जाँच ख़त्म हो तो परिणाम दिखाएँ"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "अनुक्रम"
-
 #~ msgid "1.2.0"
 #~ msgstr "1.2.0"
 
diff --git a/tde-i18n-hr/messages/tdeedu/keduca.po b/tde-i18n-hr/messages/tdeedu/keduca.po
index 9405fa9ebd0..759c93bb8ce 100644
--- a/tde-i18n-hr/messages/tdeedu/keduca.po
+++ b/tde-i18n-hr/messages/tdeedu/keduca.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca 0\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2007-01-21 00:52+0100\n"
 "Last-Translator: Renato Pavicic <renato@translator-shop.org>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -9,21 +9,229 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :  n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :  n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
 "X-Generator: TransDict server\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Izrada provjera i ispita zasnovanih na obrascima"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Renato Pavičić"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "renato@translator-shop.org"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Otvori &galeriju..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Otvori Educa datoteku"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca komponenta KParts"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Opće"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Razne postavke"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Prikaži rezultate nakon klikanja gumba \"Sljedeće\""
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Prikaži rezultate na kraju provjere"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Redoslijed"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Pitanja prikaži nasumičnim redoslijedom"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Odgovore prikaži nasumičnim redoslijedom"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Zapični ispit"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Sljedeće >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Spremi rezultate..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Spremi rezultat kao"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Dokument s ovim anzivom već postoji.\n"
+"Želite li ga prepisati?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Prepiši"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Spremanje nije uspjelo."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Pitanje %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Bodovi"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Za dovršenje pitanja preostalo je sekundi: %1.\n"
+"\n"
+"Kliknite \"U redu\" kad ćete biti spremni."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Rezultat"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistike"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Točna pitanja"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Netočna pitanja"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Ukupno bodova"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Točnih bodova"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Netočnih bodova"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Vrijeme"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Ukupno vrijeme"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Vrijeme u ispitima"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Odgovor je: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Ispravan odgovor je: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Vaš odgovor bio je: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Podaci o dokumentu"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Naslov"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategorija"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Vrsta"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Jezik"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Odgovori"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "Presotalo sekindi: %v"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Provjere i ispiti zasnovani na obrascima"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Datoteka za učitavanje"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -33,6 +241,10 @@ msgstr "Izvorni autor"
 msgid "Maintainer 2002-2004"
 msgstr "Održavatelj 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Trenutni održavatelj"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Različita poboljšanja i ispravke nedostataka"
@@ -41,11 +253,6 @@ msgstr "Različita poboljšanja i ispravke nedostataka"
 msgid "Icons"
 msgstr "Ikone"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Morate odabrati datoteku za otvaranje!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Uredi pitanje"
@@ -54,30 +261,150 @@ msgstr "Uredi pitanje"
 msgid "Add Questions"
 msgstr "Dodaj pitanja"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Točno"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Netočno"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Dodaj"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Otvori &galeriju..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Podaci o dokumentu"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Opis i pravila projekta. "
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Opis"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Vrsta:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Razina:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Jezik:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategorija:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Naslov:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Slika"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Zadana slika:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autor"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Web-stranica:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-pošta:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Ime:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Računala"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Provjera"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Provjera s bodovanim pitanjima"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Provjera s bodovanim odgovorima"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Slajdovi"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Ispit"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psihotehnički ispit"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Jednostavno"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normalno"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Stručnjak"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Nadmoćno"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -91,6 +418,11 @@ msgstr "&Dodaj..."
 msgid "&Edit..."
 msgstr "&Uredi..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Gore"
@@ -111,14 +443,6 @@ msgstr ""
 "Dodajte novo pitanje putem izbornika \"Uredi\" ili odabirom jedne od gornjih "
 "ikona."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Otvori Educa datoteku"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Odgovori"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Slika pitanja"
@@ -127,10 +451,6 @@ msgstr "Slika pitanja"
 msgid "Question point"
 msgstr "Bodovi pitanja"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Vrijeme"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sekunde</p>"
@@ -163,22 +483,10 @@ msgstr "Komprimiraj datoteku"
 msgid "Save Document As"
 msgstr "Spremi dokument kao"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Dokument s ovim anzivom već postoji.\n"
-"Želite li ga prepisati?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Prepiši"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Ako želite dijeliti ovaj dokument, bolje je kopirati slike u istu mapu kao i "
@@ -193,13 +501,6 @@ msgstr "Kopiraj slike"
 msgid "Do Not Copy"
 msgstr "Ne kopiraj"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Provjera"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -235,543 +536,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Unesi pitanje"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Podaci o dokumentu"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Opis i pravila projekta. "
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Opis"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Vrsta:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Razina:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Jezik:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategorija:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Naslov:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Slika"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Morate odabrati datoteku za otvaranje!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Zadana slika:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Izrada provjera i ispita zasnovanih na obrascima"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autor"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Web-stranica:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Potrebno je navesti poslužitelj!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "E-pošta:"
+msgid "KEduca Config Dialog"
+msgstr "KEduca dijalog konfiguracije"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Ime:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Računala"
+msgid "Show Results"
+msgstr "Prikaži rezultate"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Provjera s bodovanim pitanjima"
+msgid "At the end of the test"
+msgstr "Po završetku ispita"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Provjera s bodovanim odgovorima"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Slajdovi"
+msgid "After answering each question"
+msgstr "Po završetku svakog pitanja"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Ispit"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Redoslijed"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psihotehnički ispit"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Odgovore prikaži nasumičnim redoslijedom"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Jednostavno"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Prikaži rezultate na kraju provjere"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normalno"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Stručnjak"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Razne postavke"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Nadmoćno"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Pitanje"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Pitanje</b></p>\n"
+"  <p><b>Pitanje</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Potrebni su samo pitanje i vrsta.</p>\n"
+"  <p>Potrebni su samo pitanje i vrsta.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Pitanje:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Vrsta:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Slika:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "&Bodovi:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&Vrijeme:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&Savjet:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Objasni"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Odgovor"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Odgovori</b></p>\n"
+"  <p><b>Odgovori</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Potreban je samo odgovor i vrijednost.</p>\n"
+"  <p>Potreban je samo odgovor i vrijednost.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Odgovor:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Vrijednost:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Bodovi:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Vrijednost"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Bodovi"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Prema &vrhu"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Prema &dnu"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Podaci</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Uredi..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Uređivač - Kako započeti"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Otvori &postojeći dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Otvori &nedavni dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Otvori s internetskim preglednikom galerija"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Pokreni &novi dokument"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Podaci</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galerija"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adresa:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "Dodaj &poslužitelj"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Poslužitelji"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adresa"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Jezik"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategorija"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Vrsta"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Otvori"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca dijalog konfiguracije"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Prikaži rezultate"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Po završetku ispita"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Po završetku svakog pitanja"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Redoslijed"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Pitanja prikaži nasumičnim redoslijedom"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Odgovore prikaži nasumičnim redoslijedom"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Renato Pavičić"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "renato@translator-shop.org"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Potrebno je navesti poslužitelj!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Zapični ispit"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Sljedeće >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Spremi rezultate..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Spremi rezultat kao"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Spremanje nije uspjelo."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Pitanje %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Za dovršenje pitanja preostalo je sekundi: %1.\n"
-"\n"
-"Kliknite \"U redu\" kad ćete biti spremni."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Rezultat"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistike"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Točna pitanja"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Netočna pitanja"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Ukupno bodova"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Točnih bodova"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Netočnih bodova"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Ukupno vrijeme"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Vrijeme u ispitima"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Odgovor je: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Ispravan odgovor je: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Vaš odgovor bio je: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Naslov"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Provjere i ispiti zasnovani na obrascima"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Trenutni održavatelj"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "Presotalo sekindi: %v"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca komponenta KParts"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Opće"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Razne postavke"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Prikaži rezultate nakon klikanja gumba \"Sljedeće\""
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Prikaži rezultate na kraju provjere"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Redoslijed"
diff --git a/tde-i18n-hu/messages/tdeedu/keduca.po b/tde-i18n-hu/messages/tdeedu/keduca.po
index c544004e2b5..05b9d5f2a78 100644
--- a/tde-i18n-hu/messages/tdeedu/keduca.po
+++ b/tde-i18n-hu/messages/tdeedu/keduca.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TDE 3.5\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-12-31 11:11+0100\n"
 "Last-Translator: Tamas Szanto <tszanto@mol.hu>\n"
 "Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n"
@@ -12,17 +12,225 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Szerkesztőprogram űrlapszerű teszt- és vizsgakérdésekhez"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Szántó Tamás"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "tszanto@mol.hu"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Tesztgyűjtemény megny&itása..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "KEduca fájl megnyitása"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca objektum"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Általános"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Egyéb beállítások"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "A helyes válasz jelenjen meg a Tovább gomb lenyomása után"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "A helyes válaszok a teszt befejezése után jelenjenek meg"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Sorrend"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "A kérdések véletlenszerű sorrendben jelenjenek meg"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "A válaszok véletlenszerű sorrendben jelenjenek meg"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "A teszt meg&kezdése"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Tovább >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "Az ere&dmény mentése..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Az eredmény mentése mint"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Már létezik ilyen nevű dokumentum.\n"
+"Felül szeretné írni?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Felülírás"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "A mentés nem sikerült."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "%1. kérdés"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Pontok"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"%1 másodperc alatt kell megválaszolni ezt a kérdést.\n"
+"\n"
+"Kattintson az OK gombra, ha elkészült."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Eredmény"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statisztika"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Helyes válasz"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Helytelen válasz"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Az elért pontszám"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "A helyes válaszokra kapott pontszám"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "A helytelen válaszoknál elvesztett pontszám"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Idő"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Idő (összesen)"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "A tesztben eltöltött idő"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "A válasz: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "A helyes válasz: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Az Ön válasza: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Dokumentumjellemzők"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Cím"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategória"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Típus"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Nyelv"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Válaszok"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v másodperc van hátra"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Űrlap-alapú tesztek, vizsgák"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "A betöltendő fájl"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -32,6 +240,10 @@ msgstr "Eredeti szerző"
 msgid "Maintainer 2002-2004"
 msgstr "Karbantartó 2002-től 2004-ig"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Jelenlegi karbantartó"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Különféle javítások, tisztítások"
@@ -40,11 +252,6 @@ msgstr "Különféle javítások, tisztítások"
 msgid "Icons"
 msgstr "Ikonok"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Meg kell adni, melyik fájlt szeretné megnyitni."
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "A kérdés módosítása"
@@ -53,30 +260,150 @@ msgstr "A kérdés módosítása"
 msgid "Add Questions"
 msgstr "Kérdések felvétele"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Igaz"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Hamis"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Hozzáadás"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Tesztgyűjtemény megny&itása..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Dokumentumjellemzők"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "A projekt leírása és szabályai. "
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Leírás"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Típus:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Szint:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Nyelv:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategória:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Cím:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Kép"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Alapértelmezett kép:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Szerző"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Honlap:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-mail cím:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Név:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Számítógépek"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Teszt"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Teszt (a kérdések vannak pontozva)"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Teszt (a válaszok vannak pontozva)"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Diabemutató"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Vizsga"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Pszichotechnikai teszt"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Könnyű"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normál"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Nehéz"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Nagyon nehéz"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -90,6 +417,11 @@ msgstr "&Hozzáadás..."
 msgid "&Edit..."
 msgstr "Sz&erkesztés..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Fel"
@@ -109,14 +441,6 @@ msgid ""
 msgstr ""
 "Új kérdés felvételéhez használja a Szerkesztés menüt vagy a fenti ikonokat."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "KEduca fájl megnyitása"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Válaszok"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "A kérdéshez tartozó kép"
@@ -125,10 +449,6 @@ msgstr "A kérdéshez tartozó kép"
 msgid "Question point"
 msgstr "A kérdés pontszáma"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Idő"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " s</p>"
@@ -161,22 +481,10 @@ msgstr "A fájl összetömörítése"
 msgid "Save Document As"
 msgstr "A dokumentum mentése mint"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Már létezik ilyen nevű dokumentum.\n"
-"Felül szeretné írni?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Felülírás"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Ha meg szeretné osztani ezt a dokumentumot, érdemes a képeket egy könyvtárba "
@@ -191,13 +499,6 @@ msgstr "A képek átmásolása"
 msgid "Do Not Copy"
 msgstr "Nem kell másolni"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Teszt"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -233,543 +534,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Kérdés beszúrása"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Dokumentumjellemzők"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "A projekt leírása és szabályai. "
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Leírás"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Típus:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Szint:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Nyelv:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategória:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Cím:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Kép"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Meg kell adni, melyik fájlt szeretné megnyitni."
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Alapértelmezett kép:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Szerkesztőprogram űrlapszerű teszt- és vizsgakérdésekhez"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Szerző"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Honlap:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Meg kell adni egy kiszolgálót"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "E-mail cím:"
+msgid "KEduca Config Dialog"
+msgstr "KEduca beállítóablak"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Név:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Számítógépek"
+msgid "Show Results"
+msgstr "Az eredmény kiírása"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Teszt (a kérdések vannak pontozva)"
+msgid "At the end of the test"
+msgstr "A teszt végén egyszerre"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Teszt (a válaszok vannak pontozva)"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Diabemutató"
+msgid "After answering each question"
+msgstr "A kérdések után egyesével"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Vizsga"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Sorrend"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Pszichotechnikai teszt"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "A válaszok véletlenszerű sorrendben jelenjenek meg"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Könnyű"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "A helyes válaszok a teszt befejezése után jelenjenek meg"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normál"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Nehéz"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Egyéb beállítások"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Nagyon nehéz"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Kérdés"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Kérdés</b></p>\n"
+"  <p><b>Kérdés</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Csak a kérdést és a kérdés típusát kötelező megadni.</p>\n"
+"  <p>Csak a kérdést és a kérdés típusát kötelező megadni.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Kérdés:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "Típ&us:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "K&ép:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "P&ont:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&Idő:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&Tipp:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "Ma&gyarázat:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Válasz"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Válaszok</b></p>\n"
+"  <p><b>Válaszok</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Csak a választ és az értéket kötelező megadni.</p>\n"
+"  <p>Csak a választ és az értéket kötelező megadni.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "Válas&z:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "É&rték:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "P&ontszám:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Érték"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Pontok"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "&Felfelé"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "&Lefelé"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">A teszt jellemzői</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Sz&erkesztés..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Szerkesztő - Kezdés"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Dok&umentum megnyitása:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Nemré&g használt dokumentum megnyitása:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Megnyitás az internetes gyűjtemény böngészőjével"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Új dokumentum kész&ítése"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">A teszt jellemzői</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Tesztgyűjtemény"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Cím:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "Kiszol&gáló hozzáadása"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Kiszolgálók"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Cím"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Nyelv"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategória"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Típus"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "Megn&yitás"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca beállítóablak"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Az eredmény kiírása"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "A teszt végén egyszerre"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "A kérdések után egyesével"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Sorrend"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "A kérdések véletlenszerű sorrendben jelenjenek meg"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "A válaszok véletlenszerű sorrendben jelenjenek meg"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Szántó Tamás"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "tszanto@mol.hu"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Meg kell adni egy kiszolgálót"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "A teszt meg&kezdése"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Tovább >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "Az ere&dmény mentése..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Az eredmény mentése mint"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "A mentés nem sikerült."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "%1. kérdés"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"%1 másodperc alatt kell megválaszolni ezt a kérdést.\n"
-"\n"
-"Kattintson az OK gombra, ha elkészült."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Eredmény"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statisztika"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Helyes válasz"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Helytelen válasz"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Az elért pontszám"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "A helyes válaszokra kapott pontszám"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "A helytelen válaszoknál elvesztett pontszám"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Idő (összesen)"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "A tesztben eltöltött idő"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "A válasz: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "A helyes válasz: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Az Ön válasza: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Cím"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Űrlap-alapú tesztek, vizsgák"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Jelenlegi karbantartó"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v másodperc van hátra"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca objektum"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Általános"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Egyéb beállítások"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "A helyes válasz jelenjen meg a Tovább gomb lenyomása után"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "A helyes válaszok a teszt befejezése után jelenjenek meg"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Sorrend"
diff --git a/tde-i18n-is/messages/tdeedu/keduca.po b/tde-i18n-is/messages/tdeedu/keduca.po
index d3529215d41..dd577047b4a 100644
--- a/tde-i18n-is/messages/tdeedu/keduca.po
+++ b/tde-i18n-is/messages/tdeedu/keduca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2004-08-27 17:06+0000\n"
 "Last-Translator: Björgvin Ragnarsson <nifgraup@hotmail.com>\n"
 "Language-Team: íslenska <kde-isl@molar.is>\n"
@@ -18,17 +18,228 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Valmyndaprófasmiður"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+#, fuzzy
+msgid "Open &Gallery..."
+msgstr "Opna myndasafn..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Opna Educa skrá"
+
+#: keduca/keduca_part.cpp:59
+#, fuzzy
+msgid "KEducaPart"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:60
+#, fuzzy
+msgid "KEduca KParts Component"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Almennt"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Ýmsar stillingar"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Sýna niðurstöðu eftir að ýtt hefur verið á 'Næsta >>'"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Sýna niðurstöðu eftir að prófinu er lokið"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Uppröðun"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Sýna spurningar í handahófsröð"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Sýna svör í handahófsröð"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr ""
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Næsta >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "Vi&sta niðurstöður..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Vista niðurstöður sem"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Skjal með þessu nafni er þegar til.\n"
+"Viltu yfirskrifa það?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr ""
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Vistun mistókst"
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Spurning %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Stig"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Þú hefur %1 sekúndur til að ljúka við spurninguna.\n"
+"\n"
+"Ýttu á Í lagi þegar þú ert tilbúin."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Niðurstaða"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Tölfræði"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Réttar spurningar"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Rangar spurningar"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Samtals stig"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Rétt stig"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Rangt"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Tími"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Samtals tími"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Tími í prófum"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Svarið er: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Rétt svar er: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Þú svaraðir: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Upplýsingar um skjal"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Titill"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Flokkur"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Tegund"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Tungumál"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Möguleikar"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr ""
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Valmyndapróf"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Sækja skrá"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -38,6 +249,10 @@ msgstr ""
 msgid "Maintainer 2002-2004"
 msgstr ""
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr ""
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr ""
@@ -46,11 +261,6 @@ msgstr ""
 msgid "Icons"
 msgstr ""
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Þú verður að skilgreina skrá sem á að opna!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Breyta spurningu"
@@ -59,31 +269,150 @@ msgstr "Breyta spurningu"
 msgid "Add Questions"
 msgstr "Bæta við spurningu"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Rétt"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Rangt"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Bæta við"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-#, fuzzy
-msgid "Open &Gallery..."
-msgstr "Opna myndasafn..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Upplýsingar um skjal"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Lýsing og.reglur verkefnisins"
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Lýsing"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Tegund:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Stig:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Tungumál:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Flokkur:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Titill:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Mynd"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Sjálfgefin mynd:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Höfundur"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Vefsíða:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Netfang:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Nafn:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Tölvur"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Próf"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Próf með spurningarstigum"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Próf með svörunarstigum"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Skyggnusýning"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Próf"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Geðtæknipróf"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Auðvelt"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Venulegt"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Þungt"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Snilld"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -99,6 +428,11 @@ msgstr "Bæta við..."
 msgid "&Edit..."
 msgstr "Breyta..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 #, fuzzy
 msgid "&Up"
@@ -121,14 +455,6 @@ msgstr ""
 "Bættu við nýrri spurningu með aðgerð í Sýsl valmyndinni eða einu tákninu að "
 "ofan."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Opna Educa skrá"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Möguleikar"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Spurningarmynd"
@@ -137,10 +463,6 @@ msgstr "Spurningarmynd"
 msgid "Question point"
 msgstr "Stig fyrir spurningu"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Tími"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sekúndur</p>"
@@ -173,26 +495,14 @@ msgstr ""
 msgid "Save Document As"
 msgstr "Vista skjal sem"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Skjal með þessu nafni er þegar til.\n"
-"Viltu yfirskrifa það?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Ef þú vilt deila þessu skjali, er betra að afrita myndirnar yfir í sömu möppu "
-"og skjalið fer í.\n"
+"Ef þú vilt deila þessu skjali, er betra að afrita myndirnar yfir í sömu "
+"möppu og skjalið fer í.\n"
 "Viltu afrita myndir?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -203,13 +513,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Próf"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -246,148 +549,85 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Setja inn spurningu"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Upplýsingar um skjal"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Lýsing og.reglur verkefnisins"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Lýsing"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Tegund:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Stig:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Tungumál:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Flokkur:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Titill:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Mynd"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Sjálfgefin mynd:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Höfundur"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Vefsíða:"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Þú verður að skilgreina skrá sem á að opna!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, no-c-format
-msgid "Email:"
-msgstr "Netfang:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Valmyndaprófasmiður"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
-#, no-c-format
-msgid "Name:"
-msgstr "Nafn:"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Tölvur"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Þú þarft að tilgreina miðlara!"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Próf með spurningarstigum"
+msgid "KEduca Config Dialog"
+msgstr ""
+
+#: keduca/configdialogbase.ui:27
+#, fuzzy, no-c-format
+msgid "Show Results"
+msgstr "Niðurstaða"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Próf með svörunarstigum"
+msgid "At the end of the test"
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Skyggnusýning"
+#: keduca/configdialogbase.ui:46
+#, no-c-format
+msgid "After answering each question"
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Próf"
+#: keduca/configdialogbase.ui:56
+#, fuzzy, no-c-format
+msgid "Ordering"
+msgstr "Uppröðun"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Geðtæknipróf"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Sýna svör í handahófsröð"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Auðvelt"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Sýna niðurstöðu eftir að prófinu er lokið"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Venulegt"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Þungt"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Ýmsar stillingar"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Snilld"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Spurning"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
@@ -396,64 +636,54 @@ msgstr ""
 "<p>Aðeins er krafist spurningar og tegundar.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "S&purning:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Tegund:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Mynd:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "St&ig:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Tí&mi:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "Vísbend&ing:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "Ú&tskýra:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Svar"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
@@ -462,329 +692,120 @@ msgstr ""
 "<p>Aðeins er krafist svars og gildis.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "Sv&ar:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Gildi:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "Sti&g:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Gildi"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Stig"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Færa &upp"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Færa &niður"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b style=\"text-decoration:underline;\"> Upplýsingar</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Breyta..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Ritill - Byrjun"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Opna skjal sem &er til staðar:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Opna &nýlega notað skjal:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Opna með Internet myndasafnsvafra"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Byrja á &nýju skjali"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b style=\"text-decoration:underline;\"> Upplýsingar</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Myndasafn"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Heimilisfang:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "Bæt&a við miðlara"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Miðlarar"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Heimilisfang"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Tungumál"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Flokkur"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Tegund"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Opna"
 
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, fuzzy, no-c-format
-msgid "Show Results"
-msgstr "Niðurstaða"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, fuzzy, no-c-format
-msgid "Ordering"
-msgstr "Uppröðun"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Sýna spurningar í handahófsröð"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Sýna svör í handahófsröð"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Þú þarft að tilgreina miðlara!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr ""
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Næsta >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "Vi&sta niðurstöður..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Vista niðurstöður sem"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Vistun mistókst"
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Spurning %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Þú hefur %1 sekúndur til að ljúka við spurninguna.\n"
-"\n"
-"Ýttu á Í lagi þegar þú ert tilbúin."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Niðurstaða"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Tölfræði"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Réttar spurningar"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Rangar spurningar"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Samtals stig"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Rétt stig"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Rangt"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Samtals tími"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Tími í prófum"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Svarið er: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Rétt svar er: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Þú svaraðir: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Titill"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Valmyndapróf"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr ""
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr ""
-
-#: keduca/keduca_part.cpp:59
-#, fuzzy
-msgid "KEducaPart"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:60
-#, fuzzy
-msgid "KEduca KParts Component"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Almennt"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Ýmsar stillingar"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Sýna niðurstöðu eftir að ýtt hefur verið á 'Næsta >>'"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Sýna niðurstöðu eftir að prófinu er lokið"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Uppröðun"
-
 #~ msgid "1.2.0"
 #~ msgstr "1.2.0"
 
diff --git a/tde-i18n-it/messages/tdeedu/keduca.po b/tde-i18n-it/messages/tdeedu/keduca.po
index 95d58d00c93..43c5c449a21 100644
--- a/tde-i18n-it/messages/tdeedu/keduca.po
+++ b/tde-i18n-it/messages/tdeedu/keduca.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-08-12 00:38+0200\n"
 "Last-Translator: Pino Toscano <toscano.pino@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -19,17 +19,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Davide Rizzo,Pino Toscano"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "drizzo@daviderizzo.com,toscano.pino@tiscali.it"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Apri &galleria..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Apri file Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "Componente KParts di KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Generale"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Impostazioni varie"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Mostra i risultati della risposta dopo aver premuto Successivo"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Mostra i risultati al termine del test"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Ordine"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Mostra domande in ordine casuale"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Mostra risposte in ordine casuale"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Avvia test"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "S&uccessivo >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Salva risultati..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Salva risultati come"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Un documento con questo nome esiste già.\n"
+"Vuoi sovrascriverlo?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Sovrascrivi"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Salvataggio fallito."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Domanda %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Punti"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Hai %1 secondi per rispondere a questa domanda.\n"
+"\n"
+"Premi OK quando sei pronto."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Risultato"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistiche"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Risposte corrette"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Risposte errate"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Punti totali"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Punti ottenuti"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Punti persi"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Tempo"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Tempo totale"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Tempo impiegato"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "La risposta è: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "La risposta corretta è: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "La tua risposta era: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Informazioni sul documento"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Titolo"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Categoria"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Tipo"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Lingua"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Risposte"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v secondi rimasti"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr "Test ed esami a risposta multipla"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "File da caricare"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -39,6 +247,10 @@ msgstr "Autore originale"
 msgid "Maintainer 2002-2004"
 msgstr "Responsabile 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Attuale responsabile"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Correzioni e miglioramenti vari"
@@ -47,11 +259,6 @@ msgstr "Correzioni e miglioramenti vari"
 msgid "Icons"
 msgstr "Icone"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Devi specificare il file da aprire!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Modifica domanda"
@@ -60,30 +267,150 @@ msgstr "Modifica domanda"
 msgid "Add Questions"
 msgstr "Aggiungi domande"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Vero"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Falso"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Aggiungi"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Apri &galleria..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Informazioni sul documento"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Descrizione e regole del progetto."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Descrizione"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Tipo:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Livello:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Lingua:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Categoria:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Titolo:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Immagine"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Immagine predefinita:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autore"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Pagina Web:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Posta elettronica:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Nome:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Computer"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Test"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Test con punti per domanda"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Test con punti per risposta"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Sequenza"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Esame"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Test psicotecnico"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Facile"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normale"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Esperto"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Supremo"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -97,6 +424,11 @@ msgstr "&Aggiungi..."
 msgid "&Edit..."
 msgstr "&Modifica..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Su"
@@ -117,14 +449,6 @@ msgstr ""
 "Aggiungi una nuova domanda tramite il menu Modifica o scegliendo una delle "
 "icone qui sopra."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Apri file Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Risposte"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Immagine domanda"
@@ -133,10 +457,6 @@ msgstr "Immagine domanda"
 msgid "Question point"
 msgstr "Punto domanda"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Tempo"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " secondi</p>"
@@ -169,26 +489,14 @@ msgstr "Comprimi il file"
 msgid "Save Document As"
 msgstr "Salva il documento come"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Un documento con questo nome esiste già.\n"
-"Vuoi sovrascriverlo?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Sovrascrivi"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Se vuoi condividere questo documento, è meglio copiare le immagini nella stessa "
-"cartella del documento.\n"
+"Se vuoi condividere questo documento, è meglio copiare le immagini nella "
+"stessa cartella del documento.\n"
 "Vuoi copiare le immagini?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -199,13 +507,6 @@ msgstr "Copia immagini"
 msgid "Do Not Copy"
 msgstr "Non copiare"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Test"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -241,543 +542,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Inserisci domanda"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Informazioni sul documento"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Descrizione e regole del progetto."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Descrizione"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Tipo:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Livello:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Lingua:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Categoria:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Titolo:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Immagine"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Devi specificare il file da aprire!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Immagine predefinita:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Test ed esami a risposta multipla"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autore"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Pagina Web:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Devi specificare un server!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Posta elettronica:"
+msgid "KEduca Config Dialog"
+msgstr "Finestra di dialogo di configurazione di KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Nome:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Computer"
+msgid "Show Results"
+msgstr "Mostra risultati"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Test con punti per domanda"
+msgid "At the end of the test"
+msgstr "Alla fine del test"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Test con punti per risposta"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Sequenza"
+msgid "After answering each question"
+msgstr "Dopo aver risposto ad ogni domanda"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Esame"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Ordine"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Test psicotecnico"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Mostra risposte in ordine casuale"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Facile"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Mostra i risultati al termine del test"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normale"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Esperto"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Impostazioni varie"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Supremo"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Domanda"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Domanda</b></p>\n"
+"  <p><b>Domanda</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Richiesti solo la domanda e il tipo.</p>\n"
+"  <p>Richiesti solo la domanda e il tipo.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Domanda:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Tipo:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Immagine:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "Punt&o:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Te&mpo:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "Su&ggerimento:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "S&piega:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Risposta"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Risposte</b></p>\n"
+"  <p><b>Risposte</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Richiesti solo la risposta e il tipo.</p>\n"
+"  <p>Richiesti solo la risposta e il tipo.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Risposta:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Valore:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Punti:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Valore"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Punti"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Sposta in a&lto"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Sposta in &basso"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Informazioni</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Modifica..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Editor - Primi passi"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Apri un documento &esistente:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Apri un documento &recente:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Apri con il browser di gallerie Internet"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Crea un &nuovo documento"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Informazioni</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galleria"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Indirizzo:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Aggiungi server"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Server"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Indirizzo"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Lingua"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Categoria"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Tipo"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "A&pri"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Finestra di dialogo di configurazione di KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Mostra risultati"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Alla fine del test"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Dopo aver risposto ad ogni domanda"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Ordine"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Mostra domande in ordine casuale"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Mostra risposte in ordine casuale"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Davide Rizzo,Pino Toscano"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "drizzo@daviderizzo.com,toscano.pino@tiscali.it"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Devi specificare un server!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Avvia test"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "S&uccessivo >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Salva risultati..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Salva risultati come"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Salvataggio fallito."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Domanda %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Hai %1 secondi per rispondere a questa domanda.\n"
-"\n"
-"Premi OK quando sei pronto."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Risultato"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistiche"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Risposte corrette"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Risposte errate"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Punti totali"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Punti ottenuti"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Punti persi"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Tempo totale"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Tempo impiegato"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "La risposta è: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "La risposta corretta è: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "La tua risposta era: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Titolo"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Test ed esami a risposta multipla"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Attuale responsabile"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v secondi rimasti"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "Componente KParts di KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Generale"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Impostazioni varie"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Mostra i risultati della risposta dopo aver premuto Successivo"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Mostra i risultati al termine del test"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Ordine"
diff --git a/tde-i18n-ja/messages/tdeedu/keduca.po b/tde-i18n-ja/messages/tdeedu/keduca.po
index aa5ba42e568..bf5f21e4874 100644
--- a/tde-i18n-ja/messages/tdeedu/keduca.po
+++ b/tde-i18n-ja/messages/tdeedu/keduca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-11-14 23:09+0900\n"
 "Last-Translator: KIMIZUKA Tomokazu <sgtom@pluto.dti.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -16,17 +16,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "形式に基づいたテストおよび試験作成者"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "KIMIZUKA Tomokazu"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "sgtom@pluto.dti.ne.jp"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "ギャラリーを開く(&G)..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Educa ファイルを開く"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaパート"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca KParts コンポーネント"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "全般"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "色々な設定"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "次にキーを押すと解答結果を表示"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "テスト終了時に結果を表示"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "順番"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "任意の順で問題を表示"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "任意の順で解答を表示"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "テストを開始(&S)"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "次(&N) >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "結果を保存...(&S)"
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "結果に名前を付けて保存"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"同名の文書が既に存在します。\n"
+"上書きしますか？"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "上書き"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "保存に失敗しました。"
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "問題 %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "ポイント"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"問題に回答する時間は %1 秒あります。\n"
+"\n"
+"準備が出来たら「OK」を押してください。"
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "結果"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "統計"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "正解の問題"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "不正解の問題"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "合計ポイント"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "正解のポイント"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "不正解のポイント"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "時間"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "合計時間"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "テストにかかった時間"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "答え: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "正解: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "あなたの答え: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "文書情報"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "タイトル"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "カテゴリ"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "タイプ"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "言語"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "解答"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "あと %v 秒"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "フォーム形式でテストを行う"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "ロードするファイル"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaビルダー"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -36,6 +244,10 @@ msgstr "オリジナルの作者"
 msgid "Maintainer 2002-2004"
 msgstr "メンテナ 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "現在のメンテナ"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "諸々のフィックスおよびクリーンアップ"
@@ -44,11 +256,6 @@ msgstr "諸々のフィックスおよびクリーンアップ"
 msgid "Icons"
 msgstr "アイコン"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "開くファイルを指定してください!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "問題を修正"
@@ -57,30 +264,150 @@ msgstr "問題を修正"
 msgid "Add Questions"
 msgstr "問題を追加"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "正"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "誤"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "追加(&A)"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "ギャラリーを開く(&G)..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "文書情報"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "プロジェクトの説明とルール。"
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "説明"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "タイプ:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "レベル:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "言語:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "カテゴリ:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "タイトル:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "画像"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "デフォルトの画像:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "作者"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "ウェブページ:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Eメール:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "名前:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "コンピュータ"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "テスト"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "問題のポイントでテスト"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "解答のポイントでテスト"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "スライドショー"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "試験"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "精神鑑定"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "イージー"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "ノーマル"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "エキスパート"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "マスター"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -94,6 +421,11 @@ msgstr "追加(&A)..."
 msgid "&Edit..."
 msgstr "編集(&E)..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "上へ(&U)"
@@ -112,14 +444,6 @@ msgid ""
 "above."
 msgstr "編集メニューまたはアイコンを選択して問題を追加してください。"
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Educa ファイルを開く"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "解答"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "問題の画像"
@@ -128,10 +452,6 @@ msgstr "問題の画像"
 msgid "Question point"
 msgstr "問題のポイント:"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "時間"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " 秒</p>"
@@ -164,24 +484,14 @@ msgstr "ファイルを圧縮"
 msgid "Save Document As"
 msgstr "文書に名前を付けて保存"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"同名の文書が既に存在します。\n"
-"上書きしますか？"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "上書き"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
-msgstr "この文書を共有したい場合は、文書と同じフォルダに画像をコピーすると良いでしょう。画像をコピーしますか？"
+msgstr ""
+"この文書を共有したい場合は、文書と同じフォルダに画像をコピーすると良いでしょ"
+"う。画像をコピーしますか？"
 
 #: keducabuilder/keducabuilder.cpp:464
 msgid "Copy Images"
@@ -191,13 +501,6 @@ msgstr "画像をコピー"
 msgid "Do Not Copy"
 msgstr "コピーしない"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "テスト"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -231,543 +534,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "問題を挿入"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "文書情報"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "プロジェクトの説明とルール。"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "説明"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "タイプ:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "レベル:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "言語:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "カテゴリ:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "タイトル:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "画像"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "開くファイルを指定してください!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "デフォルトの画像:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "形式に基づいたテストおよび試験作成者"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "作者"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaビルダー"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "ウェブページ:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "開くファイルを指定してください!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Eメール:"
+msgid "KEduca Config Dialog"
+msgstr "KEduca 設定ダイアログ"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "名前:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "コンピュータ"
+msgid "Show Results"
+msgstr "結果を表示"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "問題のポイントでテスト"
+msgid "At the end of the test"
+msgstr "テストの終わり"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "解答のポイントでテスト"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "スライドショー"
+msgid "After answering each question"
+msgstr "各問題への解答後"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "試験"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "順序付け"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "精神鑑定"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "任意の順で解答を表示"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "イージー"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "テスト終了時に結果を表示"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "ノーマル"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "エキスパート"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "色々な設定"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "マスター"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "問題"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>問題</b></p>\n"
+"  <p><b>問題</b></p>\n"
 "<hr>\n"
-"  "
-"<p>問題と種類がひとつ必要です。</p>\n"
+"  <p>問題と種類がひとつ必要です。</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "問題(&Q):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "タイプ(&T):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "画像(&P):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "ポイント(&O):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "時間(&M):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "チップ(&I):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "説明(&E):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "解答"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>解答</b></p>\n"
+"  <p><b>解答</b></p>\n"
 "<hr>\n"
-"  "
-"<p>解答と値がひとつ必要です。</p>\n"
+"  <p>解答と値がひとつ必要です。</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "解答(&A):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "値(&V):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "ポイント(&P):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "値"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "ポイント"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "上に移動(&U)"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "下に移動(&D)"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b style=\"text-decoration:underline;\"> 情報</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "編集(&E)..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "エディタをはじめよう"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "既存の文書を開く(&E):"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "最近の文書を開く(&R):"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "インターネットギャラリーブラウザを開く"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "新しい文書を開く(&N)"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b style=\"text-decoration:underline;\"> 情報</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "ギャラリー"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "アドレス:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "サーバを追加(&A)"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "サーバ"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "アドレス"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "言語"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "カテゴリ"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "タイプ"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "開く(&O)"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca 設定ダイアログ"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "結果を表示"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "テストの終わり"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "各問題への解答後"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "順序付け"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "任意の順で問題を表示"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "任意の順で解答を表示"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "KIMIZUKA Tomokazu"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "sgtom@pluto.dti.ne.jp"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "開くファイルを指定してください!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "テストを開始(&S)"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "次(&N) >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "結果を保存...(&S)"
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "結果に名前を付けて保存"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "保存に失敗しました。"
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "問題 %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"問題に回答する時間は %1 秒あります。\n"
-"\n"
-"準備が出来たら「OK」を押してください。"
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "結果"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "統計"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "正解の問題"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "不正解の問題"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "合計ポイント"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "正解のポイント"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "不正解のポイント"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "合計時間"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "テストにかかった時間"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "答え: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "正解: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "あなたの答え: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "タイトル"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "フォーム形式でテストを行う"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "現在のメンテナ"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "あと %v 秒"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaパート"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca KParts コンポーネント"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "全般"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "色々な設定"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "次にキーを押すと解答結果を表示"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "テスト終了時に結果を表示"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "順番"
diff --git a/tde-i18n-km/messages/tdeedu/keduca.po b/tde-i18n-km/messages/tdeedu/keduca.po
index a426ffff509..ae3078c6289 100644
--- a/tde-i18n-km/messages/tdeedu/keduca.po
+++ b/tde-i18n-km/messages/tdeedu/keduca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2008-07-15 14:42+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <en@li.org>\n"
@@ -18,17 +18,227 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "កម្មវិធី​បង្កើត​សំណួរ និង​ការ​ប្រឡង​ដែល​ផ្អែក​លើ​សំណុំបែបបទ"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "ខឹម សុខែម, លី សួស្ដី, អេង វណ្ណៈ, អោក ពិសិដ្ឋ"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+"khoemsokhem@khmeros.info,soursdey@khmeros.info, evannak@khmeros.info,"
+"piseth_dv@khmeros.info"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "បើក​វិចិត្រសាល..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "បើក​ឯកសារ Educa "
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "សមាសភាគ KParts របស់ KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "ទូទៅ"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "ការ​កំណត់​ផ្សេងៗ"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "បង្ហាញ​លទ្ធផល​នៃ​ចម្លើយ បន្ទាប់​ពី​ចុច​បន្ទាប់"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "បង្ហាញ​លទ្ធផល​ពេល​បញ្ចប់​ការ​ប្រឡង"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "លំដាប់"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "បង្ហាញ​សំណួរ​តាម​លំដាប់​ចៃដន្យ​"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "បង្ហាញ​ចម្លើយ​តាម​លំដាប់​ចៃដន្យ​"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "ចាប់ផ្ដើម​ប្រឡង"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "បន្ទាប់ >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "រក្សាទុកលទ្ធផល​..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "រក្សាទុក​លទ្ធផល​ជា"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"មាន​ឯកសារ​ដែល​មាន​ឈ្មោះ​នេះ​រួច​ហើយ។\n"
+"តើ​អ្នក​ចង់​សរសេរ​ជាន់​លើ​​វា​ឬ ?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "សរសេរ​ជាន់​លើ"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "ការ​រក្សាទុក​បាន​បរាជ័យ ។"
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "សំណួរ​ %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "ពិន្ទុ​"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"អ្នក​មាន​រយៈពេល %1 វិនាទី ដើម្បី​បញ្ចប់​សំណួរ​នេះ ។\n"
+"\n"
+"ចុច យល់ព្រម ពេល​អ្នក​រួចរាល់ ។"
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "លទ្ធផល"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "ស្ថិតិ"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "សំណួរ​ត្រឹមត្រូវ"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "សំណួរ​មិន​ត្រឹមត្រូវ​"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "ពិន្ទុ​សរុប​"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "ពិន្ទុ​ត្រឹមត្រូវ"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "ពិន្ទុ​​មិន​ត្រឹមត្រូវ"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "រយៈពេល"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "រយៈពេលសរុប"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "រយៈពេល​ប្រឡង"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "ចម្លើយ​គឺ​ ៖ "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "ចម្លើយ​ត្រឹមត្រូវ​គឺ​​ ៖ "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "ចម្លើយ​របស់​អ្នក​គឺ​ ៖ "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "ព័ត៌មាន​ឯកសារ"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "ចំណង​ជើង"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "ប្រភេទ"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "ប្រភេទ"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "ភាសា"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "ចម្លើយ​"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "នៅ​សល់ %v វិនាទី"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "សំណួរ និង​ការ​ប្រឡង​ផ្អែក​លើ​សំណុំបែបបទ"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "ឯកសារ​ត្រូវ​ផ្ទុក"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -38,6 +248,10 @@ msgstr "អ្នក​និពន្ធ​ដំបូង"
 msgid "Maintainer 2002-2004"
 msgstr "អ្នក​ថែទាំ ២០០២-២០០៤"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "អ្នក​ថែទាំ​បច្ចុប្បន្ន"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "បំបាត់​កំហុស និង​សម្អាត​កូដ"
@@ -46,11 +260,6 @@ msgstr "បំបាត់​កំហុស និង​សម្អាត​
 msgid "Icons"
 msgstr "រូប​តំណាង"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "អ្នក​ត្រូវ​តែ​បញ្ជាក់​ឯកសារ ដែល​ត្រូវ​បើក !"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "កែប្រែ​សំណួរ"
@@ -59,30 +268,150 @@ msgstr "កែប្រែ​សំណួរ"
 msgid "Add Questions"
 msgstr "បន្ថែម​សំណួរ​"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "ពិត"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "មិន​ពិត"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "បន្ថែម"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "បើក​វិចិត្រសាល..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "ព័ត៌មាន​ឯកសារ"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "សេចក្ដីពណ៌នា និង​ច្បាប់​នៃ​គម្រោង ។"
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "សេចក្ដីពណ៌នា"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "ប្រភេទ ៖"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "កម្រិត ៖"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "ភាសា ៖"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "ប្រភេទ​ ៖"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "ចំណងជើង ៖"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "រូបភាព"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "រូបភាព​លំនាំ​ដើម ៖"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "អ្នក​និពន្ធ"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "ទំព័រ​បណ្តាញ ៖"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "អ៊ីមែល ៖"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "ឈ្មោះ ៖"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "កុំព្យូទ័រ"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "ប្រឡង"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "ប្រឡង​ជាមួយ​សំណួរ​មាន​ពិន្ទុ"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "ប្រឡង​ជាមួយ​ចម្លើយ​មាន​ពិន្ទុ"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "បញ្ចាំងស្លាយ"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "ប្រឡង"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "ប្រឡង​បែប​ចិត្តសាស្ត្រ"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "ស្រួល"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "ធម្មតា"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "ជំនាញ​"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "ពិបាកបំផុត"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -96,6 +425,11 @@ msgstr "បន្ថែម..."
 msgid "&Edit..."
 msgstr "កែសម្រួល..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "ឡើង​លើ"
@@ -112,17 +446,7 @@ msgstr "សូម​ស្វាគមន៍​មក​កាន់​ KEduca !
 msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
-msgstr ""
-"បន្ថែម​សំណួរ​ថ្មី​ដោយ​ប្រើ​ម៉ឺនុយ​កែសម្រួល​ ឬ ដោយ​ជ្រើស​រូបតំណាង​មួយ "
-"ក្នុង​ចំណោម​រូបតំណាង​ខាង​លើ ។"
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "បើក​ឯកសារ Educa "
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "ចម្លើយ​"
+msgstr "បន្ថែម​សំណួរ​ថ្មី​ដោយ​ប្រើ​ម៉ឺនុយ​កែសម្រួល​ ឬ ដោយ​ជ្រើស​រូបតំណាង​មួយ ក្នុង​ចំណោម​រូបតំណាង​ខាង​លើ ។"
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -132,10 +456,6 @@ msgstr "រូបភាព​សំណួរ"
 msgid "Question point"
 msgstr "ពិន្ទុ​សំណួរ​"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "រយៈពេល"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " វិនាទី</p>"
@@ -168,26 +488,13 @@ msgstr "បង្ហាប់​ឯកសារ​"
 msgid "Save Document As"
 msgstr "រក្សាទុក​ឯកសារ​ជា​"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"មាន​ឯកសារ​ដែល​មាន​ឈ្មោះ​នេះ​រួច​ហើយ។\n"
-"តើ​អ្នក​ចង់​សរសេរ​ជាន់​លើ​​វា​ឬ ?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "សរសេរ​ជាន់​លើ"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"បើ​អ្នក​ចង់​ចែក​រំលែក​ឯកសារ​នេះ អ្នក​គួរ​តែ​ចម្លង​រូបភាព​ទៅ​ក្នុង​ថត "
-"ដូច​ឯកសារ​ដែរ ។\n"
+"បើ​អ្នក​ចង់​ចែក​រំលែក​ឯកសារ​នេះ អ្នក​គួរ​តែ​ចម្លង​រូបភាព​ទៅ​ក្នុង​ថត ដូច​ឯកសារ​ដែរ ។\n"
 "តើ​អ្នក​ចង់​ចម្លង​រូបភាព​ឬ​ទេ ?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -198,13 +505,6 @@ msgstr "ចម្លង​រូបភាព"
 msgid "Do Not Copy"
 msgstr "កុំ​ចម្លង"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "ប្រឡង"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -240,545 +540,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "បញ្ចូល​សំណួរ"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "ព័ត៌មាន​ឯកសារ"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "សេចក្ដីពណ៌នា និង​ច្បាប់​នៃ​គម្រោង ។"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "សេចក្ដីពណ៌នា"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "ប្រភេទ ៖"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "កម្រិត ៖"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "ភាសា ៖"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "ប្រភេទ​ ៖"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "ចំណងជើង ៖"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "រូបភាព"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "អ្នក​ត្រូវ​តែ​បញ្ជាក់​ឯកសារ ដែល​ត្រូវ​បើក !"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "រូបភាព​លំនាំ​ដើម ៖"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "កម្មវិធី​បង្កើត​សំណួរ និង​ការ​ប្រឡង​ដែល​ផ្អែក​លើ​សំណុំបែបបទ"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "អ្នក​និពន្ធ"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "ទំព័រ​បណ្តាញ ៖"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "អ្នក​ត្រូវ​តែ​បញ្ជាក់​ម៉ាស៊ីន​បម្រើ​​មួយ !"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "អ៊ីមែល ៖"
+msgid "KEduca Config Dialog"
+msgstr "ប្រអប់​កំណត់​រចនាសម្ព័ន្ធ​KEduca "
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "ឈ្មោះ ៖"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "កុំព្យូទ័រ"
+msgid "Show Results"
+msgstr "បង្ហាញ​លទ្ធផល​"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "ប្រឡង​ជាមួយ​សំណួរ​មាន​ពិន្ទុ"
+msgid "At the end of the test"
+msgstr "ចុង​បញ្ចប់​នៃ​ការ​ប្រឡង"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "ប្រឡង​ជាមួយ​ចម្លើយ​មាន​ពិន្ទុ"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "បញ្ចាំងស្លាយ"
+msgid "After answering each question"
+msgstr "បន្ទាប់​ពី​ឆ្លើយ​សំណួរ​នីមួយៗ"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "ប្រឡង"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "តាមលំដាប់"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "ប្រឡង​បែប​ចិត្តសាស្ត្រ"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "បង្ហាញ​ចម្លើយ​តាម​លំដាប់​ចៃដន្យ​"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "ស្រួល"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "បង្ហាញ​លទ្ធផល​ពេល​បញ្ចប់​ការ​ប្រឡង"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "ធម្មតា"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "ជំនាញ​"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "ការ​កំណត់​ផ្សេងៗ"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "ពិបាកបំផុត"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "សំណួរ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>សំណួរ</b></p>\n"
+"  <p><b>សំណួរ</b></p>\n"
 "<hr>\n"
-"  "
-"<p>ទាមទារ​តែ​សំណួរ និង​ប្រភេទ​ប៉ុណ្ណោះ ។</p>\n"
+"  <p>ទាមទារ​តែ​សំណួរ និង​ប្រភេទ​ប៉ុណ្ណោះ ។</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "សំណួរ ៖"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "ប្រភេទ ៖"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "រូបភាព ៖"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "ពិន្ទុ​ ៖"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "រយៈពេល ៖"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "ព័ត៌មាន​ជំនួយ​ ៖"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "សេចក្ដីពន្យល់ ៖"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "ចម្លើយ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>ចម្លើយ</b></p>\n"
+"  <p><b>ចម្លើយ</b></p>\n"
 "<hr>\n"
-"  "
-"<p>ទាមទារ​តែ​ចម្លើយ និង​តម្លៃ​ប៉ុណ្ណោះ ។</p>\n"
+"  <p>ទាមទារ​តែ​ចម្លើយ និង​តម្លៃ​ប៉ុណ្ណោះ ។</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "ចម្លើយ ៖"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "តម្លៃ ៖"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "ពិន្ទុ​ ៖"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "តម្លៃ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "ពិន្ទុ​"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "​ផ្លាស់ទី​ឡើង​លើ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "ផ្លាស់ទី​ចុះ​ក្រោម"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">ព័ត៌មាន</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "កែសម្រួល..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "កម្មវិធីនិពន្ធ - ចាប់ផ្ដើម"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "បើក​ឯកសារ​ដែល​មាន​ស្រាប់​ ៖"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "បើក​ឯកសារ​ថ្មីៗ​ ៖"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "បើក​ជាមួយ​កម្មវិធី​រុករក​វិចិត្រ​សាល​អ៊ីនធឺណិត​"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "ចាប់ផ្ដើម​ឯកសារ​ថ្មី​"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">ព័ត៌មាន</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "វិចិត្រសាល"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "អាសយដ្ឋាន ៖"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "បន្ថែម​ម៉ាស៊ីន​បម្រើ"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "ម៉ាស៊ីន​បម្រើ"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "អាសយដ្ឋាន"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "ភាសា"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "ប្រភេទ"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "ប្រភេទ"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "បើក"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "ប្រអប់​កំណត់​រចនាសម្ព័ន្ធ​KEduca "
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "បង្ហាញ​លទ្ធផល​"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "ចុង​បញ្ចប់​នៃ​ការ​ប្រឡង"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "បន្ទាប់​ពី​ឆ្លើយ​សំណួរ​នីមួយៗ"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "តាមលំដាប់"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "បង្ហាញ​សំណួរ​តាម​លំដាប់​ចៃដន្យ​"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "បង្ហាញ​ចម្លើយ​តាម​លំដាប់​ចៃដន្យ​"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "ខឹម សុខែម, លី សួស្ដី, អេង វណ្ណៈ, អោក ពិសិដ្ឋ"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-"khoemsokhem@khmeros.info,soursdey@khmeros.info, "
-"evannak@khmeros.info,piseth_dv@khmeros.info"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "អ្នក​ត្រូវ​តែ​បញ្ជាក់​ម៉ាស៊ីន​បម្រើ​​មួយ !"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "ចាប់ផ្ដើម​ប្រឡង"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "បន្ទាប់ >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "រក្សាទុកលទ្ធផល​..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "រក្សាទុក​លទ្ធផល​ជា"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "ការ​រក្សាទុក​បាន​បរាជ័យ ។"
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "សំណួរ​ %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"អ្នក​មាន​រយៈពេល %1 វិនាទី ដើម្បី​បញ្ចប់​សំណួរ​នេះ ។\n"
-"\n"
-"ចុច យល់ព្រម ពេល​អ្នក​រួចរាល់ ។"
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "លទ្ធផល"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "ស្ថិតិ"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "សំណួរ​ត្រឹមត្រូវ"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "សំណួរ​មិន​ត្រឹមត្រូវ​"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "ពិន្ទុ​សរុប​"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "ពិន្ទុ​ត្រឹមត្រូវ"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "ពិន្ទុ​​មិន​ត្រឹមត្រូវ"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "រយៈពេលសរុប"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "រយៈពេល​ប្រឡង"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "ចម្លើយ​គឺ​ ៖ "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "ចម្លើយ​ត្រឹមត្រូវ​គឺ​​ ៖ "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "ចម្លើយ​របស់​អ្នក​គឺ​ ៖ "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "ចំណង​ជើង"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "សំណួរ និង​ការ​ប្រឡង​ផ្អែក​លើ​សំណុំបែបបទ"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "អ្នក​ថែទាំ​បច្ចុប្បន្ន"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "នៅ​សល់ %v វិនាទី"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "សមាសភាគ KParts របស់ KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "ទូទៅ"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "ការ​កំណត់​ផ្សេងៗ"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "បង្ហាញ​លទ្ធផល​នៃ​ចម្លើយ បន្ទាប់​ពី​ចុច​បន្ទាប់"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "បង្ហាញ​លទ្ធផល​ពេល​បញ្ចប់​ការ​ប្រឡង"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "លំដាប់"
diff --git a/tde-i18n-lt/messages/tdeedu/keduca.po b/tde-i18n-lt/messages/tdeedu/keduca.po
index 94bbb6af83b..ff2dba22d1a 100644
--- a/tde-i18n-lt/messages/tdeedu/keduca.po
+++ b/tde-i18n-lt/messages/tdeedu/keduca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-09-02 17:28+0300\n"
 "Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n"
 "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
@@ -15,24 +15,243 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 "(n%100<10 || n%100>=20) ? 1 : 2);\n"
 "100<10 || n%100>=20) ? 1 : 2);\n"
 "(n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: keducabuilder/main.cpp:26
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Eugenijus Paulauskas"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "eugenijus@agvila.lt"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
 #, fuzzy
-msgid "Form-based tests and exams builder"
+msgid "Open &Gallery..."
+msgstr "Atidaryti &pavyzdį."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Atidaryti Educa bylą"
+
+#: keduca/keduca_part.cpp:59
+#, fuzzy
+msgid "KEducaPart"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:60
+#, fuzzy
+msgid "KEduca KParts Component"
+msgstr "Ark KParts komponentas"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Bendra"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Įvairūs nustatymai"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Parodyti atsakymo rezultatus paspaudus „toliau“"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Užbaigus testą parodyti rezultatus"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Tvarka"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr ""
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr ""
+
+#: keduca/keducaview.cpp:71
+#, fuzzy
+msgid "&Start Test"
+msgstr "Pradžios laikas"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "T&oliau >>"
+
+#: keduca/keducaview.cpp:89
+#, fuzzy
+msgid "&Save Results..."
+msgstr "Įrašyti rezultatus kaip"
+
+#: keduca/keducaview.cpp:151
+#, fuzzy
+msgid "Save Results As"
+msgstr "Įrašyti rezultatus kaip"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Dokumentas šiuo vardu jau egzistuoja.\n"
+"Ar norite jį perrašyti?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Perrašyti"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Bandymas įrašyti nepavyko."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Klausimas %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Taškai"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+
+#: keduca/keducaview.cpp:376
+#, fuzzy
+msgid "Result"
+msgstr "Testas"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistika"
+
+#: keduca/keducaview.cpp:446
+#, fuzzy
+msgid "Correct questions"
+msgstr "Įdėti klausimą"
+
+#: keduca/keducaview.cpp:448
+#, fuzzy
+msgid "Incorrect questions"
+msgstr "Įdėti klausimą"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr ""
+
+#: keduca/keducaview.cpp:453
+#, fuzzy
+msgid "Correct points"
+msgstr "Įdėti klausimą"
+
+#: keduca/keducaview.cpp:455
+#, fuzzy
+msgid "Incorrect points"
+msgstr "Įdėti klausimą"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+#, fuzzy
+msgid "Time"
+msgstr "Laikas"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr ""
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr ""
+
+#: keduca/keducaview.cpp:487
+#, fuzzy
+msgid "The answer is: "
+msgstr "Atsakymas yra:"
+
+#: keduca/keducaview.cpp:489
+#, fuzzy
+msgid "The correct answer is: "
+msgstr "Teisingas atsakymas yra:"
+
+#: keduca/keducaview.cpp:495
+#, fuzzy
+msgid "Your answer was: "
+msgstr "Jūsų atsakymas buvo:"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Dokumento informacija"
+
+#: keduca/keducaview.cpp:550
+#, fuzzy
+msgid "Title"
+msgstr "Antraštė"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, fuzzy, no-c-format
+msgid "Category"
+msgstr "Kategorija"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, fuzzy, no-c-format
+msgid "Type"
+msgstr "Tipas"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, fuzzy, no-c-format
+msgid "Language"
+msgstr "Kalba"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Atsakymai"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr ""
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr "Testai ir egzaminai formoje"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Įkelti bylą"
 
-#: keducabuilder/main.cpp:37
-#, fuzzy
-msgid "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
 msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
@@ -43,6 +262,10 @@ msgstr "Originalus autorius"
 msgid "Maintainer 2002-2004"
 msgstr ""
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Dabartinis palaikytojas"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr ""
@@ -51,11 +274,6 @@ msgstr ""
 msgid "Icons"
 msgstr "Ženkliukai"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Jūs turite nurodyti atveriamą bylą!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Keisti klausimą"
@@ -64,31 +282,150 @@ msgstr "Keisti klausimą"
 msgid "Add Questions"
 msgstr "Įdėti klausimą"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Taip"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Ne"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, fuzzy, no-c-format
 msgid "&Add"
 msgstr "&Pridėti"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-#, fuzzy
-msgid "Open &Gallery..."
-msgstr "Atidaryti &pavyzdį."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Dokumento informacija"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, fuzzy, no-c-format
+msgid "Description and rules of the project."
+msgstr "Projekto aprašymas ir taisyklės. "
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Aprašymas"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Tipas:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Lygis:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Kalba:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategorija:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Pavadinimas:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Piešinys"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Numatytas piešinys:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autorius"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Žiniatinklio puslapis:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E. paštas:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Vardas:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Kompiuteriai"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Testas"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Testas su klausimų taškais"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Testas su atsakymų taškais"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Lengvas"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normalus"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Ekspertas"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Aukščiausias"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -104,6 +441,11 @@ msgstr "&Įdėti..."
 msgid "&Edit..."
 msgstr "&Keisti..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 #, fuzzy
 msgid "&Up"
@@ -124,14 +466,6 @@ msgid ""
 "above."
 msgstr ""
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Atidaryti Educa bylą"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Atsakymai"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Klausimo piešinys"
@@ -141,11 +475,6 @@ msgstr "Klausimo piešinys"
 msgid "Question point"
 msgstr "Klausimo taškas:"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-#, fuzzy
-msgid "Time"
-msgstr "Laikas"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sek.</p>"
@@ -181,22 +510,10 @@ msgstr "Suspausta byla"
 msgid "Save Document As"
 msgstr "Įrašyti dokumentą kaip"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Dokumentas šiuo vardu jau egzistuoja.\n"
-"Ar norite jį perrašyti?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Perrašyti"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 
@@ -210,13 +527,6 @@ msgstr "Kopijuoti paveikslėlį"
 msgid "Do Not Copy"
 msgstr "Nesirūpinti"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Testas"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -253,541 +563,252 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Įdėti klausimą"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Dokumento informacija"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, fuzzy, no-c-format
-msgid "Description and rules of the project."
-msgstr "Projekto aprašymas ir taisyklės. "
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Aprašymas"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Tipas:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Lygis:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Kalba:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategorija:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Pavadinimas:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Piešinys"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Numatytas piešinys:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autorius"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Jūs turite nurodyti atveriamą bylą!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Žiniatinklio puslapis:"
+#: keducabuilder/main.cpp:26
+#, fuzzy
+msgid "Form-based tests and exams builder"
+msgstr "Testai ir egzaminai formoje"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, no-c-format
-msgid "Email:"
-msgstr "E. paštas:"
+#: keducabuilder/main.cpp:37
+#, fuzzy
+msgid "KEducaBuilder"
+msgstr "KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
-#, no-c-format
-msgid "Name:"
-msgstr "Vardas:"
+#: libkeduca/kgallerydialog.cpp:168
+#, fuzzy
+msgid "You need to specify a server!"
+msgstr "Jūs turite nurodyti atveriamą bylą!"
 
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Kompiuteriai"
+#: keduca/configdialogbase.ui:16
+#, fuzzy, no-c-format
+msgid "KEduca Config Dialog"
+msgstr "Tvarkaraščio konfigūravimo dialogas"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
-#, no-c-format
-msgid "Test with Question Points"
-msgstr "Testas su klausimų taškais"
+#: keduca/configdialogbase.ui:27
+#, fuzzy, no-c-format
+msgid "Show Results"
+msgstr "Paieškos rezultatai"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
-#, no-c-format
-msgid "Test with Answers Points"
-msgstr "Testas su atsakymų taškais"
+#: keduca/configdialogbase.ui:38
+#, fuzzy, no-c-format
+msgid "At the end of the test"
+msgstr "&Palikti bylos koduotę"
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr ""
+#: keduca/configdialogbase.ui:46
+#, fuzzy, no-c-format
+msgid "After answering each question"
+msgstr "&Aktyvuoti autoatsakiklį"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr ""
+#: keduca/configdialogbase.ui:56
+#, fuzzy, no-c-format
+msgid "Ordering"
+msgstr "Tvarka"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, no-c-format
+msgid "Display answers in random order."
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Lengvas"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Užbaigus testą parodyti rezultatus"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normalus"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Ekspertas"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Įvairūs nustatymai"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Aukščiausias"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Klausimas"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, fuzzy, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr "<p><b>Klausimas</b></p><hr><p>Būtinas tik klausimas ir tipas.</p>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, fuzzy, no-c-format
 msgid "&Question:"
 msgstr "Klausimas:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, fuzzy, no-c-format
 msgid "&Type:"
 msgstr "&Tipas:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, fuzzy, no-c-format
 msgid "&Picture:"
 msgstr "&Paveikslas:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, fuzzy, no-c-format
 msgid "P&oint:"
 msgstr "Taškas:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, fuzzy, no-c-format
 msgid "Ti&me:"
 msgstr "Laikas:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, fuzzy, no-c-format
 msgid "T&ip:"
 msgstr "Patarimas:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, fuzzy, no-c-format
 msgid "&Explain:"
 msgstr "Paaiškinti:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Atsakymas"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, fuzzy, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr "<p><b>Atsakymai</b></p><hr><p>Būtinas tik atsakymas ir reikšmė.</p>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, fuzzy, no-c-format
 msgid "&Answer:"
 msgstr "Atsakymas:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, fuzzy, no-c-format
 msgid "&Value:"
 msgstr "&Reikšmė:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, fuzzy, no-c-format
 msgid "&Points:"
 msgstr "Taškai:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Reikšmė"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Taškai"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "A&ukštyn"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Že&myn"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Keisti..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, fuzzy, no-c-format
 msgid "Editor - Getting Started"
 msgstr "KEduca redaktorius paleidžiamas"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, fuzzy, no-c-format
 msgid "Open an &existing document:"
 msgstr "Atverti esamą dokumentą:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, fuzzy, no-c-format
 msgid "Open a &recent document:"
 msgstr "Atverti paskutinį dokumentą:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, fuzzy, no-c-format
 msgid "Start a &new document"
 msgstr "Pradėti naują dokumentą"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgid "&Help"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galerija"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adresas:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, fuzzy, no-c-format
 msgid "&Add Server"
 msgstr "Serveriai"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Serveriai"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, fuzzy, no-c-format
 msgid "Address"
 msgstr "Adresas"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, fuzzy, no-c-format
-msgid "Language"
-msgstr "Kalba"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, fuzzy, no-c-format
-msgid "Category"
-msgstr "Kategorija"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, fuzzy, no-c-format
-msgid "Type"
-msgstr "Tipas"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Atverti"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, fuzzy, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Tvarkaraščio konfigūravimo dialogas"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, fuzzy, no-c-format
-msgid "Show Results"
-msgstr "Paieškos rezultatai"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, fuzzy, no-c-format
-msgid "At the end of the test"
-msgstr "&Palikti bylos koduotę"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, fuzzy, no-c-format
-msgid "After answering each question"
-msgstr "&Aktyvuoti autoatsakiklį"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, fuzzy, no-c-format
-msgid "Ordering"
-msgstr "Tvarka"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Eugenijus Paulauskas"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "eugenijus@agvila.lt"
-
-#: libkeduca/kgallerydialog.cpp:168
-#, fuzzy
-msgid "You need to specify a server!"
-msgstr "Jūs turite nurodyti atveriamą bylą!"
-
-#: keduca/keducaview.cpp:71
-#, fuzzy
-msgid "&Start Test"
-msgstr "Pradžios laikas"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "T&oliau >>"
-
-#: keduca/keducaview.cpp:89
-#, fuzzy
-msgid "&Save Results..."
-msgstr "Įrašyti rezultatus kaip"
-
-#: keduca/keducaview.cpp:151
-#, fuzzy
-msgid "Save Results As"
-msgstr "Įrašyti rezultatus kaip"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Bandymas įrašyti nepavyko."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Klausimas %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-
-#: keduca/keducaview.cpp:376
-#, fuzzy
-msgid "Result"
-msgstr "Testas"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistika"
-
-#: keduca/keducaview.cpp:446
-#, fuzzy
-msgid "Correct questions"
-msgstr "Įdėti klausimą"
-
-#: keduca/keducaview.cpp:448
-#, fuzzy
-msgid "Incorrect questions"
-msgstr "Įdėti klausimą"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr ""
-
-#: keduca/keducaview.cpp:453
-#, fuzzy
-msgid "Correct points"
-msgstr "Įdėti klausimą"
-
-#: keduca/keducaview.cpp:455
-#, fuzzy
-msgid "Incorrect points"
-msgstr "Įdėti klausimą"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr ""
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr ""
-
-#: keduca/keducaview.cpp:487
-#, fuzzy
-msgid "The answer is: "
-msgstr "Atsakymas yra:"
-
-#: keduca/keducaview.cpp:489
-#, fuzzy
-msgid "The correct answer is: "
-msgstr "Teisingas atsakymas yra:"
-
-#: keduca/keducaview.cpp:495
-#, fuzzy
-msgid "Your answer was: "
-msgstr "Jūsų atsakymas buvo:"
-
-#: keduca/keducaview.cpp:550
-#, fuzzy
-msgid "Title"
-msgstr "Antraštė"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Testai ir egzaminai formoje"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Dabartinis palaikytojas"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr ""
-
-#: keduca/keduca_part.cpp:59
-#, fuzzy
-msgid "KEducaPart"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:60
-#, fuzzy
-msgid "KEduca KParts Component"
-msgstr "Ark KParts komponentas"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Bendra"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Įvairūs nustatymai"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Parodyti atsakymo rezultatus paspaudus „toliau“"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Užbaigus testą parodyti rezultatus"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Tvarka"
diff --git a/tde-i18n-lv/messages/tdeedu/keduca.po b/tde-i18n-lv/messages/tdeedu/keduca.po
index beed7f0340c..50071c907ca 100644
--- a/tde-i18n-lv/messages/tdeedu/keduca.po
+++ b/tde-i18n-lv/messages/tdeedu/keduca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2003-11-18 18:43+0200\n"
 "Last-Translator: Gints Polis <gintam@inbox.lv>\n"
 "Language-Team: Latviešu <lv@li.org>\n"
@@ -15,18 +15,228 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: keducabuilder/main.cpp:26
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Gints Polis"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "gintam@inbox.lv"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
 #, fuzzy
-msgid "Form-based tests and exams builder"
+msgid "Open &Gallery..."
+msgstr "Atvērt Galeriju..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Atvērt Educa Failu"
+
+#: keduca/keduca_part.cpp:59
+#, fuzzy
+msgid "KEducaPart"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:60
+#, fuzzy
+msgid "KEduca KParts Component"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Galvenais"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Dažādi Parametri"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Rādīt rezultātus pēc Nākamais ievades"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Rādīt rezultātus pēc testa beigām"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Kārtība"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Rādīt jautājumus nejaušā kārtībā"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Rādīt atbildes atbildes nejaušā kārtībā"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr ""
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Nākamais >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Saglabāt Rezultātus..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Saglabāt Rezultātus Kā"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Dokuments ar šo vārdu jau eksistē.\n"
+"Vai vēlaties to pārrakstīt?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr ""
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Saglabāšana neizdevās."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "%1 Jautājums"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Punkti"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Jums ir %1 sekundes lai atbildētu uz jautājumu.\n"
+"\n"
+"Nospiežat OK kad jūs esat gatavs."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Rezultāts"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistika"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Pareizi jautājumi"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Nepareizi jautājumi"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Punkti kopā"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Pareizi punkti"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Nekorektie punkti"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Laiks"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Kopējais laiks"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Laiks testos"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Atbilde ir: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Pareiza atbilde ir: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Jūsu atbilde bija: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Dokumenta informācija"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Virsraksts"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategorija"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Tips"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Valoda"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Atbildes"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr ""
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr "Uz formām bāzēti testi un eksāmeni"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Fails ielādei"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBūvētājs"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -36,6 +246,11 @@ msgstr ""
 msgid "Maintainer 2002-2004"
 msgstr ""
 
+#: keduca/main.cpp:41
+#, fuzzy
+msgid "Current Maintainer"
+msgstr "Pareiza atbilde ir:"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr ""
@@ -44,11 +259,6 @@ msgstr ""
 msgid "Icons"
 msgstr ""
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Jums jānorāda atveramais fails!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Labot Jautājumu"
@@ -57,31 +267,150 @@ msgstr "Labot Jautājumu"
 msgid "Add Questions"
 msgstr "Pievienot Jautājumus"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Patiesība"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Kļūda"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Pievienot"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-#, fuzzy
-msgid "Open &Gallery..."
-msgstr "Atvērt Galeriju..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Dokumenta informācija"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Projekta apraksts un noteikumi."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Apraksts :"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Tips:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Līmenis:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Valoda:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategorija:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Virsraksts:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Bilde"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Noklusētā bilde:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autors"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Web lapa:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "EPasts:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Vārds:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Datori"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Tests"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Tests ar Jautājuma Punktiem"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Tests Ar Atbilžu Punktiem"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Slaideru Šovs"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Eksāmens"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psihotētiskais Tests"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Viegli"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normāls"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Eksperts"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Augstākais"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -97,6 +426,11 @@ msgstr "Pievienot..."
 msgid "&Edit..."
 msgstr "Labot..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 #, fuzzy
 msgid "&Up"
@@ -119,14 +453,6 @@ msgstr ""
 "Pievienot jaunu Jautājumu lietojot Labot Izvēlni vai izvēloties vienu no šīm "
 "ikonām."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Atvērt Educa Failu"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Atbildes"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Jautājuma bilde"
@@ -135,10 +461,6 @@ msgstr "Jautājuma bilde"
 msgid "Question point"
 msgstr "Jautājuma punkts"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Laiks"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sekundes</p>"
@@ -171,22 +493,10 @@ msgstr ""
 msgid "Save Document As"
 msgstr "Saglabāt Dokumentu Kā"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Dokuments ar šo vārdu jau eksistē.\n"
-"Vai vēlaties to pārrakstīt?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Ja jūs vēlaties koplietot šo dokumentu, labāk ir kopēt attēlus tajā pašā "
@@ -201,13 +511,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Tests"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -244,542 +547,256 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Ievietot Jautājumu"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Dokumenta informācija"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Projekta apraksts un noteikumi."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Apraksts :"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Tips:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Līmenis:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Valoda:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategorija:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Virsraksts:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Bilde"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Noklusētā bilde:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autors"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Web lapa:"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Jums jānorāda atveramais fails!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, no-c-format
-msgid "Email:"
-msgstr "EPasts:"
+#: keducabuilder/main.cpp:26
+#, fuzzy
+msgid "Form-based tests and exams builder"
+msgstr "Uz formām bāzēti testi un eksāmeni"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
-#, no-c-format
-msgid "Name:"
-msgstr "Vārds:"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBūvētājs"
 
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Datori"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Jums jānorāda serveris!"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Tests ar Jautājuma Punktiem"
+msgid "KEduca Config Dialog"
+msgstr ""
+
+#: keduca/configdialogbase.ui:27
+#, fuzzy, no-c-format
+msgid "Show Results"
+msgstr "Rezultāts"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Tests Ar Atbilžu Punktiem"
+msgid "At the end of the test"
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Slaideru Šovs"
+#: keduca/configdialogbase.ui:46
+#, no-c-format
+msgid "After answering each question"
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Eksāmens"
+#: keduca/configdialogbase.ui:56
+#, fuzzy, no-c-format
+msgid "Ordering"
+msgstr "Kārtība"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psihotētiskais Tests"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Rādīt atbildes atbildes nejaušā kārtībā"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Viegli"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Rādīt rezultātus pēc testa beigām"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normāls"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Eksperts"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Dažādi Parametri"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Augstākais"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Jautājums"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, fuzzy, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
-"<p><b>Jautājums</b></p>"
-"<hr>"
-"<p>Nepieciešams tikai jautājums un tips.</p>"
+"<p><b>Jautājums</b></p><hr><p>Nepieciešams tikai jautājums un tips.</p>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, fuzzy, no-c-format
 msgid "&Question:"
 msgstr "Jautājums:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, fuzzy, no-c-format
 msgid "&Type:"
 msgstr "Tips:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, fuzzy, no-c-format
 msgid "&Picture:"
 msgstr "Bilde:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, fuzzy, no-c-format
 msgid "P&oint:"
 msgstr "Punkts:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, fuzzy, no-c-format
 msgid "Ti&me:"
 msgstr "Laiks:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, fuzzy, no-c-format
 msgid "T&ip:"
 msgstr "Info:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, fuzzy, no-c-format
 msgid "&Explain:"
 msgstr "Paskaidro:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Atbilde"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, fuzzy, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
-"<p><b>Atbildes</b></p>"
-"<hr>"
-"<p>Nepieciešama tikai Atbilde un Vērtība.</p>"
+"<p><b>Atbildes</b></p><hr><p>Nepieciešama tikai Atbilde un Vērtība.</p>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, fuzzy, no-c-format
 msgid "&Answer:"
 msgstr "Atbilde:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, fuzzy, no-c-format
 msgid "&Value:"
 msgstr "Vērtība:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, fuzzy, no-c-format
 msgid "&Points:"
 msgstr "Punkti:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Vērtība"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Punkti"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Labot..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, fuzzy, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Tiek startēts Keduca Redaktors"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, fuzzy, no-c-format
 msgid "Open an &existing document:"
 msgstr "Atvērt eksistējošu dokumentu:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, fuzzy, no-c-format
 msgid "Open a &recent document:"
 msgstr "Atvērt dokumentu no pēdējiem:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, fuzzy, no-c-format
 msgid "Start a &new document"
 msgstr "Veidot jaunu dokumentu"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgid "&Help"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, fuzzy, no-c-format
 msgid "Gallery"
 msgstr "Atvērt Galeriju..."
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, fuzzy, no-c-format
 msgid "Address:"
 msgstr "Pievienot Jautājumus"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, fuzzy, no-c-format
 msgid "Address"
 msgstr "Pievienot Jautājumus"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Valoda"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategorija"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Tips"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr ""
 
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, fuzzy, no-c-format
-msgid "Show Results"
-msgstr "Rezultāts"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, fuzzy, no-c-format
-msgid "Ordering"
-msgstr "Kārtība"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Rādīt jautājumus nejaušā kārtībā"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Rādīt atbildes atbildes nejaušā kārtībā"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Gints Polis"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "gintam@inbox.lv"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Jums jānorāda serveris!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr ""
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Nākamais >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Saglabāt Rezultātus..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Saglabāt Rezultātus Kā"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Saglabāšana neizdevās."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "%1 Jautājums"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Jums ir %1 sekundes lai atbildētu uz jautājumu.\n"
-"\n"
-"Nospiežat OK kad jūs esat gatavs."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Rezultāts"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistika"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Pareizi jautājumi"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Nepareizi jautājumi"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Punkti kopā"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Pareizi punkti"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Nekorektie punkti"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Kopējais laiks"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Laiks testos"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Atbilde ir: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Pareiza atbilde ir: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Jūsu atbilde bija: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Virsraksts"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Uz formām bāzēti testi un eksāmeni"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-#, fuzzy
-msgid "Current Maintainer"
-msgstr "Pareiza atbilde ir:"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr ""
-
-#: keduca/keduca_part.cpp:59
-#, fuzzy
-msgid "KEducaPart"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:60
-#, fuzzy
-msgid "KEduca KParts Component"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Galvenais"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Dažādi Parametri"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Rādīt rezultātus pēc Nākamais ievades"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Rādīt rezultātus pēc testa beigām"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Kārtība"
-
 #~ msgid "1.2.0"
 #~ msgstr "1.2.0"
 
diff --git a/tde-i18n-mk/messages/tdeedu/keduca.po b/tde-i18n-mk/messages/tdeedu/keduca.po
index 57b047f1553..5efc7d5dc02 100644
--- a/tde-i18n-mk/messages/tdeedu/keduca.po
+++ b/tde-i18n-mk/messages/tdeedu/keduca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-05-17 12:07+0200\n"
 "Last-Translator: Bozidar Proevski <bobibobi@freemail.com.mk>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -17,18 +17,228 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: keducabuilder/main.cpp:26
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Владимир Стефанов"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "vladoboss@mt.net.mk"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
 #, fuzzy
-msgid "Form-based tests and exams builder"
+msgid "Open &Gallery..."
+msgstr "Отвори галерија..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Отвори Educa датотека"
+
+#: keduca/keduca_part.cpp:59
+#, fuzzy
+msgid "KEducaPart"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:60
+#, fuzzy
+msgid "KEduca KParts Component"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Општо"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Различни поставувања"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Прикажи ги резултатите од одговорите по притискањето на следно"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Прикажи ги резултатите кога ќе заврши тестот"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Редослед"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Прикажи прашања по случаен редослед"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Прикажи одговори по случаен редослед"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr ""
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Следно >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Зачувај резултати..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Зачувај резултати како"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Документ со ова име веќе постои.\n"
+"Дали сакате да го препишете?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr ""
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Зачувувањето не успеа."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Прашање %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Поени"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Имате %1 секунди за да го одговорите прашањето.\n"
+"\n"
+"Притиснете Во ред кога ќе бидете спремни."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Резултат"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Статистика"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Точни прашања"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Неточни прашања"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Вкупно поени"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Точни поени"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Неточни поени"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Време"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Вкупно време"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Време на тестови"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Одговорот е:"
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Точниот одговор е:"
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Вашиот одговор беше:"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Информации за документот"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Наслов"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Категорија"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Тип"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Јазик"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Одговори"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr ""
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr "Тестови базирани на формулари и испити"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Датотека за вчитување"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -38,6 +248,10 @@ msgstr ""
 msgid "Maintainer 2002-2004"
 msgstr ""
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr ""
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr ""
@@ -46,11 +260,6 @@ msgstr ""
 msgid "Icons"
 msgstr ""
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Морате да одредите датотека за отварање!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Измени прашање"
@@ -59,31 +268,150 @@ msgstr "Измени прашање"
 msgid "Add Questions"
 msgstr "Додади прашања"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Точно"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Неточно"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Додај"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-#, fuzzy
-msgid "Open &Gallery..."
-msgstr "Отвори галерија..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Информации за документот"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Опис и правила на проектот."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Опис"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Тип:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Ниво:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Јазик:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Категорија:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Наслов:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Слика"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Почетна слика:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Автор"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Веб страница:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Е-пошта:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Име:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Компјутери"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Тест"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Тест со поени за прашањата"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Тест со поени за одговорите"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Презентација"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Испит"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Психотехнички тест"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Лесно"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Нормално"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Експерт"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Надмоќен"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -99,6 +427,11 @@ msgstr "Додај..."
 msgid "&Edit..."
 msgstr "Уреди..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 #, fuzzy
 msgid "&Up"
@@ -118,16 +451,8 @@ msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 msgstr ""
-"Додадете ново Прашање со користење на менито Уреди или со избирање на една од "
-"иконите погоре."
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Отвори Educa датотека"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Одговори"
+"Додадете ново Прашање со користење на менито Уреди или со избирање на една "
+"од иконите погоре."
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -137,10 +462,6 @@ msgstr "Слика за прашањето"
 msgid "Question point"
 msgstr "Поен на прашањето"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Време"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " секунди</p>"
@@ -173,22 +494,10 @@ msgstr ""
 msgid "Save Document As"
 msgstr "Зачувај го документот како"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Документ со ова име веќе постои.\n"
-"Дали сакате да го препишете?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Ако сакате да го делите овој документ, подобро е да ги копирате сликите во "
@@ -203,13 +512,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Тест"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -246,545 +548,260 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Внесете прашање"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Информации за документот"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Опис и правила на проектот."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Опис"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Тип:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Ниво:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Јазик:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Категорија:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Наслов:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Слика"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Почетна слика:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Автор"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Веб страница:"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Морате да одредите датотека за отварање!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, no-c-format
-msgid "Email:"
-msgstr "Е-пошта:"
+#: keducabuilder/main.cpp:26
+#, fuzzy
+msgid "Form-based tests and exams builder"
+msgstr "Тестови базирани на формулари и испити"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
-#, no-c-format
-msgid "Name:"
-msgstr "Име:"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Компјутери"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Морате да одредите сервер!"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Тест со поени за прашањата"
+msgid "KEduca Config Dialog"
+msgstr ""
+
+#: keduca/configdialogbase.ui:27
+#, fuzzy, no-c-format
+msgid "Show Results"
+msgstr "Резултат"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Тест со поени за одговорите"
+msgid "At the end of the test"
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Презентација"
+#: keduca/configdialogbase.ui:46
+#, no-c-format
+msgid "After answering each question"
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Испит"
+#: keduca/configdialogbase.ui:56
+#, fuzzy, no-c-format
+msgid "Ordering"
+msgstr "Редослед"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Психотехнички тест"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Прикажи одговори по случаен редослед"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Лесно"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Прикажи ги резултатите кога ќе заврши тестот"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Нормално"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Експерт"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Различни поставувања"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Надмоќен"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Прашање"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Прашање</b></p>\n"
+"  <p><b>Прашање</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Се бараат само прашањето и типот.</p>\n"
+"  <p>Се бараат само прашањето и типот.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Прашање:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Тип:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Слика:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "П&оени:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Вре&ме:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&Совет:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Објасни:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Одговор"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Одговори</b></p>\n"
+"  <p><b>Одговори</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Потребни се само одговорот и вредноста.</p>\n"
+"  <p>Потребни се само одговорот и вредноста.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Одговор:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Вредност:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Поени:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Вредност"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Поени"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Помести На&горе"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Помести На&доле"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Информации</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Уреди..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "KEduca - Почнуваме"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Отвори посто&ечки документ:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Отвори ско&решен документ:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Отвори со Интернет прелистувач на галерија"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Стартувај &нов документ"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Информации</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Галерија"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Адреса:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "Дод&ај сервер"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Сервери"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Адреса"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Јазик"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Категорија"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Тип"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Отвори"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, fuzzy, no-c-format
-msgid "Show Results"
-msgstr "Резултат"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, fuzzy, no-c-format
-msgid "Ordering"
-msgstr "Редослед"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Прикажи прашања по случаен редослед"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Прикажи одговори по случаен редослед"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Владимир Стефанов"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "vladoboss@mt.net.mk"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Морате да одредите сервер!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr ""
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Следно >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Зачувај резултати..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Зачувај резултати како"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Зачувувањето не успеа."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Прашање %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Имате %1 секунди за да го одговорите прашањето.\n"
-"\n"
-"Притиснете Во ред кога ќе бидете спремни."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Резултат"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Статистика"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Точни прашања"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Неточни прашања"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Вкупно поени"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Точни поени"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Неточни поени"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Вкупно време"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Време на тестови"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Одговорот е:"
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Точниот одговор е:"
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Вашиот одговор беше:"
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Наслов"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Тестови базирани на формулари и испити"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr ""
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr ""
-
-#: keduca/keduca_part.cpp:59
-#, fuzzy
-msgid "KEducaPart"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:60
-#, fuzzy
-msgid "KEduca KParts Component"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Општо"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Различни поставувања"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Прикажи ги резултатите од одговорите по притискањето на следно"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Прикажи ги резултатите кога ќе заврши тестот"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Редослед"
diff --git a/tde-i18n-mn/messages/tdeedu/keduca.po b/tde-i18n-mn/messages/tdeedu/keduca.po
index e16039f7b01..3e479c4173f 100644
--- a/tde-i18n-mn/messages/tdeedu/keduca.po
+++ b/tde-i18n-mn/messages/tdeedu/keduca.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2003-04-30 14:25-0700\n"
 "Last-Translator: Ochirbat Batzaya <buuvei@yahoo.com>\n"
 "Language-Team: mongolian <openmn-kdemn@lists.sf.net>\n"
@@ -13,18 +13,235 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.1\n"
 
-#: keducabuilder/main.cpp:26
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Очирбатын Батзаяа"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "buuvei@yahoo.com"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr ""
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Educa-Файл нээх"
+
+#: keduca/keduca_part.cpp:59
 #, fuzzy
-msgid "Form-based tests and exams builder"
+msgid "KEducaPart"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:60
+#, fuzzy
+msgid "KEduca KParts Component"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Ерөнхий"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Тохируулгын төрлүүд"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "\"Дараагийнх\" товчлуурыг дарахад хариултыг шууд харуулах"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Тест төгсөнгүүт хариуг шууд харуулах"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr ""
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr ""
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr ""
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr ""
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Дараагийнх >>"
+
+#: keduca/keducaview.cpp:89
+#, fuzzy
+msgid "&Save Results..."
+msgstr "Баримтыг дараах нэрэн дор хадгалах:"
+
+#: keduca/keducaview.cpp:151
+#, fuzzy
+msgid "Save Results As"
+msgstr "Баримтыг дараах нэрэн дор хадгалах:"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Ийм нэртэй өөр нэг файл байна.\n"
+"Хуучин файлыг устгаад оронд нь бичих үү?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr ""
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr ""
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Асуулт %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Оноо"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+
+#: keduca/keducaview.cpp:376
+#, fuzzy
+msgid "Result"
+msgstr "Тест"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr ""
+
+#: keduca/keducaview.cpp:446
+#, fuzzy
+msgid "Correct questions"
+msgstr "Асуулт оруулах"
+
+#: keduca/keducaview.cpp:448
+#, fuzzy
+msgid "Incorrect questions"
+msgstr "Асуулт оруулах"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr ""
+
+#: keduca/keducaview.cpp:453
+#, fuzzy
+msgid "Correct points"
+msgstr "Асуулт оруулах"
+
+#: keduca/keducaview.cpp:455
+#, fuzzy
+msgid "Incorrect points"
+msgstr "Асуулт оруулах"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+#, fuzzy
+msgid "Time"
+msgstr "Хугацаа:"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr ""
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr ""
+
+#: keduca/keducaview.cpp:487
+#, fuzzy
+msgid "The answer is: "
+msgstr "Хариулт:"
+
+#: keduca/keducaview.cpp:489
+#, fuzzy
+msgid "The correct answer is: "
+msgstr "Зөв хариулт:"
+
+#: keduca/keducaview.cpp:495
+#, fuzzy
+msgid "Your answer was: "
+msgstr "Таны хариулт:"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Баримтын тухай мэдээлэл"
+
+#: keduca/keducaview.cpp:550
+#, fuzzy
+msgid "Title"
+msgstr "Гарчиг(нэр):"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, fuzzy, no-c-format
+msgid "Category"
+msgstr "Категори:"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, fuzzy, no-c-format
+msgid "Type"
+msgstr "Төрөл:"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, fuzzy, no-c-format
+msgid "Language"
+msgstr "Хэл:"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Хариултууд"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr ""
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr "Хүснэгтэн тест, шалгалтууд"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Идэвхжүүлэх ёстой файл"
 
-#: keducabuilder/main.cpp:37
-#, fuzzy
-msgid "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
 msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
@@ -35,6 +252,10 @@ msgstr ""
 msgid "Maintainer 2002-2004"
 msgstr ""
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr ""
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr ""
@@ -43,11 +264,6 @@ msgstr ""
 msgid "Icons"
 msgstr ""
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Та нээх гэж буй файлаа зааж өгөх хэрэгтэй!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Асуултыг өөрчлөх"
@@ -56,31 +272,151 @@ msgstr "Асуултыг өөрчлөх"
 msgid "Add Questions"
 msgstr "Асуулт нэмэх"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Үнэн"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Худал"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, fuzzy, no-c-format
 msgid "&Add"
 msgstr "Нэмэх..."
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Баримтын тухай мэдээлэл"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, fuzzy, no-c-format
+msgid "Description and rules of the project."
+msgstr "Ажлын тухай заавар зөвлөгөө."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Заавар"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, fuzzy, no-c-format
+msgid "Type:"
+msgstr "Төрөл:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, fuzzy, no-c-format
+msgid "Level:"
+msgstr "Түвшин:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, fuzzy, no-c-format
+msgid "Language:"
+msgstr "Хэл:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, fuzzy, no-c-format
+msgid "Category:"
+msgstr "Категори:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, fuzzy, no-c-format
+msgid "Title:"
+msgstr "Гарчиг(нэр):"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Зураг"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, fuzzy, no-c-format
+msgid "Default picture:"
+msgstr "Стандарт зураг:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Зохиогч"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, fuzzy, no-c-format
+msgid "Web page:"
+msgstr "Вэб-хуудас:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, fuzzy, no-c-format
+msgid "Email:"
+msgstr "Email:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, fuzzy, no-c-format
+msgid "Name:"
+msgstr "Нэр:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Компьютер"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Тест"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, fuzzy, no-c-format
+msgid "Test with Question Points"
+msgstr "Оноотой асуулт бүхий тест"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, fuzzy, no-c-format
+msgid "Test with Answers Points"
+msgstr "Оноотой хариулт бүхий тест"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
 msgstr ""
 
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Хөнгөн"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Дунд түвшний"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Мэргэжлийн"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Маш өндөр зэрэглэлийн"
+
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
 msgstr "Мэдээлэл"
@@ -95,6 +431,11 @@ msgstr "Нэмэх..."
 msgid "&Edit..."
 msgstr "Боловсруулах..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 #, fuzzy
 msgid "&Up"
@@ -115,14 +456,6 @@ msgid ""
 "above."
 msgstr ""
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Educa-Файл нээх"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Хариултууд"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Асуултыг дагалдах зураг"
@@ -132,11 +465,6 @@ msgstr "Асуултыг дагалдах зураг"
 msgid "Question point"
 msgstr "Асуултанд өгөх оноо:"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-#, fuzzy
-msgid "Time"
-msgstr "Хугацаа:"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " секунд</p>"
@@ -173,22 +501,10 @@ msgstr ""
 msgid "Save Document As"
 msgstr "Баримтыг дараах нэрэн дор хадгалах:"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Ийм нэртэй өөр нэг файл байна.\n"
-"Хуучин файлыг устгаад оронд нь бичих үү?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 
@@ -200,13 +516,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Тест"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -243,550 +552,258 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Асуулт оруулах"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Баримтын тухай мэдээлэл"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, fuzzy, no-c-format
-msgid "Description and rules of the project."
-msgstr "Ажлын тухай заавар зөвлөгөө."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Заавар"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, fuzzy, no-c-format
-msgid "Type:"
-msgstr "Төрөл:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, fuzzy, no-c-format
-msgid "Level:"
-msgstr "Түвшин:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, fuzzy, no-c-format
-msgid "Language:"
-msgstr "Хэл:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, fuzzy, no-c-format
-msgid "Category:"
-msgstr "Категори:"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Та нээх гэж буй файлаа зааж өгөх хэрэгтэй!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, fuzzy, no-c-format
-msgid "Title:"
-msgstr "Гарчиг(нэр):"
+#: keducabuilder/main.cpp:26
+#, fuzzy
+msgid "Form-based tests and exams builder"
+msgstr "Хүснэгтэн тест, шалгалтууд"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Зураг"
+#: keducabuilder/main.cpp:37
+#, fuzzy
+msgid "KEducaBuilder"
+msgstr "KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, fuzzy, no-c-format
-msgid "Default picture:"
-msgstr "Стандарт зураг:"
+#: libkeduca/kgallerydialog.cpp:168
+#, fuzzy
+msgid "You need to specify a server!"
+msgstr "Та нээх гэж буй файлаа зааж өгөх хэрэгтэй!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Author"
-msgstr "Зохиогч"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, fuzzy, no-c-format
-msgid "Web page:"
-msgstr "Вэб-хуудас:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, fuzzy, no-c-format
-msgid "Email:"
-msgstr "Email:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
-#, fuzzy, no-c-format
-msgid "Name:"
-msgstr "Нэр:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Компьютер"
+msgid "KEduca Config Dialog"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:27
 #, fuzzy, no-c-format
-msgid "Test with Question Points"
-msgstr "Оноотой асуулт бүхий тест"
+msgid "Show Results"
+msgstr "Тест"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
-#, fuzzy, no-c-format
-msgid "Test with Answers Points"
-msgstr "Оноотой хариулт бүхий тест"
+#: keduca/configdialogbase.ui:38
+#, no-c-format
+msgid "At the end of the test"
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
+#: keduca/configdialogbase.ui:46
+#, no-c-format
+msgid "After answering each question"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, no-c-format
+msgid "Display answers in random order."
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Хөнгөн"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Тест төгсөнгүүт хариуг шууд харуулах"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Дунд түвшний"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Мэргэжлийн"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Тохируулгын төрлүүд"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Маш өндөр зэрэглэлийн"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Асуулт"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, fuzzy, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
-"<p><b>Асуулт</b></p>"
-"<hr>"
-"<p>Зөвхөн асуулт болоод төрөл л шаардлагатай.</p>"
+"<p><b>Асуулт</b></p><hr><p>Зөвхөн асуулт болоод төрөл л шаардлагатай.</p>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, fuzzy, no-c-format
 msgid "&Question:"
 msgstr "Асуулт:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, fuzzy, no-c-format
 msgid "&Type:"
 msgstr "Төрөл:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, fuzzy, no-c-format
 msgid "&Picture:"
 msgstr "Зураг:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, fuzzy, no-c-format
 msgid "P&oint:"
 msgstr "Оноо:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, fuzzy, no-c-format
 msgid "Ti&me:"
 msgstr "Хугацаа:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, fuzzy, no-c-format
 msgid "T&ip:"
 msgstr "Зөвлөмж:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, fuzzy, no-c-format
 msgid "&Explain:"
 msgstr "Тайлбар:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Хариулт"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, fuzzy, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
-"<p><b>Хариултууд</b></p>"
-"<hr>"
-"<p>Зөвхөн хариулт болоод утга л шаардлагатай.</p>"
+"<p><b>Хариултууд</b></p><hr><p>Зөвхөн хариулт болоод утга л шаардлагатай.</p>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, fuzzy, no-c-format
 msgid "&Answer:"
 msgstr "Хариулт:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, fuzzy, no-c-format
 msgid "&Value:"
 msgstr "Утга:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, fuzzy, no-c-format
 msgid "&Points:"
 msgstr "Оноо:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Утга"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Оноо"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Боловсруулах..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, fuzzy, no-c-format
 msgid "Editor - Getting Started"
 msgstr "KEduca Editor - Эхлэл"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, fuzzy, no-c-format
 msgid "Open an &existing document:"
 msgstr "Буй файлыг нээх:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, fuzzy, no-c-format
 msgid "Open a &recent document:"
 msgstr "Өмнөхөн нээж байсан документ нээх:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, fuzzy, no-c-format
 msgid "Start a &new document"
 msgstr "Шинэ документ нээх"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgid "&Help"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, fuzzy, no-c-format
 msgid "Address:"
 msgstr "Асуулт нэмэх"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, fuzzy, no-c-format
 msgid "Address"
 msgstr "Асуулт нэмэх"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, fuzzy, no-c-format
-msgid "Language"
-msgstr "Хэл:"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, fuzzy, no-c-format
-msgid "Category"
-msgstr "Категори:"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, fuzzy, no-c-format
-msgid "Type"
-msgstr "Төрөл:"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr ""
 
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, fuzzy, no-c-format
-msgid "Show Results"
-msgstr "Тест"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Очирбатын Батзаяа"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "buuvei@yahoo.com"
-
-#: libkeduca/kgallerydialog.cpp:168
-#, fuzzy
-msgid "You need to specify a server!"
-msgstr "Та нээх гэж буй файлаа зааж өгөх хэрэгтэй!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr ""
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Дараагийнх >>"
-
-#: keduca/keducaview.cpp:89
-#, fuzzy
-msgid "&Save Results..."
-msgstr "Баримтыг дараах нэрэн дор хадгалах:"
-
-#: keduca/keducaview.cpp:151
-#, fuzzy
-msgid "Save Results As"
-msgstr "Баримтыг дараах нэрэн дор хадгалах:"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr ""
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Асуулт %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-
-#: keduca/keducaview.cpp:376
-#, fuzzy
-msgid "Result"
-msgstr "Тест"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr ""
-
-#: keduca/keducaview.cpp:446
-#, fuzzy
-msgid "Correct questions"
-msgstr "Асуулт оруулах"
-
-#: keduca/keducaview.cpp:448
-#, fuzzy
-msgid "Incorrect questions"
-msgstr "Асуулт оруулах"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr ""
-
-#: keduca/keducaview.cpp:453
-#, fuzzy
-msgid "Correct points"
-msgstr "Асуулт оруулах"
-
-#: keduca/keducaview.cpp:455
-#, fuzzy
-msgid "Incorrect points"
-msgstr "Асуулт оруулах"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr ""
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr ""
-
-#: keduca/keducaview.cpp:487
-#, fuzzy
-msgid "The answer is: "
-msgstr "Хариулт:"
-
-#: keduca/keducaview.cpp:489
-#, fuzzy
-msgid "The correct answer is: "
-msgstr "Зөв хариулт:"
-
-#: keduca/keducaview.cpp:495
-#, fuzzy
-msgid "Your answer was: "
-msgstr "Таны хариулт:"
-
-#: keduca/keducaview.cpp:550
-#, fuzzy
-msgid "Title"
-msgstr "Гарчиг(нэр):"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Хүснэгтэн тест, шалгалтууд"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr ""
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr ""
-
-#: keduca/keduca_part.cpp:59
-#, fuzzy
-msgid "KEducaPart"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:60
-#, fuzzy
-msgid "KEduca KParts Component"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Ерөнхий"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Тохируулгын төрлүүд"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "\"Дараагийнх\" товчлуурыг дарахад хариултыг шууд харуулах"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Тест төгсөнгүүт хариуг шууд харуулах"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr ""
-
 #~ msgid "Main Window"
 #~ msgstr "Гол цонх"
 
diff --git a/tde-i18n-ms/messages/tdeedu/keduca.po b/tde-i18n-ms/messages/tdeedu/keduca.po
index 25ed37f09c7..220abaa5e35 100644
--- a/tde-i18n-ms/messages/tdeedu/keduca.po
+++ b/tde-i18n-ms/messages/tdeedu/keduca.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2008-08-09 22:24+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <kedidiemas@yahoogroups.com>\n"
@@ -14,19 +14,229 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: keducabuilder/main.cpp:26
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Sharuzzaman Ahmat Raslan"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "sharuzzaman@myrealbox.com"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Buka &Galeri..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
 #, fuzzy
-msgid "Form-based tests and exams builder"
-msgstr "Borang dan"
+msgid "Open Educa File"
+msgstr "tidak dapat membuka fail `%s'"
+
+#: keduca/keduca_part.cpp:59
+#, fuzzy
+msgid "KEducaPart"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "Komponen KParts KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Umum"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Pelbagai Tetapan"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Papar keputusan jawapan selepas menekan maju"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Papar keputusan selepas selesai ujian"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Susunan"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Papar soalan dalam susunan rawak"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Papar jawapan dalam turutan rawak"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Mula Ujian"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Maju >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Simpan Keputusan..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Simpan Keputusan Sebagai"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+#, fuzzy
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Dokumen dengan nama ini sudah wujud.\n"
+"Anda ingin menulisgantinya?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Tindih"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Gagal menyimpan."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Soalan %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Markah"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Anda mempunyai %1 saat untuk menyelesaikan soalan ini.\n"
+"\n"
+"Tekan OK apabila anda telah sedia."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Keputusan"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistik"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Soalan betul"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Soalan tidak betul"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Markah keseluruhan"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Markah tepat"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Markah tidak tepat"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Masa"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Jumlah masa "
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Masa dalam ujian"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Jawapannya ialah:"
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Jawapan yang betul ialah:"
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Jawapan anda adalah:"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Maklumat Dokumen"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Tajuk"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategori"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Jenis"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Bahasa"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr ""
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v saat tinggal"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Peperiksaan dan ujian berasaskan borang"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 #, fuzzy
 msgid "File to load"
 msgstr "Simpan ke fail"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr ""
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -37,6 +247,10 @@ msgstr "Pengarang Asal"
 msgid "Maintainer 2002-2004"
 msgstr "Penulis dan penyelenggara"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Penyelenggara Semasa"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 #, fuzzy
 msgid "Various fixes and cleanups"
@@ -46,11 +260,6 @@ msgstr "dan"
 msgid "Icons"
 msgstr "Ikon"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Anda perlu menyatakan fail untuk dibuka!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Ubahsuai Soalan"
@@ -59,30 +268,151 @@ msgstr "Ubahsuai Soalan"
 msgid "Add Questions"
 msgstr "Tambah Soalan"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Benar"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Salah"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "T&ambah"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Buka &Galeri..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Maklumat Dokumen"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, fuzzy, no-c-format
+msgid "Description and rules of the project."
+msgstr "Huraian dan bagi."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Huraian"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Jenis:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Tahap:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Bahasa:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategori:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Tajuk:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Gambar"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, fuzzy, no-c-format
+msgid "Default picture:"
+msgstr "Selit Gambar"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Pengarang"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Laman web:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Emel:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Nama:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Komputer"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Uji"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, fuzzy, no-c-format
+msgid "Test with Question Points"
+msgstr "Uji Soalan Titik"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, fuzzy, no-c-format
+msgid "Test with Answers Points"
+msgstr "Uji Titik"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:351
+#, fuzzy
+msgid "Psychotechnic Test"
+msgstr "Ujian Kevins"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Mudah"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normal"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Mahir"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr ""
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -96,6 +426,11 @@ msgstr "T&ambah..."
 msgid "&Edit..."
 msgstr "&Sunting..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Atas"
@@ -116,15 +451,6 @@ msgid ""
 "above."
 msgstr "Tambah baru Soalan Edit Menu atau bagi."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-#, fuzzy
-msgid "Open Educa File"
-msgstr "tidak dapat membuka fail `%s'"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:222
 #, fuzzy
 msgid "Question Image"
@@ -135,10 +461,6 @@ msgstr "Salin Imej"
 msgid "Question point"
 msgstr "Titik _Pelekapan:"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Masa"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " saat</p>"
@@ -171,24 +493,11 @@ msgstr "Mampat fail"
 msgid "Save Document As"
 msgstr "Simpan Dokumen Sebagai"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-#, fuzzy
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Dokumen dengan nama ini sudah wujud.\n"
-"Anda ingin menulisgantinya?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Tindih"
-
 #: keducabuilder/keducabuilder.cpp:462
 #, fuzzy
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr "hingga ialah hingga hingga hingga?"
 
@@ -200,13 +509,6 @@ msgstr "Salin Imej"
 msgid "Do Not Copy"
 msgstr "Jangan Salin"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Uji"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -242,545 +544,260 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Masukkan Soalan"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Maklumat Dokumen"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, fuzzy, no-c-format
-msgid "Description and rules of the project."
-msgstr "Huraian dan bagi."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Huraian"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Jenis:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Tahap:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Bahasa:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategori:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Tajuk:"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Anda perlu menyatakan fail untuk dibuka!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Gambar"
+#: keducabuilder/main.cpp:26
+#, fuzzy
+msgid "Form-based tests and exams builder"
+msgstr "Borang dan"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, fuzzy, no-c-format
-msgid "Default picture:"
-msgstr "Selit Gambar"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Pengarang"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Anda perlu menyatakan pelayan!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Web page:"
-msgstr "Laman web:"
+msgid "KEduca Config Dialog"
+msgstr "Dialog Tetapan KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Email:"
-msgstr "Emel:"
+msgid "Show Results"
+msgstr "Papar Keputusan"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Name:"
-msgstr "Nama:"
+msgid "At the end of the test"
+msgstr "Pada penghujung ujian"
 
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Komputer"
+#: keduca/configdialogbase.ui:46
+#, no-c-format
+msgid "After answering each question"
+msgstr "Selepas menjawab setiap soalan"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:56
 #, fuzzy, no-c-format
-msgid "Test with Question Points"
-msgstr "Uji Soalan Titik"
+msgid "Ordering"
+msgstr "Susunan"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
 #, fuzzy, no-c-format
-msgid "Test with Answers Points"
-msgstr "Uji Titik"
+msgid "Display answers in random order."
+msgstr "Papar jawapan dalam turutan rawak"
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr ""
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Papar keputusan selepas selesai ujian"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:351
-#, fuzzy
-msgid "Psychotechnic Test"
-msgstr "Ujian Kevins"
-
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Mudah"
-
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normal"
-
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Mahir"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Pelbagai Tetapan"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Soalan"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Soalan</b></p>\n"
+"  <p><b>Soalan</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Hanya soalan dan jenis diperlukan.</p>\n"
+"  <p>Hanya soalan dan jenis diperlukan.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Soalan:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Jenis:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Gambar:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&Masa:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "T&ip:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Jawab"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Jawapan</b></p>\n"
+"  <p><b>Jawapan</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Hanya jawapan dan nilai diperlukan.</p>\n"
+"  <p>Hanya jawapan dan nilai diperlukan.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "J&awapan:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Nilai:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Markah:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Nilai"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Markah"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Naik &Atas"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Turun &Bawah"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Maklumat</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Sunting..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Penyunting - Bagaimana Bermula"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Buka dokumen s&edia ada:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Buka dokumen te&rbaru:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Buka dengan pelayar galeri Internet"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Mula dokume&n baru"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Maklumat</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galeri"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Alamat:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "T&ambah Pelayan"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Pelayan"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Alamat"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Bahasa"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategori"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Jenis"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Buka"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Dialog Tetapan KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Papar Keputusan"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Pada penghujung ujian"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Selepas menjawab setiap soalan"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, fuzzy, no-c-format
-msgid "Ordering"
-msgstr "Susunan"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Papar soalan dalam susunan rawak"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Papar jawapan dalam turutan rawak"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Sharuzzaman Ahmat Raslan"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "sharuzzaman@myrealbox.com"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Anda perlu menyatakan pelayan!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Mula Ujian"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Maju >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Simpan Keputusan..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Simpan Keputusan Sebagai"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Gagal menyimpan."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Soalan %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Anda mempunyai %1 saat untuk menyelesaikan soalan ini.\n"
-"\n"
-"Tekan OK apabila anda telah sedia."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Keputusan"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistik"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Soalan betul"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Soalan tidak betul"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Markah keseluruhan"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Markah tepat"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Markah tidak tepat"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Jumlah masa "
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Masa dalam ujian"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Jawapannya ialah:"
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Jawapan yang betul ialah:"
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Jawapan anda adalah:"
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Tajuk"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Peperiksaan dan ujian berasaskan borang"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Penyelenggara Semasa"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v saat tinggal"
-
-#: keduca/keduca_part.cpp:59
-#, fuzzy
-msgid "KEducaPart"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "Komponen KParts KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Umum"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Pelbagai Tetapan"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Papar keputusan jawapan selepas menekan maju"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Papar keputusan selepas selesai ujian"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Susunan"
diff --git a/tde-i18n-nb/messages/tdeedu/keduca.po b/tde-i18n-nb/messages/tdeedu/keduca.po
index 662aacead23..f8081384f01 100644
--- a/tde-i18n-nb/messages/tdeedu/keduca.po
+++ b/tde-i18n-nb/messages/tdeedu/keduca.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-11-07 21:53+0100\n"
 "Last-Translator: Axel Bojer <axelb@skolelinux.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -22,17 +22,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Program for å lage skjema-baserte prøver og eksamener"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Jørgen Grønlund"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "jorgenhg@broadpark.no"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Åpne galleri …"
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Åpne Educa-fil"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca KParts komponent"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Generelt"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Forskjellige innstillinger"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Vis resultatet etter å ha trykket Neste"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Vis resultatet ved testslutt"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Rekkefølge"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Vis spørsmålene i vilkårlig rekkefølge"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Vis svarene i vilkårlig rekkefølge"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Start test"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Neste >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Lagre resultater …"
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Lagre resultater som"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Et dokument med dette navnet finnes allerede.\n"
+"Vil du overskrive det?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Skriv over"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Lagring mislyktes."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Spørsmål %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Poeng"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Du har %1 sekunder til å besvare dette spørsmålet.\n"
+"\n"
+"Trykk OK når du er klar."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Resultat"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistikk"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Riktige spørsmål"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Feil spørsmål"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Totalt poeng"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Riktig-poeng"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Feil-poeng"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Tid"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Total tid"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Tid i prøver"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Svaret er: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Korrekt svar var: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Ditt svar var: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Dokumentinformasjon"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Tittel"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategori"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Type"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Språk"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Svar"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v sekunder igjen"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Skjema-baserte prøver og eksamener"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Fil som skal lastes"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -42,6 +250,10 @@ msgstr "Opprinnelig utvikler"
 msgid "Maintainer 2002-2004"
 msgstr "Vedlikeholder 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Nåværende vedlikeholder"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Diverse rettelser og vask"
@@ -50,11 +262,6 @@ msgstr "Diverse rettelser og vask"
 msgid "Icons"
 msgstr "Ikoner"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Du må oppgi hvilken fil som skal åpnes."
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Endre spørsmål"
@@ -63,30 +270,150 @@ msgstr "Endre spørsmål"
 msgid "Add Questions"
 msgstr "Legg til spørsmål"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Sann"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Usann"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Legg til"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Åpne galleri …"
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Dokumentinformasjon"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Beskrivelse og regler i prosjektet."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Type:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Nivå:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Språk:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategori:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Tittel:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Bilde"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Forvalgt bilde:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Forfatter"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Nettside:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-post:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Navn:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Datasystemer"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Prøve"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Prøve med poeng for spørsmål"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Prøve med poeng for svar"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Lysbildevisning"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Eksamen"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psykoteknisk prøve"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Lett"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normal"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Ekspert"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Superb"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -100,6 +427,11 @@ msgstr "&Legg til"
 msgid "&Edit..."
 msgstr "&Rediger"
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Opp"
@@ -120,14 +452,6 @@ msgstr ""
 "Legg til et nytt spørsmål ved å bruke redigeringsmenyen eller trykke ett av "
 "ikonene over."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Åpne Educa-fil"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Svar"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Spørrebilde"
@@ -136,10 +460,6 @@ msgstr "Spørrebilde"
 msgid "Question point"
 msgstr "Spørsmålspoeng"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Tid"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sekunder</p>"
@@ -172,26 +492,14 @@ msgstr "Komprimer filen"
 msgid "Save Document As"
 msgstr "Lagre dokumentet som"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Et dokument med dette navnet finnes allerede.\n"
-"Vil du overskrive det?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Skriv over"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Hvis du vil dele dette dokumentet med andre, så er det bedre å kopiere bildene "
-"til samme mappe som dokumentet.\n"
+"Hvis du vil dele dette dokumentet med andre, så er det bedre å kopiere "
+"bildene til samme mappe som dokumentet.\n"
 "Vil du kopiere bilder?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -202,13 +510,6 @@ msgstr "Kopier bilder"
 msgid "Do Not Copy"
 msgstr "Ikke kopier"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Prøve"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -244,543 +545,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Legg inn spørsmål"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Dokumentinformasjon"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Beskrivelse og regler i prosjektet."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Beskrivelse"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Type:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Nivå:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Språk:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategori:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Tittel:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Bilde"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Du må oppgi hvilken fil som skal åpnes."
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Forvalgt bilde:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Program for å lage skjema-baserte prøver og eksamener"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Forfatter"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Nettside:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Du må oppgi en tjener."
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "E-post:"
+msgid "KEduca Config Dialog"
+msgstr "KEduca oppsettsdialog"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Navn:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Datasystemer"
+msgid "Show Results"
+msgstr "Vis resultater"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Prøve med poeng for spørsmål"
+msgid "At the end of the test"
+msgstr "På slutten av testen"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Prøve med poeng for svar"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Lysbildevisning"
+msgid "After answering each question"
+msgstr "Etter at hvert spørsmål er svart"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Eksamen"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Rekkefølge"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psykoteknisk prøve"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Vis svarene i vilkårlig rekkefølge"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Lett"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Vis resultatet ved testslutt"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normal"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Ekspert"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Forskjellige innstillinger"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Superb"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Spørsmål"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:clack\">\n"
-"  "
-"<p><b>Spørsmål</b></p> \n"
+"  <p><b>Spørsmål</b></p> \n"
 "<hr> \n"
-"  "
-"<p> Bare spørsmål og type er påkrevd.</p>\n"
+"  <p> Bare spørsmål og type er påkrevd.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Spørsmål:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Type:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Bilde:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "P&oeng:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Ti&d:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "H&int:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Forklar:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Svar"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Svar</b></p>\n"
+"  <p><b>Svar</b></p>\n"
 "<hr>\n"
-"  "
-"<p> Bare svar og verdi er påkrevd.</p>\n"
+"  <p> Bare svar og verdi er påkrevd.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "Sv&ar:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Verdi:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Poeng:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Verdi"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Poeng"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Flytt &opp"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Flytt ne&d"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Informasjon</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Rediger"
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Komme i gang med KEduca-redigerer"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Åpne et &eksisterende dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Åpne et nylig b&rukt dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Åpne med Internett galleriviser"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Begynn på et &nytt dokument"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Informasjon</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galleri"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adresse:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Legg til tjener"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Tjenere"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adresse"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Språk"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategori"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Type"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "Å&pne"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca oppsettsdialog"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Vis resultater"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "På slutten av testen"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Etter at hvert spørsmål er svart"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Rekkefølge"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Vis spørsmålene i vilkårlig rekkefølge"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Vis svarene i vilkårlig rekkefølge"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Jørgen Grønlund"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "jorgenhg@broadpark.no"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Du må oppgi en tjener."
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Start test"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Neste >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Lagre resultater …"
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Lagre resultater som"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Lagring mislyktes."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Spørsmål %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Du har %1 sekunder til å besvare dette spørsmålet.\n"
-"\n"
-"Trykk OK når du er klar."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Resultat"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistikk"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Riktige spørsmål"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Feil spørsmål"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Totalt poeng"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Riktig-poeng"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Feil-poeng"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Total tid"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Tid i prøver"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Svaret er: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Korrekt svar var: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Ditt svar var: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Tittel"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Skjema-baserte prøver og eksamener"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Nåværende vedlikeholder"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v sekunder igjen"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca KParts komponent"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Generelt"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Forskjellige innstillinger"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Vis resultatet etter å ha trykket Neste"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Vis resultatet ved testslutt"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Rekkefølge"
diff --git a/tde-i18n-nds/messages/tdeedu/keduca.po b/tde-i18n-nds/messages/tdeedu/keduca.po
index f111690a739..5f7970c6323 100644
--- a/tde-i18n-nds/messages/tdeedu/keduca.po
+++ b/tde-i18n-nds/messages/tdeedu/keduca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2006-12-11 00:04+0100\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -15,17 +15,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Formulorbaseert Tests un Pröven opstellen"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Manfred Wiese, Sönke Dibbern"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "m.j.wiese@web.de, s_dibbern@web.de"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "&Sammeln opmaken..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Educa-Datei opmaken"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca-Komponent"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Allgemeen"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Anner Instellen"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Resultaten vun de Antwoort na't Klicken op \"Nakamen\" wiesen"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Resultaten an't Enn vun den Test wiesen"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Reeg"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Fragen in tofällig Reeg wiesen"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Antwoorden in tofällig Reeg wiesen"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "Test &starten"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Nakamen >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "Resultaten &sekern..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Resultaten sekern as"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Dat gifft al en Dokment mit dissen Naam.\n"
+"Wullt Du dat överschrieven?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Överschrieven"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Sekern fehlslaan."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Fraag %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Pünkt"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Du hest %1 Sekunnen för't Lösen vun disse Fraag.\n"
+"\n"
+"Klick op \"OK\", wenn Du praat büst."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Resultaat"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistik"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Richtig Antwoorden"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Falsch Antwoorden"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Pünkt tosamen"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Korrekt Pünkt"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Falsch Pünkt"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Tiet"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Tiet tosamen"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Testtiet"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "De Antwoort is: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "De richtige Antwoort is: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Dien Antwoort weer: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Dokment-Informatschonen"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Titel"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategorie"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Typ"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Spraak"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Antwoorden"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v Sekunnen na"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Formulorbaseert Tests un Pröven"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Datei, de laadt warrn schall"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -35,6 +243,10 @@ msgstr "Orginaalautor"
 msgid "Maintainer 2002-2004"
 msgstr "Pleger 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Pleger opstunns"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Verscheden Koderichten un -Oprümen"
@@ -43,11 +255,6 @@ msgstr "Verscheden Koderichten un -Oprümen"
 msgid "Icons"
 msgstr "Lüttbiller"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Du muttst de Datei angeven, de Du opmaken wullt!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Fraag ännern"
@@ -56,30 +263,150 @@ msgstr "Fraag ännern"
 msgid "Add Questions"
 msgstr "Fragen tofögen"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Wohr"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Falsch"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Tofögen"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "&Sammeln opmaken..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Dokment-Informatschonen"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Beschrieven un Regeln vun dat Projekt."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Beschrieven"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Typ:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Stoop:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Spraak:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategorie:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Titel:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Bild"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Standardbild:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autor"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Nettsiet:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Nettpost:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Naam:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Reekners"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Test"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Test mit Fraagpünkt"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Test mit Antwoortpünkt"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Diaschau"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Prööv"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psycholoogsch Test"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Eenfach"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normaal"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Swoor"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Fachlüüd"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -93,6 +420,11 @@ msgstr "&Tofögen..."
 msgid "&Edit..."
 msgstr "&Bewerken..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "Na &baven"
@@ -110,16 +442,8 @@ msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 msgstr ""
-"Föög mit dat Menü \"Bewerken\" oder een vun de Lüttbiller baven en nieg Fraag "
-"in."
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Educa-Datei opmaken"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Antwoorden"
+"Föög mit dat Menü \"Bewerken\" oder een vun de Lüttbiller baven en nieg "
+"Fraag in."
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -129,10 +453,6 @@ msgstr "Bild för de Fraag"
 msgid "Question point"
 msgstr "Pünkt vun de Fraag"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Tiet"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " Sekunnen</p>"
@@ -165,22 +485,10 @@ msgstr "Datei komprimeren"
 msgid "Save Document As"
 msgstr "Dokment sekern as"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Dat gifft al en Dokment mit dissen Naam.\n"
-"Wullt Du dat överschrieven?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Överschrieven"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Wenn Du dit Dokment freegeven wullt, is dat beter, wenn Du de Biller na den "
@@ -195,13 +503,6 @@ msgstr "Biller koperen"
 msgid "Do Not Copy"
 msgstr "Nich koperen"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Test"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -237,543 +538,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Fraag infögen"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Dokment-Informatschonen"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Beschrieven un Regeln vun dat Projekt."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Beschrieven"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Typ:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Stoop:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Spraak:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategorie:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Titel:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Bild"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Du muttst de Datei angeven, de Du opmaken wullt!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Standardbild:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Formulorbaseert Tests un Pröven opstellen"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autor"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Nettsiet:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Du muttst en Server angeven!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Nettpost:"
+msgid "KEduca Config Dialog"
+msgstr "KEduca-Instellendialoog"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Naam:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Reekners"
+msgid "Show Results"
+msgstr "Resultaten wiesen"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Test mit Fraagpünkt"
+msgid "At the end of the test"
+msgstr "An't Enn vun den Test"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Test mit Antwoortpünkt"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Diaschau"
+msgid "After answering each question"
+msgstr "Na elk Antwoort"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Prööv"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Ornen"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psycholoogsch Test"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Antwoorden in tofällig Reeg wiesen"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Eenfach"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Resultaten an't Enn vun den Test wiesen"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normaal"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Swoor"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Anner Instellen"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Fachlüüd"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Fraag"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Fraag</b></p>\n"
+"  <p><b>Fraag</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Bloots Fraag un Typ doot noot.</p>\n"
+"  <p>Bloots Fraag un Typ doot noot.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Fraag:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Typ:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Bild:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "&Pünkt:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&Tiet:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "T&ipp:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Verkloren:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Antwoort"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Antwoorden</b></p>\n"
+"  <p><b>Antwoorden</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Bloots Antwoort un Weert doot noot.</p>\n"
+"  <p>Bloots Antwoort un Weert doot noot.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Antwoort:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Weert:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Pünkt:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Weert"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Pünkt"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Na &baven"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Na &nerrn"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b style=\"text-decoration:underline;\">Informatschonen</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Bewerken..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Editor - Eerste Schreed"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "En &vörhannen Dokment opmaken:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "En &annerlest bruukt Dokment opmaken:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Mit den Internet-Sammelnkieker opmaken"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "&Nieg Dokment opstellen"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b style=\"text-decoration:underline;\">Informatschonen</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Sammeln"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adress:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "Server &tofögen"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Servers"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adress"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Spraak"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategorie"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Typ"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Opmaken"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca-Instellendialoog"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Resultaten wiesen"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "An't Enn vun den Test"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Na elk Antwoort"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Ornen"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Fragen in tofällig Reeg wiesen"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Antwoorden in tofällig Reeg wiesen"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Manfred Wiese, Sönke Dibbern"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "m.j.wiese@web.de, s_dibbern@web.de"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Du muttst en Server angeven!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "Test &starten"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Nakamen >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "Resultaten &sekern..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Resultaten sekern as"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Sekern fehlslaan."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Fraag %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Du hest %1 Sekunnen för't Lösen vun disse Fraag.\n"
-"\n"
-"Klick op \"OK\", wenn Du praat büst."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Resultaat"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistik"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Richtig Antwoorden"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Falsch Antwoorden"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Pünkt tosamen"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Korrekt Pünkt"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Falsch Pünkt"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Tiet tosamen"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Testtiet"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "De Antwoort is: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "De richtige Antwoort is: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Dien Antwoort weer: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Titel"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Formulorbaseert Tests un Pröven"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Pleger opstunns"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v Sekunnen na"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca-Komponent"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Allgemeen"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Anner Instellen"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Resultaten vun de Antwoort na't Klicken op \"Nakamen\" wiesen"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Resultaten an't Enn vun den Test wiesen"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Reeg"
diff --git a/tde-i18n-nl/messages/tdeedu/keduca.po b/tde-i18n-nl/messages/tdeedu/keduca.po
index 6cb7fc314e8..d57069eb4c7 100644
--- a/tde-i18n-nl/messages/tdeedu/keduca.po
+++ b/tde-i18n-nl/messages/tdeedu/keduca.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-09-28 13:09+0200\n"
 "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -28,17 +28,225 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Formulier-gebaseerde toetsen en examens maken"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Rinse de Vries,Japie,Geert Stams"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "rinsedevries@kde.nl,,"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "&Galerij openen..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Educa-bestand openen"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca KParts-component"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Algemeen"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Diverse instellingen"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Resultaten van het antwoord tonen nadat op Volgende is gedrukt"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Resultaten tonen nadat de toets is volbracht"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Volgorde"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Vragen in willekeurige volgorde tonen"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Antwoorden in willekeurige volgorde tonen"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "Toets &starten"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Volgende >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "Res&ultaten opslaan..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Resultaten opslaan als"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Een document met deze naam bestaat reeds.\n"
+"Wilt u het overschrijven?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Overschrijven"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Opslaan mislukt."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Vraag %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Punten"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Je hebt nog %1 seconden om deze vraag te beantwoorden.\n"
+"\n"
+"Druk op \"Ok\" als je klaar bent."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Resultaat"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistieken"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Goede antwoorden"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Foute antwoorden"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Totaal aantal punten"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Goede punten"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Foute punten"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Tijd"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Totale tijd"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Tijd in toetsen"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Het antwoord is: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Het juiste antwoord is: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Je antwoord was: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Documentinformatie"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Titel"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Categorie"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Type"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Taal"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Antwoorden"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "Nog %v seconden"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Vorm-gebaseerde toetsen en examens"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Bestand om te laden"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -48,6 +256,10 @@ msgstr "Oorspronkelijke auteur"
 msgid "Maintainer 2002-2004"
 msgstr "Onderhouder in 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Huidige onderhouder"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Diverse reparaties en opschoningen"
@@ -56,11 +268,6 @@ msgstr "Diverse reparaties en opschoningen"
 msgid "Icons"
 msgstr "Pictogrammen"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Geef het bestand op dat u wilt openen."
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Vraag bewerken"
@@ -69,30 +276,150 @@ msgstr "Vraag bewerken"
 msgid "Add Questions"
 msgstr "Vragen toevoegen"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Waar "
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Onwaar"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Toevoegen"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "&Galerij openen..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Documentinformatie"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Beschrijving en regels van het project."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Beschrijving"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Type:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Niveau:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Taal:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Categorie:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Titel:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Afbeelding"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Standaardafbeelding:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Auteur"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Webpagina:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-mail:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Naam:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Computers"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Toetsen"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Toetsen met vraagpunten"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Toetsen met antwoordpunten"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Diavoorstelling"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Examen"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psychotechnische toets"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Eenvoudig"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normaal"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Expert"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Extra moeilijk"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -106,6 +433,11 @@ msgstr "&Toevoegen..."
 msgid "&Edit..."
 msgstr "Be&werken..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Omhoog"
@@ -126,14 +458,6 @@ msgstr ""
 "Voer een nieuwe vraag toe door middel van menu \"Bewerken\", of door een van "
 "bovenstaande pictogrammen te kiezen."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Educa-bestand openen"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Antwoorden"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Afbeelding bij vraag"
@@ -142,10 +466,6 @@ msgstr "Afbeelding bij vraag"
 msgid "Question point"
 msgstr "Punt van de vraag"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Tijd"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " seconden</p>"
@@ -178,26 +498,14 @@ msgstr "Comprimeer het bestand"
 msgid "Save Document As"
 msgstr "Document opslaan als"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Een document met deze naam bestaat reeds.\n"
-"Wilt u het overschrijven?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Overschrijven"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Als u dit document wilt delen, dan kunt u beter de afbeeldingen kopiëren naar "
-"de zelfde map als het document.\n"
+"Als u dit document wilt delen, dan kunt u beter de afbeeldingen kopiëren "
+"naar de zelfde map als het document.\n"
 "Wilt u de afbeeldingen kopiëren?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -208,13 +516,6 @@ msgstr "Afbeeldingen kopiëren"
 msgid "Do Not Copy"
 msgstr "Niet kopiëren"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Toetsen"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -250,538 +551,256 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Vraag invoegen"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Documentinformatie"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Beschrijving en regels van het project."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Beschrijving"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Type:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Niveau:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Taal:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Categorie:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Titel:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Afbeelding"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Geef het bestand op dat u wilt openen."
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Standaardafbeelding:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Formulier-gebaseerde toetsen en examens maken"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Auteur"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Webpagina:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Geef a.u.b. eerst een server op."
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "E-mail:"
+msgid "KEduca Config Dialog"
+msgstr "KEduca Configuratiedialoog"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Naam:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Computers"
+msgid "Show Results"
+msgstr "Resultaten tonen"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Toetsen met vraagpunten"
+msgid "At the end of the test"
+msgstr "Aan het einde van de toets"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Toetsen met antwoordpunten"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Diavoorstelling"
+msgid "After answering each question"
+msgstr "Na het beantwoorden van elke vraag"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Examen"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Volgorde"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psychotechnische toets"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Antwoorden in willekeurige volgorde tonen"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Eenvoudig"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Resultaten tonen nadat de toets is volbracht"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normaal"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Expert"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Diverse instellingen"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Extra moeilijk"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Vraag"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
 "<p><b>Vraag</b></p>\n"
-"<hr>"
-"<p>Alleen de vraag en het type is vereist.</p> </span>"
+"<hr><p>Alleen de vraag en het type is vereist.</p> </span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Vraag:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Type:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Afbeelding:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "P&unt:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Tij&d:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "T&ip:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "Uitl&eg:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Antwoord"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
 "<p><b>Antwoorden</b></p>\n"
-"<hr>"
-"<p>Alleen het antwoord en de waarde is vereist.</p>\n"
+"<hr><p>Alleen het antwoord en de waarde is vereist.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Antwoord:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Waarde:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Punten:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Waarde"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Punten"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Omhoo&g"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Om&laag"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Informatie</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Be&werken..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Editor - eerste stap"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Open een b&estaan document:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Open een &recent document:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Openen met Internetgalerijbrowser"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Start een &nieuw document"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Informatie</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galerij"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adres:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "Server &toevoegen"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Servers"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adres"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Taal"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Categorie"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Type"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Openen"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca Configuratiedialoog"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Resultaten tonen"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Aan het einde van de toets"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Na het beantwoorden van elke vraag"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Volgorde"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Vragen in willekeurige volgorde tonen"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Antwoorden in willekeurige volgorde tonen"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Rinse de Vries,Japie,Geert Stams"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "rinsedevries@kde.nl,,"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Geef a.u.b. eerst een server op."
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "Toets &starten"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Volgende >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "Res&ultaten opslaan..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Resultaten opslaan als"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Opslaan mislukt."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Vraag %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Je hebt nog %1 seconden om deze vraag te beantwoorden.\n"
-"\n"
-"Druk op \"Ok\" als je klaar bent."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Resultaat"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistieken"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Goede antwoorden"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Foute antwoorden"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Totaal aantal punten"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Goede punten"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Foute punten"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Totale tijd"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Tijd in toetsen"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Het antwoord is: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Het juiste antwoord is: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Je antwoord was: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Titel"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Vorm-gebaseerde toetsen en examens"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Huidige onderhouder"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "Nog %v seconden"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca KParts-component"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Algemeen"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Diverse instellingen"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Resultaten van het antwoord tonen nadat op Volgende is gedrukt"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Resultaten tonen nadat de toets is volbracht"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Volgorde"
diff --git a/tde-i18n-nn/messages/tdeedu/keduca.po b/tde-i18n-nn/messages/tdeedu/keduca.po
index 31ef5919da7..03d4000039c 100644
--- a/tde-i18n-nn/messages/tdeedu/keduca.po
+++ b/tde-i18n-nn/messages/tdeedu/keduca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2007-02-11 00:23+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -17,17 +17,225 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Karl Ove Hufthammer"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "karl@huftis.org"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Opna &galleri …"
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Opne Educa-fil"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca KParts-komponent"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Generelt"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Ymse innstillingar"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Vis resultetet etter å ha tasta «neste»"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Vis resultat ved testslutt"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Rekkjefølgje"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Vis spørsmåla i vilkårleg rekkjefølgje"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Vis svara i vilkårleg rekkjefølgje"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Start test"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Neste >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Lagra resultat …"
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Lagra resultat som"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Eit dokument med same namn finst frå før.\n"
+"Vil du skriva over det?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Skriv over"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Lagring mislukkast."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Spørsmål %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Poeng"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Du har %1 sekund på å svara på dette spørsmålet.\n"
+"\n"
+"Trykk «OK» når du er klar."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Resultat"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistikk"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Rette svar"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Feil svar"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Poeng i alt"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Rette poeng"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Feil poeng"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Tid"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Total tid"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Tid i prøvar"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Svaret er: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Rett svar er: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Ditt svar var: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Dokumentinformasjon"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Tittel"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategori"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Type"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Språk"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Svar"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v sekund igjen"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr "Skjemabaserte prøvar og eksamenar"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Fil som skal lastast"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -37,6 +245,10 @@ msgstr "Opphavleg utviklar."
 msgid "Maintainer 2002-2004"
 msgstr "Utviklar frå 2002 til 2004."
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Gjeldande vedlikeheldar."
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Ymse rettingar, samt opprydding."
@@ -45,11 +257,6 @@ msgstr "Ymse rettingar, samt opprydding."
 msgid "Icons"
 msgstr "Ikon."
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Du må oppgje kva fil som opnast."
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Endre spørsmål"
@@ -58,30 +265,150 @@ msgstr "Endre spørsmål"
 msgid "Add Questions"
 msgstr "Legg til spørsmål"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Sann"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Usann"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Legg til"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Opna &galleri …"
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Dokumentinformasjon"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Skildring av reglane i prosjektet."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Skildring"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Type:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Nivå:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Språk:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategori:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Tittel:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Bilete"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Standardbilete:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Utviklar"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Nettside:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-post:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Namn:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Datamaskiner"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Test"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Test med poeng for spørsmål"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Test med poeng for svar"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Biletframvising"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Eksamen"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psykoteknisk prøve"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Enkelt"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normal"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Ekspert"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Ypparleg"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -95,6 +422,11 @@ msgstr "&Legg til …"
 msgid "&Edit..."
 msgstr "&Rediger …"
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Opp"
@@ -112,16 +444,8 @@ msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 msgstr ""
-"Legg til eit nytt spørsmål ved å bruka redigeringsmenyen eller ved å bruka ein "
-"av knappane over."
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Opne Educa-fil"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Svar"
+"Legg til eit nytt spørsmål ved å bruka redigeringsmenyen eller ved å bruka "
+"ein av knappane over."
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -131,10 +455,6 @@ msgstr "Spørjebilete"
 msgid "Question point"
 msgstr "Spørsmålspoeng"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Tid"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sekund</p>"
@@ -167,26 +487,14 @@ msgstr "Komprimer fila"
 msgid "Save Document As"
 msgstr "Lagra dokument som"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Eit dokument med same namn finst frå før.\n"
-"Vil du skriva over det?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Skriv over"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Dersom du vil dela dette dokumentet med andre, er det best å kopiera bileta til "
-"den same mappa som dokumentet ligg i.\n"
+"Dersom du vil dela dette dokumentet med andre, er det best å kopiera bileta "
+"til den same mappa som dokumentet ligg i.\n"
 "Vil du kopiera bileta?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -197,13 +505,6 @@ msgstr "Kopier bilete"
 msgid "Do Not Copy"
 msgstr "Ikkje kopier"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Test"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -239,541 +540,257 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Sett inn spørsmål"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Dokumentinformasjon"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Skildring av reglane i prosjektet."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Skildring"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Type:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Nivå:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Språk:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategori:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Tittel:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Bilete"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Du må oppgje kva fil som opnast."
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Standardbilete:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Skjemabaserte prøvar og eksamenar"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Utviklar"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Nettside:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Du må velja ein tenar."
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "E-post:"
+msgid "KEduca Config Dialog"
+msgstr "KEduca-oppsettdialog"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Namn:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Datamaskiner"
+msgid "Show Results"
+msgstr "Vis resultat"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Test med poeng for spørsmål"
+msgid "At the end of the test"
+msgstr "På slutten av testen"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Test med poeng for svar"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Biletframvising"
+msgid "After answering each question"
+msgstr "Etter kvart svar"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Eksamen"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Rekkjefølgje"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psykoteknisk prøve"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Vis svara i vilkårleg rekkjefølgje"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Enkelt"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Vis resultat ved testslutt"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normal"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Ekspert"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Ymse innstillingar"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Ypparleg"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Spørsmål"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
-"<span style=\"color:black\"> "
-"<p><b>Spørsmål</b></p>"
-"<hr>"
-"<p> Berre spørsmålstype er turvande.</p></span>"
+"<span style=\"color:black\"> <p><b>Spørsmål</b></p><hr><p> Berre "
+"spørsmålstype er turvande.</p></span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Spørsmål:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Type:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Bilete:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "&Poeng:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Ti&d:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "T&ips:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Forklar:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Svar"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
-"<span style=\"color:black\">"
-"<p><b>Svar</b></p>"
-"<hr>"
-"<p> Berre svar og verdi er turvande.</p></span>"
+"<span style=\"color:black\"><p><b>Svar</b></p><hr><p> Berre svar og verdi er "
+"turvande.</p></span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Svar:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Verdi:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Poeng:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Verdi"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Poeng"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Flytt &opp"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Flytt &ned"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Informasjon</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Rediger …"
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Redigering – Koma i gang"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Opna eit &eksisterande dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Opna eit nyleg &bruka dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Opna med Internett-galleri"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Start eit &nytt dokument"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Informasjon</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galleri"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adresse:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Legg til tenar"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Tenarar"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adresse"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Språk"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategori"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Type"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Opna"
 
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca-oppsettdialog"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Vis resultat"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "På slutten av testen"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Etter kvart svar"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Rekkjefølgje"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Vis spørsmåla i vilkårleg rekkjefølgje"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Vis svara i vilkårleg rekkjefølgje"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Karl Ove Hufthammer"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "karl@huftis.org"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Du må velja ein tenar."
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Start test"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Neste >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Lagra resultat …"
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Lagra resultat som"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Lagring mislukkast."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Spørsmål %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Du har %1 sekund på å svara på dette spørsmålet.\n"
-"\n"
-"Trykk «OK» når du er klar."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Resultat"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistikk"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Rette svar"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Feil svar"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Poeng i alt"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Rette poeng"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Feil poeng"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Total tid"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Tid i prøvar"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Svaret er: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Rett svar er: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Ditt svar var: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Tittel"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Skjemabaserte prøvar og eksamenar"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Gjeldande vedlikeheldar."
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v sekund igjen"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca KParts-komponent"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Generelt"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Ymse innstillingar"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Vis resultetet etter å ha tasta «neste»"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Vis resultat ved testslutt"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Rekkjefølgje"
-
 #~ msgid "1.2.0"
 #~ msgstr "1.2.0"
 
diff --git a/tde-i18n-pa/messages/tdeedu/keduca.po b/tde-i18n-pa/messages/tdeedu/keduca.po
index 2efcbb13935..4b384d3b15d 100644
--- a/tde-i18n-pa/messages/tdeedu/keduca.po
+++ b/tde-i18n-pa/messages/tdeedu/keduca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-10-30 12:30+0530\n"
 "Last-Translator: Amanpreet Singh Alam <amanpreetalam@yahoo.com>\n"
 "Language-Team: Punjabi <fedora-trans-pa@redhat.com>\n"
@@ -17,17 +17,225 @@ msgstr ""
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "ਫਾਰਮ ਤੇ ਆਧਾਰਿਤ ਟੈਸਟ ਤੇ ਪ੍ਰੀਖਿਆ ਨਿਰਮਾਤਾ"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "ਅਮਨਪ੍ਰੀਤ ਸਿੰਘ ਆਲਮ"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "aalam@redhat.com"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "ਗੈਲਰੀ ਖੋਲੋ(&G)..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "ਪ੍ਰੀਖਿਆ ਫਾਇਲ਼ ਖੋਲੋ"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "ਕ-ਪ੍ਰੀਖਿਆ-ਭਾਗ"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "ਕ-ਪ੍ਰੀਖਿਆ ਭਾਗ"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "ਸਧਾਰਨ"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "ਸਥਾਪਨ"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "ਅੱਗੇ ਦਬਾਉਣ ਉਪਰੰਤ ਜਵਾਬ ਦਾ ਨਤੀਜਾ ਵੇਖਾਉ"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "ਟੈਸਟ ਮੁਕੰਮਲ ਹੋਣ ਉਪਰੰਤ ਨਤੀਜੇ ਵੇਖਾਉ"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "ਕ੍ਰਮ"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "ਸਵਾਲ ਰਲਵੇਂ ਵੇਖਾਉ"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "ਜਵਾਬ ਰਲਵੇਂ ਕ੍ਰਮ ਵਿੱਚ ਵੇਖਾਉ"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "ਟੈਸਟ ਸ਼ੁਰੂ(&S)"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "ਅੱਗੇ (&N) >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "ਨਤੀਜਾ ਸੰਭਾਲੋ(&S)..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "ਨਤੀਜਾ ਇਸਤਰਾਂ ਸੰਭਾਲੋ"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"ਇਸ ਨਾਂ ਨਾਲ ਦਸਤਾਵੇਜ਼ ਪਹਿਲਾਂ ਵੀ ਮੌਜੂਦ ਹੈ।\n"
+"ਕੀ ਤੁਸੀਂ ਇਸ ਉਪੱਰ ਹੀ ਲਿਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr ""
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "ਸੰਭਾਲਣ ਅਸਫਲ ਹੈ।"
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "ਸਵਾਲ %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "ਅੰਕ"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"ਇਸ ਸਵਾਲ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ ਤੁਹਾਡੇ ਕੋਲ %1 ਸਕਿੰਟ ਹਨ।\n"
+"\n"
+"ਜਦੋਂ ਤੁਸੀਂ ਤਿਆਰ ਹੋਏ ਤਾਂ ਠੀਕ ਹੈ ਨੂੰ ਦਬਾਉਣਾ।"
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "ਨਤੀਜਾ"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "ਅੰਕੜੇ"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "ਸਹੀਂ ਸਵਾਲ"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "ਗਲਤ ਸਵਾਲ"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "ਕੁੱਲ ਅੰਕ"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "ਸਹੀ ਅੰਕ"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "ਗਲਤ ਅੰਕ"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "ਸਮਾਂ"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "ਕੁੱਲ ਸਮਾਂ"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "ਟੈਸਟਾਂ ਵਿੱਚ ਸਮਾਂ"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "ਜਵਾਬ ਹੈ: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "ਸਹੀ ਜਵਾਬ ਹੈ: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "ਤੁਹਾਡਾ ਜਵਾਬ ਸੀ: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "ਦਸਤਾਵੇਜ਼ ਜਾਣਕਾਰੀ"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "ਸਿਰਲੇਖ"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "ਵਰਗ"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "ਕਿਸਮ"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "ਭਾਸ਼ਾ"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "ਜਵਾਬ"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v ਸਕਿੰਟ ਬਾਕੀ"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "ਫਾਰਮ-ਆਧਾਰਿਤ ਟੈਸਟ ਤੇ ਪ੍ਰੀਖਿਆ"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "ਲੋਡ ਕਰਨ ਲਈ ਫਾਇਲ"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "ਕ-ਪ੍ਰੀਖਿਆ"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -37,6 +245,10 @@ msgstr "ਅਸਲੀ ਲੇਖਕ"
 msgid "Maintainer 2002-2004"
 msgstr "ਪ੍ਰਬੰਧਕ 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "ਮੌਜੂਦਾ ਪ੍ਰਬੰਧਕ"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "ਕਈ ਫਿਕਸ ਅਤੇ ਸਫ਼ਾਈ"
@@ -45,11 +257,6 @@ msgstr "ਕਈ ਫਿਕਸ ਅਤੇ ਸਫ਼ਾਈ"
 msgid "Icons"
 msgstr "ਆਈਕਾਨ"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "ਤੁਹਾਨੂੰ ਖੋਲਣ ਲਈ ਫਾਇਲ ਦੇਣੀ ਚਾਹੀਦੀ ਹੈ!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "ਸਵਾਲ ਸੋਧ"
@@ -58,30 +265,150 @@ msgstr "ਸਵਾਲ ਸੋਧ"
 msgid "Add Questions"
 msgstr "ਸਵਾਲ ਸ਼ਾਮਿਲ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "ਸੱਚ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "ਝੂਠ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "ਸ਼ਾਮਿਲ(&A)"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "ਗੈਲਰੀ ਖੋਲੋ(&G)..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "ਦਸਤਾਵੇਜ਼ ਜਾਣਕਾਰੀ"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "ਪ੍ਰੋਜੈਕਟ ਬਾਰੇ ਵੇਰਵਾ ਤੇ ਨਿਯਮ"
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "ਵੇਰਵਾ"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "ਕਿਸਮ:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "ਪੱਧਰ:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "ਭਾਸ਼ਾ"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "ਵਰਗ:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "ਸਿਰਲੇਖ:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "ਚਿੱਤਰ"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "ਮੂਲ ਚਿੱਤਰ:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "ਲੇਖਕ"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "ਵੈਬ-ਸਫਾ:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "ਈ-ਪੱਤਰ:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "ਨਾਂ:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "ਕੰਪਿਊਟਰ"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "ਟੈਸਟ"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "ਸਵਾਲਾਂ ਅੰਕਾਂ ਨਾਲ ਟੈਸਟ"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "ਜਵਾਬ ਅੰਕਾਂ ਨਾਲ ਟੈਸਟ"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "ਸਲਾਇਡ ਸ਼ੌ"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "ਪ੍ਰੀਖਿਆ"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "ਅਰਧ-ਤਕਨੀਕੀ ਟੈਸਟ"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "ਆਸਾਨ"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "ਸਧਾਰਨ"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "ਮਾਹਿਰ"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "ਉੱਤਮ"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -95,6 +422,11 @@ msgstr "ਸ਼ਾਮਿਲ(&A)..."
 msgid "&Edit..."
 msgstr "ਸੋਧ(&E)..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "ਉੱਪਰ(&U)"
@@ -113,14 +445,6 @@ msgid ""
 "above."
 msgstr "ਉੱਪਰ ਦਿੱਤੇ ਆਈਕਾਨ ਜਾਂ ਸੋਧ ਮੇਨੂ ਰਾਹੀਂ ਨਵੇਂ ਸਵਾਲ ਸ਼ਾਮਿਲ ਕਰੋ।"
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "ਪ੍ਰੀਖਿਆ ਫਾਇਲ਼ ਖੋਲੋ"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "ਜਵਾਬ"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "ਸਵਾਲ ਚਿੱਤਰ"
@@ -129,10 +453,6 @@ msgstr "ਸਵਾਲ ਚਿੱਤਰ"
 msgid "Question point"
 msgstr "ਸਵਾਲ ਅੰਕ"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "ਸਮਾਂ"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " ਸਕਿੰਟ</p>"
@@ -165,26 +485,14 @@ msgstr "ਫਾਇਲ ਨਪੀੜੋ"
 msgid "Save Document As"
 msgstr "ਦਸਤਾਵੇਜ਼ ਇਸਤਰਾਂ ਸੰਭਾਲੋ"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"ਇਸ ਨਾਂ ਨਾਲ ਦਸਤਾਵੇਜ਼ ਪਹਿਲਾਂ ਵੀ ਮੌਜੂਦ ਹੈ।\n"
-"ਕੀ ਤੁਸੀਂ ਇਸ ਉਪੱਰ ਹੀ ਲਿਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਦਸਤਾਵੇਜ਼ ਨੂੰ ਸਾਂਝਾ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ, ਤਾਂ ਚੰਗਾ ਹੈ ਚਿੱਤਰ ਨੂੰ ਉਸੇ "
-"ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ ਕਰ ਦਿਉ, ਜਿਸ ਵਿੱਚ ਦਸਤਾਵੇਜ਼ ਹੈ।\n"
+"ਜੇਕਰ ਤੁਸੀਂ ਇਸ ਦਸਤਾਵੇਜ਼ ਨੂੰ ਸਾਂਝਾ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ, ਤਾਂ ਚੰਗਾ ਹੈ ਚਿੱਤਰ ਨੂੰ ਉਸੇ ਫੋਲਡਰ ਵਿੱਚ ਨਕਲ ਕਰ "
+"ਦਿਉ, ਜਿਸ ਵਿੱਚ ਦਸਤਾਵੇਜ਼ ਹੈ।\n"
 "ਕੀ ਤੁਸੀਂ ਚਿੱਤਰ ਨਕਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -195,13 +503,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "ਟੈਸਟ"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -237,543 +538,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "ਸਵਾਲ ਸ਼ਾਮਿਲ"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "ਦਸਤਾਵੇਜ਼ ਜਾਣਕਾਰੀ"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "ਪ੍ਰੋਜੈਕਟ ਬਾਰੇ ਵੇਰਵਾ ਤੇ ਨਿਯਮ"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "ਵੇਰਵਾ"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "ਕਿਸਮ:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "ਪੱਧਰ:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "ਭਾਸ਼ਾ"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "ਵਰਗ:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "ਸਿਰਲੇਖ:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "ਚਿੱਤਰ"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "ਤੁਹਾਨੂੰ ਖੋਲਣ ਲਈ ਫਾਇਲ ਦੇਣੀ ਚਾਹੀਦੀ ਹੈ!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "ਮੂਲ ਚਿੱਤਰ:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "ਫਾਰਮ ਤੇ ਆਧਾਰਿਤ ਟੈਸਟ ਤੇ ਪ੍ਰੀਖਿਆ ਨਿਰਮਾਤਾ"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "ਲੇਖਕ"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "ਵੈਬ-ਸਫਾ:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "ਤੁਹਾਨੂੰ ਸਰਵਰ ਨਿਰਧਾਰਿਤ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "ਈ-ਪੱਤਰ:"
+msgid "KEduca Config Dialog"
+msgstr "ਕ-ਪ੍ਰੀਖਿਆ ਸੰਰਚਨਾ ਵਾਰਤਾਲਾਪ"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "ਨਾਂ:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "ਕੰਪਿਊਟਰ"
+msgid "Show Results"
+msgstr "ਨਤੀਜੇ ਵੇਖਾਓ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "ਸਵਾਲਾਂ ਅੰਕਾਂ ਨਾਲ ਟੈਸਟ"
+msgid "At the end of the test"
+msgstr "ਟੈਸਟ ਦੇ ਅੰਤ ਵਿੱਚ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "ਜਵਾਬ ਅੰਕਾਂ ਨਾਲ ਟੈਸਟ"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "ਸਲਾਇਡ ਸ਼ੌ"
+msgid "After answering each question"
+msgstr "ਹਰ ਜਵਾਬ ਦੇ ਉਪਰੰਤ"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "ਪ੍ਰੀਖਿਆ"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "ਕ੍ਰਮ"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "ਅਰਧ-ਤਕਨੀਕੀ ਟੈਸਟ"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "ਜਵਾਬ ਰਲਵੇਂ ਕ੍ਰਮ ਵਿੱਚ ਵੇਖਾਉ"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "ਆਸਾਨ"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "ਟੈਸਟ ਮੁਕੰਮਲ ਹੋਣ ਉਪਰੰਤ ਨਤੀਜੇ ਵੇਖਾਉ"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "ਸਧਾਰਨ"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "ਮਾਹਿਰ"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "ਸਥਾਪਨ"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "ਉੱਤਮ"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "ਸਵਾਲ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>ਸਵਾਲ</b></p>\n"
+"  <p><b>ਸਵਾਲ</b></p>\n"
 "<hr>\n"
-"  "
-"<p>ਸਿਰਫ ਸਵਾਲ ਤੇ ਕਿਸਮ ਹੀ ਚਾਹੀਦੀ ਹੈ।</p>\n"
+"  <p>ਸਿਰਫ ਸਵਾਲ ਤੇ ਕਿਸਮ ਹੀ ਚਾਹੀਦੀ ਹੈ।</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "ਸਵਾਲ(&Q):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "ਕਿਸਮ(&T):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "ਚਿੱਤਰ(&P):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "ਬਿੰਦੂ(&o):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "ਸਮਾਂ(&m):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "ਸੰਕੇਤ(&i):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "ਵੇਰਵਾ(&E):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "ਜਵਾਬ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>ਜਵਾਬ</b></p>\n"
+"  <p><b>ਜਵਾਬ</b></p>\n"
 "<hr>\n"
-"  "
-"<p>ਸਿਰਫ ਜਵਾਬ ਤੇ ਮੁੱਲ ਹੀ ਚਾਹੀਦਾ ਹੈ।</p>\n"
+"  <p>ਸਿਰਫ ਜਵਾਬ ਤੇ ਮੁੱਲ ਹੀ ਚਾਹੀਦਾ ਹੈ।</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "ਜਵਾਬ(&A):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "ਮੁੱਲ(&V):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "ਅੰਕ(&P):"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "ਮੁੱਲ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "ਅੰਕ"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "ਉੱਪਰ ਭੇਜੋ(&U)"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "ਹੇਠਾ ਭੇਜੋ(&D)"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">ਜਾਣਕਾਰੀ</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "ਸੋਧ(&E)..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "ਸੰਪਾਦਕ - ਸ਼ੁਰੂ ਕਰੋ"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "ਮੌਜੂਦਾ ਦਸਤਾਵੇਜ਼ ਖੋਲੋ (&e):"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "ਤਾਜ਼ਾ ਦਸਤਾਵੇਜ਼ ਖੋਲੋ(&r):"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "ਇੰਟਰਨੈਟ ਗਲੈਰੀ ਝਲਕਾਰੇ ਨਾਲ ਖੋਲੋ"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "ਨਵਾਂ ਦਸਤਾਵੇਜ਼ ਸ਼ੁਰੂ(&n)"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">ਜਾਣਕਾਰੀ</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "ਗਲੈਰੀ"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "ਸਿਰਨਾਵਾਂ:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "ਸਰਵਰ ਸ਼ਾਮਿਲ(&A)"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "ਸਰਵਰ"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "ਸਿਰਨਾਵਾਂ"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "ਭਾਸ਼ਾ"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "ਵਰਗ"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "ਕਿਸਮ"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "ਖੋਲੋ(&O)"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "ਕ-ਪ੍ਰੀਖਿਆ ਸੰਰਚਨਾ ਵਾਰਤਾਲਾਪ"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "ਨਤੀਜੇ ਵੇਖਾਓ"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "ਟੈਸਟ ਦੇ ਅੰਤ ਵਿੱਚ"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "ਹਰ ਜਵਾਬ ਦੇ ਉਪਰੰਤ"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "ਕ੍ਰਮ"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "ਸਵਾਲ ਰਲਵੇਂ ਵੇਖਾਉ"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "ਜਵਾਬ ਰਲਵੇਂ ਕ੍ਰਮ ਵਿੱਚ ਵੇਖਾਉ"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "ਅਮਨਪ੍ਰੀਤ ਸਿੰਘ ਆਲਮ"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "aalam@redhat.com"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "ਤੁਹਾਨੂੰ ਸਰਵਰ ਨਿਰਧਾਰਿਤ ਕਰਨਾ ਚਾਹੀਦਾ ਹੈ!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "ਟੈਸਟ ਸ਼ੁਰੂ(&S)"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "ਅੱਗੇ (&N) >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "ਨਤੀਜਾ ਸੰਭਾਲੋ(&S)..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "ਨਤੀਜਾ ਇਸਤਰਾਂ ਸੰਭਾਲੋ"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "ਸੰਭਾਲਣ ਅਸਫਲ ਹੈ।"
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "ਸਵਾਲ %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"ਇਸ ਸਵਾਲ ਨੂੰ ਹੱਲ ਕਰਨ ਲਈ ਤੁਹਾਡੇ ਕੋਲ %1 ਸਕਿੰਟ ਹਨ।\n"
-"\n"
-"ਜਦੋਂ ਤੁਸੀਂ ਤਿਆਰ ਹੋਏ ਤਾਂ ਠੀਕ ਹੈ ਨੂੰ ਦਬਾਉਣਾ।"
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "ਨਤੀਜਾ"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "ਅੰਕੜੇ"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "ਸਹੀਂ ਸਵਾਲ"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "ਗਲਤ ਸਵਾਲ"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "ਕੁੱਲ ਅੰਕ"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "ਸਹੀ ਅੰਕ"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "ਗਲਤ ਅੰਕ"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "ਕੁੱਲ ਸਮਾਂ"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "ਟੈਸਟਾਂ ਵਿੱਚ ਸਮਾਂ"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "ਜਵਾਬ ਹੈ: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "ਸਹੀ ਜਵਾਬ ਹੈ: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "ਤੁਹਾਡਾ ਜਵਾਬ ਸੀ: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "ਸਿਰਲੇਖ"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "ਫਾਰਮ-ਆਧਾਰਿਤ ਟੈਸਟ ਤੇ ਪ੍ਰੀਖਿਆ"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "ਕ-ਪ੍ਰੀਖਿਆ"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "ਮੌਜੂਦਾ ਪ੍ਰਬੰਧਕ"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v ਸਕਿੰਟ ਬਾਕੀ"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "ਕ-ਪ੍ਰੀਖਿਆ-ਭਾਗ"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "ਕ-ਪ੍ਰੀਖਿਆ ਭਾਗ"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "ਸਧਾਰਨ"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "ਸਥਾਪਨ"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "ਅੱਗੇ ਦਬਾਉਣ ਉਪਰੰਤ ਜਵਾਬ ਦਾ ਨਤੀਜਾ ਵੇਖਾਉ"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "ਟੈਸਟ ਮੁਕੰਮਲ ਹੋਣ ਉਪਰੰਤ ਨਤੀਜੇ ਵੇਖਾਉ"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "ਕ੍ਰਮ"
diff --git a/tde-i18n-pl/messages/tdeedu/keduca.po b/tde-i18n-pl/messages/tdeedu/keduca.po
index 887ec6ccb59..135cc6640a3 100644
--- a/tde-i18n-pl/messages/tdeedu/keduca.po
+++ b/tde-i18n-pl/messages/tdeedu/keduca.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2006-04-24 11:09+0200\n"
 "Last-Translator: Krzysztof Lichota <lichota@mimuw.edu.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -19,21 +19,229 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
-"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 "(n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Program do tworzenia testów i egzaminów opartych na formularzach"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Marcin Garski, Piotr Szymański"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "mgarski@post.pl,djurban@linuxpl.org"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Otwórz &galerie..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Otwórz plik Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "Składnik KParts KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Ogólne"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Różne ustawienia"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Wyświetlaj wyniki odpowiedzi po naciśnięciu dalej"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Wyświetlaj wyniki po zakończeniu testu"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Kolejność"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Wyświetlaj pytania w losowej kolejności"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Wyświetlaj odpowiedzi w losowej kolejności"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Uruchom test"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Dalej >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Zapisz wyniki..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Zapisz wyniki jako"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Dokument o tej nazwie już istnieje.\n"
+"Czy chcesz go zastąpić?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Zastąp"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Zapisywanie nie powiodło się."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Pytanie %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Ilość punktów"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Masz %1 sekund na ukończenie tego pytania.\n"
+"\n"
+"Naciśnij przycisk OK, gdy zechcesz kontynuować."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Wynik"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statystyki"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Poprawne pytania"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Niepoprawne pytania"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Razem punktów"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Poprawne punkty"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Niepoprawne punkty"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Czas"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Całkowity czas"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Czas w testach"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Odpowiedź brzmi: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Poprawna odpowiedź brzmi: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Twoja odpowiedź: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Informacje o dokumencie"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Tytuł"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategoria"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Rodzaj"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Język"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Odpowiedzi"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "zostało %v sekund"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Testy i egzaminy oparte na formularzach"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Plik do wczytania"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -43,6 +251,10 @@ msgstr "Oryginalny autor"
 msgid "Maintainer 2002-2004"
 msgstr "Opiekun 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Obecny opiekun"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Różne poprawki i porządkowanie"
@@ -51,11 +263,6 @@ msgstr "Różne poprawki i porządkowanie"
 msgid "Icons"
 msgstr "Ikony"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Musisz podać nazwę pliku do otwarcia!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Zmodyfikuj pytanie"
@@ -64,30 +271,150 @@ msgstr "Zmodyfikuj pytanie"
 msgid "Add Questions"
 msgstr "Dodaj pytanie"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Prawda"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Fałsz"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Dodaj"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Otwórz &galerie..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Informacje o dokumencie"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Opis i zasady projektu."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Opis"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Rodzaj:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Poziom:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Język:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategoria:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Tytuł:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Obrazek"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Domyślny obrazek:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autor"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Strona internetowa:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Email:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Nazwa:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Komputery"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Test"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Test z punktowanymi pytaniami"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Test z punktowanymi odpowiedziami"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Pokaz slajdów"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Egzamin"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Test psychotechniczny"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Łatwy"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normalny"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Trudny"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Zabójczy"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -101,6 +428,11 @@ msgstr "&Dodaj..."
 msgid "&Edit..."
 msgstr "&Edytuj..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "W &górę"
@@ -121,14 +453,6 @@ msgstr ""
 "Dodaj nowe pytanie używając menu Edycja, lub wybierając jedną z powyższych "
 "ikon."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Otwórz plik Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Odpowiedzi"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Obrazek pytania"
@@ -137,10 +461,6 @@ msgstr "Obrazek pytania"
 msgid "Question point"
 msgstr "Punkty za odpowiedź"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Czas"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sekund</p>"
@@ -173,26 +493,14 @@ msgstr "Kompresuj plik"
 msgid "Save Document As"
 msgstr "Zapisz dokument jako"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Dokument o tej nazwie już istnieje.\n"
-"Czy chcesz go zastąpić?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Zastąp"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Jeśli chcesz współdzielić ten dokument, lepiej jest skopiować obrazki do tego "
-"samego katalogu co dokument.\n"
+"Jeśli chcesz współdzielić ten dokument, lepiej jest skopiować obrazki do "
+"tego samego katalogu co dokument.\n"
 "Czy chcesz skopiować obrazki?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -203,13 +511,6 @@ msgstr "Skopiuj obrazki"
 msgid "Do Not Copy"
 msgstr "Nie kopiuj"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Test"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -245,543 +546,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Wstaw pytanie"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Informacje o dokumencie"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Opis i zasady projektu."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Opis"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Rodzaj:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Poziom:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Język:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategoria:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Tytuł:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Obrazek"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Musisz podać nazwę pliku do otwarcia!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Domyślny obrazek:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Program do tworzenia testów i egzaminów opartych na formularzach"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autor"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Strona internetowa:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Musisz określić serwer!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Email:"
+msgid "KEduca Config Dialog"
+msgstr "Konfiguracja KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Nazwa:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Komputery"
+msgid "Show Results"
+msgstr "Wyświetlaj wynik"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Test z punktowanymi pytaniami"
+msgid "At the end of the test"
+msgstr "Na końcu testu"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Test z punktowanymi odpowiedziami"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Pokaz slajdów"
+msgid "After answering each question"
+msgstr "Po każdej odpowiedzi"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Egzamin"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Kolejność"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Test psychotechniczny"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Wyświetlaj odpowiedzi w losowej kolejności"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Łatwy"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Wyświetlaj wyniki po zakończeniu testu"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normalny"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Trudny"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Różne ustawienia"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Zabójczy"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Pytanie"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Pytanie</b></p>\n"
+"  <p><b>Pytanie</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Tylko pytanie i rodzaj są wymagane.</p>\n"
+"  <p>Tylko pytanie i rodzaj są wymagane.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Pytanie:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Rodzaj:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Obrazek:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "Ilość p&unktów:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&Czas:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "Por&ada:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Wyjaśnienie:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Odpowiedź"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Odpowiedzi</b></p>\n"
+"  <p><b>Odpowiedzi</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Jedynie pola odpowiedź i wartość są wymagane.</p>\n"
+"  <p>Jedynie pola odpowiedź i wartość są wymagane.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Odpowiedź:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Wartość:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "Ilość &punktów:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Wartość"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Ilość punktów"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Przenieś w &górę"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Przenieś w &dół"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Informacja</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Edytuj..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Pierwsze kroki z edytorem"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Otwórz i&stniejący dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Otwórz &ostatnio używany dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Otwórz za pomocą internetowej przeglądarki galerii"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Utwórz &nowy dokument"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Informacja</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galeria"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adres:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Dodaj serwer"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Serwery"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adres"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Język"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategoria"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Rodzaj"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Otwórz"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Konfiguracja KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Wyświetlaj wynik"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Na końcu testu"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Po każdej odpowiedzi"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Kolejność"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Wyświetlaj pytania w losowej kolejności"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Wyświetlaj odpowiedzi w losowej kolejności"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Marcin Garski, Piotr Szymański"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "mgarski@post.pl,djurban@linuxpl.org"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Musisz określić serwer!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Uruchom test"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Dalej >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Zapisz wyniki..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Zapisz wyniki jako"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Zapisywanie nie powiodło się."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Pytanie %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Masz %1 sekund na ukończenie tego pytania.\n"
-"\n"
-"Naciśnij przycisk OK, gdy zechcesz kontynuować."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Wynik"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statystyki"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Poprawne pytania"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Niepoprawne pytania"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Razem punktów"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Poprawne punkty"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Niepoprawne punkty"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Całkowity czas"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Czas w testach"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Odpowiedź brzmi: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Poprawna odpowiedź brzmi: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Twoja odpowiedź: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Tytuł"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Testy i egzaminy oparte na formularzach"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Obecny opiekun"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "zostało %v sekund"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "Składnik KParts KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Ogólne"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Różne ustawienia"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Wyświetlaj wyniki odpowiedzi po naciśnięciu dalej"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Wyświetlaj wyniki po zakończeniu testu"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Kolejność"
diff --git a/tde-i18n-pt/messages/tdeedu/keduca.po b/tde-i18n-pt/messages/tdeedu/keduca.po
index 189e8b135ed..2fad9153f80 100644
--- a/tde-i18n-pt/messages/tdeedu/keduca.po
+++ b/tde-i18n-pt/messages/tdeedu/keduca.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2006-07-25 18:17+0100\n"
 "Last-Translator: José Nuno Pires <jncp@netcabo.pt>\n"
 "Language-Team: pt <kde-i18n-pt@kde.org>\n"
@@ -11,17 +11,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-POFile-SpellExtra: KEduca KEducaPart order KParts\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Um criador de testes e exames baseados em formulários"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "José Nuno Pires,Pedro Morais"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "jncp@netcabo.pt,morais@kde.org"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Abrir &Galeria..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Abrir Ficheiro do Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "Componente KParts do KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Geral"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Opções Diversas"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Mostrar os resultados da resposta depois de escolher o próximo"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Mostrar os resultados no fim do teste"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Ordem"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Mostrar as perguntas em ordem aleatória"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Mostrar as resposta em order aleatório"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "Iniciar Te&ste"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "Segui&nte >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Gravar os Resultados..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Gravar os Resultados Como"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Já existe um documento com esse nome.\n"
+"Deseja escrever por cima dele?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Sobrepor"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "A gravação falhou."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Pergunta %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Pontos"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Tem %1 segundos para terminar esta pergunta.\n"
+"\n"
+"Carregue em OK quando estiver pronto."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Resultado"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Perguntas correctas"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Perguntas incorrectas"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Pontos totais"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Pontos correctos"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Pontos incorrectos"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Tempo"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Tempo total"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Tempo em testes"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "A resposta é: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "A resposta correcta é: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "A sua resposta foi: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Informação do Documento"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Título"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Categoria"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Tipo"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Língua"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Respostas"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "faltam %v segundos"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Testes e exames baseados em formulários"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Ficheiro a abrir"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "Construtor do KEduca"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -31,6 +239,10 @@ msgstr "Autor Original"
 msgid "Maintainer 2002-2004"
 msgstr "Manutenção 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Manutenção Actual"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Várias correcções e limpezas"
@@ -39,11 +251,6 @@ msgstr "Várias correcções e limpezas"
 msgid "Icons"
 msgstr "Ícones"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Deve indicar o ficheiro a abrir!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Modificar a Pergunta"
@@ -52,30 +259,150 @@ msgstr "Modificar a Pergunta"
 msgid "Add Questions"
 msgstr "Adicionar Perguntas"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Verdadeiro"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Falso"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Adicionar"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Abrir &Galeria..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Informação do Documento"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Descrição e regras do projecto."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Descrição"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Tipo:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Nível:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Língua:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Categoria:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Título:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Imagem"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Imagem por omissão:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autor"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Página Web:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-mail:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Nome:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Computadores"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Teste"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Teste de Perguntas com Pontos"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Teste de Respostas com Pontos"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Apresentação"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Exame"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Teste Psicotécnico"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Fácil"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normal"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Perito"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Supremo"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -89,6 +416,11 @@ msgstr "&Adicionar..."
 msgid "&Edit..."
 msgstr "&Editar..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "S&ubir"
@@ -106,16 +438,8 @@ msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 msgstr ""
-"Adicione uma nova Pergunta utilizando o Menu Editar ou escolhendo um dos ícones "
-"acima."
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Abrir Ficheiro do Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Respostas"
+"Adicione uma nova Pergunta utilizando o Menu Editar ou escolhendo um dos "
+"ícones acima."
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -125,10 +449,6 @@ msgstr "Imagem da Pergunta"
 msgid "Question point"
 msgstr "Ponto da pergunta"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Tempo"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " segundos</p>"
@@ -161,22 +481,10 @@ msgstr "Comprimir o ficheiro"
 msgid "Save Document As"
 msgstr "Gravar o Documento Como"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Já existe um documento com esse nome.\n"
-"Deseja escrever por cima dele?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Sobrepor"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Se quiser partilhar este documento, é melhor copiar as imagens para a mesma "
@@ -191,13 +499,6 @@ msgstr "Copiar Imagens"
 msgid "Do Not Copy"
 msgstr "Não Copiar"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Teste"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -233,543 +534,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Inserir Pergunta"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Informação do Documento"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Descrição e regras do projecto."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Descrição"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Tipo:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Nível:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Língua:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Categoria:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Título:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Imagem"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Deve indicar o ficheiro a abrir!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Imagem por omissão:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Um criador de testes e exames baseados em formulários"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autor"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "Construtor do KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Página Web:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Deve indicar um servidor!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "E-mail:"
+msgid "KEduca Config Dialog"
+msgstr "Janela de Configuração do KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Nome:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Computadores"
+msgid "Show Results"
+msgstr "Mostrar os Resultados"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Teste de Perguntas com Pontos"
+msgid "At the end of the test"
+msgstr "No fim do teste"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Teste de Respostas com Pontos"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Apresentação"
+msgid "After answering each question"
+msgstr "Depois de responde a cada pergunta"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Exame"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Ordenação"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Teste Psicotécnico"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Mostrar as resposta em order aleatório"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Fácil"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Mostrar os resultados no fim do teste"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normal"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Perito"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Opções Diversas"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Supremo"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Pergunta"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Pergunta</b></p>\n"
+"  <p><b>Pergunta</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Apenas a pergunta e tipo são necessários.</p>\n"
+"  <p>Apenas a pergunta e tipo são necessários.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Pergunta:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Tipo:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "Ima&gem:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "P&onto:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Te&mpo:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "D&ica:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Explicação:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Resposta"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Respostas</b></p>\n"
+"  <p><b>Respostas</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Apenas a resposta e o valor são necessários.</p>\n"
+"  <p>Apenas a resposta e o valor são necessários.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "Respost&a:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Valor:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Pontos:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Valor"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Pontos"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "S&ubir"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "&Descer"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Informação/b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Editar..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Editor - Começar"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Abrir um documento &existente:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Abrir um documento &recente:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Abrir com o navegador da galeria na Internet"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Iniciar um &novo documento"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Informação/b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galeria"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Endereço:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Adicionar um Servidor"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Servidores"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Endereço"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Língua"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Categoria"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Tipo"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Abrir"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Janela de Configuração do KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Mostrar os Resultados"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "No fim do teste"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Depois de responde a cada pergunta"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Ordenação"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Mostrar as perguntas em ordem aleatória"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Mostrar as resposta em order aleatório"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "José Nuno Pires,Pedro Morais"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "jncp@netcabo.pt,morais@kde.org"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Deve indicar um servidor!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "Iniciar Te&ste"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "Segui&nte >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Gravar os Resultados..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Gravar os Resultados Como"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "A gravação falhou."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Pergunta %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Tem %1 segundos para terminar esta pergunta.\n"
-"\n"
-"Carregue em OK quando estiver pronto."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Resultado"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Estatísticas"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Perguntas correctas"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Perguntas incorrectas"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Pontos totais"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Pontos correctos"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Pontos incorrectos"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Tempo total"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Tempo em testes"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "A resposta é: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "A resposta correcta é: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "A sua resposta foi: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Título"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Testes e exames baseados em formulários"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Manutenção Actual"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "faltam %v segundos"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "Componente KParts do KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Geral"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Opções Diversas"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Mostrar os resultados da resposta depois de escolher o próximo"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Mostrar os resultados no fim do teste"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Ordem"
diff --git a/tde-i18n-pt_BR/messages/tdeedu/keduca.po b/tde-i18n-pt_BR/messages/tdeedu/keduca.po
index ae1784e59e0..11c4b2f4aa4 100644
--- a/tde-i18n-pt_BR/messages/tdeedu/keduca.po
+++ b/tde-i18n-pt_BR/messages/tdeedu/keduca.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-04-07 14:41-0300\n"
 "Last-Translator: Lisiane Sztoltz Teixeira <lisiane@kdemail.net>\n"
 "Language-Team: Brazilian portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -19,17 +19,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Construtor de testes e exames baseados em formulários"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Lisiane Sztoltz Teixeira, Wanderlei Antonio Cavassin"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "lisiane@kdemail.net, cavassin@mandriva.com"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Abrir &Galeria ..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Abrir Arquivo Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "Componente do KEduca"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "Componente KParts do KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Geral"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Várias Configurações"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Mostrar resultados da resposta após pressionar próximo"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Mostrar resultados quando finalizado o teste"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Ordem"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Mostrar questões em ordem aleatória"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Mostrar respostas em ordem aleatória"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Iniciar Teste"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Próximo >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "Salvar Resultad&os..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Salvar Resultados Como"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Um documento com esse nome já existe.\n"
+"Você deseja sobrescreve-lo?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Sobrescrever"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Falha ao salvar."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Pergunta %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Pontos"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Você precisa de %1 segundos para completar esta questão.\n"
+"\n"
+"Pressione OK quando estiver pronto."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Resultado"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Questões Corretas"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Questões incorretas"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Total de pontos"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Pontos de corretas"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Pontos de incorretas"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Tempo"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Tempo total"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Tempo nos testes"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "A resposta é:"
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "A resposta correta é:"
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Sua resposta foi:"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Informação do Documento"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Título"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Categoria"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Tipo"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Idioma"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Respostas"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v segundos restantes"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Teste e exames baseados em formulários"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Arquivo a ser carregado"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "Construtor do KEduca"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -39,6 +247,10 @@ msgstr "Autor Original"
 msgid "Maintainer 2002-2004"
 msgstr "Mantenedor 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Mantenedor atual"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Várias correções e limpezas no código"
@@ -47,11 +259,6 @@ msgstr "Várias correções e limpezas no código"
 msgid "Icons"
 msgstr "Ícones"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Você precisa especificar o arquivo a ser aberto!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Modificar Questão"
@@ -60,30 +267,150 @@ msgstr "Modificar Questão"
 msgid "Add Questions"
 msgstr "Adicionar Questão"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Verdadeiro"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Falso"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Adicionar"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Abrir &Galeria ..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Informação do Documento"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Descrição e regras do projeto."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Descrição"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Tipo:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Nível:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Linguagem:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Categoria:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Título:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Figura"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Figura padrão:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autor"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Página Web:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-mail:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Nome:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Computadores"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Teste"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Teste com pontuação de perguntas"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Teste com pontuação de respostas"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Show de Slides"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Exame"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Teste Psicotécnico"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Fácil"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normal"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Perito"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Supremo"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -97,6 +424,11 @@ msgstr "&Adicionar..."
 msgid "&Edit..."
 msgstr "&Editar..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "Para &cima"
@@ -117,14 +449,6 @@ msgstr ""
 "Adicione uma nova pergunta usando o Menu Editar ou escolhendo um dos' ícones "
 "acima."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Abrir Arquivo Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Respostas"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Imagem da Pergunta"
@@ -133,10 +457,6 @@ msgstr "Imagem da Pergunta"
 msgid "Question point"
 msgstr "Ponto da pergunta"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Tempo"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " segundos<p>"
@@ -169,26 +489,14 @@ msgstr "Compactar o arquivo"
 msgid "Save Document As"
 msgstr "Salvar Documento como"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Um documento com esse nome já existe.\n"
-"Você deseja sobrescreve-lo?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Sobrescrever"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Se você deseja compartilhar este documento, é melhor copiar as imagens para a "
-"mesma pasta do documento.\n"
+"Se você deseja compartilhar este documento, é melhor copiar as imagens para "
+"a mesma pasta do documento.\n"
 "Deseja copiar as imagens?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -199,13 +507,6 @@ msgstr "Copiar Imagens"
 msgid "Do Not Copy"
 msgstr "Não Copiar"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Teste"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -241,216 +542,141 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Inserir Pergunta"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Informação do Documento"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Descrição e regras do projeto."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Descrição"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Tipo:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Nível:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Linguagem:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Categoria:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Título:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Figura"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Você precisa especificar o arquivo a ser aberto!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Figura padrão:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Construtor de testes e exames baseados em formulários"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autor"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "Construtor do KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Página Web:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Você precisa especificar um servidor!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "E-mail:"
+msgid "KEduca Config Dialog"
+msgstr "Diálogo de Configuração"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Nome:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Computadores"
+msgid "Show Results"
+msgstr "Mostrar resultados"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Teste com pontuação de perguntas"
+msgid "At the end of the test"
+msgstr "No final do teste"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Teste com pontuação de respostas"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Show de Slides"
+msgid "After answering each question"
+msgstr "Após responder cada questão"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Exame"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Ordenando"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Teste Psicotécnico"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Mostrar respostas em ordem aleatória"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Fácil"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Mostrar resultados quando finalizado o teste"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normal"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Perito"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Várias Configurações"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Supremo"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Questão"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Questão</b></p>\n"
+"  <p><b>Questão</b></p>\n"
 "<hr>\n"
-" "
-"<p>Somente a questão e tipo são requeridos.</p>\n"
+" <p>Somente a questão e tipo são requeridos.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Questão:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Tipo:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Figura:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "&Pontuação:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&Tempo:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&Dica:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "E&xplique:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Resposta"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
@@ -459,323 +685,116 @@ msgstr ""
 "<p>Somente a Resposta e Valor são requeridos.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Resposta:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Valor:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "P&ontos:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Valor"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Pontos"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Mover para &cima"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Mover para &baixo"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Informações</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Editar..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Conhecendo o Editor KEduca"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Abrir um documento &existente:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Abrir um documento rece&nte:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Abrir com o Navegador de Galeria"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "&Iniciar um novo documento"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Informações</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galeria"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Endereço:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "Adicionar &servidor"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Servidores"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Endereço"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Idioma"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Categoria"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Tipo"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Abrir"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Diálogo de Configuração"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Mostrar resultados"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "No final do teste"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Após responder cada questão"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Ordenando"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Mostrar questões em ordem aleatória"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Mostrar respostas em ordem aleatória"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Lisiane Sztoltz Teixeira, Wanderlei Antonio Cavassin"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "lisiane@kdemail.net, cavassin@mandriva.com"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Você precisa especificar um servidor!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Iniciar Teste"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Próximo >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "Salvar Resultad&os..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Salvar Resultados Como"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Falha ao salvar."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Pergunta %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Você precisa de %1 segundos para completar esta questão.\n"
-"\n"
-"Pressione OK quando estiver pronto."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Resultado"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Estatísticas"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Questões Corretas"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Questões incorretas"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Total de pontos"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Pontos de corretas"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Pontos de incorretas"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Tempo total"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Tempo nos testes"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "A resposta é:"
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "A resposta correta é:"
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Sua resposta foi:"
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Título"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Teste e exames baseados em formulários"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Mantenedor atual"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v segundos restantes"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "Componente do KEduca"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "Componente KParts do KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Geral"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Várias Configurações"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Mostrar resultados da resposta após pressionar próximo"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Mostrar resultados quando finalizado o teste"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Ordem"
diff --git a/tde-i18n-ro/messages/tdeedu/keduca.po b/tde-i18n-ro/messages/tdeedu/keduca.po
index 0870c165d76..2a3ef54a0b0 100644
--- a/tde-i18n-ro/messages/tdeedu/keduca.po
+++ b/tde-i18n-ro/messages/tdeedu/keduca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2003-11-08 18:11+0200\n"
 "Last-Translator: Claudiu Costin <claudiuc@kde.org>\n"
 "Language-Team: Romanian <ro-kde@egroups.com>\n"
@@ -15,16 +15,218 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.1\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr ""
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr ""
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr ""
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr ""
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr ""
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr ""
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr ""
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr ""
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr ""
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr ""
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr ""
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr ""
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr ""
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr ""
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr ""
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr ""
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr ""
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr ""
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr ""
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr ""
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr ""
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr ""
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr ""
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr ""
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr ""
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr ""
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr ""
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr ""
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+msgid "Information"
+msgstr ""
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr ""
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr ""
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr ""
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr ""
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr ""
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr ""
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr ""
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Fişier de încărcat"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
 msgstr ""
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
@@ -35,6 +237,10 @@ msgstr ""
 msgid "Maintainer 2002-2004"
 msgstr ""
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr ""
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr ""
@@ -43,11 +249,6 @@ msgstr ""
 msgid "Icons"
 msgstr ""
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr ""
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr ""
@@ -56,29 +257,149 @@ msgstr ""
 msgid "Add Questions"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr ""
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr ""
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr ""
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr ""
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
 msgstr ""
 
 #: keducabuilder/keducabuilder.cpp:121
@@ -93,6 +414,11 @@ msgstr ""
 msgid "&Edit..."
 msgstr ""
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr ""
@@ -111,14 +437,6 @@ msgid ""
 "above."
 msgstr ""
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr ""
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr ""
@@ -127,10 +445,6 @@ msgstr ""
 msgid "Question point"
 msgstr ""
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr ""
@@ -161,20 +475,10 @@ msgstr ""
 msgid "Save Document As"
 msgstr ""
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 
@@ -186,13 +490,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -217,530 +514,253 @@ msgid ""
 "You must insert a question."
 msgstr ""
 
-#: keducabuilder/keducabuilder.cpp:547
-msgid "Insert Question"
-msgstr ""
-
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr ""
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr ""
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr ""
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr ""
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr ""
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
+#: keducabuilder/keducabuilder.cpp:547
+msgid "Insert Question"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Author"
+msgid "KEduca Config Dialog"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Web page:"
+msgid "Show Results"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Email:"
+msgid "At the end of the test"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Name:"
-msgstr ""
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
+msgid "After answering each question"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:56
 #, no-c-format
-msgid "Test with Question Points"
+msgid "Ordering"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr ""
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr ""
-
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr ""
-
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
+msgid "Display answers in random order."
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
+#: keduca/keduca.kcfg:17
+#, no-c-format
+msgid "Show results only at the end of the test."
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
+#: keduca/keduca_partui.rc:4
+#, no-c-format
+msgid "&Settings"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr ""
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
-#, no-c-format
-msgid "Editor - Getting Started"
-msgstr ""
-
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
-#, no-c-format
-msgid "Open an &existing document:"
-msgstr ""
-
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
-#, no-c-format
-msgid "Open a &recent document:"
-msgstr ""
-
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
-#, no-c-format
-msgid "Open with Internet gallery browser"
-msgstr ""
-
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
-#, no-c-format
-msgid "Start a &new document"
-msgstr ""
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/kcontrolheaderbase.ui:92
 #, no-c-format
 msgid "<b  style=\"text-decoration:underline;\">Information</b>"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
-#, no-c-format
-msgid "Gallery"
-msgstr ""
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
 #, no-c-format
-msgid "Address:"
+msgid "&OK"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
 #, no-c-format
-msgid "&Add Server"
+msgid "&Cancel"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: keducabuilder/keducabuilderui.rc:8
 #, no-c-format
-msgid "Servers"
+msgid "&Edit"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
-msgid "Address"
+msgid "Editor - Getting Started"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
-msgid "Language"
+msgid "Open an &existing document:"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
-msgid "Category"
+msgid "Open a &recent document:"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
-msgid "Type"
+msgid "Open with Internet gallery browser"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
-msgid "&Open"
+msgid "Start a &new document"
 msgstr ""
 
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "KEduca Config Dialog"
+msgid "&Help"
 msgstr ""
 
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
-msgid "Show Results"
+msgid "Gallery"
 msgstr ""
 
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
-msgid "At the end of the test"
+msgid "Address:"
 msgstr ""
 
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
-msgid "After answering each question"
+msgid "&Add Server"
 msgstr ""
 
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
-msgid "Ordering"
+msgid "Servers"
 msgstr ""
 
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
-msgid "Show questions in random order"
+msgid "Address"
 msgstr ""
 
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
-msgid "Show answers in random order"
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr ""
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr ""
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr ""
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr ""
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr ""
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr ""
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr ""
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr ""
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr ""
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr ""
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr ""
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr ""
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr ""
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr ""
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr ""
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr ""
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr ""
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr ""
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr ""
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr ""
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr ""
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr ""
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr ""
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr ""
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr ""
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr ""
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr ""
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr ""
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr ""
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr ""
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
+msgid "&Open"
 msgstr ""
diff --git a/tde-i18n-ru/messages/tdeedu/keduca.po b/tde-i18n-ru/messages/tdeedu/keduca.po
index 3a69f50b0fe..b66bc20c4bc 100644
--- a/tde-i18n-ru/messages/tdeedu/keduca.po
+++ b/tde-i18n-ru/messages/tdeedu/keduca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2007-11-06 00:37+0300\n"
 "Last-Translator: Andrey Cherepanov <sibskull@mail.ru>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -16,20 +16,228 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Григорий Матвеев,Андрей Черепанов,Николай Шафоростов"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "tyro@kde.ru,sibskull@mail.ru,shafff@ukr.net"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Получить &тест..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Открыть файл экзамена"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KParts-компонент KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Поведение"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Различные параметры"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Показывать результаты ответа после нажатия кнопки 'Далее >>'"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Показывать результаты после окончания теста"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Порядок"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Показывать вопросы в случайном порядке"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Показывать ответы в случайном порядке"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Начать тест"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Далее >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Сохранить результаты..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Сохранить результаты как"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Документ с таким именем уже существует.\n"
+"Перезаписать его?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Перезаписать"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Ошибка сохранения."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Вопрос %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Очки"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"У вас %1 секунд для ответа на вопрос.\n"
+"\n"
+"Нажмите 'Далее >>' когда ответ будет готов."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Результат"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Статистика"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Правильных ответов"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Неправильных ответов"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Всего очков"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Очков за правильные ответы"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Очков за неправильные ответы"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Время"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Общее время"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Время ответов на вопросы"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Ответ:"
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Правильный ответ:"
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Ваш ответ:"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Сведения о документе"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Название"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Категория"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Тип"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Язык"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Ответы"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "осталось: %v с"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr "Экзамены и тесты, основанные на карточках"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Открыть файл"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "Редактор экзаменов TDE"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -39,6 +247,10 @@ msgstr "Автор идеи"
 msgid "Maintainer 2002-2004"
 msgstr "Сопровождение (2002-2004)"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Текущее сопровождение"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Различные исправления и подчистка кода"
@@ -47,11 +259,6 @@ msgstr "Различные исправления и подчистка кода
 msgid "Icons"
 msgstr "Значки"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Вы должны указать открываемый файл!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Изменить вопрос"
@@ -60,30 +267,150 @@ msgstr "Изменить вопрос"
 msgid "Add Questions"
 msgstr "Добавить вопрос"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Верно"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Неверно"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Добавить"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Получить &тест..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Сведения о документе"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Описание и правила проекта."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Описание"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Тип:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Уровень:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Язык:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Категория:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Название:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Картинка"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Картинка по умолчанию:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Автор"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Веб-страница:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-mail:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Имя:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Компьютеры"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Тест"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Тест с очками за вопросы"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Тест с очками за ответы"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Слайды"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Экзамен"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Психологический тест"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Лёгкий"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Средний"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Эксперт"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Высший"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -97,6 +424,11 @@ msgstr "&Добавить..."
 msgid "&Edit..."
 msgstr "&Изменить..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Вверх"
@@ -116,14 +448,6 @@ msgid ""
 msgstr ""
 "Добавьте новый вопрос через меню 'Правка' или кнопки на панели инструментов."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Открыть файл экзамена"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Ответы"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Изображение к вопросу "
@@ -132,10 +456,6 @@ msgstr "Изображение к вопросу "
 msgid "Question point"
 msgstr "Очков за вопрос"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Время"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " секунд</p>"
@@ -168,26 +488,14 @@ msgstr "Сжать файл"
 msgid "Save Document As"
 msgstr "Сохранить как"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Документ с таким именем уже существует.\n"
-"Перезаписать его?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Перезаписать"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Если вы хотите использовать этот документ совместно, лучше скопировать картинки "
-"в тот же каталог, что и документ.\n"
+"Если вы хотите использовать этот документ совместно, лучше скопировать "
+"картинки в тот же каталог, что и документ.\n"
 "Вы хотите скопировать картинки в каталог документа?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -198,13 +506,6 @@ msgstr "Скопировать"
 msgid "Do Not Copy"
 msgstr "Не копировать"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Тест"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -240,543 +541,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Вставить вопрос"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Сведения о документе"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Описание и правила проекта."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Описание"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Тип:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Уровень:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Язык:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Категория:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Название:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Картинка"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Вы должны указать открываемый файл!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Картинка по умолчанию:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Экзамены и тесты, основанные на карточках"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Автор"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "Редактор экзаменов TDE"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Веб-страница:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Вы должны указать сервер!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "E-mail:"
+msgid "KEduca Config Dialog"
+msgstr "Параметры KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Имя:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Компьютеры"
+msgid "Show Results"
+msgstr "Вывести результаты"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Тест с очками за вопросы"
+msgid "At the end of the test"
+msgstr "В конце теста"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Тест с очками за ответы"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Слайды"
+msgid "After answering each question"
+msgstr "После ответа на каждый вопрос"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Экзамен"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Порядок"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Психологический тест"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Показывать ответы в случайном порядке"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Лёгкий"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Показывать результаты после окончания теста"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Средний"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Эксперт"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Различные параметры"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Высший"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Вопрос"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Вопрос</b></p>\n"
+"  <p><b>Вопрос</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Требуется только формулировка вопроса и тип.</p>\n"
+"  <p>Требуется только формулировка вопроса и тип.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Вопрос:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Тип:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Картинка:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "&Очков:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "В&ремя:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&Подсказка:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "По&яснение:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Ответ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Ответы</b></p>\n"
+"  <p><b>Ответы</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Требуется только формулировка ответа и его значение.</p>\n"
+"  <p>Требуется только формулировка ответа и его значение.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Ответ:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Значение:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Очков:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Значение"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Очки"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "&Выше"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "&Ниже"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Сведения</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Изменить..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Редактор - начало работы"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "&Открыть документ:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Открыть &недавний документ:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Получить тест из Интернета"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Начать &новый документ"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Сведения</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Список тестов"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Адрес:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Добавить сервер"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Серверы"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Адрес"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Язык"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Категория"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Тип"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Открыть"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Параметры KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Вывести результаты"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "В конце теста"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "После ответа на каждый вопрос"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Порядок"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Показывать вопросы в случайном порядке"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Показывать ответы в случайном порядке"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Григорий Матвеев,Андрей Черепанов,Николай Шафоростов"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "tyro@kde.ru,sibskull@mail.ru,shafff@ukr.net"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Вы должны указать сервер!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Начать тест"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Далее >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Сохранить результаты..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Сохранить результаты как"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Ошибка сохранения."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Вопрос %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"У вас %1 секунд для ответа на вопрос.\n"
-"\n"
-"Нажмите 'Далее >>' когда ответ будет готов."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Результат"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Статистика"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Правильных ответов"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Неправильных ответов"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Всего очков"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Очков за правильные ответы"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Очков за неправильные ответы"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Общее время"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Время ответов на вопросы"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Ответ:"
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Правильный ответ:"
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Ваш ответ:"
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Название"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Экзамены и тесты, основанные на карточках"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Текущее сопровождение"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "осталось: %v с"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KParts-компонент KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Поведение"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Различные параметры"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Показывать результаты ответа после нажатия кнопки 'Далее >>'"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Показывать результаты после окончания теста"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Порядок"
diff --git a/tde-i18n-rw/messages/tdeedu/keduca.po b/tde-i18n-rw/messages/tdeedu/keduca.po
index 428948c381d..a05750705e9 100644
--- a/tde-i18n-rw/messages/tdeedu/keduca.po
+++ b/tde-i18n-rw/messages/tdeedu/keduca.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca 3.4\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-05-25 18:09-0600\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -24,9 +24,243 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: keducabuilder/main.cpp:26
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+"Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien "
+"NSENGIYUMVA"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+"muvia1@yahoo.fr, ngenda_denis@yahoo.co.uk, akiberwa@yahoo.co.uk, "
+"ndonatienuk@yahoo.co.uk"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
 #, fuzzy
-msgid "Form-based tests and exams builder"
+msgid "Open &Gallery..."
+msgstr "Gufungura ... "
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+#, fuzzy
+msgid "Open Educa File"
+msgstr "Gufungura Idosiye "
+
+#: keduca/keduca_part.cpp:59
+#, fuzzy
+msgid "KEducaPart"
+msgstr "Uburezi"
+
+#: keduca/keduca_part.cpp:60
+#, fuzzy
+msgid "KEduca KParts Component"
+msgstr "Ibigize by'Ipaji"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Rusange"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+#, fuzzy
+msgid "Various Settings"
+msgstr "Gucapa amagenamiterere y'ibikorwa"
+
+#: keduca/keducaprefs.cpp:56
+#, fuzzy
+msgid "Show results of the answer after press next"
+msgstr "ibisubizo Bya i Nyuma Kanda Ibikurikira > "
+
+#: keduca/keducaprefs.cpp:60
+#, fuzzy
+msgid "Show results when finish the test"
+msgstr "ibisubizo Ryari: Kurangiza i Igerageza "
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Itondekanya"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, fuzzy, no-c-format
+msgid "Show questions in random order"
+msgstr "in Bitunguranye Itondekanya "
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, fuzzy, no-c-format
+msgid "Show answers in random order"
+msgstr "in Bitunguranye Itondekanya "
+
+#: keduca/keducaview.cpp:71
+#, fuzzy
+msgid "&Start Test"
+msgstr "Gutangira "
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+#, fuzzy
+msgid "&Next >>"
+msgstr "Komeza>>"
+
+#: keduca/keducaview.cpp:89
+#, fuzzy
+msgid "&Save Results..."
+msgstr "Kubika ... "
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Kubika Ibyavuyemo Nka"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+#, fuzzy
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr "Wifuzakurisimbura."
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Gusimbuza"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Kubika Byanze."
+
+#: keduca/keducaview.cpp:212
+#, fuzzy, c-format
+msgid "Question %1"
+msgstr "Ikibazo"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "utubago"
+
+#: keduca/keducaview.cpp:267
+#, fuzzy
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"%1 amasogonda Kuri Byuzuye iyi Ikibazo . \n"
+"\n"
+"Ryari: Cyiteguye . "
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Igisubizo"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Sitatisitiki"
+
+#: keduca/keducaview.cpp:446
+#, fuzzy
+msgid "Correct questions"
+msgstr "Gushyirahamwe ibyifuzo"
+
+#: keduca/keducaview.cpp:448
+#, fuzzy
+msgid "Incorrect questions"
+msgstr "Ubwoko butari bwo"
+
+#: keduca/keducaview.cpp:452
+#, fuzzy
+msgid "Total points"
+msgstr "Utudomo "
+
+#: keduca/keducaview.cpp:453
+#, fuzzy
+msgid "Correct points"
+msgstr "Utudomo "
+
+#: keduca/keducaview.cpp:455
+#, fuzzy
+msgid "Incorrect points"
+msgstr "Utudomo "
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Igihe"
+
+#: keduca/keducaview.cpp:460
+#, fuzzy
+msgid "Total time"
+msgstr "Igihe "
+
+#: keduca/keducaview.cpp:462
+#, fuzzy
+msgid "Time in tests"
+msgstr "in "
+
+#: keduca/keducaview.cpp:487
+#, fuzzy
+msgid "The answer is: "
+msgstr "ni : "
+
+#: keduca/keducaview.cpp:489
+#, fuzzy
+msgid "The correct answer is: "
+msgstr "ni : "
+
+#: keduca/keducaview.cpp:495
+#, fuzzy
+msgid "Your answer was: "
+msgstr "ni : "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Amakuru ku nyandiko"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Umutwe"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Icyiciro"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Ubwoko"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Ururimi"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+#, fuzzy
+msgid "Answers"
+msgstr "Nta gisubizo"
+
+#: keduca/kquestion.cpp:56
+#, fuzzy
+msgid "%v seconds left"
+msgstr "%v amasogonda Ibumoso: "
+
+#: keduca/main.cpp:25
+#, fuzzy
+msgid "Form-based tests and exams"
 msgstr "- na "
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
@@ -34,10 +268,10 @@ msgstr "- na "
 msgid "File to load"
 msgstr "Idosiye Kuri Ibirimo "
 
-#: keducabuilder/main.cpp:37
+#: keduca/main.cpp:36
 #, fuzzy
-msgid "KEducaBuilder"
-msgstr "Iridace Guilder"
+msgid "KEduca"
+msgstr "Uburezi"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -48,6 +282,10 @@ msgstr "Umwanditsi Mwimerere"
 msgid "Maintainer 2002-2004"
 msgstr "Umurinzi"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Ukurikirana Ugezweho"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 #, fuzzy
 msgid "Various fixes and cleanups"
@@ -57,12 +295,6 @@ msgstr "na "
 msgid "Icons"
 msgstr "Udushushondanga"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-#, fuzzy
-msgid "You need to specify the file to open!"
-msgstr "Kuri Kugaragaza i Idosiye Kuri Gufungura ! "
-
 #: keducabuilder/kcontroladdedit.cpp:56
 #, fuzzy
 msgid "Modify Question"
@@ -73,31 +305,155 @@ msgstr "Guhindura icyiciro"
 msgid "Add Questions"
 msgstr "Ikibazo"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Nibyo"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Sibyo"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Ongera"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Amakuru ku nyandiko"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, fuzzy, no-c-format
+msgid "Description and rules of the project."
+msgstr "na Bya i Umushinga . "
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Isobanuramiterere"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Ubwoko:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, fuzzy, no-c-format
+msgid "Level:"
+msgstr "urwego"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Ururimi:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, fuzzy, no-c-format
+msgid "Category:"
+msgstr "Icyiciro"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Umutwe:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Ishusho"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, fuzzy, no-c-format
+msgid "Default picture:"
+msgstr "(%PRODUCTNAME) y'Ishusho : "
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Umwanditsi"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, fuzzy, no-c-format
+msgid "Web page:"
+msgstr "Ipaji ya webu..."
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Imeli:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Izina:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Mudasobwa"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Igerageza"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, fuzzy, no-c-format
+msgid "Test with Question Points"
+msgstr "Na: "
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, fuzzy, no-c-format
+msgid "Test with Answers Points"
+msgstr "Na: "
+
+#: keducabuilder/kcontrolheader.cpp:349
 #, fuzzy
-msgid "Open &Gallery..."
-msgstr "Gufungura ... "
+msgid "Slidershow"
+msgstr "&Kwerekana Igice:"
+
+#: keducabuilder/kcontrolheader.cpp:350
+#, fuzzy
+msgid "Exam"
+msgstr "Urugero"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:354
+#, fuzzy
+msgid "Easy"
+msgstr "Marigarita"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Bisanzwe"
+
+#: keducabuilder/kcontrolheader.cpp:356
+#, fuzzy
+msgid "Expert"
+msgstr "Inzobere"
+
+#: keducabuilder/kcontrolheader.cpp:357
+#, fuzzy
+msgid "Supreme"
+msgstr "Igiti ky'ungirije"
 
 #: keducabuilder/keducabuilder.cpp:121
 #, fuzzy
@@ -112,6 +468,11 @@ msgstr "Ongeraho"
 msgid "&Edit..."
 msgstr "Kwandika..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "Hejuru"
@@ -133,16 +494,6 @@ msgid ""
 msgstr ""
 "A Gishya ku ikoresha i Cyangwa ku Rimwe Bya i Udushushondanga hejuru . "
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-#, fuzzy
-msgid "Open Educa File"
-msgstr "Gufungura Idosiye "
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-#, fuzzy
-msgid "Answers"
-msgstr "Nta gisubizo"
-
 #: keducabuilder/keducabuilder.cpp:222
 #, fuzzy
 msgid "Question Image"
@@ -153,10 +504,6 @@ msgstr "Ikibazo"
 msgid "Question point"
 msgstr "Akadomo "
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Igihe"
-
 #: keducabuilder/keducabuilder.cpp:236
 #, fuzzy
 msgid " seconds</p>"
@@ -193,26 +540,15 @@ msgstr "i Idosiye "
 msgid "Save Document As"
 msgstr "Gushyingura Inyandiko Mu"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-#, fuzzy
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr "Wifuzakurisimbura."
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Gusimbuza"
-
 #: keducabuilder/keducabuilder.cpp:462
 #, fuzzy
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Kuri Gusangiza iyi Inyandiko , ni Kuri Gukoporora i Ishusho Kuri i Ububiko... "
-"Nka i Inyandiko . \n"
+"Kuri Gusangiza iyi Inyandiko , ni Kuri Gukoporora i Ishusho Kuri i "
+"Ububiko... Nka i Inyandiko . \n"
 "Kuri Gukoporora Ishusho ? "
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -225,13 +561,6 @@ msgstr "Gukoporora Ishusho"
 msgid "Do Not Copy"
 msgstr "Ntacyo Bimbwiye"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Igerageza"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -270,153 +599,89 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Kwinjizamo ikiciro"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Amakuru ku nyandiko"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, fuzzy, no-c-format
-msgid "Description and rules of the project."
-msgstr "na Bya i Umushinga . "
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Isobanuramiterere"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Ubwoko:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, fuzzy, no-c-format
-msgid "Level:"
-msgstr "urwego"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+#, fuzzy
+msgid "You need to specify the file to open!"
+msgstr "Kuri Kugaragaza i Idosiye Kuri Gufungura ! "
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Ururimi:"
+#: keducabuilder/main.cpp:26
+#, fuzzy
+msgid "Form-based tests and exams builder"
+msgstr "- na "
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, fuzzy, no-c-format
-msgid "Category:"
-msgstr "Icyiciro"
+#: keducabuilder/main.cpp:37
+#, fuzzy
+msgid "KEducaBuilder"
+msgstr "Iridace Guilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Umutwe:"
+#: libkeduca/kgallerydialog.cpp:168
+#, fuzzy
+msgid "You need to specify a server!"
+msgstr "Kuri Kugaragaza A Seriveri: ! "
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Picture"
-msgstr "Ishusho"
+msgid "KEduca Config Dialog"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
+#: keduca/configdialogbase.ui:27
 #, fuzzy, no-c-format
-msgid "Default picture:"
-msgstr "(%PRODUCTNAME) y'Ishusho : "
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Umwanditsi"
+msgid "Show Results"
+msgstr "Ibisubizo by'ishakisha"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
+#: keduca/configdialogbase.ui:38
 #, fuzzy, no-c-format
-msgid "Web page:"
-msgstr "Ipaji ya webu..."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, no-c-format
-msgid "Email:"
-msgstr "Imeli:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
-#, no-c-format
-msgid "Name:"
-msgstr "Izina:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Mudasobwa"
+msgid "At the end of the test"
+msgstr "i Impera Bya i Igerageza "
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:46
 #, fuzzy, no-c-format
-msgid "Test with Question Points"
-msgstr "Na: "
+msgid "After answering each question"
+msgstr "Ikibazo "
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:56
 #, fuzzy, no-c-format
-msgid "Test with Answers Points"
-msgstr "Na: "
-
-#: keducabuilder/kcontrolheader.cpp:349
-#, fuzzy
-msgid "Slidershow"
-msgstr "&Kwerekana Igice:"
-
-#: keducabuilder/kcontrolheader.cpp:350
-#, fuzzy
-msgid "Exam"
-msgstr "Urugero"
-
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr ""
+msgid "Ordering"
+msgstr "Itondekanya"
 
-#: keducabuilder/kcontrolheader.cpp:354
-#, fuzzy
-msgid "Easy"
-msgstr "Marigarita"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "in Bitunguranye Itondekanya "
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Bisanzwe"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "ibisubizo Ryari: Kurangiza i Igerageza "
 
-#: keducabuilder/kcontrolheader.cpp:356
-#, fuzzy
-msgid "Expert"
-msgstr "Inzobere"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:357
-#, fuzzy
-msgid "Supreme"
-msgstr "Igiti ky'ungirije"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Gucapa amagenamiterere y'ibikorwa"
+
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Ikibazo"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, fuzzy, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "< Imisusire = \" Ibara: : umukara \" > \n"
@@ -425,64 +690,54 @@ msgstr ""
 "<p> i Ikibazo na Ubwoko: ni Bya ngombwa . </p> \n"
 "< /> "
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, fuzzy, no-c-format
 msgid "&Question:"
 msgstr "Ikibazo"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Ubwoko:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Ishusho..."
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, fuzzy, no-c-format
 msgid "P&oint:"
 msgstr "Akadomo"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, fuzzy, no-c-format
 msgid "Ti&me:"
 msgstr "Igihe:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, fuzzy, no-c-format
 msgid "T&ip:"
 msgstr "Inyobora:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, fuzzy, no-c-format
 msgid "&Explain:"
 msgstr "Agura"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, fuzzy, no-c-format
 msgid "Answer"
 msgstr "Nta gisubizo"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, fuzzy, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "< Imisusire = \" Ibara: : umukara \" > \n"
@@ -491,350 +746,116 @@ msgstr ""
 "<p> i na Agaciro: ni Bya ngombwa . </p> \n"
 "< /> "
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, fuzzy, no-c-format
 msgid "&Answer:"
 msgstr "Ukoresha:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "Agaciro:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, fuzzy, no-c-format
 msgid "&Points:"
 msgstr "Utudomo"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Agaciro"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "utubago"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Kwimura hejuru"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Kwimura hasi"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, fuzzy, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "< b Imisusire = \" Umwandiko - : Gucaho umurongo ; \" > </b> "
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Kwandika..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, fuzzy, no-c-format
 msgid "Open an &existing document:"
 msgstr "Gufungura Inyandiko : "
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, fuzzy, no-c-format
 msgid "Open a &recent document:"
 msgstr "Gufungura A Inyandiko : "
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, fuzzy, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Gufungura Na: Ikirongozi Mucukumbuzi "
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, fuzzy, no-c-format
 msgid "Start a &new document"
 msgstr "Gutangira A Gishya Inyandiko "
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
-#, fuzzy, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "< b Imisusire = \" Umwandiko - : Gucaho umurongo ; \" > </b> "
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
+#, no-c-format
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Umwanyanzira"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Aderesi:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, fuzzy, no-c-format
 msgid "&Add Server"
 msgstr "Seriveri:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Amaseriveri"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Aderesi"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Ururimi"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Icyiciro"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Ubwoko"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "Gufungura"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, fuzzy, no-c-format
-msgid "Show Results"
-msgstr "Ibisubizo by'ishakisha"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, fuzzy, no-c-format
-msgid "At the end of the test"
-msgstr "i Impera Bya i Igerageza "
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, fuzzy, no-c-format
-msgid "After answering each question"
-msgstr "Ikibazo "
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, fuzzy, no-c-format
-msgid "Ordering"
-msgstr "Itondekanya"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, fuzzy, no-c-format
-msgid "Show questions in random order"
-msgstr "in Bitunguranye Itondekanya "
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, fuzzy, no-c-format
-msgid "Show answers in random order"
-msgstr "in Bitunguranye Itondekanya "
-
-#: _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"
-
-#: libkeduca/kgallerydialog.cpp:168
-#, fuzzy
-msgid "You need to specify a server!"
-msgstr "Kuri Kugaragaza A Seriveri: ! "
-
-#: keduca/keducaview.cpp:71
-#, fuzzy
-msgid "&Start Test"
-msgstr "Gutangira "
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-#, fuzzy
-msgid "&Next >>"
-msgstr "Komeza>>"
-
-#: keduca/keducaview.cpp:89
-#, fuzzy
-msgid "&Save Results..."
-msgstr "Kubika ... "
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Kubika Ibyavuyemo Nka"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Kubika Byanze."
-
-#: keduca/keducaview.cpp:212
-#, fuzzy, c-format
-msgid "Question %1"
-msgstr "Ikibazo"
-
-#: keduca/keducaview.cpp:267
-#, fuzzy
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"%1 amasogonda Kuri Byuzuye iyi Ikibazo . \n"
-"\n"
-"Ryari: Cyiteguye . "
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Igisubizo"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Sitatisitiki"
-
-#: keduca/keducaview.cpp:446
-#, fuzzy
-msgid "Correct questions"
-msgstr "Gushyirahamwe ibyifuzo"
-
-#: keduca/keducaview.cpp:448
-#, fuzzy
-msgid "Incorrect questions"
-msgstr "Ubwoko butari bwo"
-
-#: keduca/keducaview.cpp:452
-#, fuzzy
-msgid "Total points"
-msgstr "Utudomo "
-
-#: keduca/keducaview.cpp:453
-#, fuzzy
-msgid "Correct points"
-msgstr "Utudomo "
-
-#: keduca/keducaview.cpp:455
-#, fuzzy
-msgid "Incorrect points"
-msgstr "Utudomo "
-
-#: keduca/keducaview.cpp:460
-#, fuzzy
-msgid "Total time"
-msgstr "Igihe "
-
-#: keduca/keducaview.cpp:462
-#, fuzzy
-msgid "Time in tests"
-msgstr "in "
-
-#: keduca/keducaview.cpp:487
-#, fuzzy
-msgid "The answer is: "
-msgstr "ni : "
-
-#: keduca/keducaview.cpp:489
-#, fuzzy
-msgid "The correct answer is: "
-msgstr "ni : "
-
-#: keduca/keducaview.cpp:495
-#, fuzzy
-msgid "Your answer was: "
-msgstr "ni : "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Umutwe"
-
-#: keduca/main.cpp:25
-#, fuzzy
-msgid "Form-based tests and exams"
-msgstr "- na "
-
-#: keduca/main.cpp:36
-#, fuzzy
-msgid "KEduca"
-msgstr "Uburezi"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Ukurikirana Ugezweho"
-
-#: keduca/kquestion.cpp:56
-#, fuzzy
-msgid "%v seconds left"
-msgstr "%v amasogonda Ibumoso: "
-
-#: keduca/keduca_part.cpp:59
-#, fuzzy
-msgid "KEducaPart"
-msgstr "Uburezi"
-
-#: keduca/keduca_part.cpp:60
-#, fuzzy
-msgid "KEduca KParts Component"
-msgstr "Ibigize by'Ipaji"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Rusange"
-
-#: keduca/keducaprefs.cpp:41
-#, fuzzy
-msgid "Various Settings"
-msgstr "Gucapa amagenamiterere y'ibikorwa"
-
-#: keduca/keducaprefs.cpp:56
-#, fuzzy
-msgid "Show results of the answer after press next"
-msgstr "ibisubizo Bya i Nyuma Kanda Ibikurikira > "
-
-#: keduca/keducaprefs.cpp:60
-#, fuzzy
-msgid "Show results when finish the test"
-msgstr "ibisubizo Ryari: Kurangiza i Igerageza "
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Itondekanya"
diff --git a/tde-i18n-se/messages/tdeedu/keduca.po b/tde-i18n-se/messages/tdeedu/keduca.po
index e7a3f6ced54..b4d32327bd6 100644
--- a/tde-i18n-se/messages/tdeedu/keduca.po
+++ b/tde-i18n-se/messages/tdeedu/keduca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2006-01-10 20:27+0100\n"
 "Last-Translator: Børre Gaup <boerre@skolelinux.no>\n"
 "Language-Team: Northern Sami <i18n-sme@lister.ping.uio.no>\n"
@@ -15,17 +15,230 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Børre Gaup"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "boerre@skolelinux.no"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr ""
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr ""
+
+#: keduca/keduca_part.cpp:59
+#, fuzzy
+msgid "KEducaPart"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:60
+#, fuzzy
+msgid "KEduca KParts Component"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr ""
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr ""
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr ""
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr ""
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr ""
+
+#: keduca/keducaview.cpp:89
+#, fuzzy
+msgid "&Save Results..."
+msgstr "Geahččaleapmi"
+
+#: keduca/keducaview.cpp:151
+#, fuzzy
+msgid "Save Results As"
+msgstr "Geahččaleapmi"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr ""
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr ""
+
+#: keduca/keducaview.cpp:212
+#, fuzzy, c-format
+msgid "Question %1"
+msgstr "Lasit jearaldagaid"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Čuoggát"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+
+#: keduca/keducaview.cpp:376
+#, fuzzy
+msgid "Result"
+msgstr "Geahččaleapmi"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr ""
+
+#: keduca/keducaview.cpp:446
+#, fuzzy
+msgid "Correct questions"
+msgstr "Lasit jearaldagaid"
+
+#: keduca/keducaview.cpp:448
+#, fuzzy
+msgid "Incorrect questions"
+msgstr "Lasit jearaldagaid"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr ""
+
+#: keduca/keducaview.cpp:453
+#, fuzzy
+msgid "Correct points"
+msgstr "Lasit jearaldagaid"
+
+#: keduca/keducaview.cpp:455
+#, fuzzy
+msgid "Incorrect points"
+msgstr "Lasit jearaldagaid"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+#, fuzzy
+msgid "Time"
+msgstr "Áigi:"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr ""
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr ""
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr ""
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr ""
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr ""
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Dokumeantadieđut"
+
+#: keduca/keducaview.cpp:550
+#, fuzzy
+msgid "Title"
+msgstr "Namahus:"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, fuzzy, no-c-format
+msgid "Category"
+msgstr "Láhki:"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, fuzzy, no-c-format
+msgid "Type"
+msgstr "Šládja:"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, fuzzy, no-c-format
+msgid "Language"
+msgstr "Giella:"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr ""
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr ""
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr ""
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Fiilla maid viežžat"
 
-#: keducabuilder/main.cpp:37
-#, fuzzy
-msgid "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
 msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
@@ -36,6 +249,10 @@ msgstr ""
 msgid "Maintainer 2002-2004"
 msgstr ""
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr ""
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr ""
@@ -44,11 +261,6 @@ msgstr ""
 msgid "Icons"
 msgstr ""
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr ""
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr ""
@@ -57,29 +269,149 @@ msgstr ""
 msgid "Add Questions"
 msgstr "Lasit jearaldagaid"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Duohtta"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Boastut"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, fuzzy, no-c-format
 msgid "&Add"
 msgstr "Lasit …"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Dokumeantadieđut"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Válddahus"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Šládja:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Dássi:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Giella:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Láhki:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Namahus:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Govva"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Standárdgovva:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Čálli"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Fierpmádatsiidu:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-boasta:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Namma:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Dihtorat"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Geahččaleapmi"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr ""
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr ""
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Álki"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Dábálaš"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Čeahppi"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
 msgstr ""
 
 #: keducabuilder/keducabuilder.cpp:121
@@ -96,6 +428,11 @@ msgstr "Lasit …"
 msgid "&Edit..."
 msgstr "Doaimmat …"
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 #, fuzzy
 msgid "&Up"
@@ -116,14 +453,6 @@ msgid ""
 "above."
 msgstr ""
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr ""
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr ""
@@ -133,11 +462,6 @@ msgstr ""
 msgid "Question point"
 msgstr "Jearaldat"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-#, fuzzy
-msgid "Time"
-msgstr "Áigi:"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sekundda</p>"
@@ -169,20 +493,10 @@ msgstr ""
 msgid "Save Document As"
 msgstr ""
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 
@@ -194,13 +508,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Geahččaleapmi"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -230,536 +537,250 @@ msgstr ""
 msgid "Insert Question"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Dokumeantadieđut"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Válddahus"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Šládja:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Dássi:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Giella:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Láhki:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Namahus:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Govva"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Standárdgovva:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Čálli"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Fierpmádatsiidu:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, no-c-format
-msgid "Email:"
-msgstr "E-boasta:"
+#: keducabuilder/main.cpp:37
+#, fuzzy
+msgid "KEducaBuilder"
+msgstr "KEduca"
+
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Name:"
-msgstr "Namma:"
+msgid "KEduca Config Dialog"
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Dihtorat"
+#: keduca/configdialogbase.ui:27
+#, fuzzy, no-c-format
+msgid "Show Results"
+msgstr "Geahččaleapmi"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
+msgid "At the end of the test"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
+msgid "After answering each question"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, no-c-format
+msgid "Display answers in random order."
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
+#: keduca/keduca.kcfg:17
+#, no-c-format
+msgid "Show results only at the end of the test."
 msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Álki"
-
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Dábálaš"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Čeahppi"
+#: keduca/keduca_partui.rc:4
+#, no-c-format
+msgid "&Settings"
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, fuzzy, no-c-format
 msgid "Question"
 msgstr "Lasit jearaldagaid"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, fuzzy, no-c-format
 msgid "&Question:"
 msgstr "Lasit jearaldagaid"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, fuzzy, no-c-format
 msgid "&Type:"
 msgstr "Šládja:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, fuzzy, no-c-format
 msgid "&Picture:"
 msgstr "Govva:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, fuzzy, no-c-format
 msgid "P&oint:"
 msgstr "Čuoggá:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, fuzzy, no-c-format
 msgid "Ti&me:"
 msgstr "Áigi:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, fuzzy, no-c-format
 msgid "T&ip:"
 msgstr "Šládja:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, fuzzy, no-c-format
 msgid "&Explain:"
 msgstr "Čilge:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, fuzzy, no-c-format
 msgid "Answer"
 msgstr "Vástádus:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, fuzzy, no-c-format
 msgid "&Answer:"
 msgstr "Vástádus:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, fuzzy, no-c-format
 msgid "&Value:"
 msgstr "Árvu:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, fuzzy, no-c-format
 msgid "&Points:"
 msgstr "Čuoggát:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Árvu"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Čuoggát"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Doaimmat …"
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr ""
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, fuzzy, no-c-format
 msgid "Start a &new document"
 msgstr "Álggat ođđa dokumeantta"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgid "&Help"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, fuzzy, no-c-format
 msgid "Address:"
 msgstr "Lasit jearaldagaid"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, fuzzy, no-c-format
 msgid "Address"
 msgstr "Lasit jearaldagaid"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, fuzzy, no-c-format
-msgid "Language"
-msgstr "Giella:"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, fuzzy, no-c-format
-msgid "Category"
-msgstr "Láhki:"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, fuzzy, no-c-format
-msgid "Type"
-msgstr "Šládja:"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, fuzzy, no-c-format
-msgid "Show Results"
-msgstr "Geahččaleapmi"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Børre Gaup"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "boerre@skolelinux.no"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr ""
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr ""
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr ""
-
-#: keduca/keducaview.cpp:89
-#, fuzzy
-msgid "&Save Results..."
-msgstr "Geahččaleapmi"
-
-#: keduca/keducaview.cpp:151
-#, fuzzy
-msgid "Save Results As"
-msgstr "Geahččaleapmi"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr ""
-
-#: keduca/keducaview.cpp:212
-#, fuzzy, c-format
-msgid "Question %1"
-msgstr "Lasit jearaldagaid"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-
-#: keduca/keducaview.cpp:376
-#, fuzzy
-msgid "Result"
-msgstr "Geahččaleapmi"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr ""
-
-#: keduca/keducaview.cpp:446
-#, fuzzy
-msgid "Correct questions"
-msgstr "Lasit jearaldagaid"
-
-#: keduca/keducaview.cpp:448
-#, fuzzy
-msgid "Incorrect questions"
-msgstr "Lasit jearaldagaid"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr ""
-
-#: keduca/keducaview.cpp:453
-#, fuzzy
-msgid "Correct points"
-msgstr "Lasit jearaldagaid"
-
-#: keduca/keducaview.cpp:455
-#, fuzzy
-msgid "Incorrect points"
-msgstr "Lasit jearaldagaid"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr ""
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr ""
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr ""
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr ""
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr ""
-
-#: keduca/keducaview.cpp:550
-#, fuzzy
-msgid "Title"
-msgstr "Namahus:"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr ""
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr ""
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr ""
-
-#: keduca/keduca_part.cpp:59
-#, fuzzy
-msgid "KEducaPart"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:60
-#, fuzzy
-msgid "KEduca KParts Component"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr ""
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr ""
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr ""
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr ""
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr ""
diff --git a/tde-i18n-sk/messages/tdeedu/keduca.po b/tde-i18n-sk/messages/tdeedu/keduca.po
index f982f0b20ee..2d30e65dab5 100644
--- a/tde-i18n-sk/messages/tdeedu/keduca.po
+++ b/tde-i18n-sk/messages/tdeedu/keduca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2006-04-24 20:09+0200\n"
 "Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
 "Language-Team: Slovak <kde-i18n-doc@kde.org>\n"
@@ -19,17 +19,225 @@ msgstr ""
 "X-Generator: KBabel 1.11.2\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Vytváranie testov založených na formulároch"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Stanislav Višňovský"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "visnovsky@kde.org"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Otvoriť &galériu..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Otvoriť súbor Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca KParts komponent"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Všeobecné"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Rôzne nastavenia"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Zobraziť výsledky odpovede pred prechodom na nasledujúcu otázku"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Zobraziť výsledky pri dokončení testu"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Poradie"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Zobraziť otázky v náhodnom poradí"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Zobraziť odpovede v náhodnom poradí"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Spustiť test"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Nasledujúca >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "Uložiť &výsledky..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Uložiť výsledky ako"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Dokument s týmto menom už existuje.\n"
+"Chcete ho prepísať?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Prepísať"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Uloženie zlyhalo."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Otázka %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Body"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Na dokončenie tejto otázky máte %1 sekúnd.\n"
+"\n"
+"Stlačte OK, ak ste pripravený."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Výsledok"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Štatistika"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Správne odpovede"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Nesprávne odpovede"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Celkom bodov"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Body za správne odpovede"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Body za nesprávne odpovede"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Čas"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Celkový čas"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Čas v testoch"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Odpoveď je:"
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Správna odpoveď je:"
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Vaša odpoveď bola:"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Informácie o dokumente"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Titulok"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategória"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Typ"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Jazyk"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Odpovede"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "zostáva %v sekúnd"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Testy a skúšky založené na formulároch"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Súbor, ktorý sa má načítať"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -39,6 +247,10 @@ msgstr "Pôvodný autor"
 msgid "Maintainer 2002-2004"
 msgstr "Údržbár 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Aktuálny údržbár"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Rôzne opravy a vyčistenie"
@@ -47,11 +259,6 @@ msgstr "Rôzne opravy a vyčistenie"
 msgid "Icons"
 msgstr "Ikony"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Musíte zadať súbor, ktorý chcete otvoriť!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Upraviť otázku"
@@ -60,30 +267,150 @@ msgstr "Upraviť otázku"
 msgid "Add Questions"
 msgstr "Pridať otázky"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Pravda"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Nepravda"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Pridať"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Otvoriť &galériu..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Informácie o dokumente"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Popis a pravidlá projektu."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Popis"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Typ:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Úroveň:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Jazyk:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategória:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Titulok:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Obrázok"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Štandardný otázok:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autor"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Webová stránka:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-mail:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Meno:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Počítače"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Test"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Test s bodmi za otázky"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Test s bodmi za odpovede"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Prezentácia"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Skúška"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psychotechnický test"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Ľahká"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normálna"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Expert"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Vynikajúca"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -97,6 +424,11 @@ msgstr "&Pridať..."
 msgid "&Edit..."
 msgstr "&Upraviť..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Hore"
@@ -115,14 +447,6 @@ msgid ""
 "above."
 msgstr "Novú otázku pridáte v menu Upraviť alebo pomocou ikony."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Otvoriť súbor Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Odpovede"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Obrázok otázky"
@@ -131,10 +455,6 @@ msgstr "Obrázok otázky"
 msgid "Question point"
 msgstr "Body otázky"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Čas"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sekúnd</p>"
@@ -167,22 +487,10 @@ msgstr "Komprimovať súbor"
 msgid "Save Document As"
 msgstr "Uložiť dokument ako"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Dokument s týmto menom už existuje.\n"
-"Chcete ho prepísať?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Prepísať"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Ak chcete tento súbor zdieľať, je lepšie obrázky skopírovať do rovnakého "
@@ -197,13 +505,6 @@ msgstr "Kopírať obrázky"
 msgid "Do Not Copy"
 msgstr "Nekopírovať"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Test"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -239,543 +540,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Vložiť otázku"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Informácie o dokumente"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Popis a pravidlá projektu."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Popis"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Typ:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Úroveň:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Jazyk:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategória:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Titulok:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Obrázok"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Musíte zadať súbor, ktorý chcete otvoriť!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Štandardný otázok:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Vytváranie testov založených na formulároch"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autor"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Webová stránka:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Musíte zadať server!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "E-mail:"
+msgid "KEduca Config Dialog"
+msgstr "KEduca konfiguračný dialóg"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Meno:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Počítače"
+msgid "Show Results"
+msgstr "Zobraziť výsledok"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Test s bodmi za otázky"
+msgid "At the end of the test"
+msgstr "Na koniec testu"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Test s bodmi za odpovede"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Prezentácia"
+msgid "After answering each question"
+msgstr "Po odpovedaní na každú otázku"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Skúška"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Poradie"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psychotechnický test"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Zobraziť odpovede v náhodnom poradí"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Ľahká"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Zobraziť výsledky pri dokončení testu"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normálna"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Expert"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Rôzne nastavenia"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Vynikajúca"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Otázka"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Otázka</b></p>\n"
+"  <p><b>Otázka</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Je požadovaná iba otázka a typ.</p>\n"
+"  <p>Je požadovaná iba otázka a typ.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Otázka:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Typ:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Obrázok:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "&Bod:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Č&as:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&Tip:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Vysvetlenie:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Odpoveď"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Odpovede</b></p>\n"
+"  <p><b>Odpovede</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Požadované sú iba odpoved a hodnota.</p>\n"
+"  <p>Požadované sú iba odpoved a hodnota.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Odpoveď:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Hodnota:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Body:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Hodnota"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Body"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "&Vyššie"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "&Nižšie"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Informácia</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Upraviť..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Editor - Rýchly úvod"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Otvoriť &existujúci dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Otvoriť &nedávny dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Otvoriť v prehliadači internetovej galérie"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Vytvoriť nový dokument"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Informácia</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galéria"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adresa:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Pridať server"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Servery"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adresa"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Jazyk"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategória"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Typ"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Otvoriť"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca konfiguračný dialóg"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Zobraziť výsledok"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Na koniec testu"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Po odpovedaní na každú otázku"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Poradie"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Zobraziť otázky v náhodnom poradí"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Zobraziť odpovede v náhodnom poradí"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Stanislav Višňovský"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "visnovsky@kde.org"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Musíte zadať server!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Spustiť test"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Nasledujúca >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "Uložiť &výsledky..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Uložiť výsledky ako"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Uloženie zlyhalo."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Otázka %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Na dokončenie tejto otázky máte %1 sekúnd.\n"
-"\n"
-"Stlačte OK, ak ste pripravený."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Výsledok"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Štatistika"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Správne odpovede"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Nesprávne odpovede"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Celkom bodov"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Body za správne odpovede"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Body za nesprávne odpovede"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Celkový čas"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Čas v testoch"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Odpoveď je:"
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Správna odpoveď je:"
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Vaša odpoveď bola:"
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Titulok"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Testy a skúšky založené na formulároch"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Aktuálny údržbár"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "zostáva %v sekúnd"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca KParts komponent"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Všeobecné"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Rôzne nastavenia"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Zobraziť výsledky odpovede pred prechodom na nasledujúcu otázku"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Zobraziť výsledky pri dokončení testu"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Poradie"
diff --git a/tde-i18n-sl/messages/tdeedu/keduca.po b/tde-i18n-sl/messages/tdeedu/keduca.po
index d981e2c3b8a..9262ed4d4c7 100644
--- a/tde-i18n-sl/messages/tdeedu/keduca.po
+++ b/tde-i18n-sl/messages/tdeedu/keduca.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2006-07-23 22:45+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -22,17 +22,225 @@ msgstr ""
 "Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
 "n%100==4 ? 2 : 3);\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Sestavljalnik preizkusov in izpitov na osnovi obrazcev"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Jure Repinc"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "jlp@holodeck1.com"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Odpri &galerijo ..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Odpri datoteko Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "Komponenta KEduca KParts"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Splošno"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Razne nastavitve"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Prikaži rezultate po pritisku na Naslednji"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Prikaži rezultate po zaključku preizkusa"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Vrstni red"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Vprašanja prikazuj v naključnem vrstnem redu"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Odgovore prikazuj v naključnem vrstnem redu"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Prični preizkus"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Naslednji >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Shrani rezultate ..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Shrani rezultate kot"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Dokument s tem imenom že obstaja.\n"
+"Ga želite nadomestiti?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Nadomesti"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Shranjevanje ni uspelo."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Vprašanje %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Točke"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Za odgovor na vprašanje imate na voljo %1 sekund.\n"
+"\n"
+"Ko ste pripravljeni kliknite »V redu«."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Rezultat"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistika"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Pravilni odgovori"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Napačni odgovori"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Skupno točk"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Pravilne točke:"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Napačne točke:"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Čas"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Skupni čas:"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Čas v preizkusih"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Odgovor je: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Pravilen odgovor je: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Vaš odgovor je: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Informacije o dokumentu"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Naslov"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategorija"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Vrsta"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Jezik"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Odgovori"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v sekund do konca"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Preizkusi in izpiti na osnovi obrazcev"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Datoteka za nalaganje"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -42,6 +250,10 @@ msgstr "Prvotni avtor"
 msgid "Maintainer 2002-2004"
 msgstr "Vzdrževalec 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Trenutni vzdrževalec"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Različni popravki in čiščenja"
@@ -50,11 +262,6 @@ msgstr "Različni popravki in čiščenja"
 msgid "Icons"
 msgstr "Ikone"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Navesti morate datoteko za odprtje!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Spremeni vprašanje"
@@ -63,30 +270,150 @@ msgstr "Spremeni vprašanje"
 msgid "Add Questions"
 msgstr "Dodaj vprašanja"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Pravilno"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Napačno"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Dodaj"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Odpri &galerijo ..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Informacije o dokumentu"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Opis in pravila projekta."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Opis"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Vrsta:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Stopnja:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Jezik:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategorija:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Naslov:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Slika"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Privzeta slika:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Avtor"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Spletna stran:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-pošta:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Ime:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Računalništvo"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Preizkus"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Preizkus s točkami za vprašanje"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Preizkus s točkami za odgovor"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Predstavitev"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Izpit"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psihotehnični preizkus"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Lahko"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normalno"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Strokovno"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Izjemno"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -100,6 +427,11 @@ msgstr "&Dodaj ..."
 msgid "&Edit..."
 msgstr "&Uredi ..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "G&or"
@@ -120,14 +452,6 @@ msgstr ""
 "Novo vprašanje dodajte z uporabo menija »Urejanje« ali s klikom na ikono v "
 "orodjarni."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Odpri datoteko Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Odgovori"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Slika vprašanja"
@@ -136,10 +460,6 @@ msgstr "Slika vprašanja"
 msgid "Question point"
 msgstr "Točka za vprašanje"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Čas"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sekund</p>"
@@ -172,22 +492,10 @@ msgstr "Stisni datoteko"
 msgid "Save Document As"
 msgstr "Shrani dokument kot"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Dokument s tem imenom že obstaja.\n"
-"Ga želite nadomestiti?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Nadomesti"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Če želite ta dokument deliti z drugimi, je bolje slike skopirati v mapo z "
@@ -202,13 +510,6 @@ msgstr "Skopiraj slike"
 msgid "Do Not Copy"
 msgstr "Ne kopiraj"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Preizkus"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -244,543 +545,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Vstavi vprašanje"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Informacije o dokumentu"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Opis in pravila projekta."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Opis"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Vrsta:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Stopnja:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Jezik:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategorija:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Naslov:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Slika"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Navesti morate datoteko za odprtje!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Privzeta slika:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Sestavljalnik preizkusov in izpitov na osnovi obrazcev"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Avtor"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Spletna stran:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Določiti morate strežnik!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "E-pošta:"
+msgid "KEduca Config Dialog"
+msgstr "Nastavitve za KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Ime:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Računalništvo"
+msgid "Show Results"
+msgstr "Prikaži rezultate"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Preizkus s točkami za vprašanje"
+msgid "At the end of the test"
+msgstr "Na koncu preizkusa"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Preizkus s točkami za odgovor"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Predstavitev"
+msgid "After answering each question"
+msgstr "Po odgovoru na vsako vprašanje"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Izpit"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Vrstni red"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psihotehnični preizkus"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Odgovore prikazuj v naključnem vrstnem redu"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Lahko"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Prikaži rezultate po zaključku preizkusa"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normalno"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Strokovno"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Razne nastavitve"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Izjemno"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Vprašanje"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Vprašanje</b></p>\n"
+"  <p><b>Vprašanje</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Potrebna sta samo vprašanje in vrsta.</p>\n"
+"  <p>Potrebna sta samo vprašanje in vrsta.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Vprašanje:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "V&rsta:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Slika:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "&Točka:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&Čas:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&Namig:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Razlaga:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Odgovor"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Odgovori</b></p>\n"
+"  <p><b>Odgovori</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Potrebna sta samo odgovor in vrednost.</p>\n"
+"  <p>Potrebna sta samo odgovor in vrednost.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Odgovor:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Vrednost:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Točke:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Vrednost"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Točke"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Premakni &gor"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Premakni &dol"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Informacija</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Uredi ..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Urejevalnik - Ob začetku"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Odpri &obstoječ dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Odpri n&edaven dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Odpri z internetnim brskalnikom po galeriji"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Začni &nov dokument"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Informacija</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galerija"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Naslov:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Dodaj strežnik"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Strežniki"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Naslov"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Jezik"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategorija"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Vrsta"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Odpri"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Nastavitve za KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Prikaži rezultate"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Na koncu preizkusa"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Po odgovoru na vsako vprašanje"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Vrstni red"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Vprašanja prikazuj v naključnem vrstnem redu"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Odgovore prikazuj v naključnem vrstnem redu"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Jure Repinc"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "jlp@holodeck1.com"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Določiti morate strežnik!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Prični preizkus"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Naslednji >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Shrani rezultate ..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Shrani rezultate kot"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Shranjevanje ni uspelo."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Vprašanje %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Za odgovor na vprašanje imate na voljo %1 sekund.\n"
-"\n"
-"Ko ste pripravljeni kliknite »V redu«."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Rezultat"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistika"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Pravilni odgovori"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Napačni odgovori"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Skupno točk"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Pravilne točke:"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Napačne točke:"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Skupni čas:"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Čas v preizkusih"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Odgovor je: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Pravilen odgovor je: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Vaš odgovor je: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Naslov"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Preizkusi in izpiti na osnovi obrazcev"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Trenutni vzdrževalec"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v sekund do konca"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "Komponenta KEduca KParts"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Splošno"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Razne nastavitve"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Prikaži rezultate po pritisku na Naslednji"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Prikaži rezultate po zaključku preizkusa"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Vrstni red"
diff --git a/tde-i18n-sr/messages/tdeedu/keduca.po b/tde-i18n-sr/messages/tdeedu/keduca.po
index 5b8b8299744..c15ddebcd33 100644
--- a/tde-i18n-sr/messages/tdeedu/keduca.po
+++ b/tde-i18n-sr/messages/tdeedu/keduca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-10-24 18:14+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -16,17 +16,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Изграђивач тестова и испита заснованих на формуларима"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Часлав Илић"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "caslav.ilic@gmx.net"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Отвори &галерију..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Отвори Educa фајл"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca као KParts компонента"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Опште"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Разна подешавања"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Прикажи резултате одговора после притиска на „Следеће“"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Прикажи резултате када се тест заврши"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Редослед"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Прикажи питања случајним редоследом"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Прикажи одговоре случајним редоследом"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Покрени тест"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Следеће >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Сними резултате..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Сними резултате као"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Документ са овим именом већ постоји.\n"
+"Желите ли да га пребришете?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Пребриши"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Снимање није успело."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Питање %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Поени"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Имате %1 секунди да завршите ово питање.\n"
+"\n"
+"Притисните „У реду“ када будете спремни."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Резултат"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Статистика"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Тачна питања"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Нетачна питања"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Укупно поена"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Тачних поена"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Нетачних поена"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Време"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Укупно време"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Време у тестовима"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Одговор је: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Тачан одговор је: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Ваш одговор је био: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Информације о документу"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Наслов"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Категорија"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Врста"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Језик"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Одговори"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v секунди преостало"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Тестови и испити засновани на формуларима"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Фајл за учитавање"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -36,6 +244,10 @@ msgstr "Првобитни аутор"
 msgid "Maintainer 2002-2004"
 msgstr "Одржавалац 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Тренутни одржавалац"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Разне исправке и чишћења"
@@ -44,11 +256,6 @@ msgstr "Разне исправке и чишћења"
 msgid "Icons"
 msgstr "Иконе"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Морате навести фајл који ће бити отворен!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Измени питање"
@@ -57,30 +264,150 @@ msgstr "Измени питање"
 msgid "Add Questions"
 msgstr "Додај питања"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Тачно"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Нетачно"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Додај"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Отвори &галерију..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Информације о документу"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Опис и правила пројекта."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Опис"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Врста:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Ниво:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Језик:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Категорија:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Наслов:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Слика"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Подразумевана слика:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Аутор"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Веб страна:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Е-пошта:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Име:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Рачунари"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Тест"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Тест са поенима за питања"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Тест са поенима за одговоре"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Приказ клизача"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Испит"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Психотехнички тест"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Лак"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Обичан"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Стручни"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Мајсторски"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -94,6 +421,11 @@ msgstr "&Додај..."
 msgid "&Edit..."
 msgstr "&Уреди..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Горе"
@@ -113,14 +445,6 @@ msgid ""
 msgstr ""
 "Додајте ново питање користећи мени „Измене“ или избором једне од икона изнад."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Отвори Educa фајл"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Одговори"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Слика питања"
@@ -129,10 +453,6 @@ msgstr "Слика питања"
 msgid "Question point"
 msgstr "Тачка питања"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Време"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " секунде</p>"
@@ -165,26 +485,14 @@ msgstr "Компресуј фајл"
 msgid "Save Document As"
 msgstr "Сними документ као"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Документ са овим именом већ постоји.\n"
-"Желите ли да га пребришете?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Пребриши"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Ако желите да делите овај документ, боље је да копирате слике у исту фасциклу "
-"као и документ.\n"
+"Ако желите да делите овај документ, боље је да копирате слике у исту "
+"фасциклу као и документ.\n"
 "Желите ли да копирате слике?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -195,13 +503,6 @@ msgstr "Копирај слике"
 msgid "Do Not Copy"
 msgstr "Не копирај"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Тест"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -237,543 +538,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Уметни питање"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Информације о документу"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Опис и правила пројекта."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Опис"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Врста:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Ниво:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Језик:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Категорија:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Наслов:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Слика"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Морате навести фајл који ће бити отворен!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Подразумевана слика:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Изграђивач тестова и испита заснованих на формуларима"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Аутор"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Веб страна:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Морате навести сервер!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Е-пошта:"
+msgid "KEduca Config Dialog"
+msgstr "Дијалог за подешавање KEduca-е"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Име:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Рачунари"
+msgid "Show Results"
+msgstr "Прикажи резултате"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Тест са поенима за питања"
+msgid "At the end of the test"
+msgstr "На крају теста"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Тест са поенима за одговоре"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Приказ клизача"
+msgid "After answering each question"
+msgstr "После сваког одговора на питање"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Испит"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Редослед"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Психотехнички тест"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Прикажи одговоре случајним редоследом"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Лак"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Прикажи резултате када се тест заврши"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Обичан"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Стручни"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Разна подешавања"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Мајсторски"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Питање"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Питање</b></p>\n"
+"  <p><b>Питање</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Потребно је само питање и врста.</p>\n"
+"  <p>Потребно је само питање и врста.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Питање:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Врста:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Слика:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "П&оен:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Вре&ме:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "С&авет:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "О&бјашњење:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Одговор"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Одговори</b></p>\n"
+"  <p><b>Одговори</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Потребан је само одговор и вредност.</p>\n"
+"  <p>Потребан је само одговор и вредност.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "О&дговор:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "Вред&ност:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Поени:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Вредност"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Поени"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Помери на&горе"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Помери на&доле"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Информација</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Уреди..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Уређивач — почетак"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Отвори &постојећи документ:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Отвори &скорашњи документ:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Отвори помоћу интернет прегледача галерија"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Започни &нови документ"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Информација</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Галерија"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Адреса:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Додај сервер"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Сервери"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Адреса"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Језик"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Категорија"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Врста"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Отвори"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Дијалог за подешавање KEduca-е"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Прикажи резултате"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "На крају теста"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "После сваког одговора на питање"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Редослед"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Прикажи питања случајним редоследом"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Прикажи одговоре случајним редоследом"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Часлав Илић"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "caslav.ilic@gmx.net"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Морате навести сервер!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Покрени тест"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Следеће >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Сними резултате..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Сними резултате као"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Снимање није успело."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Питање %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Имате %1 секунди да завршите ово питање.\n"
-"\n"
-"Притисните „У реду“ када будете спремни."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Резултат"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Статистика"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Тачна питања"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Нетачна питања"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Укупно поена"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Тачних поена"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Нетачних поена"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Укупно време"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Време у тестовима"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Одговор је: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Тачан одговор је: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Ваш одговор је био: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Наслов"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Тестови и испити засновани на формуларима"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Тренутни одржавалац"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v секунди преостало"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca као KParts компонента"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Опште"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Разна подешавања"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Прикажи резултате одговора после притиска на „Следеће“"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Прикажи резултате када се тест заврши"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Редослед"
diff --git a/tde-i18n-sr@Latn/messages/tdeedu/keduca.po b/tde-i18n-sr@Latn/messages/tdeedu/keduca.po
index 0f64b51e256..e83610de2bc 100644
--- a/tde-i18n-sr@Latn/messages/tdeedu/keduca.po
+++ b/tde-i18n-sr@Latn/messages/tdeedu/keduca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-10-24 18:14+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -16,17 +16,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Izgrađivač testova i ispita zasnovanih na formularima"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Časlav Ilić"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "caslav.ilic@gmx.net"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Otvori &galeriju..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Otvori Educa fajl"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca kao KParts komponenta"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Opšte"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Razna podešavanja"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Prikaži rezultate odgovora posle pritiska na „Sledeće“"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Prikaži rezultate kada se test završi"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Redosled"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Prikaži pitanja slučajnim redosledom"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Prikaži odgovore slučajnim redosledom"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Pokreni test"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Sledeće >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Snimi rezultate..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Snimi rezultate kao"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Dokument sa ovim imenom već postoji.\n"
+"Želite li da ga prebrišete?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Prebriši"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Snimanje nije uspelo."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Pitanje %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Poeni"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Imate %1 sekundi da završite ovo pitanje.\n"
+"\n"
+"Pritisnite „U redu“ kada budete spremni."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Rezultat"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistika"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Tačna pitanja"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Netačna pitanja"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Ukupno poena"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Tačnih poena"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Netačnih poena"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Vreme"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Ukupno vreme"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Vreme u testovima"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Odgovor je: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Tačan odgovor je: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Vaš odgovor je bio: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Informacije o dokumentu"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Naslov"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategorija"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Vrsta"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Jezik"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Odgovori"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v sekundi preostalo"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Testovi i ispiti zasnovani na formularima"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Fajl za učitavanje"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -36,6 +244,10 @@ msgstr "Prvobitni autor"
 msgid "Maintainer 2002-2004"
 msgstr "Održavalac 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Trenutni održavalac"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Razne ispravke i čišćenja"
@@ -44,11 +256,6 @@ msgstr "Razne ispravke i čišćenja"
 msgid "Icons"
 msgstr "Ikone"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Morate navesti fajl koji će biti otvoren!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Izmeni pitanje"
@@ -57,30 +264,150 @@ msgstr "Izmeni pitanje"
 msgid "Add Questions"
 msgstr "Dodaj pitanja"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Tačno"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Netačno"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Dodaj"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Otvori &galeriju..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Informacije o dokumentu"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Opis i pravila projekta."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Opis"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Vrsta:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Nivo:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Jezik:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategorija:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Naslov:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Slika"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Podrazumevana slika:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Autor"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Veb strana:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-pošta:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Ime:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Računari"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Test"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Test sa poenima za pitanja"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Test sa poenima za odgovore"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Prikaz klizača"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Ispit"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psihotehnički test"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Lak"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Običan"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Stručni"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Majstorski"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -94,6 +421,11 @@ msgstr "&Dodaj..."
 msgid "&Edit..."
 msgstr "&Uredi..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Gore"
@@ -111,15 +443,8 @@ msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 msgstr ""
-"Dodajte novo pitanje koristeći meni „Izmene“ ili izborom jedne od ikona iznad."
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Otvori Educa fajl"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Odgovori"
+"Dodajte novo pitanje koristeći meni „Izmene“ ili izborom jedne od ikona "
+"iznad."
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -129,10 +454,6 @@ msgstr "Slika pitanja"
 msgid "Question point"
 msgstr "Tačka pitanja"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Vreme"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sekunde</p>"
@@ -165,26 +486,14 @@ msgstr "Kompresuj fajl"
 msgid "Save Document As"
 msgstr "Snimi dokument kao"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Dokument sa ovim imenom već postoji.\n"
-"Želite li da ga prebrišete?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Prebriši"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Ako želite da delite ovaj dokument, bolje je da kopirate slike u istu fasciklu "
-"kao i dokument.\n"
+"Ako želite da delite ovaj dokument, bolje je da kopirate slike u istu "
+"fasciklu kao i dokument.\n"
 "Želite li da kopirate slike?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -195,13 +504,6 @@ msgstr "Kopiraj slike"
 msgid "Do Not Copy"
 msgstr "Ne kopiraj"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Test"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -237,543 +539,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Umetni pitanje"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Informacije o dokumentu"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Opis i pravila projekta."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Opis"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Vrsta:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Nivo:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Jezik:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategorija:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Naslov:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Slika"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Morate navesti fajl koji će biti otvoren!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Podrazumevana slika:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Izgrađivač testova i ispita zasnovanih na formularima"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Autor"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Veb strana:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Morate navesti server!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "E-pošta:"
+msgid "KEduca Config Dialog"
+msgstr "Dijalog za podešavanje KEduca-e"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Ime:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Računari"
+msgid "Show Results"
+msgstr "Prikaži rezultate"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Test sa poenima za pitanja"
+msgid "At the end of the test"
+msgstr "Na kraju testa"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Test sa poenima za odgovore"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Prikaz klizača"
+msgid "After answering each question"
+msgstr "Posle svakog odgovora na pitanje"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Ispit"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Redosled"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psihotehnički test"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Prikaži odgovore slučajnim redosledom"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Lak"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Prikaži rezultate kada se test završi"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Običan"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Stručni"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Razna podešavanja"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Majstorski"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Pitanje"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Pitanje</b></p>\n"
+"  <p><b>Pitanje</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Potrebno je samo pitanje i vrsta.</p>\n"
+"  <p>Potrebno je samo pitanje i vrsta.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Pitanje:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Vrsta:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Slika:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "P&oen:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Vre&me:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "S&avet:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "O&bjašnjenje:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Odgovor"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Odgovori</b></p>\n"
+"  <p><b>Odgovori</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Potreban je samo odgovor i vrednost.</p>\n"
+"  <p>Potreban je samo odgovor i vrednost.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "O&dgovor:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "Vred&nost:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Poeni:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Vrednost"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Poeni"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Pomeri na&gore"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Pomeri na&dole"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Informacija</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Uredi..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Uređivač — početak"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Otvori &postojeći dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Otvori &skorašnji dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Otvori pomoću internet pregledača galerija"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Započni &novi dokument"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Informacija</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galerija"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adresa:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Dodaj server"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Serveri"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adresa"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Jezik"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategorija"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Vrsta"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Otvori"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Dijalog za podešavanje KEduca-e"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Prikaži rezultate"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Na kraju testa"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Posle svakog odgovora na pitanje"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Redosled"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Prikaži pitanja slučajnim redosledom"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Prikaži odgovore slučajnim redosledom"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Časlav Ilić"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "caslav.ilic@gmx.net"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Morate navesti server!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Pokreni test"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Sledeće >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Snimi rezultate..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Snimi rezultate kao"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Snimanje nije uspelo."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Pitanje %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Imate %1 sekundi da završite ovo pitanje.\n"
-"\n"
-"Pritisnite „U redu“ kada budete spremni."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Rezultat"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistika"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Tačna pitanja"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Netačna pitanja"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Ukupno poena"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Tačnih poena"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Netačnih poena"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Ukupno vreme"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Vreme u testovima"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Odgovor je: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Tačan odgovor je: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Vaš odgovor je bio: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Naslov"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Testovi i ispiti zasnovani na formularima"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Trenutni održavalac"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v sekundi preostalo"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca kao KParts komponenta"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Opšte"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Razna podešavanja"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Prikaži rezultate odgovora posle pritiska na „Sledeće“"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Prikaži rezultate kada se test završi"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Redosled"
diff --git a/tde-i18n-sv/messages/tdeedu/keduca.po b/tde-i18n-sv/messages/tdeedu/keduca.po
index ceaec4d91de..d9dcf6fa17f 100644
--- a/tde-i18n-sv/messages/tdeedu/keduca.po
+++ b/tde-i18n-sv/messages/tdeedu/keduca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-09-05 23:44+0200\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
 "Language-Team: Svenska <sv@li.org>\n"
@@ -16,17 +16,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Bygg formulärbaserade prov och tentamina"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Mattias Newzella,Stefan Asserhäll"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "newzella@linux.nu,stefan.asserhall@comhem.se"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Öppna &galleri..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Öppna Educa-fil"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "Keduca-delprogram"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "Keduca delprogramkomponent"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Allmänt"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Diverse inställningar"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Visa resultat för svaret efter klick på nästa"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Visa resultat när provet är klart"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Ordning"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Visa frågor i slumpmässig ordning"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Visa svar i slumpmässig ordning"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Starta prov"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Nästa >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Spara resultat..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Spara resultat som"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Ett dokument med det här namnet finns redan.\n"
+"Vill du skriva över det?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Skriv över"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Misslyckades spara."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Fråga %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Poäng"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Du har %1 sekunder kvar att svara på frågan.\n"
+"\n"
+"Klicka på OK när du är klar."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Resultat"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Statistik"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Riktiga frågor"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Felaktiga frågor"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Totalt antal poäng"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Riktiga poäng"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Felaktiga poäng"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Tid"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Total tid"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Tid för prov"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Svaret är: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Det riktiga svaret är: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Ditt svar var: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Dokumentinformation"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Titel"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategori"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Typ"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Språk"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Svar"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v sekunder kvar"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Formulärbaserade prov och tentamina"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Fil att ladda"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "Keduca-byggare"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "Keduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -36,6 +244,10 @@ msgstr "Ursprunglig upphovsman"
 msgid "Maintainer 2002-2004"
 msgstr "Utveckling 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Nuvarande utvecklare"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Diverse rättningar och upprensningar"
@@ -44,11 +256,6 @@ msgstr "Diverse rättningar och upprensningar"
 msgid "Icons"
 msgstr "Ikoner"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Du måste ange filen som ska öppnas."
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Ändra fråga"
@@ -57,30 +264,150 @@ msgstr "Ändra fråga"
 msgid "Add Questions"
 msgstr "Lägg till frågor"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Sant"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Falsk"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Lägg till"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Öppna &galleri..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Dokumentinformation"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Beskrivning och regler för projektet."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Beskrivning"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Typ:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Nivå:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Språk:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Kategori:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Titel:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Bild"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Förvald bild:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Upphovsman"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Webbsida:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-post:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Namn:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Datorer"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Prov"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Prov med frågepoäng"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Prov med svarspoäng"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Bildspel"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Tentamen"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psykotekniskt prov"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Lätt"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normal"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Expert"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Mästare"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -94,6 +421,11 @@ msgstr "&Lägg till..."
 msgid "&Edit..."
 msgstr "&Redigera..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Upp"
@@ -111,16 +443,8 @@ msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 msgstr ""
-"Lägg till en ny fråga genom att använda menyn Redigera, eller genom att välja "
-"någon av ikonerna ovan."
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Öppna Educa-fil"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Svar"
+"Lägg till en ny fråga genom att använda menyn Redigera, eller genom att "
+"välja någon av ikonerna ovan."
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -130,10 +454,6 @@ msgstr "Frågebild"
 msgid "Question point"
 msgstr "Frågepunkt"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Tid"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " sekunder</p>"
@@ -166,22 +486,10 @@ msgstr "Komprimera filen"
 msgid "Save Document As"
 msgstr "Spara dokument som"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Ett dokument med det här namnet finns redan.\n"
-"Vill du skriva över det?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Skriv över"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Om du vill dela dokumentet är det bättre att kopiera bilderna till samma "
@@ -196,13 +504,6 @@ msgstr "Kopiera bilder"
 msgid "Do Not Copy"
 msgstr "Kopiera inte"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Prov"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -238,543 +539,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Infoga fråga"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Dokumentinformation"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Beskrivning och regler för projektet."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Beskrivning"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Typ:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Nivå:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Språk:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Kategori:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Titel:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Bild"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Du måste ange filen som ska öppnas."
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Förvald bild:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Bygg formulärbaserade prov och tentamina"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Upphovsman"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "Keduca-byggare"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Webbsida:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Du måste ange en server."
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "E-post:"
+msgid "KEduca Config Dialog"
+msgstr "Keduca inställningsdialogruta"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Namn:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Datorer"
+msgid "Show Results"
+msgstr "Visa resultat"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Prov med frågepoäng"
+msgid "At the end of the test"
+msgstr "Vid provets slut"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Prov med svarspoäng"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Bildspel"
+msgid "After answering each question"
+msgstr "Efter varje fråga besvarats"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Tentamen"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Ordning"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psykotekniskt prov"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Visa svar i slumpmässig ordning"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Lätt"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Visa resultat när provet är klart"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normal"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Expert"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Diverse inställningar"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Mästare"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Fråga"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Fråga</b></p>\n"
+"  <p><b>Fråga</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Bara fråga och typ krävs.</p>\n"
+"  <p>Bara fråga och typ krävs.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Fråga:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Typ:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Bild:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "P&oäng:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Ti&d:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "Ti&ps:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Förklara:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Svar"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Svar</b></p>\n"
+"  <p><b>Svar</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Bara svar och värde krävs.</p>\n"
+"  <p>Bara svar och värde krävs.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "S&var:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Värde:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Poäng:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Värde"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Poäng"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Flytta &upp"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Flytta &ner"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Information</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Redigera..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Editor - Komma igång"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Öppna &befintligt dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Öppna s&enaste dokument:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Öppna med Internet galleribläddrare"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Starta ett &nytt dokument"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Information</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Galleri"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adress:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Lägg till server"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Servrar"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adress"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Språk"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategori"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Typ"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "Ö&ppna"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Keduca inställningsdialogruta"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Visa resultat"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Vid provets slut"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Efter varje fråga besvarats"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Ordning"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Visa frågor i slumpmässig ordning"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Visa svar i slumpmässig ordning"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Mattias Newzella,Stefan Asserhäll"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "newzella@linux.nu,stefan.asserhall@comhem.se"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Du måste ange en server."
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Starta prov"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Nästa >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Spara resultat..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Spara resultat som"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Misslyckades spara."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Fråga %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Du har %1 sekunder kvar att svara på frågan.\n"
-"\n"
-"Klicka på OK när du är klar."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Resultat"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Statistik"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Riktiga frågor"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Felaktiga frågor"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Totalt antal poäng"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Riktiga poäng"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Felaktiga poäng"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Total tid"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Tid för prov"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Svaret är: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Det riktiga svaret är: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Ditt svar var: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Titel"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Formulärbaserade prov och tentamina"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "Keduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Nuvarande utvecklare"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v sekunder kvar"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "Keduca-delprogram"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "Keduca delprogramkomponent"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Allmänt"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Diverse inställningar"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Visa resultat för svaret efter klick på nästa"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Visa resultat när provet är klart"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Ordning"
diff --git a/tde-i18n-ta/messages/tdeedu/keduca.po b/tde-i18n-ta/messages/tdeedu/keduca.po
index ef1d0ba1fac..5a9845bd07d 100644
--- a/tde-i18n-ta/messages/tdeedu/keduca.po
+++ b/tde-i18n-ta/messages/tdeedu/keduca.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2005-03-28 02:46-0800\n"
 "Last-Translator: Tamil PC <tamilpc@ambalam.com>\n"
 "Language-Team: Tamil <en@li.org>\n"
@@ -21,17 +21,222 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "படிவ-அடிப்படையிலான சோதனைகள் தேர்வுகள் அமைப்பான்"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "tamilpc team"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "tamilpc@ambalam.com"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "&படத்தொகுப்பை திற..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Educa  கோப்பினை திறக்கவும்"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca கேபகுதிகள் பிரிவு"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "பொது"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "பல்வேறு அமைவுகள் "
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "அடுத்ததற்கு சென்றவுடன் தீர்வின் விடையை காட்டு"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "சோதனை முடிததவுடன் தீர்வை காட்டு"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "வரிசை"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "கேள்விகளை குறியில்லா வரிசையில் காட்டு"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "விடைகளை குறியில்லா வரிசையில் காட்டு"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&சோதனையைத் தொடரு"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&அடுத்தது >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&விடைகள் சேமி"
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "ஆவணத்தை இப்பெயரில் சேமி"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"ஏற்கனவே இதே பெயரில் ஆவணம் உள்ளது\n"
+"அதன்மேல் எழுத வேண்டுமா"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr ""
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "சேமிக்க இயலவில்லை"
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "கேள்வி %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "புள்ளிகள்"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr "இந்த வினாவை முடிப்பதற்கு உங்களுக்கு %1 வினாடிகளே உள்ளன"
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "தீர்வு"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "புள்ளி விவரம்"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "சரியான கேள்விகள்"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "தவறான கேள்விகள்"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "மொத்த புள்ளிகள்"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "சரியான புள்ளிகள்"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "தவறான புள்ளிகள்"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "நேரம்"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "மொத்த நேரம்"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "சோதனைகளின் கால அளவு"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "விடை :"
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "சரியான விடை :"
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "உங்கள் விடை"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "ஆவண தகவல்"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "தலைப்பு"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "வகை"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "வகை"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "மொழி"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "பதில்கள்"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v நொடிகள் கடந்தது"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "படிவம் சார்ந்த சோதனைகளும் தேர்வுகளும் "
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "உள்வாங்கவேண்டிய கோப்பு"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -41,6 +246,10 @@ msgstr "மூல ஆசிரியர்"
 msgid "Maintainer 2002-2004"
 msgstr "மேம்பாட்டாளர் 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "நடப்பு மேம்பாட்டாளர்"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "பலவித பிழைநீக்கிகள் மற்றும் அழித்தல்கள்"
@@ -49,11 +258,6 @@ msgstr "பலவித பிழைநீக்கிகள் மற்று
 msgid "Icons"
 msgstr "குறும்படங்கள்"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "நீங்கள் திறக்க வேண்டிய ஆவணத்தை குறிப்பிடுக"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "கேள்வி மாற்றம்"
@@ -62,30 +266,150 @@ msgstr "கேள்வி மாற்றம்"
 msgid "Add Questions"
 msgstr "கேள்விகளை சேர்"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "சரி"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "தவறு"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&சேர்"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "&படத்தொகுப்பை திற..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "ஆவண தகவல்"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "திட்டத்துக்கான விதிகளும் விவரங்களும்."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "விவரம்"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "வகை:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "நிலை:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "மொழி:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "வகை:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "தலைப்பு:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "படம்"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "முன்னிருப்பு படம்"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "ஆசிரியர்"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "இணைய பக்கம்:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "மின்னஞ்சல்:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "பெயர்:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "கணிப்பொறிகள்"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "சோதி"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "கேள்வி குறிப்புகளோடு தேர்வு"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "பதில் குறிப்புகளோடு தேர்வு"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "படக்காட்சி"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "தேர்வு"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "உளவியல் சோதனை"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "சுலபமான"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "சாதாரண"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "நிபுணர்"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "முதன்மையான"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -99,6 +423,11 @@ msgstr "&சேர்..."
 msgid "&Edit..."
 msgstr "&தொகு..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&மேல்"
@@ -115,17 +444,7 @@ msgstr "KEduca வரவேற்கிறது"
 msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
-msgstr ""
-"புதிய கேள்விகளை சேர்க்க தொகு பட்டியை பயன்படுத்து அல்லது சின்னத்தை தேர்வு "
-"செய்யவும்"
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Educa  கோப்பினை திறக்கவும்"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "பதில்கள்"
+msgstr "புதிய கேள்விகளை சேர்க்க தொகு பட்டியை பயன்படுத்து அல்லது சின்னத்தை தேர்வு செய்யவும்"
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -135,10 +454,6 @@ msgstr "கேள்வி படம்"
 msgid "Question point"
 msgstr "கேள்வி குறிப்பு"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "நேரம்"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr "நொடிகள் </p>"
@@ -171,26 +486,14 @@ msgstr "கோப்பை அழுத்து"
 msgid "Save Document As"
 msgstr "ஆவணத்தை இப்பெயரில் சேமி"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"ஏற்கனவே இதே பெயரில் ஆவணம் உள்ளது\n"
-"அதன்மேல் எழுத வேண்டுமா"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -201,13 +504,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "சோதி"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -243,540 +539,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "கேள்வியை நுழை"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "ஆவண தகவல்"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "திட்டத்துக்கான விதிகளும் விவரங்களும்."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "விவரம்"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "வகை:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "நிலை:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "மொழி:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "வகை:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "தலைப்பு:"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "நீங்கள் திறக்க வேண்டிய ஆவணத்தை குறிப்பிடுக"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "படம்"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "படிவ-அடிப்படையிலான சோதனைகள் தேர்வுகள் அமைப்பான்"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "முன்னிருப்பு படம்"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "ஆசிரியர்"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "நீங்கள் ஒரு சேவையகத்தை குறிப்பிடுக"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Web page:"
-msgstr "இணைய பக்கம்:"
+msgid "KEduca Config Dialog"
+msgstr "KEduca வடிவமைப்பு உரையாடல்"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Email:"
-msgstr "மின்னஞ்சல்:"
+msgid "Show Results"
+msgstr "முடிவுகளைக் காட்டு"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Name:"
-msgstr "பெயர்:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "கணிப்பொறிகள்"
+msgid "At the end of the test"
+msgstr "சோதனையின் முடிவில்"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "கேள்வி குறிப்புகளோடு தேர்வு"
+msgid "After answering each question"
+msgstr "ஒவ்வொரு கேள்விக்கும் பதில் அளித்தபிறகு"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:56
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "பதில் குறிப்புகளோடு தேர்வு"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "படக்காட்சி"
-
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "தேர்வு"
+msgid "Ordering"
+msgstr "வரிசைஅமைத்தல்"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "உளவியல் சோதனை"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "விடைகளை குறியில்லா வரிசையில் காட்டு"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "சுலபமான"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "சோதனை முடிததவுடன் தீர்வை காட்டு"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "சாதாரண"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "நிபுணர்"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "பல்வேறு அமைவுகள் "
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "முதன்மையான"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "கேள்வி "
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>கேள்வி</b></p>\n"
+"  <p><b>கேள்வி</b></p>\n"
 "<hr>\n"
-"  "
-"<p>கேள்வி மற்றும் வகை மட்டும் தேவை.</p>\n"
+"  <p>கேள்வி மற்றும் வகை மட்டும் தேவை.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&கேள்வி:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&வகை:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "படம்:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "புள்ளிகள்:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "நேரம்:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "யோசனை:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "விவரி:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "பதில்"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>பதில்</b></p>\n"
+"  <p><b>பதில்</b></p>\n"
 "<hr>\n"
-"  "
-"<p>பதில் மற்றும் மதிப்பு மட்டும் தேவை.</p>\n"
+"  <p>பதில் மற்றும் மதிப்பு மட்டும் தேவை.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&பதில்:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&மதிப்பு:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&புள்ளிகள்:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "மதிப்பு"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "புள்ளிகள்"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "&மேலே நகர்த்து"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "கீழே நகர்த்து"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">தகவல்</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&தொகு..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "தொகுப்பான் - துவக்கப்படுகிறது"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "&இருக்கும் ஆவணத்தை திற:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "அண்மை ஆவணத்தை திற:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "இணைய வரைபொருள் உலாவியுடன் திற"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "&புதிய ஆவணத்தை துவக்கு."
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">தகவல்</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "வரைபொருள்"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "முகவரி:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "சேவையகத்தை &சேர்"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "சேவையகங்கள்"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "முகவரி"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "மொழி"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "வகை"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "வகை"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&திற"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca வடிவமைப்பு உரையாடல்"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "முடிவுகளைக் காட்டு"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "சோதனையின் முடிவில்"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "ஒவ்வொரு கேள்விக்கும் பதில் அளித்தபிறகு"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "வரிசைஅமைத்தல்"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "கேள்விகளை குறியில்லா வரிசையில் காட்டு"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "விடைகளை குறியில்லா வரிசையில் காட்டு"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "tamilpc team"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "tamilpc@ambalam.com"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "நீங்கள் ஒரு சேவையகத்தை குறிப்பிடுக"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&சோதனையைத் தொடரு"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&அடுத்தது >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&விடைகள் சேமி"
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "ஆவணத்தை இப்பெயரில் சேமி"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "சேமிக்க இயலவில்லை"
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "கேள்வி %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr "இந்த வினாவை முடிப்பதற்கு உங்களுக்கு %1 வினாடிகளே உள்ளன"
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "தீர்வு"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "புள்ளி விவரம்"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "சரியான கேள்விகள்"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "தவறான கேள்விகள்"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "மொத்த புள்ளிகள்"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "சரியான புள்ளிகள்"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "தவறான புள்ளிகள்"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "மொத்த நேரம்"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "சோதனைகளின் கால அளவு"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "விடை :"
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "சரியான விடை :"
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "உங்கள் விடை"
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "தலைப்பு"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "படிவம் சார்ந்த சோதனைகளும் தேர்வுகளும் "
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "நடப்பு மேம்பாட்டாளர்"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v நொடிகள் கடந்தது"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca கேபகுதிகள் பிரிவு"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "பொது"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "பல்வேறு அமைவுகள் "
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "அடுத்ததற்கு சென்றவுடன் தீர்வின் விடையை காட்டு"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "சோதனை முடிததவுடன் தீர்வை காட்டு"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "வரிசை"
diff --git a/tde-i18n-tg/messages/tdeedu/keduca.po b/tde-i18n-tg/messages/tdeedu/keduca.po
index 39273869c91..70f6f182cb7 100644
--- a/tde-i18n-tg/messages/tdeedu/keduca.po
+++ b/tde-i18n-tg/messages/tdeedu/keduca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2004-06-17 00:38-0400\n"
 "Last-Translator: Marina Kolucheva <youth_opportunities@tajik.net>\n"
 "Language-Team: Tajik\n"
@@ -16,18 +16,228 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: keducabuilder/main.cpp:26
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
 #, fuzzy
-msgid "Form-based tests and exams builder"
+msgid "Open &Gallery..."
+msgstr "Кушодани галерея..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Кушодани Файли Educa"
+
+#: keduca/keduca_part.cpp:59
+#, fuzzy
+msgid "KEducaPart"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:60
+#, fuzzy
+msgid "KEduca KParts Component"
+msgstr "KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Умумӣ"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Танзимотҳои гуногун"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Баъди пахшкунии кнопкаи ОЯНДА натиҷатҳои саволҳо намоиш кунед"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Баъди тамом кардани санҷиш натиҷатҳо намоиш кунед"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Тартиб"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Намоиши саволҳо дар тартиби тасодуфӣ"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Намоиши ҷавобҳо дар тартиби тасодуфӣ"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr ""
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Оянда >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Нигоҳ доштани натиҷаҳо..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Нигоҳ доштани натиҷаҳои ҳамчун..."
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Номи ин ҳуҷҷат боз вуҷуд дорад.\n"
+" Шумо хоҳед ин аз нав боз нависед?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr ""
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Нигоҳ доштан нашуд."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Савол %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Маҳалҳо"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Шумо бояд баъди %1 сония барои ин савол ҷавоб диҳед.\n"
+"\n"
+"Агар шумо тайёт аст, OK-ро пахш кунед."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Натиҷа"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Статистика"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Саволҳои дуруст"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Саволҳои нодуруст"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Ҳамагӣ маҳалҳо"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Маҳалҳои дуруст"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Маҳалҳои нодуруст"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Вақт"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Вақти ҳамагӣ"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Вақти санҷишҳо"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Ҷавоб:"
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Ҷавоби дуруст:"
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Ин ҷавоби шумо буд:"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Ахбороти Ҳуҷҷат"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Сарлавҳа"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Категория"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Намуд"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Забон"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Ҷавобҳо"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr ""
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
 msgstr "Имтиҳонҳо ва Санҷишҳо"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Файл барои пурбор кардан"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -37,6 +247,10 @@ msgstr ""
 msgid "Maintainer 2002-2004"
 msgstr ""
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr ""
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr ""
@@ -45,11 +259,6 @@ msgstr ""
 msgid "Icons"
 msgstr ""
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Шумо бояд файл барои кушодан муайян кунед!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Дигаргункардани савол"
@@ -58,31 +267,150 @@ msgstr "Дигаргункардани савол"
 msgid "Add Questions"
 msgstr "Иловаи Саволҳо"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Аниқ"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Нодуруст"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Илова кардан"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-#, fuzzy
-msgid "Open &Gallery..."
-msgstr "Кушодани галерея..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Ахбороти Ҳуҷҷат"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Тасвир ва қоида барои лоиҳа."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Тасвир"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Намуд:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Ҳамвор:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Забон:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Категория:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Сарлавҳа:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Сурат"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Сурати пешфарз:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Муаллиф"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Саҳифаи Веб:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Почтаи электронӣ:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Ном:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Компютерҳо"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Санҷиш"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Санҷиш бо Саволи Маҳалҳо"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Санҷиш бо Ҷавоби Маҳалҳо"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Намоиши слайд"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Санҷидан"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Санҷиши Психологӣ"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Осон"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Муқаррарӣ"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Мутазассис"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Олӣ"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -98,6 +426,11 @@ msgstr "Илова кунед..."
 msgid "&Edit..."
 msgstr "Муҳаррирӣ кардан..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 #, fuzzy
 msgid "&Up"
@@ -120,14 +453,6 @@ msgstr ""
 "Бо истифодаи Менюи Муҳаррир ё бо интихоби нишонаи поёнбуда саволи нав илова "
 "куне"
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Кушодани Файли Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Ҷавобҳо"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Тасвири Савол"
@@ -136,10 +461,6 @@ msgstr "Тасвири Савол"
 msgid "Question point"
 msgstr "Саволи маҳал"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Вақт"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " сонияҳо</p>"
@@ -172,22 +493,10 @@ msgstr ""
 msgid "Save Document As"
 msgstr "Нигоҳ доштани ҳуҷҷатро ҳамчун"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Номи ин ҳуҷҷат боз вуҷуд дорад.\n"
-" Шумо хоҳед ин аз нав боз нависед?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr ""
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Агар шумо мехоҳед ин ҳуҷҷат ширкат намоед, шумо метавонед аз ин ҳуҷҷат нусха "
@@ -202,13 +511,6 @@ msgstr ""
 msgid "Do Not Copy"
 msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Санҷиш"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -245,549 +547,264 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Саволро Монед"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Ахбороти Ҳуҷҷат"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Тасвир ва қоида барои лоиҳа."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Тасвир"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Намуд:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Ҳамвор:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Забон:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Категория:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Сарлавҳа:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Сурат"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Сурати пешфарз:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Муаллиф"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Саҳифаи Веб:"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Шумо бояд файл барои кушодан муайян кунед!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
-#, no-c-format
-msgid "Email:"
-msgstr "Почтаи электронӣ:"
+#: keducabuilder/main.cpp:26
+#, fuzzy
+msgid "Form-based tests and exams builder"
+msgstr "Имтиҳонҳо ва Санҷишҳо"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
-#, no-c-format
-msgid "Name:"
-msgstr "Ном:"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Компютерҳо"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Шумо бояд серверро муайян кунед!"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Санҷиш бо Саволи Маҳалҳо"
+msgid "KEduca Config Dialog"
+msgstr ""
+
+#: keduca/configdialogbase.ui:27
+#, fuzzy, no-c-format
+msgid "Show Results"
+msgstr "Натиҷа"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Санҷиш бо Ҷавоби Маҳалҳо"
+msgid "At the end of the test"
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Намоиши слайд"
+#: keduca/configdialogbase.ui:46
+#, no-c-format
+msgid "After answering each question"
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Санҷидан"
+#: keduca/configdialogbase.ui:56
+#, fuzzy, no-c-format
+msgid "Ordering"
+msgstr "Тартиб"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Санҷиши Психологӣ"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Намоиши ҷавобҳо дар тартиби тасодуфӣ"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Осон"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Баъди тамом кардани санҷиш натиҷатҳо намоиш кунед"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Муқаррарӣ"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Мутазассис"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Танзимотҳои гуногун"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Олӣ"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Савол"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Саволҳо</b></p>\n"
+"  <p><b>Саволҳо</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Танҳо саволҳо ва навиштан даркор аст.</p>\n"
+"  <p>Танҳо саволҳо ва навиштан даркор аст.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Савол:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Намуд:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Сурат:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "&Маҳал:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&Вақт:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "Н&ӯг:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Фаҳмондан:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Ҷавоб"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Ҷавобҳо</b></p>\n"
+"  <p><b>Ҷавобҳо</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Танҳо ҷавобҳо ва аҳамият даркор аст.</p>\n"
+"  <p>Танҳо ҷавобҳо ва аҳамият даркор аст.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Ҷавоб:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Арзиш:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Маҳалҳо:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Арзиш"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Маҳалҳо"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Ҳа&ракати боло"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Ҳарак&ати поён"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Ахборот</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "Муҳаррирӣ кардан..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Муҳаррир - Сар кардан"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "&Кушодани ҳуҷҷатҳои мавҷудбуда:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "&Кушодани ҳуҷҷатҳои қарибӣ:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Бо Броузери Галереяи Интернет кушоед"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "&Ҳуҷҷати нав сар кунед"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Ахборот</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Галерея"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Адрес:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "Иловаи &Сервер"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Серверҳо"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Адрес"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Забон"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Категория"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Намуд"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Кушодан"
 
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, fuzzy, no-c-format
-msgid "Show Results"
-msgstr "Натиҷа"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr ""
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, fuzzy, no-c-format
-msgid "Ordering"
-msgstr "Тартиб"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Намоиши саволҳо дар тартиби тасодуфӣ"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Намоиши ҷавобҳо дар тартиби тасодуфӣ"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Шумо бояд серверро муайян кунед!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr ""
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Оянда >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Нигоҳ доштани натиҷаҳо..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Нигоҳ доштани натиҷаҳои ҳамчун..."
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Нигоҳ доштан нашуд."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Савол %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Шумо бояд баъди %1 сония барои ин савол ҷавоб диҳед.\n"
-"\n"
-"Агар шумо тайёт аст, OK-ро пахш кунед."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Натиҷа"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Статистика"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Саволҳои дуруст"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Саволҳои нодуруст"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Ҳамагӣ маҳалҳо"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Маҳалҳои дуруст"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Маҳалҳои нодуруст"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Вақти ҳамагӣ"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Вақти санҷишҳо"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Ҷавоб:"
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Ҷавоби дуруст:"
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Ин ҷавоби шумо буд:"
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Сарлавҳа"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Имтиҳонҳо ва Санҷишҳо"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr ""
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr ""
-
-#: keduca/keduca_part.cpp:59
-#, fuzzy
-msgid "KEducaPart"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:60
-#, fuzzy
-msgid "KEduca KParts Component"
-msgstr "KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Умумӣ"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Танзимотҳои гуногун"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Баъди пахшкунии кнопкаи ОЯНДА натиҷатҳои саволҳо намоиш кунед"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Баъди тамом кардани санҷиш натиҷатҳо намоиш кунед"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Тартиб"
-
 #~ msgid "1.2.0"
 #~ msgstr "1.2.0"
 
diff --git a/tde-i18n-tr/messages/tdeedu/keduca.po b/tde-i18n-tr/messages/tdeedu/keduca.po
index 89872ba2de2..74e128c8b55 100644
--- a/tde-i18n-tr/messages/tdeedu/keduca.po
+++ b/tde-i18n-tr/messages/tdeedu/keduca.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2007-07-10 02:21+0300\n"
 "Last-Translator: Serdar Soytetir\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -22,17 +22,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Form tabanlı testler ve sınavlar yaratıcısı"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Zerrin Çakmakkaya"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "zerrin@uludag.org.tr"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "&Galeriyi Aç..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Educa Dosyası Aç"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca KParts Bileşeni"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Genel"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Çeşitli Ayarlar"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "İleri tuşuna tıkladıktan sonra sorunun cevabını göster"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Test bittiği zaman sonuçları göster"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Sıralama"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Soruları rastgele göster"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Cevapları rastgele göster"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "Te&sti Başlat"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "İ&leri >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Sonuçları Kaydet..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Sonuçları Farklı Kaydet"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Bu isimde bir belge var.\n"
+"Üzerine kaydedilsin mi?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Üzerine Yaz"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Kaydetme başarısız oldu."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "%1 Soru"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Puanlar"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Bu soruyu cevaplamak için %1 saniyeniz var. \n"
+"\n"
+"Hazır olduğunuz zaman \"Onayla\" düğmesine tıklayın."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Sonuç"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "İstatistikler"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Doğru sorular"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Yanlış sorular"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Toplam puan"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Doğru puanlar"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Yanlış puanlar"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Zaman"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Toplam süre"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Testlerdeki süre"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Cevap:"
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Doğru cevap:"
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Sizin cevabınız: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Belge Bilgisi"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Başlık"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Kategori"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Tür"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Dil"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Cevaplar"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v saniye kaldı"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Form tabanlı testler ve sınavlar"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Yüklenecek dosya"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -42,6 +250,10 @@ msgstr "Asıl Yazar"
 msgid "Maintainer 2002-2004"
 msgstr "Sorumlu 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Mevcut Sorumlu"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Çeşitli düzeltmeler ve temizlemeler"
@@ -50,11 +262,6 @@ msgstr "Çeşitli düzeltmeler ve temizlemeler"
 msgid "Icons"
 msgstr "Simgeler"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Açılacak dosya adını belirtmelisiniz!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Soruyu Değiştir"
@@ -63,30 +270,150 @@ msgstr "Soruyu Değiştir"
 msgid "Add Questions"
 msgstr "Soru Ekle"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Doğru"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Yanlış"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Ekle"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "&Galeriyi Aç..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Belge Bilgisi"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Projenin açıklaması ve kuralları."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Açıklama"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Tür:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Seviye:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Lisan:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Katogori:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Başlık:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Resim"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Öntanımlı resim:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Yazar"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Web sayfası:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "E-posta:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "İsim:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Bilgisayar"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Dene"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Soru Puanlarıyla Test"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Cevap Puanlarıyla Test"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Slayt gösterisi"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Sınav"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Psikoteknik Test"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Kolay"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Normal"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Uzman"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Çok zor"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -100,6 +427,11 @@ msgstr "&Ekle..."
 msgid "&Edit..."
 msgstr "&Düzenle..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Yukarı"
@@ -117,16 +449,8 @@ msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 msgstr ""
-"Düzenlene Menüsü'nü kullanarak ya da yukarıdaki simgelerden birini seçerek yeni "
-"bir Soru ekle."
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Educa Dosyası Aç"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Cevaplar"
+"Düzenlene Menüsü'nü kullanarak ya da yukarıdaki simgelerden birini seçerek "
+"yeni bir Soru ekle."
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -136,10 +460,6 @@ msgstr "Soru Resmi"
 msgid "Question point"
 msgstr "Soru puanı"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Zaman"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " saniye</p>"
@@ -172,22 +492,10 @@ msgstr "Dosyayı sıkıştır"
 msgid "Save Document As"
 msgstr "Belgeyi Farklı Kaydet"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Bu isimde bir belge var.\n"
-"Üzerine kaydedilsin mi?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Üzerine Yaz"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "Bu belgeyi paylaşmak isterseniz, resimleri belgeyle aynı klasöre kopyalamak "
@@ -202,13 +510,6 @@ msgstr "Resimleri Kopyala"
 msgid "Do Not Copy"
 msgstr "Kopyalama"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Dene"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -244,543 +545,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Soru Ekle"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Belge Bilgisi"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Projenin açıklaması ve kuralları."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Açıklama"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Tür:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Seviye:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Lisan:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Katogori:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Başlık:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Resim"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Açılacak dosya adını belirtmelisiniz!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Öntanımlı resim:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Form tabanlı testler ve sınavlar yaratıcısı"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Yazar"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Web sayfası:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Bir sunucu adı belirtmelisiniz!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "E-posta:"
+msgid "KEduca Config Dialog"
+msgstr "KEduca Yapılandırma Kutusu"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "İsim:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Bilgisayar"
+msgid "Show Results"
+msgstr "Sonuçları Göster"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Soru Puanlarıyla Test"
+msgid "At the end of the test"
+msgstr "Testin sonunda"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Cevap Puanlarıyla Test"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Slayt gösterisi"
+msgid "After answering each question"
+msgstr "Her soruya cevap verdikten sonra"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Sınav"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Sıralama"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Psikoteknik Test"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Cevapları rastgele göster"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Kolay"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Test bittiği zaman sonuçları göster"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Normal"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Uzman"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Çeşitli Ayarlar"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Çok zor"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Soru"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Soru</b></p>\n"
+"  <p><b>Soru</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Sadece soru ve türü gereklidir.</p>\n"
+"  <p>Sadece soru ve türü gereklidir.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Soru:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Tür:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Resim:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "&Puan:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&Zaman:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&İpucu:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "&Açıkla:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Cevap"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Cevaplar</b></p>\n"
+"  <p><b>Cevaplar</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Sadece cevap ve değerli gereklidir.</p>\n"
+"  <p>Sadece cevap ve değerli gereklidir.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Cevap:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Değer:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Puanlar:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Değer"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Puanlar"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "&Yukarı Taşı"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "&Aşağı Taşı"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Bilgi</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Düzenle..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "KEduca Düzenleyicisi Başlatılıyor"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "&Mevcut bir belgeyi aç:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "&Son kullanılan belgelerden aç:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "İnternet galeri tarayıcısıyla aç"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "&Yeni bir belgeye başla"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Bilgi</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "&Galeri"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Adres:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Sunucu Ekle"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Sunucular"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Adres"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Dil"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Kategori"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Tür"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Aç"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca Yapılandırma Kutusu"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Sonuçları Göster"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Testin sonunda"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Her soruya cevap verdikten sonra"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Sıralama"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Soruları rastgele göster"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Cevapları rastgele göster"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Zerrin Çakmakkaya"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "zerrin@uludag.org.tr"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Bir sunucu adı belirtmelisiniz!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "Te&sti Başlat"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "İ&leri >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Sonuçları Kaydet..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Sonuçları Farklı Kaydet"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Kaydetme başarısız oldu."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "%1 Soru"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Bu soruyu cevaplamak için %1 saniyeniz var. \n"
-"\n"
-"Hazır olduğunuz zaman \"Onayla\" düğmesine tıklayın."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Sonuç"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "İstatistikler"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Doğru sorular"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Yanlış sorular"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Toplam puan"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Doğru puanlar"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Yanlış puanlar"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Toplam süre"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Testlerdeki süre"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Cevap:"
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Doğru cevap:"
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Sizin cevabınız: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Başlık"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Form tabanlı testler ve sınavlar"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Mevcut Sorumlu"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v saniye kaldı"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca KParts Bileşeni"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Genel"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Çeşitli Ayarlar"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "İleri tuşuna tıkladıktan sonra sorunun cevabını göster"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Test bittiği zaman sonuçları göster"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Sıralama"
diff --git a/tde-i18n-uk/messages/tdeedu/keduca.po b/tde-i18n-uk/messages/tdeedu/keduca.po
index 36d940c2b5a..16760a748d7 100644
--- a/tde-i18n-uk/messages/tdeedu/keduca.po
+++ b/tde-i18n-uk/messages/tdeedu/keduca.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2007-03-24 18:19-0700\n"
 "Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -19,25 +19,233 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Побудова (на основі форм) тестів та екзаменів"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Gladky Dima,Іван Петрущак"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "gladimdim@inbox.ru,ivanpetrouchtchak@yahoo.com"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Відкрити &галерею..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Відкрити файл Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "Компонент KEduca KParts"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Загальне"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Різні параметри"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Показувати результати відповіді після натискання далі"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Показувати результати після закінчення тесту"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Порядок"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Показувати питання у випадковому порядку"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Показувати відповіді у випадковому порядку"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Почати тест"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Далі >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Зберегти результати..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Зберегти результати як"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Документ з такою назвою вже існує.\n"
+"Перезаписати його?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Перезаписати"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Помилка збереження."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Питання %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Бали"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Ви маєте %1 сек. для відповіді на це питання.\n"
+"\n"
+"Натисніть \"Гаразд\", коли ви готові."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Результат"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Статистика"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Вірні питання"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Невірні питання"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Всього балів"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Бали за правильні відповіді"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Балів за неправильні відповіді"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Час"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Всього часу"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Час в тестах"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Відповідь: "
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Вірна відповідь: "
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Ваша відповідь: "
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Інформація про документ"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Заголовок"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Категорія"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Тип"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Мова"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Відповіді"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "%v залишилось секунд"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Тести та екзамени у формах"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Файл для звантаження"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -47,6 +255,10 @@ msgstr "Перший автор"
 msgid "Maintainer 2002-2004"
 msgstr "Супровід 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Поточний супровід"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Різні виправлення на чистка"
@@ -55,11 +267,6 @@ msgstr "Різні виправлення на чистка"
 msgid "Icons"
 msgstr "Піктограми"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Ви маєте вказати файл для відкриття!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Змінити питання"
@@ -68,30 +275,150 @@ msgstr "Змінити питання"
 msgid "Add Questions"
 msgstr "Додати питання"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Вірно"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Невірно"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Додати"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Відкрити &галерею..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Інформація про документ"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Опис і правила проекту."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Опис"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Тип:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Рівень:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Мова:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Категорія:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Заголовок:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Зображення"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Типове зображення:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Автор"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Веб-сторінка:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Ел. пошта:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Ім'я:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Комп'ютери"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Тест"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Тест з балами за питання"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Тест з балами за відповідь"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Показ слайдів"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Екзамен"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Психологічний тест"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Легкий"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Нормальний"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Експерт"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Найскладніший"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -105,6 +432,11 @@ msgstr "&Додати..."
 msgid "&Edit..."
 msgstr "&Редагувати..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Вгору"
@@ -124,14 +456,6 @@ msgid ""
 msgstr ""
 "Додайте новий тест через меню \"Правка\" або вибравши одну з піктограм вище."
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Відкрити файл Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Відповіді"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "Зображення питання"
@@ -140,10 +464,6 @@ msgstr "Зображення питання"
 msgid "Question point"
 msgstr "Бал за питання"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Час"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " секунд</p>"
@@ -176,26 +496,14 @@ msgstr "Стиснути файл"
 msgid "Save Document As"
 msgstr "Зберегти документ як"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Документ з такою назвою вже існує.\n"
-"Перезаписати його?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Перезаписати"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Якщо ви хочете зробити цей документ спільним, то краще скопіювати зображення до "
-"тієї самої теки що й документи.\n"
+"Якщо ви хочете зробити цей документ спільним, то краще скопіювати зображення "
+"до тієї самої теки що й документи.\n"
 "Хочете скопіювати зображення?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -206,13 +514,6 @@ msgstr "Скопіювати зображення"
 msgid "Do Not Copy"
 msgstr "Не копіювати"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Тест"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -248,543 +549,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Вставити питання"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Інформація про документ"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Опис і правила проекту."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Опис"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Тип:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Рівень:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Мова:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Категорія:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Заголовок:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Зображення"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Ви маєте вказати файл для відкриття!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Типове зображення:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Побудова (на основі форм) тестів та екзаменів"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Автор"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Веб-сторінка:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Необхідно вказати сервер!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Ел. пошта:"
+msgid "KEduca Config Dialog"
+msgstr "Вікно налаштування KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Ім'я:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Комп'ютери"
+msgid "Show Results"
+msgstr "Показати результати"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Тест з балами за питання"
+msgid "At the end of the test"
+msgstr "Наприкінці тесту"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Тест з балами за відповідь"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Показ слайдів"
+msgid "After answering each question"
+msgstr "Після відповіді на кожне питання"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Екзамен"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Порядок"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Психологічний тест"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Показувати відповіді у випадковому порядку"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Легкий"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Показувати результати після закінчення тесту"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Нормальний"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Експерт"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Різні параметри"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Найскладніший"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Питання"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Питання</b></p>\n"
+"  <p><b>Питання</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Потрібне тільки питання і тип.</p>\n"
+"  <p>Потрібне тільки питання і тип.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Питання:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Тип:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Зображення:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "Ба&л:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "Ча&с:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "П&ідказка:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "По&яснення:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Відповідь"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Відповіді</b></p>\n"
+"  <p><b>Відповіді</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Потрібна тільки відповідь і значення.</p>\n"
+"  <p>Потрібна тільки відповідь і значення.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Відповідь:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "&Значення:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "&Бали:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Значення"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Бали"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Пересунути &вгору"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Пересунути в&низ"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Інформація</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Редагувати..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Editor - початок роботи"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Відкрити і&снуючий документ:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Відкрити &недавній документ:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Відкрити в переглядачі галерей Інтернету"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Почати н&овий документ"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Інформація</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Галерея"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Адреса:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Додати сервер"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Сервери"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Адреса"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Мова"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Категорія"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Тип"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Відкрити"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Вікно налаштування KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Показати результати"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Наприкінці тесту"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Після відповіді на кожне питання"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Порядок"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Показувати питання у випадковому порядку"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Показувати відповіді у випадковому порядку"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Gladky Dima,Іван Петрущак"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "gladimdim@inbox.ru,ivanpetrouchtchak@yahoo.com"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Необхідно вказати сервер!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Почати тест"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Далі >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Зберегти результати..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Зберегти результати як"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Помилка збереження."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Питання %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Ви маєте %1 сек. для відповіді на це питання.\n"
-"\n"
-"Натисніть \"Гаразд\", коли ви готові."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Результат"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Статистика"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Вірні питання"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Невірні питання"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Всього балів"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Бали за правильні відповіді"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Балів за неправильні відповіді"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Всього часу"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Час в тестах"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Відповідь: "
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Вірна відповідь: "
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Ваша відповідь: "
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Заголовок"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Тести та екзамени у формах"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Поточний супровід"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "%v залишилось секунд"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "Компонент KEduca KParts"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Загальне"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Різні параметри"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Показувати результати відповіді після натискання далі"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Показувати результати після закінчення тесту"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Порядок"
diff --git a/tde-i18n-vi/messages/tdeedu/keduca.po b/tde-i18n-vi/messages/tdeedu/keduca.po
index efb9b69158d..a1cba31517a 100644
--- a/tde-i18n-vi/messages/tdeedu/keduca.po
+++ b/tde-i18n-vi/messages/tdeedu/keduca.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2006-06-02 15:41+0930\n"
 "Last-Translator: Trần Thế Trung <tttrung@hotmail.com>\n"
 "Language-Team: Vietnamese <kde-l10n-vi@kde.org>\n"
@@ -16,17 +16,225 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms: nplurals=1;plural=0\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "Trình tạo dựng kiểm tra học vấn dựa trên điền vào đơn"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Trần Thế Trung"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "tttrung@hotmail.com"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "Mở &Trưng bày...."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "Mở Tập tin Educa"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "Thành phần KPart của KEduca"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "Chung"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "Các Cài đặt"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "Hiển thị kết quả của câu tra lời sau khi nhấn nút tiếp theo"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "Hiển thị kết quả sau khi hoàn thành toàn bộ bài kiểm tra"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "Thứ tự"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "Hiển thị câu hỏi theo thứ tự ngẫu nhiên"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "Hiện thị câu trả lời theo thứ tự ngẫu nhiên"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "&Bắt đầu Kiểm tra"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "&Tiếp theo >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "&Lưu Kết quả..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "Lưa Kết quả Là"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Một tài liệu có cùng tên đã tồn tại.\n"
+"Bạn có muốn ghi đè lên nó không?"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "Ghi đè"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "Không lưu được."
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "Câu hỏi %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "Điểm"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"Bạn còn %1 giây để trả lời câu hỏi này.\n"
+"\n"
+"Nhấn OK khi bạn sẵn sàng."
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "Kết quả"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "Thống kê"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "Câu trả lời đúng"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "Câu trả lời sai"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "Tổng điểm"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "Điểm đúng"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "Điểm sai"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "Thời gian"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "Tổng thời gian"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "Thời gian trong kiểm tra"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "Câu trả lời là:"
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "Câu trả lời đúng là:"
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "Câu trả lời của bạn đã là:"
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "Thông tin Tài liệu"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "Tiêu đề"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "Thể loại"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "Kiểu"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "Ngôn ngữ"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "Trả lời"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "còn %v giây"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "Kiểm tra và thi dựa trên điền vào đơn"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "Tập tin để tải"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "Trình tạo dựng Kiểm tra Học vấn KEduca"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -36,6 +244,10 @@ msgstr "Tác giả Gốc"
 msgid "Maintainer 2002-2004"
 msgstr "Bảo trì 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "Người bảo trì hiện tại"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "Nhiều sửa chữa và dọn dẹp"
@@ -44,11 +256,6 @@ msgstr "Nhiều sửa chữa và dọn dẹp"
 msgid "Icons"
 msgstr "Biểu tượng"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "Bạn cần chỉ rõ tập tin cần mở!"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "Sửa Câu hỏi"
@@ -57,30 +264,150 @@ msgstr "Sửa Câu hỏi"
 msgid "Add Questions"
 msgstr "Thêm Câu hỏi"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "Đúng"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "Sai"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "&Thêm"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "Mở &Trưng bày...."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "Thông tin Tài liệu"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "Miêu tả và luật lệ của dự án."
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "Miêu tả"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "Kiểu:"
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "Mức độ:"
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "Ngôn ngữ:"
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "Thể loại:"
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "Tiêu đề:"
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "Hình"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "Hình mặc định:"
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "Tác giả"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "Trang mạng:"
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "Thư điện tử:"
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "Tên:"
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "Máy tính"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "Kiểm tra"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "Kiểm tra với Điểm cho Câu hỏi"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "Kiểm tra với Điểm cho Câu trả lời"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "Chiếu lướt"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "Thi"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "Kiểm tra Tâm lý kỹ thuật"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "Dễ"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "Trung bình"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "Chuyên gia"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "Siêu đẳng"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -94,6 +421,11 @@ msgstr "&Thêm..."
 msgid "&Edit..."
 msgstr "&Soạn..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "&Lên"
@@ -111,15 +443,8 @@ msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 msgstr ""
-"Thêm Câu hỏi mới bằng cách dùng Thực đơn Soạn hoặc chọn một biểu tượng ở trên."
-
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "Mở Tập tin Educa"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "Trả lời"
+"Thêm Câu hỏi mới bằng cách dùng Thực đơn Soạn hoặc chọn một biểu tượng ở "
+"trên."
 
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
@@ -129,10 +454,6 @@ msgstr "Hình Câu hỏi"
 msgid "Question point"
 msgstr "Điểm Câu hỏi"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "Thời gian"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " giây</p>"
@@ -165,26 +486,14 @@ msgstr "Nén tập tin"
 msgid "Save Document As"
 msgstr "Lưu Tài liệu Là"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Một tài liệu có cùng tên đã tồn tại.\n"
-"Bạn có muốn ghi đè lên nó không?"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "Ghi đè"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
-"Nếu bạn muốn chia sẻ tài liệu này, bạn nên sao chép hình vào cùng thư mục với "
-"tài liệu.\n"
+"Nếu bạn muốn chia sẻ tài liệu này, bạn nên sao chép hình vào cùng thư mục "
+"với tài liệu.\n"
 "Bạn có muốn sao chép hình không?"
 
 #: keducabuilder/keducabuilder.cpp:464
@@ -195,13 +504,6 @@ msgstr "Sao chép Hình ảnh"
 msgid "Do Not Copy"
 msgstr "Đừng Sao chép"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "Kiểm tra"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -237,543 +539,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "Chèn vào Câu hỏi"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "Thông tin Tài liệu"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "Miêu tả và luật lệ của dự án."
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "Miêu tả"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "Kiểu:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "Mức độ:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "Ngôn ngữ:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "Thể loại:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "Tiêu đề:"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "Hình"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "Bạn cần chỉ rõ tập tin cần mở!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "Hình mặc định:"
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "Trình tạo dựng kiểm tra học vấn dựa trên điền vào đơn"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "Tác giả"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "Trình tạo dựng Kiểm tra Học vấn KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "Trang mạng:"
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "Bạn cần chỉ rõ máy phục vụ!"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "Thư điện tử:"
+msgid "KEduca Config Dialog"
+msgstr "Hộp thoại Cấu hình KEduca"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "Tên:"
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "Máy tính"
+msgid "Show Results"
+msgstr "Hiển thị Kết quả"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "Kiểm tra với Điểm cho Câu hỏi"
+msgid "At the end of the test"
+msgstr "Ở cuối cuộc kiểm tra"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "Kiểm tra với Điểm cho Câu trả lời"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "Chiếu lướt"
+msgid "After answering each question"
+msgstr "Sau mỗi câu trả lời"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "Thi"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "Thứ tự"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "Kiểm tra Tâm lý kỹ thuật"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "Hiện thị câu trả lời theo thứ tự ngẫu nhiên"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "Dễ"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "Hiển thị kết quả sau khi hoàn thành toàn bộ bài kiểm tra"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "Trung bình"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "Chuyên gia"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "Các Cài đặt"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "Siêu đẳng"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "Câu hỏi"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Câu hỏi</b></p>\n"
+"  <p><b>Câu hỏi</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Chỉ cần câu hỏi và kiểu hỏi.</p>\n"
+"  <p>Chỉ cần câu hỏi và kiểu hỏi.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "&Câu hỏi:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "&Kiểu:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "&Hình:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "Đ&iểm:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "&Thời gian:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "&Gợi ý:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "Giải thí&ch:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "Trả lời"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Câu trả lời</b></p>\n"
+"  <p><b>Câu trả lời</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Chỉ cần câu trả lời và giá trị.</p>\n"
+"  <p>Chỉ cần câu trả lời và giá trị.</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "&Trả lời:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "Giá t&rị:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "Điể&m:"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "Giá trị"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "Điểm"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "Chuyển &Lên"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "Chuyển &Xuống"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">Thông tin</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "&Soạn..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "Biên tập - Bắt đầu"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "Mở một tài liệu có &sẵn:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "Mở một tài liệu &gần đây:"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "Mở một trình duyệt trang trưng bày trên Internet"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "Bắt đầu một tài liệu &mới"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">Thông tin</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "Trưng bày"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "Địa chỉ:"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "&Thêm Máy phục vụ"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "Máy phục vụ"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "Địa chỉ"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "Ngôn ngữ"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "Thể loại"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "Kiểu"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "&Mở"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "Hộp thoại Cấu hình KEduca"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "Hiển thị Kết quả"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "Ở cuối cuộc kiểm tra"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "Sau mỗi câu trả lời"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "Thứ tự"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "Hiển thị câu hỏi theo thứ tự ngẫu nhiên"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "Hiện thị câu trả lời theo thứ tự ngẫu nhiên"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Trần Thế Trung"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "tttrung@hotmail.com"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "Bạn cần chỉ rõ máy phục vụ!"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "&Bắt đầu Kiểm tra"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "&Tiếp theo >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "&Lưu Kết quả..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "Lưa Kết quả Là"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "Không lưu được."
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "Câu hỏi %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"Bạn còn %1 giây để trả lời câu hỏi này.\n"
-"\n"
-"Nhấn OK khi bạn sẵn sàng."
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "Kết quả"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "Thống kê"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "Câu trả lời đúng"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "Câu trả lời sai"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "Tổng điểm"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "Điểm đúng"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "Điểm sai"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "Tổng thời gian"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "Thời gian trong kiểm tra"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "Câu trả lời là:"
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "Câu trả lời đúng là:"
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "Câu trả lời của bạn đã là:"
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "Tiêu đề"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "Kiểm tra và thi dựa trên điền vào đơn"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "Người bảo trì hiện tại"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "còn %v giây"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "Thành phần KPart của KEduca"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "Chung"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "Các Cài đặt"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "Hiển thị kết quả của câu tra lời sau khi nhấn nút tiếp theo"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "Hiển thị kết quả sau khi hoàn thành toàn bộ bài kiểm tra"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "Thứ tự"
diff --git a/tde-i18n-zh_CN/messages/tdeedu/keduca.po b/tde-i18n-zh_CN/messages/tdeedu/keduca.po
index 7c46c4be8d5..9a251ea3d8b 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/keduca.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/keduca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2008-01-30 11:07+0800\n"
 "Last-Translator: Wu XiaoGuang <woohsiaokuang@yahoo.com.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
@@ -18,17 +18,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "基于表格的测验和考试创建器"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "TDE 中文翻译组"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "打开图库(&G)..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "打开 Educa 文件"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca KParts 组件"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "常规"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "各种设置"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "按“下一个”后显示回答结果"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "完成测验后显示结果"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "顺序"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "以随机顺序显示问题"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "以随机顺序显示答案"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "开始测试(&S)"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "下一个(&N) >>"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "保存结果(&S)..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "结果另存为"
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"已经存在此名称的文档。\n"
+"您是否想要覆盖？"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "覆盖"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "保存失败。"
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "问题 %1："
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "分值"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"您有 %1 秒来完成这个问题。\n"
+"\n"
+"当您准备好之后请单击确定。"
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "结果"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "统计"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "正确答案"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "错误答案"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "总分"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "正确分数"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "不正确分数"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "时间"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "总计时间"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "测试中的时间"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "答案是："
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "正确的答案是："
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "您的回答是："
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "文档信息"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "标题"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "分类"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "类型"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "语言"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "回答"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "剩余 %v 秒"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "基于表格的测验和考试"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "要载入的文件"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -38,6 +246,10 @@ msgstr "原作者"
 msgid "Maintainer 2002-2004"
 msgstr "维护者 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "当前维护者"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "各种修复和清理"
@@ -46,11 +258,6 @@ msgstr "各种修复和清理"
 msgid "Icons"
 msgstr "图标"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "您需要指定要打开的文件！"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "修改问题"
@@ -59,30 +266,150 @@ msgstr "修改问题"
 msgid "Add Questions"
 msgstr "添加问题"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "对"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "错"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "添加(&A)"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "打开图库(&G)..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "文档信息"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "工程的描述和规则。"
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "描述"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "类型："
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "级别："
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "语言："
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "分类："
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "标题："
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "图片"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "默认图片："
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "作者"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "网页："
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "电子邮件："
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "姓名："
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "计算机"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "测验"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "根据问题分值测验"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "根据回答分值测验"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "幻灯片"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "考试"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "心理测验"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "容易"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "普通"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "专家"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "超级"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -96,6 +423,11 @@ msgstr "添加(&A)..."
 msgid "&Edit..."
 msgstr "编辑(&E)..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "上(&U)"
@@ -114,14 +446,6 @@ msgid ""
 "above."
 msgstr "使用编辑菜单或选择上面的任一图标可添加新问题。"
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "打开 Educa 文件"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "回答"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "问题图像"
@@ -130,10 +454,6 @@ msgstr "问题图像"
 msgid "Question point"
 msgstr "问题分值"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "时间"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " 秒数</p>"
@@ -166,22 +486,10 @@ msgstr "压缩文件"
 msgid "Save Document As"
 msgstr "文档另存为"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"已经存在此名称的文档。\n"
-"您是否想要覆盖？"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "覆盖"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr ""
 "如果您想要共享此文档，建议您将图像复制到文档所在文件夹。\n"
@@ -195,13 +503,6 @@ msgstr "复制图像"
 msgid "Do Not Copy"
 msgstr "不复制"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "测验"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -237,543 +538,259 @@ msgstr ""
 msgid "Insert Question"
 msgstr "插入问题"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "文档信息"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "工程的描述和规则。"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "描述"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "类型："
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "级别："
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "语言："
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "分类："
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "标题："
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "图片"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "您需要指定要打开的文件！"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "默认图片："
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "基于表格的测验和考试创建器"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "作者"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "网页："
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "您需要指定服务器！"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "电子邮件："
+msgid "KEduca Config Dialog"
+msgstr "KEduca 配置对话框"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "姓名："
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "计算机"
+msgid "Show Results"
+msgstr "显示结果"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "根据问题分值测验"
+msgid "At the end of the test"
+msgstr "测验结束后"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "根据回答分值测验"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "幻灯片"
+msgid "After answering each question"
+msgstr "回答每个问题后"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "考试"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "顺序"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "心理测验"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "以随机顺序显示答案"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "容易"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "完成测验后显示结果"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "普通"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "专家"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "各种设置"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "超级"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "问题"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>问题</b></p>\n"
+"  <p><b>问题</b></p>\n"
 "<hr>\n"
-"  "
-"<p>只需要问题与类型。</p>\n"
+"  <p>只需要问题与类型。</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "问题(&Q)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "类型(&T)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "图片(&P)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "分值(&O)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "时间(&M)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "提示(&I)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "解释(&E)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "回答"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>回答</b></p>\n"
+"  <p><b>回答</b></p>\n"
 "<hr>\n"
-"  "
-"<p>只需要回答与数值。</p>\n"
+"  <p>只需要回答与数值。</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "回答(&A)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "数值(&V)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "分值(&P)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "数值"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "分值"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "上移(&U)"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "下移(&D)"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b  style=\"text-decoration:underline;\">信息</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "编辑(&E)..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "编辑器 - 入门"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "打开已有文档(&E)："
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "打开最近的文档(&R)："
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "用 Internet 图库浏览器打开"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "开始新文档(&N)"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b  style=\"text-decoration:underline;\">信息</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "图库"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "地址："
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "添加服务器(&A)"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "服务器"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "地址"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "语言"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "分类"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "类型"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "打开(&O)"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca 配置对话框"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "显示结果"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "测验结束后"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "回答每个问题后"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "顺序"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "以随机顺序显示问题"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "以随机顺序显示答案"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "TDE 中文翻译组"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "您需要指定服务器！"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "开始测试(&S)"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "下一个(&N) >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "保存结果(&S)..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "结果另存为"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "保存失败。"
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "问题 %1："
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"您有 %1 秒来完成这个问题。\n"
-"\n"
-"当您准备好之后请单击确定。"
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "结果"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "统计"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "正确答案"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "错误答案"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "总分"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "正确分数"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "不正确分数"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "总计时间"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "测试中的时间"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "答案是："
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "正确的答案是："
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "您的回答是："
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "标题"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "基于表格的测验和考试"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "当前维护者"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "剩余 %v 秒"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca KParts 组件"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "常规"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "各种设置"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "按“下一个”后显示回答结果"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "完成测验后显示结果"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "顺序"
diff --git a/tde-i18n-zh_TW/messages/tdeedu/keduca.po b/tde-i18n-zh_TW/messages/tdeedu/keduca.po
index 0fbd75ec0a5..f27152ddb6a 100644
--- a/tde-i18n-zh_TW/messages/tdeedu/keduca.po
+++ b/tde-i18n-zh_TW/messages/tdeedu/keduca.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 18:53+0100\n"
 "PO-Revision-Date: 2006-06-19 12:25+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -17,17 +17,225 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "產生基本測驗的程式"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "陳英傑,Frank Weng (a.k.a. Franklin)"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "yinjieh@csie.nctu.edu.tw,franklin at goodhorse dot idv dot tw"
+
+#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+msgid "Open &Gallery..."
+msgstr "開啟相簿(&G)..."
+
+#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+msgid "Open Educa File"
+msgstr "開啟 Educa 檔案"
+
+#: keduca/keduca_part.cpp:59
+msgid "KEducaPart"
+msgstr "KEducaPart"
+
+#: keduca/keduca_part.cpp:60
+msgid "KEduca KParts Component"
+msgstr "KEduca KParts 元件"
+
+#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
+msgid "General"
+msgstr "一般的"
+
+#: keduca/keducaprefs.cpp:30
+msgid "Configure"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Miscellaneous"
+msgstr ""
+
+#: keduca/keducaprefs.cpp:41
+msgid "Various Settings"
+msgstr "各項設定"
+
+#: keduca/keducaprefs.cpp:56
+msgid "Show results of the answer after press next"
+msgstr "在按「下一個」之後顯示答題的結果"
+
+#: keduca/keducaprefs.cpp:60
+msgid "Show results when finish the test"
+msgstr "在結束測驗之後顯示結果"
+
+#: keduca/keducaprefs.cpp:64
+msgid "Order"
+msgstr "順序"
+
+#: keduca/configdialogbase.ui:67 keduca/keducaprefs.cpp:74
+#, no-c-format
+msgid "Show questions in random order"
+msgstr "隨機決定問題順序"
+
+#: keduca/configdialogbase.ui:75 keduca/keducaprefs.cpp:78
+#, no-c-format
+msgid "Show answers in random order"
+msgstr "隨機決定答案順序"
+
+#: keduca/keducaview.cpp:71
+msgid "&Start Test"
+msgstr "開始測驗(&S)"
+
+#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
+msgid "&Next >>"
+msgstr "下一個 >> (&N)"
+
+#: keduca/keducaview.cpp:89
+msgid "&Save Results..."
+msgstr "儲存結果(&S)..."
+
+#: keduca/keducaview.cpp:151
+msgid "Save Results As"
+msgstr "儲存結果為..."
+
+#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+msgid ""
+"A document with this name already exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"相同檔名的檔案已經存在。\n"
+"要覆寫嗎？"
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder/keducabuilder.cpp:464
+msgid "Warning"
+msgstr ""
+
+#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+msgid "Overwrite"
+msgstr "覆寫"
+
+#: keduca/keducaview.cpp:192
+msgid "Save failed."
+msgstr "儲存失敗。"
+
+#: keduca/keducaview.cpp:212
+#, c-format
+msgid "Question %1"
+msgstr "問題 %1"
+
+#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482
+#: keducabuilder/kcontroladdeditbase.ui:664
+#, no-c-format
+msgid "Points"
+msgstr "得分"
+
+#: keduca/keducaview.cpp:267
+msgid ""
+"You have %1 seconds to complete this question.\n"
+"\n"
+"Press OK when you are ready."
+msgstr ""
+"您還有 %1 秒來完成此問題。\n"
+"\n"
+"準備好以後請按下「確定」。"
+
+#: keduca/keducaview.cpp:376
+msgid "Result"
+msgstr "結果"
+
+#: keduca/keducaview.cpp:445
+msgid "Statistics"
+msgstr "統計"
+
+#: keduca/keducaview.cpp:446
+msgid "Correct questions"
+msgstr "答對的題數"
+
+#: keduca/keducaview.cpp:448
+msgid "Incorrect questions"
+msgstr "答錯的題數"
+
+#: keduca/keducaview.cpp:452
+msgid "Total points"
+msgstr "總分"
+
+#: keduca/keducaview.cpp:453
+msgid "Correct points"
+msgstr "正確得分"
+
+#: keduca/keducaview.cpp:455
+msgid "Incorrect points"
+msgstr "錯誤得分"
+
+#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+msgid "Time"
+msgstr "時間"
+
+#: keduca/keducaview.cpp:460
+msgid "Total time"
+msgstr "總共時間"
+
+#: keduca/keducaview.cpp:462
+msgid "Time in tests"
+msgstr "作答時間"
+
+#: keduca/keducaview.cpp:487
+msgid "The answer is: "
+msgstr "答案為："
+
+#: keduca/keducaview.cpp:489
+msgid "The correct answer is: "
+msgstr "正確答案為："
+
+#: keduca/keducaview.cpp:495
+msgid "Your answer was: "
+msgstr "您的答案是："
+
+#: keduca/keducaview.cpp:549 keducabuilder/kcontrolheader.cpp:69
+#, fuzzy
+msgid "Information"
+msgstr "文件資訊"
+
+#: keduca/keducaview.cpp:550
+msgid "Title"
+msgstr "標題"
+
+#: keduca/keducaview.cpp:551 libkeduca/kgallerydialogbase.ui:212
+#, no-c-format
+msgid "Category"
+msgstr "類別"
+
+#: keduca/keducaview.cpp:552 libkeduca/kgallerydialogbase.ui:223
+#, no-c-format
+msgid "Type"
+msgstr "類型"
+
+#: keduca/keducaview.cpp:553 libkeduca/kgallerydialogbase.ui:201
+#, no-c-format
+msgid "Language"
+msgstr "語言"
+
+#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+msgid "Answers"
+msgstr "答案"
+
+#: keduca/kquestion.cpp:56
+msgid "%v seconds left"
+msgstr "還有 %v 秒"
+
+#: keduca/main.cpp:25
+msgid "Form-based tests and exams"
+msgstr "產生基本的測驗"
 
 #: keduca/main.cpp:30 keducabuilder/main.cpp:31
 msgid "File to load"
 msgstr "要載入的檔案"
 
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
+#: keduca/main.cpp:36
+msgid "KEduca"
+msgstr "KEduca"
 
 #: keduca/main.cpp:39 keducabuilder/main.cpp:40
 msgid "Original Author"
@@ -37,6 +245,10 @@ msgstr "原始作者"
 msgid "Maintainer 2002-2004"
 msgstr "維護者 2002-2004"
 
+#: keduca/main.cpp:41
+msgid "Current Maintainer"
+msgstr "目前維護者"
+
 #: keduca/main.cpp:42 keducabuilder/main.cpp:42
 msgid "Various fixes and cleanups"
 msgstr "修正多個錯誤與整理程式碼"
@@ -45,11 +257,6 @@ msgstr "修正多個錯誤與整理程式碼"
 msgid "Icons"
 msgstr "圖示"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
-msgid "You need to specify the file to open!"
-msgstr "您必須指定要開啟的檔案。"
-
 #: keducabuilder/kcontroladdedit.cpp:56
 msgid "Modify Question"
 msgstr "修改題目"
@@ -58,30 +265,150 @@ msgstr "修改題目"
 msgid "Add Questions"
 msgstr "增加題目"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
 #: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
+#: keducabuilder/kcontroladdeditbase.ui:592
 #, no-c-format
 msgid "True"
 msgstr "對的"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
 #: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
+#: keducabuilder/kcontroladdeditbase.ui:587
 #, no-c-format
 msgid "False"
 msgstr "錯的"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
+#: keducabuilder/kcontroladdedit.cpp:106
+msgid "&Apply"
+msgstr ""
+
+#: keducabuilder/kcontroladdedit.cpp:108
+#: keducabuilder/kcontroladdeditbase.ui:696
 #, no-c-format
 msgid "&Add"
 msgstr "新增(&A)"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
-msgid "Open &Gallery..."
-msgstr "開啟相簿(&G)..."
+#: keducabuilder/kcontrolheader.cpp:30
+msgid "Document Information"
+msgstr "文件資訊"
+
+#: keducabuilder/kcontrolheader.cpp:77 keducabuilder/kcontrolheaderbase.ui:119
+#, no-c-format
+msgid "Description and rules of the project."
+msgstr "此專案的描述與規則"
+
+#: keducabuilder/kcontrolheader.cpp:83 keducabuilder/kcontrolheaderbase.ui:129
+#: libkeduca/kgallerydialogbase.ui:190
+#, no-c-format
+msgid "Description"
+msgstr "描述"
+
+#: keducabuilder/kcontrolheader.cpp:97 keducabuilder/kcontrolheaderbase.ui:173
+#, no-c-format
+msgid "Type:"
+msgstr "型態："
+
+#: keducabuilder/kcontrolheader.cpp:110 keducabuilder/kcontrolheaderbase.ui:224
+#, no-c-format
+msgid "Level:"
+msgstr "等級："
+
+#: keducabuilder/kcontrolheader.cpp:119 keducabuilder/kcontrolheaderbase.ui:151
+#, no-c-format
+msgid "Language:"
+msgstr "語言："
+
+#: keducabuilder/kcontrolheader.cpp:128 keducabuilder/kcontrolheaderbase.ui:162
+#, no-c-format
+msgid "Category:"
+msgstr "類別："
+
+#: keducabuilder/kcontrolheader.cpp:140 keducabuilder/kcontrolheaderbase.ui:140
+#, no-c-format
+msgid "Title:"
+msgstr "標題："
+
+#: keducabuilder/kcontrolheader.cpp:148 keducabuilder/kcontrolheaderbase.ui:252
+#, no-c-format
+msgid "Picture"
+msgstr "圖片"
+
+#: keducabuilder/kcontrolheader.cpp:158 keducabuilder/kcontrolheaderbase.ui:263
+#, no-c-format
+msgid "Default picture:"
+msgstr "預設圖片："
+
+#: keducabuilder/kcontrolheader.cpp:166 keducabuilder/kcontrolheaderbase.ui:281
+#: libkeduca/kgallerydialogbase.ui:234
+#, no-c-format
+msgid "Author"
+msgstr "作者"
+
+#: keducabuilder/kcontrolheader.cpp:184 keducabuilder/kcontrolheaderbase.ui:318
+#, no-c-format
+msgid "Web page:"
+msgstr "網頁："
+
+#: keducabuilder/kcontrolheader.cpp:190 keducabuilder/kcontrolheaderbase.ui:329
+#, no-c-format
+msgid "Email:"
+msgstr "電子郵件地址："
+
+#: keducabuilder/kcontrolheader.cpp:196 keducabuilder/kcontrolheaderbase.ui:292
+#: libkeduca/kgallerydialogbase.ui:46
+#, no-c-format
+msgid "Name:"
+msgstr "名稱："
+
+#: keducabuilder/kcontrolheader.cpp:340
+msgid "Computers"
+msgstr "電腦"
+
+#: keducabuilder/kcontroladdeditbase.ui:206
+#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
+#, no-c-format
+msgid "Test"
+msgstr "一般測驗題"
+
+#: keducabuilder/kcontroladdeditbase.ui:211
+#: keducabuilder/kcontrolheader.cpp:347
+#, no-c-format
+msgid "Test with Question Points"
+msgstr "依題目計分"
+
+#: keducabuilder/kcontroladdeditbase.ui:216
+#: keducabuilder/kcontrolheader.cpp:348
+#, no-c-format
+msgid "Test with Answers Points"
+msgstr "依答案計分"
+
+#: keducabuilder/kcontrolheader.cpp:349
+msgid "Slidershow"
+msgstr "幻燈片展示"
+
+#: keducabuilder/kcontrolheader.cpp:350
+msgid "Exam"
+msgstr "測驗"
+
+#: keducabuilder/kcontrolheader.cpp:351
+msgid "Psychotechnic Test"
+msgstr "心理學測試"
+
+#: keducabuilder/kcontrolheader.cpp:354
+msgid "Easy"
+msgstr "簡單"
+
+#: keducabuilder/kcontrolheader.cpp:355
+msgid "Normal"
+msgstr "一般"
+
+#: keducabuilder/kcontrolheader.cpp:356
+msgid "Expert"
+msgstr "專業"
+
+#: keducabuilder/kcontrolheader.cpp:357
+msgid "Supreme"
+msgstr "最強的"
 
 #: keducabuilder/keducabuilder.cpp:121
 msgid "Document Info"
@@ -95,6 +422,11 @@ msgstr "新增(&A)..."
 msgid "&Edit..."
 msgstr "編輯(&E)..."
 
+#: keducabuilder/kcontroladdeditbase.ui:707 keducabuilder/keducabuilder.cpp:126
+#, no-c-format
+msgid "&Remove"
+msgstr ""
+
 #: keducabuilder/keducabuilder.cpp:127
 msgid "&Up"
 msgstr "上移(&U)"
@@ -113,14 +445,6 @@ msgid ""
 "above."
 msgstr "用編輯選單或上方的圖示來新增問題。"
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
-msgid "Open Educa File"
-msgstr "開啟 Educa 檔案"
-
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
-msgid "Answers"
-msgstr "答案"
-
 #: keducabuilder/keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "題目圖片"
@@ -129,10 +453,6 @@ msgstr "題目圖片"
 msgid "Question point"
 msgstr "題目得分"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
-msgid "Time"
-msgstr "時間"
-
 #: keducabuilder/keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " 秒</p>"
@@ -163,22 +483,10 @@ msgstr "壓縮此檔"
 msgid "Save Document As"
 msgstr "儲存文件為"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
-msgid ""
-"A document with this name already exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"相同檔名的檔案已經存在。\n"
-"要覆寫嗎？"
-
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
-msgid "Overwrite"
-msgstr "覆寫"
-
 #: keducabuilder/keducabuilder.cpp:462
 msgid ""
-"If you want to share this document, it is better to copy the images to the same "
-"folder as the document.\n"
+"If you want to share this document, it is better to copy the images to the "
+"same folder as the document.\n"
 "Do you want to copy images?"
 msgstr "如果要分享此文件，最好將圖片複製到跟文件同一個目錄下。您要複製圖片嗎？"
 
@@ -190,13 +498,6 @@ msgstr "複製圖片"
 msgid "Do Not Copy"
 msgstr "不要複製"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
-#, no-c-format
-msgid "Test"
-msgstr "一般測驗題"
-
 #: keducabuilder/keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
@@ -232,148 +533,85 @@ msgstr ""
 msgid "Insert Question"
 msgstr "新增題目"
 
-#: keducabuilder/kcontrolheader.cpp:30
-msgid "Document Information"
-msgstr "文件資訊"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:128
-#, no-c-format
-msgid "Description and rules of the project."
-msgstr "此專案的描述與規則"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:131 rc.cpp:191
-#, no-c-format
-msgid "Description"
-msgstr "描述"
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:143
-#, no-c-format
-msgid "Type:"
-msgstr "型態："
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:146
-#, no-c-format
-msgid "Level:"
-msgstr "等級："
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:137
-#, no-c-format
-msgid "Language:"
-msgstr "語言："
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:140
-#, no-c-format
-msgid "Category:"
-msgstr "類別："
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:134
-#, no-c-format
-msgid "Title:"
-msgstr "標題："
-
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:149
-#, no-c-format
-msgid "Picture"
-msgstr "圖片"
+#: keducabuilder/keducaeditorstartdialog.cpp:109
+#: libkeduca/kgallerydialog.cpp:182
+msgid "You need to specify the file to open!"
+msgstr "您必須指定要開啟的檔案。"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:152
-#, no-c-format
-msgid "Default picture:"
-msgstr "預設圖片："
+#: keducabuilder/main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "產生基本測驗的程式"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:155 rc.cpp:203
-#, no-c-format
-msgid "Author"
-msgstr "作者"
+#: keducabuilder/main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:161
-#, no-c-format
-msgid "Web page:"
-msgstr "網頁："
+#: libkeduca/kgallerydialog.cpp:168
+msgid "You need to specify a server!"
+msgstr "您必須指定伺服器。"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:164
+#: keduca/configdialogbase.ui:16
 #, no-c-format
-msgid "Email:"
-msgstr "電子郵件地址："
+msgid "KEduca Config Dialog"
+msgstr "KEduca 設定對話框"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:158 rc.cpp:176
+#: keduca/configdialogbase.ui:27
 #, no-c-format
-msgid "Name:"
-msgstr "名稱："
-
-#: keducabuilder/kcontrolheader.cpp:340
-msgid "Computers"
-msgstr "電腦"
+msgid "Show Results"
+msgstr "顯示結果"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#: keduca/configdialogbase.ui:38
 #, no-c-format
-msgid "Test with Question Points"
-msgstr "依題目計分"
+msgid "At the end of the test"
+msgstr "測驗結束時"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#: keduca/configdialogbase.ui:46
 #, no-c-format
-msgid "Test with Answers Points"
-msgstr "依答案計分"
-
-#: keducabuilder/kcontrolheader.cpp:349
-msgid "Slidershow"
-msgstr "幻燈片展示"
+msgid "After answering each question"
+msgstr "回答每個問題後"
 
-#: keducabuilder/kcontrolheader.cpp:350
-msgid "Exam"
-msgstr "測驗"
+#: keduca/configdialogbase.ui:56
+#, no-c-format
+msgid "Ordering"
+msgstr "順序"
 
-#: keducabuilder/kcontrolheader.cpp:351
-msgid "Psychotechnic Test"
-msgstr "心理學測試"
+#: keduca/keduca.kcfg:9 keduca/keduca.kcfg:13
+#, fuzzy, no-c-format
+msgid "Display answers in random order."
+msgstr "隨機決定答案順序"
 
-#: keducabuilder/kcontrolheader.cpp:354
-msgid "Easy"
-msgstr "簡單"
+#: keduca/keduca.kcfg:17
+#, fuzzy, no-c-format
+msgid "Show results only at the end of the test."
+msgstr "在結束測驗之後顯示結果"
 
-#: keducabuilder/kcontrolheader.cpp:355
-msgid "Normal"
-msgstr "一般"
+#: keduca/keduca.kcfg:27
+#, no-c-format
+msgid "How the screen is divided in KEducaView."
+msgstr ""
 
-#: keducabuilder/kcontrolheader.cpp:356
-msgid "Expert"
-msgstr "專業"
+#: keduca/keduca_partui.rc:4
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "各項設定"
 
-#: keducabuilder/kcontrolheader.cpp:357
-msgid "Supreme"
-msgstr "最強的"
+#: keduca/keducaui.rc:4 keducabuilder/keducabuilderui.rc:4
+#, no-c-format
+msgid "&File"
+msgstr ""
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#: keducabuilder/kcontroladdeditbase.ui:20
 #, no-c-format
 msgid "Question"
 msgstr "題目"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#: keducabuilder/kcontroladdeditbase.ui:116
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Question</b></p>\n"
+"  <p><b>Question</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the question and type is required.</p>\n"
+"  <p>Only the question and type is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
@@ -382,64 +620,54 @@ msgstr ""
 "<p>題目與類型為必填欄位。</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#: keducabuilder/kcontroladdeditbase.ui:161
 #, no-c-format
 msgid "&Question:"
 msgstr "題目(&Q)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#: keducabuilder/kcontroladdeditbase.ui:175
 #, no-c-format
 msgid "&Type:"
 msgstr "類型(&T)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#: keducabuilder/kcontroladdeditbase.ui:189
 #, no-c-format
 msgid "&Picture:"
 msgstr "圖片(&P)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#: keducabuilder/kcontroladdeditbase.ui:228
 #, no-c-format
 msgid "P&oint:"
 msgstr "分數(&O)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#: keducabuilder/kcontroladdeditbase.ui:242
 #, no-c-format
 msgid "Ti&me:"
 msgstr "時間(&M)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#: keducabuilder/kcontroladdeditbase.ui:256
 #, no-c-format
 msgid "T&ip:"
 msgstr "提示(&I)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#: keducabuilder/kcontroladdeditbase.ui:275
 #, no-c-format
 msgid "&Explain:"
 msgstr "解釋(&E)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#: keducabuilder/kcontroladdeditbase.ui:367
+#: keducabuilder/kcontroladdeditbase.ui:642
 #, no-c-format
 msgid "Answer"
 msgstr "答案"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#: keducabuilder/kcontroladdeditbase.ui:463
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
-"  "
-"<p><b>Answers</b></p>\n"
+"  <p><b>Answers</b></p>\n"
 "<hr>\n"
-"  "
-"<p>Only the answer and value is required.</p>\n"
+"  <p>Only the answer and value is required.</p>\n"
 "</span>"
 msgstr ""
 "<span style=\"color:black\">\n"
@@ -448,323 +676,116 @@ msgstr ""
 "<p>「答案」與「對錯」為必填欄位。</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#: keducabuilder/kcontroladdeditbase.ui:553
 #, no-c-format
 msgid "&Answer:"
 msgstr "答案(&A)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#: keducabuilder/kcontroladdeditbase.ui:567
 #, no-c-format
 msgid "&Value:"
 msgstr "對錯(&V)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#: keducabuilder/kcontroladdeditbase.ui:606
 #, no-c-format
 msgid "&Points:"
 msgstr "分數(&P)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#: keducabuilder/kcontroladdeditbase.ui:653
 #, no-c-format
 msgid "Value"
 msgstr "對錯"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "得分"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#: keducabuilder/kcontroladdeditbase.ui:735
 #, no-c-format
 msgid "Move &Up"
 msgstr "向上移動(&U)"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#: keducabuilder/kcontroladdeditbase.ui:746
 #, no-c-format
 msgid "Move &Down"
 msgstr "向下移動(&D)"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:101
+#: keducabuilder/kcontrolheaderbase.ui:92
+#, no-c-format
+msgid "<b  style=\"text-decoration:underline;\">Information</b>"
+msgstr "<b style=\"text-decoration:underline;\">資訊</b>"
+
+#: keducabuilder/kcontrolheaderbase.ui:404
+#: keducabuilder/keducaeditorstartdialogbase.ui:253
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: keducabuilder/kcontrolheaderbase.ui:418
+#: keducabuilder/keducaeditorstartdialogbase.ui:267
+#: libkeduca/kgallerydialogbase.ui:332
+#, no-c-format
+msgid "&Cancel"
+msgstr ""
+
+#: keducabuilder/keducabuilderui.rc:8
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "編輯(&E)..."
+
+#: keducabuilder/keducaeditorstartdialogbase.ui:16
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "編輯器─開始使用"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:104
+#: keducabuilder/keducaeditorstartdialogbase.ui:76
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "開啟已存在的文件(&E)："
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:107
+#: keducabuilder/keducaeditorstartdialogbase.ui:127
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "開啟最近的文件(&R)："
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:110
+#: keducabuilder/keducaeditorstartdialogbase.ui:176
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "開啟網路上的問答集瀏覽器"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:113
+#: keducabuilder/keducaeditorstartdialogbase.ui:184
 #, no-c-format
 msgid "Start a &new document"
 msgstr "開啟新文件(&N)"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:125
+#: keducabuilder/keducaeditorstartdialogbase.ui:225
+#: libkeduca/kgallerydialogbase.ui:284
 #, no-c-format
-msgid "<b  style=\"text-decoration:underline;\">Information</b>"
-msgstr "<b style=\"text-decoration:underline;\">資訊</b>"
+msgid "&Help"
+msgstr ""
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
+#: libkeduca/kgallerydialogbase.ui:16
 #, no-c-format
 msgid "Gallery"
 msgstr "問答集"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
+#: libkeduca/kgallerydialogbase.ui:72
 #, no-c-format
 msgid "Address:"
 msgstr "位址："
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
+#: libkeduca/kgallerydialogbase.ui:118
 #, no-c-format
 msgid "&Add Server"
 msgstr "新增伺服器(&A)"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
+#: libkeduca/kgallerydialogbase.ui:157
 #, no-c-format
 msgid "Servers"
 msgstr "伺服器"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
+#: libkeduca/kgallerydialogbase.ui:168 libkeduca/kgallerydialogbase.ui:245
 #, no-c-format
 msgid "Address"
 msgstr "位址"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "語言"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "類別"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "類型"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
+#: libkeduca/kgallerydialogbase.ui:315
 #, no-c-format
 msgid "&Open"
 msgstr "開啟(&O)"
-
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca 設定對話框"
-
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "顯示結果"
-
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "測驗結束時"
-
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "回答每個問題後"
-
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "順序"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "隨機決定問題順序"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "隨機決定答案順序"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "陳英傑,Frank Weng (a.k.a. Franklin)"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "yinjieh@csie.nctu.edu.tw,franklin at goodhorse dot idv dot tw"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "您必須指定伺服器。"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "開始測驗(&S)"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "下一個 >> (&N)"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "儲存結果(&S)..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "儲存結果為..."
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "儲存失敗。"
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "問題 %1"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"您還有 %1 秒來完成此問題。\n"
-"\n"
-"準備好以後請按下「確定」。"
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "結果"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "統計"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "答對的題數"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "答錯的題數"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "總分"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "正確得分"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "錯誤得分"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "總共時間"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "作答時間"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "答案為："
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "正確答案為："
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "您的答案是："
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "標題"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "產生基本的測驗"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "目前維護者"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "還有 %v 秒"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca KParts 元件"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "一般的"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "各項設定"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "在按「下一個」之後顯示答題的結果"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "在結束測驗之後顯示結果"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "順序"