Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: tdeedu/klatin
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/tdeedu/klatin/
(cherry picked from commit 426202536a491e2ef1b89325d2f278f752f6f619)

52 files changed, 8913 insertions, 12072 deletions

diff --git a/tde-i18n-ar/messages/tdeedu/klatin.po b/tde-i18n-ar/messages/tdeedu/klatin.po
index 96dea39069e..c67fcd87a9d 100644
--- a/tde-i18n-ar/messages/tdeedu/klatin.po
+++ b/tde-i18n-ar/messages/tdeedu/klatin.po
@@ -4,7 +4,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 19:28+0100\n"
 "PO-Revision-Date: 2005-08-10 10:20+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr ""
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -270,12 +270,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 
@@ -289,8 +290,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr ""
@@ -319,144 +320,151 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr ""
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
+msgid "The language selected by the user"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr ""
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr ""
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr ""
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr ""
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
 "Please Choose Section of Revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -465,422 +473,353 @@ msgid ""
 "Line 4"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr ""
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr ""
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr ""
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
diff --git a/tde-i18n-az/messages/tdeedu/klatin.po b/tde-i18n-az/messages/tdeedu/klatin.po
index d58604bf3da..0ae6159c2a8 100644
--- a/tde-i18n-az/messages/tdeedu/klatin.po
+++ b/tde-i18n-az/messages/tdeedu/klatin.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 19:28+0100\n"
 "PO-Revision-Date: 2001-12-31 01:52GMT+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,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Vasif İsmayıloğlu MD"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -279,12 +279,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 
@@ -298,8 +299,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -331,144 +332,151 @@ msgstr "Lüğət bazası"
 msgid "Polish Vocabulary Data Translation"
 msgstr "Lüğət bazası"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
-#, fuzzy, no-c-format
-msgid "S&ection"
-msgstr "Qisim:"
+#: klatin.kcfg:9
+#, no-c-format
+msgid "The language selected by the user"
+msgstr ""
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr ""
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr ""
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr ""
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr ""
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
 "Please Choose Section of Revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, fuzzy, no-c-format
 msgid "Revision Sections"
 msgstr "Qisim:"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, fuzzy, no-c-format
 msgid "&Vocabulary"
 msgstr "&Lüğət!"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, fuzzy, no-c-format
 msgid "Test on Vocabulary"
 msgstr "&Lüğət!"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, fuzzy, no-c-format
 msgid "&Grammar"
 msgstr "&Qramatika!"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, fuzzy, no-c-format
 msgid "Ver&bs"
 msgstr "&Fellər!"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, fuzzy, no-c-format
 msgid "&Revision notes"
 msgstr "Qisim:"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, fuzzy, no-c-format
 msgid "S&tart"
 msgstr "&Başla!"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, fuzzy, no-c-format
 msgid "Quit KLatin"
 msgstr "KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, fuzzy, no-c-format
 msgid "Grammar Section"
 msgstr "Qisim:"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -477,426 +485,357 @@ msgid ""
 "Line 4"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Xal"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, fuzzy, no-c-format
 msgid "&Back"
 msgstr "&Dala get"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, fuzzy, no-c-format
 msgid "Question"
 msgstr "Qisim:"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, fuzzy, no-c-format
 msgid "Configure Vocabulary"
 msgstr "&Lüğət!"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, fuzzy, no-c-format
 msgid "To Latin"
 msgstr "KLatin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, fuzzy, no-c-format
 msgid "From Latin"
 msgstr "KLatin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, fuzzy, no-c-format
+msgid "S&ection"
+msgstr "Qisim:"
+
+#: klatinverbswidget.ui:40
 #, fuzzy, no-c-format
 msgid "Verbs Section"
 msgstr "Qisim:"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, fuzzy, no-c-format
 msgid "Vocabulary Section"
 msgstr "&Lüğət!"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr ""
 
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr ""
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
-
 #, fuzzy
 #~ msgid "&Load Vocabulary File"
 #~ msgstr "&Lüğət!"
diff --git a/tde-i18n-bg/messages/tdeedu/klatin.po b/tde-i18n-bg/messages/tdeedu/klatin.po
index 585a056e83c..d00f6704465 100644
--- a/tde-i18n-bg/messages/tdeedu/klatin.po
+++ b/tde-i18n-bg/messages/tdeedu/klatin.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2006-12-01 23:06+0200\n"
 "Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -18,13 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Красимира Минчева"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -105,8 +105,8 @@ msgstr "5 женски род"
 #: klatingrammar.cpp:119
 msgid "Could not load grammar-definition file, check KLatin installation."
 msgstr ""
-"Файлът с граматиката не може да бъде зареден. Моля, проверете инсталацията на "
-"KLatin."
+"Файлът с граматиката не може да бъде зареден. Моля, проверете инсталацията "
+"на KLatin."
 
 #: klatingrammar.cpp:119 klatinverbs.cpp:109 klatinvocab.cpp:110
 msgid "Error with KLatin"
@@ -279,12 +279,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Какво е %1 лице %2 %3 %4 %5 от %6?"
 
@@ -300,8 +301,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "Програма за преговор на познанията по латински език"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -330,14 +331,37 @@ msgstr "Bug fixes and code improvement, Italian Vocabulary Data Translation"
 msgid "Polish Vocabulary Data Translation"
 msgstr "Polish Vocabulary Data Translation"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&Раздел"
+msgid "The language selected by the user"
+msgstr "Езикът, избран от потребителя"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "брой въпроси, задавани в една сесия."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "неограничен брой въпроси."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "речник по подразбиране."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "въпроси на латински."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "отговори на латински."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -346,130 +370,114 @@ msgstr ""
 "Добре дошли в KLatin\n"
 "Моля, изберете раздел за преговор"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Преговор"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Речник"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Тест върху думи от речника"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Тест върху думи от речника, с варианти"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Граматика"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Тест върху съществителни имена"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Тест върху съществителни имена и окончания"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Г&лаголи"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Тест върху глаголни форми"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Тест върху глаголни форми и окончания"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Бележки"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Зареждане на бележките"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr "Бележки за съществителни и глаголи"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Начало"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Начало на тема от избрания раздел"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Начало на избрания раздел"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Изход"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Изход"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Изход от KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Граматика"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Избор на съществителни за тестване"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -482,280 +490,258 @@ msgstr ""
 "Ред 3\n"
 "Ред 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Тук се показва въпросът"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Резултат"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Вашият резултат в проценти"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Отговор:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Тук трябва да зададете вашия отговор"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Въведете отговор"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Проверка на отговора"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "На&зад"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Назад към диалога за избор"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Избор на раздел"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Резултати"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Вашите резултати</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Въпрос"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Вашият отговор"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Верен отговор"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Таблица с резултати"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "В проценти:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Верни отговори"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr "Процент на верните отговори."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Брой опити:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Брой опити"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Верни отговори."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Затваряне на диалога"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Затваряне на диалога и връщане към основния прозорец на програмата."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Настройки на речника"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Тип на теста"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Превод на латински"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Въпрос на родния ви език и отговори на латински"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Превод от родния ви език на латински, което означава, че думата ще е на родния "
-"ви език и ще трябва да изберете превода и от 4 думи на латински."
+"Превод от родния ви език на латински, което означава, че думата ще е на "
+"родния ви език и ще трябва да изберете превода и от 4 думи на латински."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Превод от латински"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Въпроси на латински и отговори на родния ви език"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
-"Превод от латински на родния ви език, което означава, че думата ще е латински и "
-"ще трябва да изберете превода и от 4 думи на родния ви език."
+"Превод от латински на родния ви език, което означава, че думата ще е "
+"латински и ще трябва да изберете превода и от 4 думи на родния ви език."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Файл на речника"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Може да промените файла, върху който е теста от настройките"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Брой въпроси:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Брой въпроси, задавани в теста"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr "Брой въпроси, задавани в теста."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Брой въпроси, задавани преди края"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Брой въпроси, задавани за време"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&Раздел"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Глаголи"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Избор на спрежение на глагола"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -764,14 +750,12 @@ msgstr ""
 "Тест върху спряженията\n"
 "на глаголите"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Избор на залог на глагола"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -780,14 +764,12 @@ msgstr ""
 "Тест върху залога\n"
 "на глаголите"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Избор на наклонение на глагола"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -796,120 +778,77 @@ msgstr ""
 "Тест върху наклоненията\n"
 "на глаголите"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Промяна на типа въпроси"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Проверка на отговора"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Речник"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Въпрос"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "В това поле се показва въпроса"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Вашият резултат до момента"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
-"В това поле се показва вашият резултат. Резултатът се образува като отношение "
-"между броя на верните отговори към общия брой на отговорите."
+"В това поле се показва вашият резултат. Резултатът се образува като "
+"отношение между броя на верните отговори към общия брой на отговорите."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Отговор 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Натиснете тук, ако смятате, че това е верният отговор."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Отговор 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Отговор 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Отговор 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Избор на раздел"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Езикът, избран от потребителя"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "брой въпроси, задавани в една сесия."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "неограничен брой въпроси."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "речник по подразбиране."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "въпроси на латински."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "отговори на латински."
diff --git a/tde-i18n-br/messages/tdeedu/klatin.po b/tde-i18n-br/messages/tdeedu/klatin.po
index 2983af5f7a9..756b736ca5e 100644
--- a/tde-i18n-br/messages/tdeedu/klatin.po
+++ b/tde-i18n-br/messages/tdeedu/klatin.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeedu/klatin.pot\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: br <LL@li.org>\n"
@@ -12,13 +12,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Thierry Vignaud, Jañ-Mai Drapier"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -269,12 +269,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 
@@ -288,8 +289,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -318,144 +319,151 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr ""
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "D&achenn"
+msgid "The language selected by the user"
+msgstr "Ar yezh a zo dibabet gant an arveriad"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr ""
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr ""
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "restr ar geriaoueg dre ziouer."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr ""
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
 "Please Choose Section of Revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Geriaoueg"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Yezhadur"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Ver&boù"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "L&oc'hañ"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Quitaat a ra"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Quitaat a ra"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Kuitaat KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Dachenn ar yezhadur"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -467,422 +475,353 @@ msgstr ""
 "Linenn 2\n"
 "Linenn 3Linenn 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Merk"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Eilger :"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Roit hoc'h eilger amañ"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Gwiriekaat ar respont"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&War-gil"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Disoc'hoù"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Ho tisoc'hoù</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Goulenn"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Ho respont"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Respont reizh"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Taolenn an disoc'hoù"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Dregantad :"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Serriñ ar c'hendiviz-se"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Kefluniañ ar geriaoueg"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Da latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Eus Latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Niver a goulennoù :"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "D&achenn"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Dachenn ar verboù"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Gwiriit ho respont"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Dachenn ar geriaoueg"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Ger ar c'houlenn"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Ho merk red"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Respont 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Respont 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Respont 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Respont 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr ""
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Ar yezh a zo dibabet gant an arveriad"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "restr ar geriaoueg dre ziouer."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
diff --git a/tde-i18n-ca/messages/tdeedu/klatin.po b/tde-i18n-ca/messages/tdeedu/klatin.po
index f1550e39fcc..3385d126295 100644
--- a/tde-i18n-ca/messages/tdeedu/klatin.po
+++ b/tde-i18n-ca/messages/tdeedu/klatin.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-10-06 23:19+0200\n"
 "Last-Translator: Albert Astals Cid <aacid@kde.org>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Albert Astals Cid,David Gil Oliva,Imma Zapata"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -270,18 +270,19 @@ msgstr "futur perfet"
 #: klatinverbs.cpp:109
 msgid "Could not load verb-definition file, check KLatin installation."
 msgstr ""
-"No s'ha pogut carregar el fitxer de definició de verbs, si us plau comproveu la "
-"instal·lació de KLatin."
+"No s'ha pogut carregar el fitxer de definició de verbs, si us plau comproveu "
+"la instal·lació de KLatin."
 
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Quina és la %1 persona del %2 del %3 de %4 %5 de %6?"
 
@@ -297,8 +298,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - un programa per ajudar a revisar el llatí"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -322,20 +323,44 @@ msgstr "Icona SVG"
 #: main.cpp:44
 msgid "Bug fixes and code improvement, Italian Vocabulary Data Translation"
 msgstr ""
-"Correcció d'errors i millora del codi, traducció de dades del vocabulari italià"
+"Correcció d'errors i millora del codi, traducció de dades del vocabulari "
+"italià"
 
 #: main.cpp:45
 msgid "Polish Vocabulary Data Translation"
 msgstr "Traducció de dades del vocabulari polonès"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&Secció"
+msgid "The language selected by the user"
+msgstr "L'idioma seleccionat per l'usuari"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "quantes preguntes es fan en una sessió."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "si KLatin ha de preguntar il·limitadament."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "el fitxer de vocabulari per defecte."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "si les preguntes han de ser del llatí a l'idioma de l'usuari."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "si les preguntes han de ser de l'idioma de l'usuari al llatí."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -344,130 +369,114 @@ msgstr ""
 "Benvingut a KLatin\n"
 "Si us plau escolliu una secció a revisar"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Seccions a revisar"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Vocabulari"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Prova de vocabulari"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Prova de vocabulari amb respostes múltiples"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Gramàtica"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Prova de gramàtica de substantius"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Prova de substantius i terminacions comuns"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Ver&bs"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Prova de formes verbals"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Prova de verbs i terminacions comuns"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Notes de revisió"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Carrega notes de revisió"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr "Les notes de revisió de KLatin amb\\ taules de verbs i substantius"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Inicia"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Inicia l'àrea de revisió escollida"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Inicia la secció que heu escollit"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Surt"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Surt"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Surt de KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Secció de gramàtica"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Selecció de substantius per a fer la prova"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -480,251 +489,230 @@ msgstr ""
 "Línia 3\n"
 "Línia 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "La pregunta apareixerà aquí"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Puntuació"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Percentatge de prova fins ara"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Resposta:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "La vostra resposta va aquí"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Introduïu la vostra resposta aquí"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Comprova la resposta"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "E&nrere"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Torna a la pantalla de selecció"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Torna a la pantalla de selecció"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Resultats"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Els vostres resultats</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Pregunta"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "La vostra resposta"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Resposta correcta"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Taula de resultats"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Percentatge:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Percentatge de respostes correctes"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
-"Mostra el percentatge de respostes correctes respecte de les respostes totals."
+"Mostra el percentatge de respostes correctes respecte de les respostes "
+"totals."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Nombre de respostes:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Nombre de preguntes contestades"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Mostra el nombre de preguntes contestades."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Tanca aquest diàleg"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Tanca aquest diàleg i torna a la finestra principal de KLatin."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Configura el vocabulari"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Estil de les proves"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Al llatí"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Preguntes en el vostre idioma i respostes en llatí"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 "Escolliu fer la prova del vostre idioma al llatí, el que significa que "
 "apareixerà una paraula en el vostre idioma i haureu d'escollir entre 4 "
 "traduccions llatines."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Del llatí"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Preguntes en llatí i respostes en el vostre idioma"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 "Escolliu fer la prova del llatí al vostre idioma, el que significa que "
-"apareixerà una paraula en llatí i haureu d'escollir entre 4 traduccions en el "
-"vostre idioma."
+"apareixerà una paraula en llatí i haureu d'escollir entre 4 traduccions en "
+"el vostre idioma."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "El fitxer de la prova de vocabulari"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Podeu canviar el fitxer de la secció de vocabulari"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Nombre de preguntes:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Estableix el nombre de preguntes que voleu"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -733,32 +721,32 @@ msgstr ""
 "Aquí podeu establir el nombre de preguntes que voleu. Quan s'arriba a aquest "
 "nombre apareix un diàleg de resultats."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Nombre de preguntes a fer abans d'acabar"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Nombre de preguntes a fer alhora"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&Secció"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Secció de verbs"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Selecció de conjugació verbal"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -767,14 +755,12 @@ msgstr ""
 "Conjugació del verb\n"
 "de la prova"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Selecció de la veu verbal"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -783,14 +769,12 @@ msgstr ""
 "Veu del verb\n"
 "de la prova"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Selecció del mode verbal"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -799,124 +783,81 @@ msgstr ""
 "Mode del verb\n"
 "de la prova"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Canvia la prova a un tipus nou"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Comproveu la vostra resposta"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Secció de vocabulari"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Adverbi interrogatiu"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "L'adverbi interrogatiu apareixerà aquí"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "La vostra puntuació actual"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 "La vostra puntuació apareix a aquesta pantalla. Nombre de respostes "
 "correctes/nombre total de respostes."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Resposta 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Cliqueu aquí si penseu que és la resposta correcta."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Resposta 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Resposta 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Resposta 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Torna a la pantalla de selecció"
 
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "L'idioma seleccionat per l'usuari"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "quantes preguntes es fan en una sessió."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "si KLatin ha de preguntar il·limitadament."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "el fitxer de vocabulari per defecte."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "si les preguntes han de ser del llatí a l'idioma de l'usuari."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "si les preguntes han de ser de l'idioma de l'usuari al llatí."
-
 #~ msgid ""
 #~ "_: Inform the user that nothing has been typed in\n"
 #~ "Please enter an answer."
diff --git a/tde-i18n-cs/messages/tdeedu/klatin.po b/tde-i18n-cs/messages/tdeedu/klatin.po
index 720f6b1fa37..fe9b9909aeb 100644
--- a/tde-i18n-cs/messages/tdeedu/klatin.po
+++ b/tde-i18n-cs/messages/tdeedu/klatin.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2006-07-05 22:31+0200\n"
 "Last-Translator: Klara Cihlarova <koty@seznam.cz>\n"
 "Language-Team: Czech <suse@suse.cz>\n"
@@ -15,16 +15,16 @@ 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%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"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Klára Cihlářová,Jakub Friedl"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -276,12 +276,13 @@ msgstr "Nelze načíst soubor s definicí sloves; zkontrolujte instalaci KLatin.
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 
@@ -295,8 +296,8 @@ msgstr "Nelze načíst soubor se slovníkem; chyba v instalaci KLatin."
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - program na procvičování Latiny"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -325,14 +326,37 @@ msgstr "Opravy chyb a vylepšení, italský překlad slovníkových dat"
 msgid "Polish Vocabulary Data Translation"
 msgstr "Polský překlad slovníkových dat"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "Čá&sti"
+msgid "The language selected by the user"
+msgstr "Jazyk zvolený uživatelem"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "kolik otázek bude obsahovat jedno cvičení."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "zda má KLatin pokládat neomezené otázky."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "výchozí soubor se slovní zásobou."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "zda mají být otázky z latiny do češtiny."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "zda mají být otázky z češtiny do latiny."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -341,80 +365,67 @@ msgstr ""
 "Vítejte v KLatin!\n"
 "Zvolte prosím sekci procvičování"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Části k procvičování"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Slovní zasoba"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Test slovní zásoby"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Test slovní zásoby s výběrem odpovědi"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Gramatika"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Testovat gramatiku podstatných jmen"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Slo&vesa"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Test slovesných tvarů"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Poznámky"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Zavést poznámky k procvičování"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -423,50 +434,47 @@ msgstr ""
 "Poznámky k programu KLatin\n"
 "s tabulkami sloves a podstatných jmen"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Spustit"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Zvolte část k procvičování"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Spuštění zvolené části"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Ukončení"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Ukončení"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Ukončit KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Část gramatiky"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Výběr pod. jmen pro test"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -479,424 +487,355 @@ msgstr ""
 " řádka 3\n"
 "řádka 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Zde se ukáže otázka"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Skóre"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Vaše dosavadní úspěšnost v testu"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Odpověď:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Sem patří vaše odpověď"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Zde zadejte svou odpověď"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Překontrolovat odpověď"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Zpět"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Zpět k výběru"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Zpět na výběr"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Výsledky"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Vaše výsledky</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Dotaz"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Vaše odpověď"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Správná odpověď"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Tabulka výsledků"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Správné odpovědi:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Podíl správných odpovědí v procentech"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Počet dotazů:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Počet zkoušených otázek"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Zobrazuje počet zodpovězených otázek."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Zavřít tento dialog"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Zavřít tento dialog a vrátit se k hlavnímu oknu KLatin."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Nastavit slovní zásobu"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Způsob procvičování"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Do latiny"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Dotaz je ve vašem jazyku, odpověď v latině"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Z latiny"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Dotaz je v latině, odpověď ve vašem jazyku"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Počet otázek:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Počet najednou pokládaných otázek"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "Čá&sti"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Změnit typ testu"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Zkontrolovat odpověď"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Část slovní zásoby"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Slovo dotazu"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Zde se objeví otázka"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Vaše aktuální skóre"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
-"Zde se objeví vaše výsledky ve formátu počet správných odpovědí/počet odpovědí "
-"celkem."
+"Zde se objeví vaše výsledky ve formátu počet správných odpovědí/počet "
+"odpovědí celkem."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Odpověď 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Klikněte na odpověď, o níž se domníváte, že je správná."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Odpověď 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Odpověď 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Odpověď 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Návrat k výběru procvičování"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Jazyk zvolený uživatelem"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "kolik otázek bude obsahovat jedno cvičení."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "zda má KLatin pokládat neomezené otázky."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "výchozí soubor se slovní zásobou."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "zda mají být otázky z latiny do češtiny."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "zda mají být otázky z češtiny do latiny."
diff --git a/tde-i18n-cy/messages/tdeedu/klatin.po b/tde-i18n-cy/messages/tdeedu/klatin.po
index ea0291fb43e..47d98815aa4 100644
--- a/tde-i18n-cy/messages/tdeedu/klatin.po
+++ b/tde-i18n-cy/messages/tdeedu/klatin.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ../cy/messages//tdeedu/klatin.po\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+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,13 +10,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "KD wrth KGyfieithu"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -267,12 +267,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 
@@ -286,8 +287,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -316,144 +317,151 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr ""
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "A&dran"
+msgid "The language selected by the user"
+msgstr ""
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr ""
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr ""
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr ""
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr ""
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
 "Please Choose Section of Revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "D&echrau"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -462,422 +470,353 @@ msgid ""
 "Line 4"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Sgôr"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Ateb :"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Yn ôl"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Canlyniadau"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Cwestiwn"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Eich Ateb"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Ateb Cywir"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Nifer Cwestiynau:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "A&dran"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Gwiriwch eich ateb"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr ""
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr ""
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
diff --git a/tde-i18n-da/messages/tdeedu/klatin.po b/tde-i18n-da/messages/tdeedu/klatin.po
index a8f52e4da48..49ae8ea121a 100644
--- a/tde-i18n-da/messages/tdeedu/klatin.po
+++ b/tde-i18n-da/messages/tdeedu/klatin.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-09-21 21:26-0400\n"
 "Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Erik Kjær Pedersen"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -273,12 +273,13 @@ msgstr "Kunne ikke indlæse verbum-definitionsfil, tjek KLatin-installation."
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Hvad er %1. person %2 %3 %4 %5 af %6?"
 
@@ -287,15 +288,15 @@ msgid ""
 "Could not load vocabulary file; there is a problem with your KLatin "
 "installation."
 msgstr ""
-"Kunne ikke indlæse ordforrådsfil. Der er et problem med din "
-"KLatin-installationen."
+"Kunne ikke indlæse ordforrådsfil. Der er et problem med din KLatin-"
+"installationen."
 
 #: main.cpp:23
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - et program til at hjælpe med at revidere Latin"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -324,14 +325,37 @@ msgstr "Fejlrettelse og kodeforbedringer. Italiensk ordbogs dataoversættelse"
 msgid "Polish Vocabulary Data Translation"
 msgstr "Polsk ordbogs dataoversættelse"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&Afsnit"
+msgid "The language selected by the user"
+msgstr "Sproget som brugeren vælger"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "hvor mange spørgsmål stilles i en session."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "om KLatin skal stille ubegrænset mange spørgsmål."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "standard-ordforrådsfil."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "om spørgsmålene skal være fra latin til brugerens sprog."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "om spørgsmålene skal være fra brugerens sprog til latin."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -340,80 +364,67 @@ msgstr ""
 "Velkommen til KLatin\n"
 "Vælg venligst et afsnit af revisionen"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Revisionsafsnit"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Ordforråd"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Test om ordforråd"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Multiple choice ordforrådstest"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Grammatik"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Test om navneordsgrammatik"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Test om almindelige navneord og endelser"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "&Verber"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Test om verbeformer"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Test om almindelige verber og endelser"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Revisionsnoter"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Indlæs revisionsnoter"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -422,50 +433,47 @@ msgstr ""
 "KLatin revisionsnoter med\n"
 "verbum- og navneordstabeller"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "S&tart"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Start valgt revisionsområde"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Start det afsnit du har valgt"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Afslutter"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Afslutter"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Afslut KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Grammatikafsnit"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Valg af navneord til test"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -478,250 +486,228 @@ msgstr ""
 "Linje 3\n"
 "Linje 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Spørgsmålet vil blive vist her"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Stilling"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Din test-procent indtil videre"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Svar:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Dit svar skal være her"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Indtast dit svar her"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Tjek svaret"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "Til&bage"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Gå tilbage til valg-skærmen"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Vend tilbage til valg-skærmen"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Resultater"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Dine resultater</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Spørgsmål"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Dit svar"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Rigtigt svar"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Tabel med resultater"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Procent:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Procent rigtige svar"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 "Dette viser procenten af spørgsmålene du svarede rigtigt blandt de der blev "
 "forsøgt."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Antal forsøgt:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Antal spørgsmål forsøgt"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Dette viser antallet af spørgsmål du besvarede."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Luk denne dialog"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Luk denne dialog og vend tilbage til KLatin's hovedvindue."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Indstil ordforråd"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Test-stil"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Til latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Spørgsmål er på dit sprog og svar på latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Vælg at blive testet fra dit sprog til latin, hvilket betyder ordet bliver vist "
-"på dit sprog og du vil skulle vælge ud fra 4 latinske oversættelser."
+"Vælg at blive testet fra dit sprog til latin, hvilket betyder ordet bliver "
+"vist på dit sprog og du vil skulle vælge ud fra 4 latinske oversættelser."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Fra latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Spørgsmål er på latinsk med svare på dit sprog"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+"Vælg at blive testet fra latin til dit sprog, hvilket betyder ordet bliver "
+"vist på latinsk og du vil skulle vælge ud fra 4 oversættelser til dit sprog."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
-"Vælg at blive testet fra latin til dit sprog, hvilket betyder ordet bliver vist "
-"på latinsk og du vil skulle vælge ud fra 4 oversættelser til dit sprog."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Filen du bliver testet på i ordforråd"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Du kan ændre filen du bliver testet på i ordforrådsafsnittet"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Antal spørgsmål:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Sæt antal spørgsmål du ønsker at blive testet i"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -730,32 +716,32 @@ msgstr ""
 "Her kan du sætte det antal spørgsmål du ønsker at blive testet i. Når dette "
 "antal er nået, vil en resultatdialog komme frem."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Antal spørgsmål der skal stilles før der afsluttes"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Antal spørgsmål der stilles af gangen"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&Afsnit"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Verbumsafsnit"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Valg af verbebøjning"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -764,14 +750,12 @@ msgstr ""
 "Bøjning af verber der skal\n"
 "testes"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Valg af verbe-stamme"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -780,14 +764,12 @@ msgstr ""
 "Stemme for verber der skal\n"
 "testes"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Valg af verbe-humør"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -796,119 +778,76 @@ msgstr ""
 "Humør for verber der skal\n"
 "testes"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Ændr test til ny type"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Tjek dit svar"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Ordforrådsafsnit"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Spørgsmålsord"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Spørgsmåls-ordet vil være her"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Din nuværende scoring"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 "Din scoring ses i denne visning. Antallet af rigtige svar/totalt antal svar."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Svar 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Klik på dette hvis du tror det er det rigtige svar."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Svar 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Svar 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Svar 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Vend tilbage til valg-skærmen"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Sproget som brugeren vælger"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "hvor mange spørgsmål stilles i en session."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "om KLatin skal stille ubegrænset mange spørgsmål."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "standard-ordforrådsfil."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "om spørgsmålene skal være fra latin til brugerens sprog."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "om spørgsmålene skal være fra brugerens sprog til latin."
diff --git a/tde-i18n-de/messages/tdeedu/klatin.po b/tde-i18n-de/messages/tdeedu/klatin.po
index 3837e094308..4b09bd8ae30 100644
--- a/tde-i18n-de/messages/tdeedu/klatin.po
+++ b/tde-i18n-de/messages/tdeedu/klatin.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2006-03-05 14:38+0100\n"
 "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Thorsten Mürell"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -105,8 +105,8 @@ msgstr "5. weiblich"
 #: klatingrammar.cpp:119
 msgid "Could not load grammar-definition file, check KLatin installation."
 msgstr ""
-"Die Grammatikdefinitionsdatei lässt sich nicht laden, bitte überprüfen Sie Ihre "
-"Installation."
+"Die Grammatikdefinitionsdatei lässt sich nicht laden, bitte überprüfen Sie "
+"Ihre Installation."
 
 #: klatingrammar.cpp:119 klatinverbs.cpp:109 klatinvocab.cpp:110
 msgid "Error with KLatin"
@@ -279,12 +279,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Wie lautet die %1. Person %2 %3 %4 %5 von %6?"
 
@@ -300,8 +301,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - Ein Programm zum Lateinlernen"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -332,14 +333,41 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr "Polnische Übersetzung der Vokabeldaten"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "Lek&tion"
+msgid "The language selected by the user"
+msgstr "Die vom Benutzer gewählte Sprache"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "Die Anzahl der in einer Sitzung gestellten Fragen."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "Ob KLatin unbegrenzt Fragen stellen soll."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "Die voreingestellte Vokabeldatei."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr ""
+"Ob die Fragen in Latein gestellt und die Antwort in der Sprache des "
+"Benutzers erwartet wird."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+"Ob die Fragen von der Sprache des Benutzers gestellt wird und die Antwort in "
+"Latein erwartet wird."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -348,80 +376,67 @@ msgstr ""
 "Willkommen bei KLatin!\n"
 "Bitte wählen Sie eine Lektion, die abgefragt werden soll."
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Abfragelektionen"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Vokabeln"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Vokabeltest"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Vokabeltest (Multiple Choice)"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Grammatik"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Nomengrammatiktest"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Test mit gebräuchlichen Nomina und Endungen"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "&Verben"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Verbformentest"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Test mit gebräuchlichen Verben und Endungen"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Lernnotizen"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Lernnotizen laden"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -430,50 +445,47 @@ msgstr ""
 "Die KLatin-Lernnotizen mit\n"
 "Verben- und Nomentabellen"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Los!"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Gewählten Trainingsbereich starten"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Startet die ausgewählte Lektion"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Beendet"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Beendet"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "KLatin beenden"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Grammatiklektion"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Auswahl der abgefragten Nomina"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -486,438 +498,365 @@ msgstr ""
 "Zeile 3\n"
 "Zeile 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Die Frage erscheint hier"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Punkte"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Ihr Testprozentsatz bisher"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Antwort:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Ihre Antwort kommt hier hinein"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Geben Sie Ihre Antwort hier ein"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Antwort überprüfen"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Zurück"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Zurück zum Auswahlbildschirm"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Zurück zum Auswahlbildschirm"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Ergebnisse"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Ihre Ergebnisse</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Frage"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Ihre Antwort"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Korrekte Antwort"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Ergebnistabelle"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Prozentsatz:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Anteil der richtigen Anworten"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
-"Dies zeigt den Prozentsatz der Antworten, die sie korrekt gegeben haben, an der "
-"versuchten Zahl."
+"Dies zeigt den Prozentsatz der Antworten, die sie korrekt gegeben haben, an "
+"der versuchten Zahl."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Anzahl der Versuche:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Anzahl der Fragen"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Zeigt die Anzahl der beantworteten Fragen."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Diesen Dialog schließen"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Schließt den Dialog und kehrt zum Hauptfenster zurück."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Vokabeln einrichten"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Testmodus"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Nach Latein"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Fragen in Ihrer Sprache und Antworten in Latein"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Wählen Sie diese Einstellung, wenn Sie in Ihrer Sprache nach Latein abgefragt "
-"werden wollen. Das bedeutet, das Wort wird in Ihrer Sprache angezeigt, und Sie "
-"müssen aus vier lateinischen Übersetzungen wählen."
+"Wählen Sie diese Einstellung, wenn Sie in Ihrer Sprache nach Latein "
+"abgefragt werden wollen. Das bedeutet, das Wort wird in Ihrer Sprache "
+"angezeigt, und Sie müssen aus vier lateinischen Übersetzungen wählen."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Von Latein"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Frage in Latein und Antworten in Ihrer Sprache"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 "Wählen Sie diese Einstellung, wenn Sie in Latein zu Ihrer Sprache abgefragt "
-"werden möchten. Das bedeutet, das Wort wird in Latein angezeigt, und Sie müssen "
-"aus vier Übersetzungen in Ihrer Sprache auswählen."
+"werden möchten. Das bedeutet, das Wort wird in Latein angezeigt, und Sie "
+"müssen aus vier Übersetzungen in Ihrer Sprache auswählen."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Die Datei, die die Abfragen für den Vokabeltest enthält"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Sie können die Testdatei im Abschnitt \"Vokabeln\" ändern"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Anzahl der Fragen:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Wählen Sie die Anzahl der gestellten Fragen"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
-"Hier können Sie die Anzahl der Testfragen festlegen. Wenn diese Anzahl erreicht "
-"ist, sehen Sie das Ergebnis."
+"Hier können Sie die Anzahl der Testfragen festlegen. Wenn diese Anzahl "
+"erreicht ist, sehen Sie das Ergebnis."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Anzahl der zu stellenden Fragen"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Anzahl der Fragen, die zu einem Zeitpunkt gestellt werden"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "Lek&tion"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Abschnitt \"Verben\""
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Wahl der Verbkonjugation"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr "Konjugation des Verbs"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Auswahl des Verbmodus"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr "Modus des Verbs"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Wahl der Verb-Stimmung"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr "Stimmung des zu testenden Verbs"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Test zu neuem Typ ändern"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Überprüfen Sie Ihre Antwort"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Abschnitt \"Vokabeln\""
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Fragewort"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Das Fragewort erscheint hier"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Ihre aktuelle Punktzahl"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
-"Ihre Punktzahl erscheint auf dieser Anzeige. Anzahl der korrekten "
-"Antworten/Gesamtzahl der Antworten."
+"Ihre Punktzahl erscheint auf dieser Anzeige. Anzahl der korrekten Antworten/"
+"Gesamtzahl der Antworten."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Antwort 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Klicken Sie hier, wenn Sie denken, dass dies die richtige Antwort ist."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Antwort 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Antwort 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Antwort 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Zurück zum Auswahlbildschirm"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Die vom Benutzer gewählte Sprache"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "Die Anzahl der in einer Sitzung gestellten Fragen."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "Ob KLatin unbegrenzt Fragen stellen soll."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "Die voreingestellte Vokabeldatei."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr ""
-"Ob die Fragen in Latein gestellt und die Antwort in der Sprache des Benutzers "
-"erwartet wird."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
-"Ob die Fragen von der Sprache des Benutzers gestellt wird und die Antwort in "
-"Latein erwartet wird."
diff --git a/tde-i18n-el/messages/tdeedu/klatin.po b/tde-i18n-el/messages/tdeedu/klatin.po
index ebc36f0b439..8a1a8e8f438 100644
--- a/tde-i18n-el/messages/tdeedu/klatin.po
+++ b/tde-i18n-el/messages/tdeedu/klatin.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2007-03-10 11:32+0200\n"
 "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Σπύρος Γεωργαράς, Νίκος Χατζηδάκης, Τούσης Μανώλης"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -101,7 +101,8 @@ msgstr "5ο Θηλυκό"
 #: klatingrammar.cpp:119
 msgid "Could not load grammar-definition file, check KLatin installation."
 msgstr ""
-"Αδύνατη η φόρτωση του αρχείου γραμματικής, ελέγξτε την εγκατάσταση του KLatin."
+"Αδύνατη η φόρτωση του αρχείου γραμματικής, ελέγξτε την εγκατάσταση του "
+"KLatin."
 
 #: klatingrammar.cpp:119 klatinverbs.cpp:109 klatinvocab.cpp:110
 msgid "Error with KLatin"
@@ -273,12 +274,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 "Ποιό είναι το %1 πρόσωπο %2 χρόνου %3 έγκλισης %4 φωνής %5 του ρήματος %6;"
@@ -295,8 +297,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - ένα πρόγραμμα που βοηθά στην επανάληψη των λατινικών"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -327,14 +329,37 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr "Πολωνική μετάφραση δεδομένων λεξικού"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "Τ&ομέας"
+msgid "The language selected by the user"
+msgstr "Η γλώσσα που επιλέχθηκε από το χρήστη"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "Πόσες ερωτήσεις γίνονται σε μία συνεδρία"
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "Αν το KLatin θα κάνει απεριόριστες ερωτήσεις."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "Προκαθορισμένο αρχείο λεξιλογίου."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "Αν οι ερωτήσεις θα γίνονται από τα λατινικά στη γλώσσα σας."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "Αν οι ερωτήσεις θα γίνονται από τη γλώσσα σας στα λατινικά."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -343,80 +368,67 @@ msgstr ""
 "Καλώς ορίσατε στο KLatin\n"
 "Παρακαλώ επιλέξτε ενότητα για επαναληπτικό"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Ενότητες επαναληπτικών"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Λεξιλόγιο"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Εξέταση στο λεξιλόγιο"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Εξέταση πολλαπλής επιλογής στο λεξιλόγιο"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Γραμματική"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Τεστ στη γραμματική ουσιαστικών"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Τεστ σε κοινά ουσιαστικά και καταλήξεις"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Ρ&ήματα"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Εξέταση στους τύπους ρημάτων"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Τεστ σε κοινά ρήματα και καταλήξεις"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "Σημειώσεις &επαναληπτικού"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Φόρτωση σημειώσεων επαναληπτικού"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -425,50 +437,47 @@ msgstr ""
 "Οι σημειώσεις επαναληπτικών του KLatin με\n"
 "πίνακες ρημάτων και ουσιαστικών"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "Έ&ναρξη"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Έναρξη επαναληπτικού επιλεγμένης περιοχής"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Έναρξη του τομέα που έχετε επιλέξει"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Έξοδος"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Έξοδος"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Έξοδος από το KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Τομέας γραμματικής"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Επιλογή ουσιαστικών για το τεστ"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -481,252 +490,230 @@ msgstr ""
 "Γραμμή 3\n"
 "Γραμμή 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Η εμφάνιση θα εμφανίζεται εδώ"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Σκορ"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Το ποσοστό της εξέτασης μέχρι τώρα"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Απάντηση:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Η απάντησή σας πηγαίνει εδώ"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Εισάγετε την απάντησή σας εδώ"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Έλεγχος απάντησης"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Πίσω"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Επιστροφή στην οθόνη επιλογών"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Επιστροφή στην οθόνη επιλογών"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Αποτελέσματα"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Τα αποτελέσματά σας</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Ερώτηση"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Η απάντησή σας"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Σωστή απάντηση"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Πίνακας αποτελεσμάτων"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Ποσοστό:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Ποσοστό σωστών απαντήσεων"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 "Αυτό σας δείχνει το ποσοστό των ερωτήσεων που απαντήσατε σωστά από τις "
 "ερωτήσεις που έχετε προσπαθήσει."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Αριθμός που επιχειρήθηκε:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Αριθμός ερωτήσεων που επιχειρήθηκαν"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Εμφανίζει τον αριθμό των ερωτήσεων που απαντήσατε."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Κλείσιμο αυτού του διαλόγου"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
 "Κλείσιμο αυτού του παραθύρου και επιστροφή στο κυρίως παράθυρο του KLatin."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Ρύθμιση του λεξιλογίου"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Στυλ τεστ"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Στα Λατινικά"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Ερώτηση στη γλώσσα σας και απάντηση στα λατινικά"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr "Επιλέξτε να εξεταστείτε από τη γλώσσα σας στα Λατινικά."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Από τα Λατινικά"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Ερώτηση στα λατινικά και απάντηση στη γλώσσα σας"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+"Επιλέξτε να εξεταστείτε από τα λατινικά στη γλώσσα σας, που σημαίνει ότι η "
+"λέξη θα εμφανίζεται στα λατινικά και εσείς θα πρέπει να επιλέξετε από 4 "
+"μεταφράσεις στη γλώσσα σας."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
-"Επιλέξτε να εξεταστείτε από τα λατινικά στη γλώσσα σας, που σημαίνει ότι η λέξη "
-"θα εμφανίζεται στα λατινικά και εσείς θα πρέπει να επιλέξετε από 4 μεταφράσεις "
-"στη γλώσσα σας."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Το αρχείο στο οποίο δοκιμάζεστε στο λεξιλόγιο"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 "Μπορείτε να αλλάξετε το αρχείο στο οποίο εξετάζεστε για τον τομέα του "
 "λεξιλογίου"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Αριθμός ερωτήσεων:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Ορίστε τον αριθμό των ερωτήσεων στις οποίες θέλετε να εξεταστείτε"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -736,32 +723,32 @@ msgstr ""
 "εξεταστείτε. Όταν φτάσετε αυτό τον αριθμό, θα εμφανιστεί ένας διάλογος με τα "
 "αποτελέσματα."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Αριθμός αναπάντητων ερωτήσεων μέχρι το τέλος"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Αριθμός ερωτήσεων που θα δίνονται κάθε φορά"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "Τ&ομέας"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Τομέας ρημάτων"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Επιλογή συζυγίας του ρήματος"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -770,14 +757,12 @@ msgstr ""
 "Συζυγία του ρήματος\n"
 "που θα ελεγχθεί"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Επιλογή φωνής του ρήματος"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -786,14 +771,12 @@ msgstr ""
 "Φωνή του ρήματος στην οποία\n"
 "θέλετε να εξεταστείτε"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Επιλογή της έγκλισης του ρήματος"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -802,120 +785,77 @@ msgstr ""
 "Έγκλιση του ρήματος\n"
 "που θα ελεγχθεί"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Αλλαγή του τεστ σε νέο τύπο"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Ελέγξτε την απάντησή σας"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Τομέας λεξιλογίου"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Λέξη-Ερώτηση"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Η λέξη-ερώτηση θα εμφανιστεί εδώ"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Οι βαθμοί σας"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
-"Οι βαθμοί σας εμφανίζονται σε αυτή την οθόνη. Αριθμός των σωστών "
-"απαντήσεων/πλήθος απαντήσεων."
+"Οι βαθμοί σας εμφανίζονται σε αυτή την οθόνη. Αριθμός των σωστών απαντήσεων/"
+"πλήθος απαντήσεων."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Απάντηση 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Κάντε κλικ εδώ αν νομίζεται ότι αυτή είναι η σωστή απάντηση."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Απάντηση 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Απάντηση 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Απάντηση 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Επιστροφή στην οθόνη επιλογών"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Η γλώσσα που επιλέχθηκε από το χρήστη"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "Πόσες ερωτήσεις γίνονται σε μία συνεδρία"
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "Αν το KLatin θα κάνει απεριόριστες ερωτήσεις."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "Προκαθορισμένο αρχείο λεξιλογίου."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "Αν οι ερωτήσεις θα γίνονται από τα λατινικά στη γλώσσα σας."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "Αν οι ερωτήσεις θα γίνονται από τη γλώσσα σας στα λατινικά."
diff --git a/tde-i18n-en_GB/messages/tdeedu/klatin.po b/tde-i18n-en_GB/messages/tdeedu/klatin.po
index e4d8d3eb613..e2ed4655851 100644
--- a/tde-i18n-en_GB/messages/tdeedu/klatin.po
+++ b/tde-i18n-en_GB/messages/tdeedu/klatin.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-11-06 00:23+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Andrew Coles"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -271,12 +271,13 @@ msgstr "Could not load verb-definition file, check KLatin installation."
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "What is the %1 person %2 %3 %4 %5 of %6?"
 
@@ -292,8 +293,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - a program to help revise Latin"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -322,14 +323,37 @@ msgstr "Bug fixes and code improvement, Italian Vocabulary Data Translation"
 msgid "Polish Vocabulary Data Translation"
 msgstr "Polish Vocabulary Data Translation"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "S&ection"
+msgid "The language selected by the user"
+msgstr "The language selected by the user"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "how many questions are asked in one session."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "whether KLatin should ask unlimited questions."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "the default vocabulary file."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "whether the questions should be Latin to the user's language."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "whether the questions should be the user's language to Latin."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -338,80 +362,67 @@ msgstr ""
 "Welcome to KLatin\n"
 "Please Choose Section of Revision"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Revision Sections"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Vocabulary"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Test on Vocabulary"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Multiple choice vocabulary test"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Grammar"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Test on noun grammar"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Test on common nouns and endings"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Ver&bs"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Test on verb forms"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Test on common verbs and endings"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Revision notes"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Load revision notes"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -420,50 +431,47 @@ msgstr ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "S&tart"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Start chosen area of revision"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Start the section you have chosen"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Quits"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Quits"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Quit KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Grammar Section"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Choice of nouns for testing"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -476,252 +484,230 @@ msgstr ""
 "Line 3\n"
 "Line 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "The question will appear here"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Score"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Your test percentage so far"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Answer:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Your answer goes here"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Enter your answer here"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Check answer"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Back"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Go back to the selection screen"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Return to selection screen"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Results"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Your Results</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Question"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Your Answer"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Correct Answer"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Table of results"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Percentage:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Percentage of correct answers"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Number attempted:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Number of questions attempted"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "This shows the number of questions you answered."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Close this dialogue"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Close this dialogue and return to KLatin's main window."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Configure Vocabulary"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Testing Style"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "To Latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Question in your language and answers in Latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "From Latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Question in Latin and answers in your language"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "The file you are tested on in vocabulary"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "You can change the file you are tested on for the vocabulary section"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Number of questions:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Set the number of questions you want to be tested on"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -730,32 +716,32 @@ msgstr ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialogue appears."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Number of questions to be asked before ending"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Numbers of questions to ask at a time"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "S&ection"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Verbs Section"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Choice of verb conjugation"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -764,14 +750,12 @@ msgstr ""
 "Conjugation of verb to be\n"
 "tested on"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Choice of verb voice"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -780,14 +764,12 @@ msgstr ""
 "Voice of verb to be\n"
 "tested on"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Choice of verb mood"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -796,120 +778,77 @@ msgstr ""
 "Mood of verb to be\n"
 "tested on"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Change test to new type"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Check your answer"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Vocabulary Section"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Question Word"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "The question word will appear here"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Your current score"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Answer 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Click this if you think it is the right answer."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Answer 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Answer 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Answer 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Return to the selection screen"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "The language selected by the user"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "how many questions are asked in one session."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "whether KLatin should ask unlimited questions."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "the default vocabulary file."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "whether the questions should be Latin to the user's language."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "whether the questions should be the user's language to Latin."
diff --git a/tde-i18n-eo/messages/tdeedu/klatin.po b/tde-i18n-eo/messages/tdeedu/klatin.po
index fd6320e98be..2feff0e5a8f 100644
--- a/tde-i18n-eo/messages/tdeedu/klatin.po
+++ b/tde-i18n-eo/messages/tdeedu/klatin.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2007-05-18 18:00+0100\n"
 "Last-Translator: Axel Rousseau <axel@esperanto-jeunes.org>\n"
 "Language-Team: esperanto <kde-i18n-eo@kde.org>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Esperanto\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Axel Rousseau"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -272,12 +272,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 
@@ -291,8 +292,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -321,144 +322,151 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr ""
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
+msgid "The language selected by the user"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr ""
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr ""
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr ""
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr ""
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
 "Please Choose Section of Revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Forigu el KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -467,422 +475,353 @@ msgid ""
 "Line 4"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Poentoj"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Respondo:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "&Rezultoj"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Demando"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Via respondo"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Procento:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Fermu la fenestron"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Al la latina"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr ""
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Respondo 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Respondo 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Respondo 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Respondo 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr ""
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr ""
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
diff --git a/tde-i18n-es/messages/tdeedu/klatin.po b/tde-i18n-es/messages/tdeedu/klatin.po
index 457312b4bae..7dd70ab93f1 100644
--- a/tde-i18n-es/messages/tdeedu/klatin.po
+++ b/tde-i18n-es/messages/tdeedu/klatin.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2007-08-05 11:48+0200\n"
 "Last-Translator: Santiago Fernández Sancho <santi@kde-es.org>\n"
 "Language-Team: Español <kde-es@kybs.de>\n"
@@ -18,13 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Eloy Cuadra,Ignacio Bezanilla Díaz,Rafael Beccar"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -105,7 +105,8 @@ msgstr "5ª en femenino"
 #: klatingrammar.cpp:119
 msgid "Could not load grammar-definition file, check KLatin installation."
 msgstr ""
-"No se puede cargar el archivo de gramática. Compruebe la instalación de KLatin."
+"No se puede cargar el archivo de gramática. Compruebe la instalación de "
+"KLatin."
 
 #: klatingrammar.cpp:119 klatinverbs.cpp:109 klatinvocab.cpp:110
 msgid "Error with KLatin"
@@ -277,12 +278,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 "¿Cuál es la %1 persona del %2 del %3 del modo %4 en voz %5 del verbo %6?"
@@ -292,15 +294,15 @@ msgid ""
 "Could not load vocabulary file; there is a problem with your KLatin "
 "installation."
 msgstr ""
-"No se puede cargar el archivo de vocabulario. Puede que exista un problema en "
-"su instalación de KLatin."
+"No se puede cargar el archivo de vocabulario. Puede que exista un problema "
+"en su instalación de KLatin."
 
 #: main.cpp:23
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - Un programa que le ayuda a repasar latín"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -331,14 +333,39 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr "Traducción de los archivos de vocabulario al polaco"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "S&ección"
+msgid "The language selected by the user"
+msgstr "El idioma seleccionado por el usuario"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "cuántas preguntas se hacen en una sesión."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "si KLatin debe hacer un número ilimitado de preguntas."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "el archivo de vocabulario predeterminado."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr ""
+"si las preguntas deben ser de traducción de latín al idioma del usuario."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+"si las preguntas deben ser de traducción del idioma del usuario al latín."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -347,83 +374,70 @@ msgstr ""
 "¡Bienvenido a KLatin!\n"
 "Por favor, elija la sección de repaso"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Secciones de repaso"
 
 # no-c-format
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Vocabulario"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Prueba de vocabulario"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Prueba de vocabulario con múltiples opciones"
 
 # no-c-format
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Gramática"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Prueba de gramática de nombres"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Prueba de nombres comunes y terminaciones"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Ver&bos"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Prueba de formas verbales"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Prueba de verbos comunes y terminaciones"
 
 # no-c-format
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "Notas de &repaso"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Cargar notas de repaso"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -432,50 +446,47 @@ msgstr ""
 "Las notas de repaso de KLatin con\n"
 "tablas de verbos y nombres"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Iniciar"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Iniciar el área de repaso seleccionada"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Iniciar la sección que ha seleccionado"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Salir"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Salir"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Salir de KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Sección de gramática"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Selección de nombres para la prueba"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -488,286 +499,265 @@ msgstr ""
 "Línea 3\n"
 "Línea 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "La pregunta aparecerá aquí"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Puntuación"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "El porcentaje de su prueba hasta ahora"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Respuesta:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Aquí va su respuesta"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Introduzca su respuesta aquí"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Comprobar respuesta"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Atrás"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Volver a la pantalla de selección"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Volver a la pantalla de selección"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Resultados"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Sus resultados</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Pregunta"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Su respuesta"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Respuesta correcta"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Tabla de resultados"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Porcentaje:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Proporción (por cien) de respuestas correctas"
 
 # no-c-format
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr "Proporción (por cien) de respuestas correctas sobre preguntas totales."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Número de intentos:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Cantidad de intentos"
 
 # no-c-format
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Muestra la cantidad de preguntas que fueron contestadas."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Cerrar este diálogo"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Cerrar este diálogo y retornar a la ventana principal de KLatin."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Configurar el vocabulario"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Tipo de prueba"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Al latín"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Las preguntas son en su idioma y las respuestas en latín"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Selecciona traducir de su idioma al latín, lo que significa que la palabra será "
-"mostrada en su idioma y tendrá que escoger entre 4 traducciones al latín."
+"Selecciona traducir de su idioma al latín, lo que significa que la palabra "
+"será mostrada en su idioma y tendrá que escoger entre 4 traducciones al "
+"latín."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Del latín"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Las preguntas son en latín y las respuestas en su idioma"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+"Selecciona traducir de latín a su idioma, lo que significa que la palabra "
+"será mostrada en latín y tendrá que escoger entre 4 traducciones a su idioma."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
-"Selecciona traducir de latín a su idioma, lo que significa que la palabra será "
-"mostrada en latín y tendrá que escoger entre 4 traducciones a su idioma."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "El archivo sobre el que está haciendo la prueba de vocabulario"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
-"Puede cambiar el archivo sobre el que está haciendo la prueba en la sección de "
-"vocabulario"
+"Puede cambiar el archivo sobre el que está haciendo la prueba en la sección "
+"de vocabulario"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Número de preguntas:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Fijar el número de preguntas que quiere contestar"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
-"Aquí puede fijar el número de preguntas que quiere contestar. Cuando se alcance "
-"este número aparecerá un diálogo con el resultado."
+"Aquí puede fijar el número de preguntas que quiere contestar. Cuando se "
+"alcance este número aparecerá un diálogo con el resultado."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Número de preguntas a contestar antes de acabar"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Número de preguntas a contestar de una vez"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "S&ección"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Sección de verbos"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Selección de la conjugación verbal"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -776,14 +766,12 @@ msgstr ""
 "Conjugación verbal para\n"
 "hacer la prueba"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Selección de voz verbal"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -792,14 +780,12 @@ msgstr ""
 "Voz verbal para\n"
 "hacer la prueba"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Selección del modo verbal"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -808,121 +794,77 @@ msgstr ""
 "Modo verbal para\n"
 "hacer la prueba"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Cambiar a un nuevo tipo de prueba"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Compruebe su respuesta"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Sección de vocabulario"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Palabra preguntada"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "La palabra preguntada aparecerá aquí"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Su puntuación actual"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
-"Su puntuación se muestra en pantalla: respuestas correctas/ respuestas totales."
+"Su puntuación se muestra en pantalla: respuestas correctas/ respuestas "
+"totales."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Respuesta 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Pulse aquí si piensa que esta es la respuesta correcta."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Respuesta 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Respuesta 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Respuesta 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Volver a la pantalla de selección"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "El idioma seleccionado por el usuario"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "cuántas preguntas se hacen en una sesión."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "si KLatin debe hacer un número ilimitado de preguntas."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "el archivo de vocabulario predeterminado."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr ""
-"si las preguntas deben ser de traducción de latín al idioma del usuario."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
-"si las preguntas deben ser de traducción del idioma del usuario al latín."
diff --git a/tde-i18n-et/messages/tdeedu/klatin.po b/tde-i18n-et/messages/tdeedu/klatin.po
index 602fdedd65d..480039c6fa0 100644
--- a/tde-i18n-et/messages/tdeedu/klatin.po
+++ b/tde-i18n-et/messages/tdeedu/klatin.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-12-02 17:57+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Marek Laane"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -275,12 +275,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Milline on %1 isik %2 %3 (%4 %5) sõnast %6?"
 
@@ -294,8 +295,8 @@ msgstr "Sõnavarafaili avamine ebaõnnestus. Kontrolli KLatini paigaldust."
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - ladina keele õppimise abiline"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -324,14 +325,37 @@ msgstr "Veaparandused ja abi koodi juures, itaalia sõnastikuandmete tõlge"
 msgid "Polish Vocabulary Data Translation"
 msgstr "Poola sõnastikuandmete tõlge"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "S&ektsioon"
+msgid "The language selected by the user"
+msgstr "Kasutaja valitud keel"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "mitu küsimust ühel seansil küsitakse."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "kas KLatin peaks küsima piiramatu arvu küsimusi."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "vaikimisi sõnavarafail."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "kas küsimused peaksid olema stiilis ladina -> kasutaja keel."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "kas küsimused peaksid olema stiilis kasutaja -> ladina keel."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -340,80 +364,67 @@ msgstr ""
 "Tere tulemast kasutama KLatinit!\n"
 "Palun vali meelepärane sektsioon"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Ülevaate sektsioonid"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "Sõna&vara"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Sõnavara testimine"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Mitme valikuga sõnavaratest"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Grammatika"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Nimisõnade grammatika testimine"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Levinud nimisõnade ja käänamise test"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Ver&bid"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Verbivormide testimine"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Levinud verbide ja pööramise test"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "Ülevaa&de"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Laadi ülevaade"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -422,50 +433,47 @@ msgstr ""
 "KLatini ülevaade koos\n"
 "nimi- ja tegusõnatabelitega"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "Alu&sta"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Alusta valitud ülevaateteemaga"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Alusta valitud sektsiooniga"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Väljub"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Väljub"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Välju KLatinist"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Grammatika sektsioon"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Nimisõnade valik testimiseks"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -478,284 +486,262 @@ msgstr ""
 "Rida 3\n"
 "Rida 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Siia tuleb küsimus"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Punktid"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Sinu senine edu protsentides"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Vastus:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Siia läheb sinu vastus"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Kirjuta siia oma vastus"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Kontrolli vastust"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Tagasi"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Liigub tagasi valikuekraanile"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Tagasi valikuekraanile"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Tulemused"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Sinu tulemused</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Küsimus"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Sinu vastus"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Õige vastus"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Tulemuste tabel"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Protsent:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Õigete vastuste protsent"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 "See näitab, mitu protsenti sinu vastatud küsimustest on korrektselt vastatud."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Katsete arv:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Katsete arv"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Näitab, mitmele küsimusele oled vastanud."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Sulge dialoog"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Sulgeb dialoogi ja naaseb KLatini peaaknasse."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Sõnavara seadistamine..."
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Testistiil"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Ladina keelde"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Küsimused sinu, vastused ladina keeles"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 "Vali testimiseks suunal sinu keel -> ladina keel, mis tähendab, et sõna "
 "näidatakse sinu emakeeles ja sa pead valima 4 ladinakeelse sõna seast õige "
 "tõlke."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Ladina keelest"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Küsimused ladina, vastused sinu keeles"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 "Vali testimiseks suunal ladina keel -> sinu keel, mis tähendab, et sõna "
 "näidatakse ladina keeles ja sa pead valima 4 emakeelse sõna seast õige tõlke."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Fail, millega sõnavara testida"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Faili, mida testimiseks kasutatakse, saab muuta sõnavarasektsioonis"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Küsimuste arv:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Määrab testil küsitavate küsimuste arvu"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
-"Siin saab määrata, mitu küsimust testi käigus esitatakse. Kui see arv küsimusi "
-"on esitatud, näidatakse saavutatud tulemust."
+"Siin saab määrata, mitu küsimust testi käigus esitatakse. Kui see arv "
+"küsimusi on esitatud, näidatakse saavutatud tulemust."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Enne lõpetamist küsitavate küsimuste arv"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Korraga küsitavate küsimuste arv"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "S&ektsioon"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Verbide sektsioon"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Verbi pöördkonna valik"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -764,14 +750,12 @@ msgstr ""
 "Pöördkond, mille verbe\n"
 "testitakse"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Verbi tegumoe valik"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -780,14 +764,12 @@ msgstr ""
 "Tegumood, mille verbe\n"
 "testitakse"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Verbi kõneviisi valik"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -796,118 +778,75 @@ msgstr ""
 "Kõneviis, mille verbe\n"
 "testitakse"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Muuda testi tüüpi"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Kontrolli vastust"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Sõnavara sektsioon"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Küsimussõna"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Siia tuleb küsimussõna"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Sinu praegune skoor"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr "Siin on näha sinu skoor: korrektsete vastuste arv/vastuste koguarv."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Vastus 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Klõpsa siia, kui arvad, et oled õigesti vastanud."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Vastus 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Vastus 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Vastus 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Tagasi valikuekraanile"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Kasutaja valitud keel"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "mitu küsimust ühel seansil küsitakse."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "kas KLatin peaks küsima piiramatu arvu küsimusi."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "vaikimisi sõnavarafail."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "kas küsimused peaksid olema stiilis ladina -> kasutaja keel."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "kas küsimused peaksid olema stiilis kasutaja -> ladina keel."
diff --git a/tde-i18n-eu/messages/tdeedu/klatin.po b/tde-i18n-eu/messages/tdeedu/klatin.po
index 0cf1150a60a..75c5bf825ba 100644
--- a/tde-i18n-eu/messages/tdeedu/klatin.po
+++ b/tde-i18n-eu/messages/tdeedu/klatin.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-08-25 18:23+0200\n"
 "Last-Translator: Ion Gaztañaga <igaztanaga@gmail.com>\n"
 "Language-Team: Basque <kdeuskaraz@euskalgnu.org>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Ion Gaztañaga"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -276,12 +276,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Zein da %6 aditzaren ahots %5ko %4ko %3ko %1 pertsonaren %2?"
 
@@ -297,8 +298,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin. Latina errepasatzeko programa bat"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -322,20 +323,44 @@ msgstr "SVG ikonoa"
 #: main.cpp:44
 msgid "Bug fixes and code improvement, Italian Vocabulary Data Translation"
 msgstr ""
-"Errore-konponketak eta kodearen hobekuntza, italierako hiztegi-datuen itzulpena"
+"Errore-konponketak eta kodearen hobekuntza, italierako hiztegi-datuen "
+"itzulpena"
 
 #: main.cpp:45
 msgid "Polish Vocabulary Data Translation"
 msgstr "Polonierako hiztegi-datuen itzulpena"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&Atala"
+msgid "The language selected by the user"
+msgstr "Erabiltzaileak hautatutako hizkuntza"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "sesio batean zenbat galdera egingo diren."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "KLatin-ek galdera-kopuru mugagabea egingo duen."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "hiztegi-fitxategi lehenetsia."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "galderak latinetik erabiltzailearen hizkuntzara diren."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "galderak erabiltzailearen hizkuntzetik latinera diren."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -344,80 +369,67 @@ msgstr ""
 "Ongi etorri KLatin-era\n"
 "Hautatu errebisioaren atal bat"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Errebisio atalak"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Hiztegia"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Hiztegi-proba"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Aukera anizkoitzeko hiztegi-proba"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Gramatika"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Izen-gramatika proba"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Izen eta amaiera arrunten proba"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "&Aditzak"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Aditzi-formen proba"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Aditz eta amaiera arrunten proba"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Errebisio-oharrak"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Kargatu errebisio-oharrak"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -426,50 +438,47 @@ msgstr ""
 "Aditz eta izen tauladun\n"
 "KLatin-en errebisio oharra"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Hasi"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Hasi hautatutako errebisio-atala"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Hasi hautatu duzun atala"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Irten"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Irten"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Irten KLatin-etik"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Gramatika atala"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Probarako izen-hautapena"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -482,248 +491,228 @@ msgstr ""
 "3. lerroa\n"
 "4. lerroa"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Galdera hemen agertuko da"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Puntuazioa"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Momenturartu egin duzun probaren portzentaia"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Erantzuna:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Zure erantzuna hemen joango da"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Sartu zure erantzunak hemen"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Egiaztatu erantzuna"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Atzera"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Joan atzera hautapen pantailara"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Itzuli hautapen-pantailara"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Emaitzak"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Zure emaitzak</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Galdera"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Zure erantzuna"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Erantzun zuzena"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Emaitzen taula"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Portzentaia:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Erantzun zuzenen portzentaia"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr "Honek ongi erantzun dituzun galderen portzentaia erakusten du."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Saiakera kopurua:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Saiatutako galdera kopurua"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Honek erantzundako galdera kopurua erakusten du."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Itxi elkarrizketa-koadro hau"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Itxi elkarrizketa-koadro hau eta itzuli KLatin-en lehio nagusira."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Konfiguratu hiztegia"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Probaren estiloa"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Latinera"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Galderak zure hizkuntzan eta erantzunak latinez"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Hautatu zure hizkuntzatik latinerako proba nahi baduzu. Hitza zure hizkuntzan "
-"agertuko da eta zuk latineko itzulpena 4 aukeretatik hautatu beharko duzu."
+"Hautatu zure hizkuntzatik latinerako proba nahi baduzu. Hitza zure "
+"hizkuntzan agertuko da eta zuk latineko itzulpena 4 aukeretatik hautatu "
+"beharko duzu."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Latinetik"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Galderak latinez eta erantzunak zure hizkuntzan"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+"Hautatu latinetik zure hizkuntzarako proba nahi baduzu. Hitza latinez "
+"agertuko da eta zuk zure hizkuntzako itzulpena 4 aukeretatik hautatu beharko "
+"duzu."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
-"Hautatu latinetik zure hizkuntzarako proba nahi baduzu. Hitza latinez agertuko "
-"da eta zuk zure hizkuntzako itzulpena 4 aukeretatik hautatu beharko duzu."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Hiztegi-probaren fitxategia"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Hiztegi-probaren fitxategia alda dezakezu"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Galdera kopurua:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Ezarri probarako nahi dituzun galdera kopurua"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -732,32 +721,32 @@ msgstr ""
 "Hemen probaren galdera kopurua ezarri dezakezu. Kopuru honetara iristean, "
 "emaitzen elkarrizketa-koadroa agertuko da."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Amaierara iristeko behar diren galdera kopurua"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Batera galdetuko diren galdera kopurua"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&Atala"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Aditzen atala"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Hautatu aditzen konjugazioa"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -766,148 +755,101 @@ msgstr ""
 "Probatu nahi dituzun aditzen\n"
 "konjugazioa"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Aditz-ahotsaren hautapena"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr "Probarako aditz-ahotsa"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Aditz-moduaren hautapena"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr "Probarako aditz-modua"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Aldatu proba mota berri batera"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Egiaztatu zure erantzuna"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Hiztegiaren atala"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Galdetutako hitza"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Galdetutako hitza hemen agertuko da"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Zure uneko puntuazioa"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 "Zure puntuazio hemen agertuko da. Erantzun kopuruaren araberako erantzun "
 "zuzenen kopurua."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "1. erantzuna"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Klikatu hau erantzun zuzena dela pentsatzen baduzu."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "2. erantzuna"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "3. erantzuna"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "4. erantzuna"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Itzuli hautapen-pantailara"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Erabiltzaileak hautatutako hizkuntza"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "sesio batean zenbat galdera egingo diren."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "KLatin-ek galdera-kopuru mugagabea egingo duen."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "hiztegi-fitxategi lehenetsia."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "galderak latinetik erabiltzailearen hizkuntzara diren."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "galderak erabiltzailearen hizkuntzetik latinera diren."
diff --git a/tde-i18n-fa/messages/tdeedu/klatin.po b/tde-i18n-fa/messages/tdeedu/klatin.po
index 4f1227591ff..8b91fd95fd1 100644
--- a/tde-i18n-fa/messages/tdeedu/klatin.po
+++ b/tde-i18n-fa/messages/tdeedu/klatin.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2007-02-10 14:23+0330\n"
 "Last-Translator: Nazanin Kazemi <kazemi@itland.ir>\n"
 "Language-Team: Persian <kde-i18n-fa@kde.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "نسیم دانیارزاده"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -275,12 +275,13 @@ msgstr "پروندۀ تعریف فعل را نتوانست بارگذاری کن
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr " %1 شخص %2 %3 %4 %5 ِ %6 چیست؟"
 
@@ -295,8 +296,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - برنامه‌‌‌‌ای برای کمک به بازبینی زبان لاتین"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr ""
@@ -325,14 +326,37 @@ msgstr "رفع اشکالها و اصلاح کد، ترجمۀ دادۀ واژگ�
 msgid "Polish Vocabulary Data Translation"
 msgstr "اصلاح ترجمۀ دادۀ واژگان"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&بخش‌"
+msgid "The language selected by the user"
+msgstr "زبان توسط کاربر انتخاب می‌‌‌‌شود"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "چند پرسش در هر نشست پرسیده می‌شود."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "آیا  KLatin باید پرسشهای نامحدود بپرسد."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "پروندۀ واژگان پیش‌فرض"
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "آیا پرسشها باید از زبان لاتین به زبان کاربر باشند."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "آیا پرسشها باید از زبان کاربر به زبان لاتین باشند."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -341,80 +365,67 @@ msgstr ""
 "به KLatin خوش آمدید\n"
 "لطفاً، بخش بازبینی را انتخاب کنید"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "بخشهای بازبینی"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&واژگان‌"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "آزمون در مورد واژگان"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "آزمون واژگان چندگزینه‌‌ای"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&دستور زبان‌"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "آزمون در مورد دستور زبان اسم"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "آزمون در مورد اسمهای عام و پی‌‌‌بندها"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "&فعلها‌"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "آزمون در مورد حالتهای فعل"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "آزمون در مورد اسمهای عام و پی‌‌‌بندها"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "یادداشتهای &بازبینی‌"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "بارگذاری یادداشتهای بازبینی"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -423,50 +434,47 @@ msgstr ""
 "یادداشتهای بازبینی KLatin با\n"
 "جدولهای فعل و اسم"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&آغاز‌"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "آغاز ناحیۀ انتخاب‌‌شدۀ بازبینی"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "آغاز بخشی که انتخاب کرده‌اید"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "خارج می‌شود"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "خارج می‌شود"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "خروج از KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "بخش دستور زبان"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "انتخاب اسمها برای آزمایش"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -479,250 +487,227 @@ msgstr ""
 "خط ۳\n"
 "خط ۴"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "پرسش در اینجا ظاهر می‌‌شود"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "امتیاز"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "۰"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "درصد آزمونتان تا اینجا"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "پاسخ:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "پاسخ شما در اینجا قرار می‌‌گیرد"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "پاسخ خود را در اینجا وارد کنید"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "علامت زدن پاسخ"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&پس‌"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "بازگشتن به پردۀ گزینش"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "برگشتن به پردۀ گزینش"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "نتایج"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>نتایج شما</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "پرسش"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "پاسخ شما"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "پاسخ درست"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "فهرست نتایج"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "درصد:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "درصد پاسخهای درست"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr " درصد پرسشهای درست از میان آنهایی که پاسخ دادید را نمایش می‌دهد."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "تعداد پاسخ‌ داده‌شده:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "تعداد پرسشهای پاسخ داده‌‌‌شده"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "تعداد پرسشهایی که پاسخ دادید را نمایش می‌دهد."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "بستن این محاوره"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "بستن این محاوره و برگشتن به پنجرۀ اصلی KLatin."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "پیکربندی واژگان"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "سبک آزمایش"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "به زبان لاتین"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "پرسشها به زبان شما و پاسخها به زبان لاتین"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 "انتخابی که از زبان شما به زبان لاتین آزمایش می‌‌شود، به این معناست که واژه به "
 "زبان شما نمایش داده می‌شود و مجبورید از میان ۴ ترجمۀ لاتین انتخاب کنید."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "از زبان لاتین"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "پرسش به زبان لاتین و پاسخها به زبان شما"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 "انتخابی که از زبان لاتین به زبان شما آزمایش می‌‌‌شود، به این معناست که واژه به "
 "زبان لاتین نمایش داده می‌‌شود و مجبورید از میان ۴ ترجمه به زبان خودتان انتخاب "
 "کنید."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "پرونده‌ای که شما را در خصوص واژگان آزمایش می‌‌کند"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
-msgstr ""
-"پرونده‌‌ای که شما را برای بخش واژگان آزمایش می‌کند را می‌‌‌توانید تغییر دهید"
+msgstr "پرونده‌‌ای که شما را برای بخش واژگان آزمایش می‌کند را می‌‌‌توانید تغییر دهید"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "تعداد پرسشها:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "تنظیم تعداد پرسشهایی که می‌خواهید با آنها آزمایش شوید"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -731,32 +716,32 @@ msgstr ""
 "در اینجا تعداد پرسشهایی که می‌خواهید با آنها آزمایش شوید را می‌توانید تنظیم "
 "کنید. هنگامی که این تعداد به دست بیاید، محاورۀ نتیجه ظاهر می‌شود."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "تعداد پرسشهایی که قبل از پایان پرسیده می‌‌شوند"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "تعداد پرسشهایی که هر دفعه پرسیده می‌شوند"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&بخش‌"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "بخش فعلها"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "انتخاب صرف فعل"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -765,14 +750,12 @@ msgstr ""
 "صرف فعل\n"
 "آزمایش می‌شود"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "انتخاب حالت فعل"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -781,14 +764,12 @@ msgstr ""
 "حالت فعل\n"
 "آزمایش می‌‌شود"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "انتخاب وجه فعل"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -797,118 +778,75 @@ msgstr ""
 "وجه فعل\n"
 "آزمایش می‌‌شود"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "تغییر آزمون به نوع جدید"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "پاسختان را علامت بزنید"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "بخش واژگان"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "واژۀ پرسش"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "واژۀ پرسش در اینجا ظاهر می‌‌‌شود"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "نمرۀ جاری شما"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr "امتیاز شما در این نمایش ظاهر می‌شود. تعداد پاسخهای درست/تعداد کل."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "پاسخ ۱"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "اگر فکر می‌کنید این پاسخ درست است، اینجا را فشار دهید."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "پاسخ ۲"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "پاسخ ۳"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "پاسخ ۴"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "برگشتن به پردۀ گزینش"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "زبان توسط کاربر انتخاب می‌‌‌‌شود"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "چند پرسش در هر نشست پرسیده می‌شود."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "آیا  KLatin باید پرسشهای نامحدود بپرسد."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "پروندۀ واژگان پیش‌فرض"
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "آیا پرسشها باید از زبان لاتین به زبان کاربر باشند."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "آیا پرسشها باید از زبان کاربر به زبان لاتین باشند."
diff --git a/tde-i18n-fi/messages/tdeedu/klatin.po b/tde-i18n-fi/messages/tdeedu/klatin.po
index c8d199a73cd..cde387457d3 100644
--- a/tde-i18n-fi/messages/tdeedu/klatin.po
+++ b/tde-i18n-fi/messages/tdeedu/klatin.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2006-09-14 18:31+0300\n"
 "Last-Translator: Ilpo Kantonen <ilpo@iki.fi>\n"
 "Language-Team: finnish <fi@li.org>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Ilpo Kantonen"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -273,12 +273,13 @@ msgstr "Ei voitu ladata verbiien määrittelytiedostoa, tarkista KLatin-asennus.
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Mikä on %1 persoonan %2 %3 %4 %5 sanasta %6?"
 
@@ -292,8 +293,8 @@ msgstr "Ei voitu ladata sanastotiedostoa, KLatin-asennuksessa on ongelmia."
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - ohjelma latinan tarkistamiseen"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -323,14 +324,37 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr "Puolalaisen sanaston käännös"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&Osio"
+msgid "The language selected by the user"
+msgstr "Käyttäjän valitsema kieli"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "Kuinka monta kysymystä kussakin kyselyssä kysytään."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "kysyykö KLatin rajoittamattomia kysymyksiä."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "oletussanaston tiedosto."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "kysytäänkö latinasta käyttäjän omalle kielelle."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "kysytäänkö käyttäjän omasta kielestä latinaksi."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -339,130 +363,114 @@ msgstr ""
 "Tervetuloa KLatin-ohjelmaan!\n"
 "Valitse tarkistuksen osio"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Tarkistusosiot"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Sanasto"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Sanastotesti"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Sanaston monivalintatehtävä"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Kielioppi"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Substantiivien kieliopin testi"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Testi keskeisille substantiiveille"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Ver&bit"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Verbimuototesti"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Testi keskeisille verbeille"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Tarkistusviitteet"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Aloita tarkistusviitteet"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr "KLatin viitemerkinnät verbeineen ja substantiivitauluineen"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "Aloi&ta"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Aloita testiosio"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Aloita valitsemasi osio"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Lopettaa"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Lopettaa"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Lopeta KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Kielioppiosa"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Valitse testattavat substantiivit"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -475,249 +483,228 @@ msgstr ""
 "Rivi 3\n"
 "Rivi 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Kysymys ilmestyy tähän"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Pisteet"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Testi prosenttilukusi"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Vastaus:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Vastauksesi menee tähän"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Anna vastauksesi tähän"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Tarkista vastaus"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Takaisin"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Palaa takaisin valintaruutuun"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Palaa valintaruutuun"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Tulokset"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Tuloksesi</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Kysymys"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Vastauksesi"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Oikea vastaus"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Tulostaulu"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Prosenttia:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Oikeita vastauksia prosenttia:"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
-"Tämä näyttää oikein vastattujen kysymysten prosentuaalisen osuuden yrityksistä."
+"Tämä näyttää oikein vastattujen kysymysten prosentuaalisen osuuden "
+"yrityksistä."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Yrityskerrat:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Yritettyjen kysymysten lukumäärä"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Tämä näyttää vastaamiesi kysymysten lukumäärän."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Sulje tämä keskusteluikkuna"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Sulje tämä keskusteluikkuna ja palaa KLatinin pääikkunaan."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Säädä sanastoa"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Testaustyyli"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Latinaksi"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Kysymys kielelläsi ja vastaus latinaksi"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Testaus omalta kieleltäsi latinaksi. Sana näytetään omalla kielelläsi ja sinun "
-"tulee valita oikea neljästä latinan käännöksestä."
+"Testaus omalta kieleltäsi latinaksi. Sana näytetään omalla kielelläsi ja "
+"sinun tulee valita oikea neljästä latinan käännöksestä."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Latinasta"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Kysymys latinaksi ja vastaukset omalla kielelläsi"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 "Testaus latinasta omalle kielellesi. Sana näytetään latinaksi ja sinun tulee "
 "valita oikea neljästä käännöksestä omalle kielellesi."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Testattavan sanaston tiedosto"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Voit vaihtaa testauksen tiedoston sanasto-osiolle"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Kysymysten lukumäärä:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Aseta haluamasi kysymysten lukumäärä"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -726,180 +713,133 @@ msgstr ""
 "Tässä voit asettaa haluamasi kysymysten lukumäärän. Kun tämä on saavutettu, "
 "tulosikkuna ilmestyy."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Kysyttävien kysymysten lukumäärä ennen loppua"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Kullakin kerralla kysyttävien kysymysten lukumäärä"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&Osio"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Verbiosio"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Valitse verbin konjugaatio"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr "Testattava verbin konjugaatio"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Valitse verbin pääluokka"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr "Testattava verbin pääluokka"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Verbin modus"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr "Testattava verbin modus"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Vaihda testi uuteen tyyppiin"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Tarkista vastauksesi"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Sanasto-osio"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Kysymyssana"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Kysymyssana ilmestyy tähän"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Nykyiset pisteesi"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 "Sinun pisteesi ilmestyvät tähän näyttöön. Oikeiden vastausten lukumäärä / "
 "kaikkien vastausten lukumäärä."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Vastaus 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Nausauta tästä, jos se on mielestäsi oikea vastaus."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Vastaus 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Vastaus 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Vastaus 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Palaa valintaruutuun"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Käyttäjän valitsema kieli"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "Kuinka monta kysymystä kussakin kyselyssä kysytään."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "kysyykö KLatin rajoittamattomia kysymyksiä."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "oletussanaston tiedosto."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "kysytäänkö latinasta käyttäjän omalle kielelle."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "kysytäänkö käyttäjän omasta kielestä latinaksi."
diff --git a/tde-i18n-fr/messages/tdeedu/klatin.po b/tde-i18n-fr/messages/tdeedu/klatin.po
index b20e2fb608c..ed09f1d5b09 100644
--- a/tde-i18n-fr/messages/tdeedu/klatin.po
+++ b/tde-i18n-fr/messages/tdeedu/klatin.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-10-13 10:42+0200\n"
 "Last-Translator: Matthieu Robin <matthieu@macolu.org>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -21,18 +21,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Thibaut Cousin,Matthieu Robin,Anne-Marie Mahfouf ,Nicolas Ternisien"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr ""
-"cousin@kde.org,kde@macolu.org,annemarie.mahfouf@free.fr,nicolast@libertysurf.fr"
+"cousin@kde.org,kde@macolu.org,annemarie.mahfouf@free.fr,nicolast@libertysurf."
+"fr"
 
 #: klatin.cpp:57
 msgid "Load &Vocabulary"
@@ -277,18 +278,19 @@ msgstr "du futur antérieur"
 #: klatinverbs.cpp:109
 msgid "Could not load verb-definition file, check KLatin installation."
 msgstr ""
-"Impossible de charger le fichier de définition des verbes, vérifiez que KLatin "
-"est installé correctement."
+"Impossible de charger le fichier de définition des verbes, vérifiez que "
+"KLatin est installé correctement."
 
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Quelle est la %1 personne %2 %3 %4 %5 de %6 ?"
 
@@ -304,8 +306,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - un programme permettant d'apprendre le Latin"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -336,14 +338,37 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr "Traduction polonaise des données de vocabulaire"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "S&ection"
+msgid "The language selected by the user"
+msgstr "La langue choisie par l'utilisateur"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "combien de questions sont posées dans une session."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "si KLatin doit poser un nombre de questions infini."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "le fichier de vocabulaire par défaut."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "si les questions doivent être du latin à la langue de l'utilisateur."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "si les questions doivent être de la langue de l'utilisateur au latin."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -352,80 +377,67 @@ msgstr ""
 "Bienvenue dans KLatin\n"
 "Veuillez choisir une section de révision"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Sections de révision"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Vocabulaire"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Test de vocabulaire"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Test de vocabulaire à choix multiples"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Grammaire"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Test sur la grammaire des noms"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Test sur les noms communs et les terminaisons"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Ver&bes"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Test sur la conjugaison"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Test sur les verbes les plus courants et leurs terminaisons"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "Notes de &révision"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Charger les notes de révision"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -434,50 +446,47 @@ msgstr ""
 "Les notes de révision de KLatin avec\n"
 "les tables des verbes et des noms communs"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Démarrer"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Démarrer la section de révision choisie"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Démarrer la section que vous avez choisie"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Quitte"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Quitte"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Quitter KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Section grammaticale"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Choix du groupe pour le test"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -490,288 +499,267 @@ msgstr ""
 "Ligne 3\n"
 "Ligne 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "La question apparaîtra ici"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Score"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Le pourcentage de votre test jusqu'à présent"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Réponse :"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Votre réponse va ici"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Saisissez votre réponse ici"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Vérifiez votre réponse"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Retour"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Revenir à l'écran de choix"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Retour à l'écran de choix"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Résultats"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Vos résultats</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Question"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Votre réponse"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Réponse correcte"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Tableau des résultats"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Pourcentage :"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Pourcentage de réponses correctes"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 "Cela affiche le pourcentage de questions auxquelles vous avez répondu "
 "correctement par rapport au nombre de questions posées."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Nombre de questions tentées :"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Nombre de questions tentées"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Cela affiche le nombre de questions auxquelles vous avez répondu."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Fermer cette boîte de dialogue"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
-"Fermer cette boîte de dialogue et retourner à la fenêtre principale de KLatin."
+"Fermer cette boîte de dialogue et retourner à la fenêtre principale de "
+"KLatin."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Configurer le vocabulaire"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Style de test"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Vers le latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "La question est dans votre langue et les réponses en latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Choisissez d'être testé de votre langue vers le latin, ce qui signifie que le "
-"mot sera affiché dans votre langue et que vous devrez choisir entre quatre "
-"traductions en latin."
+"Choisissez d'être testé de votre langue vers le latin, ce qui signifie que "
+"le mot sera affiché dans votre langue et que vous devrez choisir entre "
+"quatre traductions en latin."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Du latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Question en latin et réponses dans votre langue"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
-"Choisissez d'être testé du latin vers votre langue, ce qui signifie que le mot "
-"sera affiché en latin et vous devrez choisir entre quatre traductions dans "
-"votre langue."
+"Choisissez d'être testé du latin vers votre langue, ce qui signifie que le "
+"mot sera affiché en latin et vous devrez choisir entre quatre traductions "
+"dans votre langue."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Le fichier sur lequel vous êtes testé en vocabulaire"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 "Vous pouvez changer le fichier sur lequel vous êtes testé pour le vocabulaire"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Nombre de questions :"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Définir le nombre de questions pour le test"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
-"Vous pouvez définir ici le nombre de questions pour le test. Lorsque ce nombre "
-"est atteint, la boîte de dialogue des résultats apparaîtra."
+"Vous pouvez définir ici le nombre de questions pour le test. Lorsque ce "
+"nombre est atteint, la boîte de dialogue des résultats apparaîtra."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Nombre de questions restantes avant la fin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Nombres de questions à poser"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "S&ection"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Section des verbes"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Choix de la conjugaison du verbe"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -780,14 +768,12 @@ msgstr ""
 "Conjugaison de la personne sur laquelle\n"
 "vous êtes testé"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Choix de la voix du verbe"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -796,14 +782,12 @@ msgstr ""
 "Voix du verbe sur lequel\n"
 "vous êtes testé"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Choix du mode pour la conjugaison"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -812,120 +796,77 @@ msgstr ""
 "Mode du verbe sur lequel\n"
 "vous êtes testé"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Changer le test vers le nouveau type"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Vérifiez votre réponse"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Section vocabulaire"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Question"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "La question va apparaître ici"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Votre score actuel"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
-"Votre score apparaît ici. Le nombre de réponses correctes / le nombre total de "
-"réponses."
+"Votre score apparaît ici. Le nombre de réponses correctes / le nombre total "
+"de réponses."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Réponse 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Cliquez ici si vous pensez que c'est la bonne réponse"
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Réponse 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Réponse 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Réponse 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Revenir à l'écran de sélection"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "La langue choisie par l'utilisateur"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "combien de questions sont posées dans une session."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "si KLatin doit poser un nombre de questions infini."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "le fichier de vocabulaire par défaut."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "si les questions doivent être du latin à la langue de l'utilisateur."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "si les questions doivent être de la langue de l'utilisateur au latin."
diff --git a/tde-i18n-ga/messages/tdeedu/klatin.po b/tde-i18n-ga/messages/tdeedu/klatin.po
index c82e71828aa..49ae2096b74 100644
--- a/tde-i18n-ga/messages/tdeedu/klatin.po
+++ b/tde-i18n-ga/messages/tdeedu/klatin.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeedu/klatin.po\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+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,13 +10,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Séamus Ó Ciardhuáin,Kevin Scannell"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -267,12 +267,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Cad é an %1 pearsa %2 %3 %4 %5 de %6?"
 
@@ -286,8 +287,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -316,144 +317,151 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr ""
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "R&annán"
+msgid "The language selected by the user"
+msgstr "An teanga roghnaithe ag an úsáideoir"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr ""
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr ""
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr ""
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr ""
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
 "Please Choose Section of Revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Rannáin Leasaithe"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Stór Focal"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Gramadach"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "&Briathra"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "Nótaí &leasaithe"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Luchtaigh nótaí leasaithe"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Tosaigh"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Tosaigh an rannán a roghnaigh tú"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Scoir"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Scoir"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Scoir KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Rannán Gramadaí"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -466,426 +474,357 @@ msgstr ""
 "Líne 3\n"
 "Líne 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Scór"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Freagra:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Cuir do fhreagra anseo"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Iontráil do fhreagra anseo"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "Ar Ai&s"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Téigh ar ais go dtí an scáileáin roghnaithe"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Téigh ar ais go dtí an scáileáin roghnaithe"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Torthaí"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Do Chuid Torthaí</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Ceist"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Do Fhreagra"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Freagra Ceart"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Tábla torthaí"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Céatadán:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Dún an dialóg seo"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Cumraigh an Stór Focal"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Stíl Tástála"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Go Laidin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Ceist i nGaeilge agus freagraí i Laidin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Ceist i Laidin agus freagraí i nGaeilge"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Líon na gceisteanna:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "R&annán"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Freagra 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Freagra 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Freagra 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Freagra 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr ""
 
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "An teanga roghnaithe ag an úsáideoir"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
-
 #~ msgid ""
 #~ "_: Inform the user that nothing has been typed in\n"
 #~ "Please enter an answer."
diff --git a/tde-i18n-gl/messages/tdeedu/klatin.po b/tde-i18n-gl/messages/tdeedu/klatin.po
index bf82e6e482a..3f98e2cf851 100644
--- a/tde-i18n-gl/messages/tdeedu/klatin.po
+++ b/tde-i18n-gl/messages/tdeedu/klatin.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin2\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-10-23 10:16+0200\n"
 "Last-Translator: Manuel A. Vázquez Diz <xixirei@yahoo.es>\n"
 "Language-Team:  <es@li.org>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Manuel A. Vázquez Diz"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -274,12 +274,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "¿Cal é a %1 persoa %2 do%3 de %4 en voz%5 do verbo %6?"
 
@@ -288,15 +289,15 @@ msgid ""
 "Could not load vocabulary file; there is a problem with your KLatin "
 "installation."
 msgstr ""
-"Non se pode cargar o ficheiro de vocabulario; é posible que haxa un problema na "
-"súa instalación de KLatin."
+"Non se pode cargar o ficheiro de vocabulario; é posible que haxa un problema "
+"na súa instalación de KLatin."
 
 #: main.cpp:23
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - un programa que lle axuda a repasar o Latín"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -327,14 +328,37 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr "Traducción ao polaco do vocabulario"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "S&ección"
+msgid "The language selected by the user"
+msgstr "A lingua seleccionada polo usuario"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "cantas preguntas fanse nunha sesión."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "se KLatin debe facer un número ilimitado de preguntas."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "o ficheiro de vocabulario predeterminado."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "se as preguntas deben ser traducidas do Latín á lingua do usuario"
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "se as preguntas deben ser traducidas da lingua do usuario ó Latín."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -343,80 +367,67 @@ msgstr ""
 "¡Benvido a KLatin!\n"
 "Por favor, escolla a sección a repasar "
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Seccións de repaso"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Vocabulario"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Proba de vocabulario"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Proba de elección múltiple de vocabulario"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Gramática"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Proba de gramática con nomes"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Proba con nomes comúns e terminacións"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Ver&bos"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Proba de formas verbais"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Proba de verbos e terminacións"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Notas de repaso"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Cargar notas de repaso"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -425,50 +436,47 @@ msgstr ""
 "As notas de repaso de KLatin\n"
 "con táboas de nomes e verbos"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "¡E&scomezar! "
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Iniciar a área de repaso seleccionada"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Iniciar a sección que vostede seleccionou"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Saír"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Saír"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Saír de KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Sección de Gramática"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Selección de nomes para a proba"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -481,250 +489,228 @@ msgstr ""
 "Liña 3\n"
 "Liña 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "A pregunta aparecerá aquí"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Puntuación"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "A porcentaxe da súa proba ata agora"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Resposta:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Aquí vai a súa resposta"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Introduza aquí a súa resposta"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Comprobar resposta"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Atrás"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Volver á pantalla de selección"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Volver á pantalla de selección"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Resultados"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Os seus resultados</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Pregunta"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "A súa resposta"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Resposta correcta"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Táboa de resultados"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Porcentaxe:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Porcentaxe de respostas correctas"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr "Fixar a porcentaxe de preguntas contestadas correctamente."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Número de intentos"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Número de preguntas"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Fixar o número de preguntas que quere contestar"
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Pechar este diálogo"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Pechar este diálogo e volver á xanela de KLatin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Configurar vocabulario"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Tipo de proba"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Ó Latín"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Pregunta na súa lingua e resposta en Latín"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Seleccionar traducir da súa lingua ó Latin, isto significa que a palabra será "
-"amosada na súa lingua e terá que escoller entre 4 traduccións ó Latín."
+"Seleccionar traducir da súa lingua ó Latin, isto significa que a palabra "
+"será amosada na súa lingua e terá que escoller entre 4 traduccións ó Latín."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Do Latín"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Pregunta en Latín e respostas na súa lingua"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+"Seleccionar traducir do Latín á súa lingua, isto significa que a palabra "
+"será amosada en Latín e terá que escoller entre 4 traduccións á súa lingua."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
-"Seleccionar traducir do Latín á súa lingua, isto significa que a palabra será "
-"amosada en Latín e terá que escoller entre 4 traduccións á súa lingua."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "O ficheiro que está probando en vocabulario"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 "Pode cambiar o ficheiro sobre o que está a facer a proba da sección de "
 "vocabulario"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Número de preguntas"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Fixar o número de preguntas que quere respostar"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -733,32 +719,32 @@ msgstr ""
 "Aquí pode fixar o número de preguntas que quere contestar. Cando se alcance "
 "este número aparecerá un diálogo co resultado."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Número de preguntas a contestar antes de rematar"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Número de preguntas a contestar dunha vez"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "S&ección"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Sección Verbos"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Elixa a conxugación verbal"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -767,14 +753,12 @@ msgstr ""
 "Conxugación verbal para\n"
 "facer a proba"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Elixa a voz do verbo"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -783,14 +767,12 @@ msgstr ""
 "Voz verbal para\n"
 "facer a proba"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Elixa o modo do verbo"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -799,120 +781,77 @@ msgstr ""
 "Modo verbal para\n"
 "facer a proba"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Cambiar a un novo tipo de proba"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Comprobe a súa resposta"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Sección Vocabulario"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Palabra preguntada"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Aquí aparecerá a palabra preguntada"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "A súa puntuación actual"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 "O resultado da súa proba aparecerá nesta pantalla. Número total de respostas "
 "correctas/número total de respostas."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Resposta 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Prema aquí se pensa que esta é a resposta correcta"
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Resposta 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Resposta 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Resposta 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Volver á pantalla de selección"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "A lingua seleccionada polo usuario"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "cantas preguntas fanse nunha sesión."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "se KLatin debe facer un número ilimitado de preguntas."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "o ficheiro de vocabulario predeterminado."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "se as preguntas deben ser traducidas do Latín á lingua do usuario"
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "se as preguntas deben ser traducidas da lingua do usuario ó Latín."
diff --git a/tde-i18n-hi/messages/tdeedu/klatin.po b/tde-i18n-hi/messages/tdeedu/klatin.po
index 54364bb435e..3dc62a647a6 100644
--- a/tde-i18n-hi/messages/tdeedu/klatin.po
+++ b/tde-i18n-hi/messages/tdeedu/klatin.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-01-07 12:49+0530\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@gmail.com>\n"
 "Language-Team: indlinux-hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Hindi\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "रविशंकर श्रीवास्तव "
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -272,12 +272,13 @@ msgstr "क्रिया परिभाषा फ़ाइल लोड न�
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 
@@ -285,15 +286,14 @@ msgstr ""
 msgid ""
 "Could not load vocabulary file; there is a problem with your KLatin "
 "installation."
-msgstr ""
-"शब्दावली फ़ाइल लोड नहीं कर सका; आपके के-लेटिन संस्थापना के साथ कोई समस्या है."
+msgstr "शब्दावली फ़ाइल लोड नहीं कर सका; आपके के-लेटिन संस्थापना के साथ कोई समस्या है."
 
 #: main.cpp:23
 msgid "KLatin - a program to help revise Latin"
 msgstr "के-लेटिन - एक प्रोग्राम जो लेटिन में सुधार में मदद करता है"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "के-लेटिन"
@@ -324,14 +324,37 @@ msgstr "इतालवी शब्दावलि डाटा ट्रां
 msgid "Polish Vocabulary Data Translation"
 msgstr "पोलिश शब्दावलि डाटा ट्रांसलेशन"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "खण्ड (&e)"
+msgid "The language selected by the user"
+msgstr "उपयोक्ता द्वारा चयनित भाषा"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "एक सत्र में कितने प्रश्न पूछे जाएँ."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "क्या के-लेटिन असीमित प्रश्न पूछे."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "डिफ़ॉल्ट शब्दावली फ़ाइल."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "क्या उपयोक्ता को प्रश्न लेटिन में हों."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "क्या उपयोक्ता को प्रश्न लेटिन में हों."
+
+#: klatinchoose.ui:46
 #, fuzzy, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -340,80 +363,67 @@ msgstr ""
 "के-लेटिन में आपका स्वागत है!\n"
 "सुधार के लिए कृपया कोई खण्ड चुनें"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "सुधार खण्ड"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "शब्दावली (&V)"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "शब्दावली पर परीक्षा"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "मल्टीपल चॉइस शब्दावली परीक्षा"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "व्याकरण (&G)"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "संज्ञा व्याकरण पर परीक्षा"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "सामान्य क्रियाओं तथा एन्डिंग्स पर परीक्षा"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "क्रिया (&b)"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "क्रिया रूपों पर परीक्षा"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "सामान्य क्रियाओं तथा एन्डिंग्स पर परीक्षा"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "सुधार नोट्स (&R)"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "सुधार नोट लोड करें"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -422,50 +432,47 @@ msgstr ""
 "के-लेटिन सुधार नोट\n"
 "क्रिया तथा संज्ञा तालिका सहित"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, fuzzy, no-c-format
 msgid "S&tart"
 msgstr "प्रारंभ! (&t)"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "सुधार हेतु चयनित क्षेत्र प्रारंभ करें"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "जो खण्ड आपने चुना है उसे प्रारंभ करें"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "बाहर होता है"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "बाहर होता है"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "के-लेटिन से बाहर हों"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "व्याकरण खण्ड"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "परीक्षा हेतु संज्ञाओं के चयन"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -478,277 +485,254 @@ msgstr ""
 "पंक्ति 3\n"
 "पंक्ति 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "प्रश्न यहाँ दिखाई देंगे"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "अंक"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "अब तक का आपका परीक्षा प्रतिशत"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "उत्तर:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "आपका उत्तर यहाँ जाएगा"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "अपना उत्तर यहाँ भरें"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "उत्तर जाँचें"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "पीछे (&B)"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "चयन स्क्रीन पर वापस जाएँ"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "चयन स्क्रीन पर वापस जाएँ"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "परिणाम"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>आपके उत्तर</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "प्रश्न"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "आपका उत्तर"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "सही उत्तर"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "परिणामों की तालिका"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "प्रतिशत:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "सही उत्तरों का प्रतिशत"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
-msgstr ""
-"आपके द्वारा हल किए गए प्रश्नों में से सही उत्तरों के प्रतिशत को यह दिखाता है"
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
+msgstr "आपके द्वारा हल किए गए प्रश्नों में से सही उत्तरों के प्रतिशत को यह दिखाता है"
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "हल किए प्रश्नों की संख्या:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "हल किए गए प्रश्नों की संख्या"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "यह बताता है कि आपने कितने प्रश्नों के उत्तर दिए हैं."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "यह संवाद बंद करें"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "इस संवाद को बन्द करें तथा के-लेटिन के मुख्य विंडो में वापस जाएँ"
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "शब्दावली कॉन्फ़िगर करें"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "परीक्षा शैली"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "लेटिन में"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "प्रश्न आपकी भाषा में तथा उत्तर लेटिन में"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "लेटिन से"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "प्रश्न लेटिन में तथा उत्तर आपकी भाषा में"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "शब्दकोश के लिए आपकी परीक्षा फ़ाइल"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "शब्दकोश खण्ड के लिए आप फ़ाइल को बदल सकते हैं जिसमें आपने परीक्षा दी है"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "प्रश्नों की संख्या:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "प्रश्नों की संख्या नियत करें जिसमें कि आप परीक्षा देना चाहते हैं"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "प्रश्नों की संख्या जिन्हें आखिरी में पूछा जाना है"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "प्रश्नों की संख्या जिन्हें एक साथ पूछा जाना है"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "खण्ड (&e)"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "क्रिया खण्ड"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "क्रिया कॉज़ुगेशन का चुनाव"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -757,14 +741,12 @@ msgstr ""
 "क्रिया का कॉज़ुगेशन\n"
 "जिसे जाँचना है"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "क्रिया आवाज़ का चयन"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -773,14 +755,12 @@ msgstr ""
 "क्रिया की आवाज़\n"
 "जिसे जाँचना है"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "क्रिया मूड का चुनाव"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -789,124 +769,79 @@ msgstr ""
 "क्रिया का मूड\n"
 "जिसे जाँचना है"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "परीक्षा नई शैली में बदलें"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "अपना उत्तर जाँचें"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "शब्दकोश खण्ड"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "प्रश्न शब्द"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "प्रश्न के शब्द यहाँ दिखाई देंगे"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "आपका मौजूदा अंक"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
-msgstr ""
-"आपका अंक इस प्रदर्शक पर प्रकट होगा. सही उत्तरों की संख्या/कुल उत्तरों की "
-"संख्या."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
+msgstr "आपका अंक इस प्रदर्शक पर प्रकट होगा. सही उत्तरों की संख्या/कुल उत्तरों की संख्या."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "उत्तर 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "इसे क्लिक करें यदि आप समझते हैं कि आपने सही उत्तर दिया है."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "उत्तर 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "उत्तर 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "उत्तर 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "चयन स्क्रीन पर वापस जाएँ"
 
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "उपयोक्ता द्वारा चयनित भाषा"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "एक सत्र में कितने प्रश्न पूछे जाएँ."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "क्या के-लेटिन असीमित प्रश्न पूछे."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "डिफ़ॉल्ट शब्दावली फ़ाइल."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "क्या उपयोक्ता को प्रश्न लेटिन में हों."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "क्या उपयोक्ता को प्रश्न लेटिन में हों."
-
 #~ msgid ""
 #~ "_: Inform the user that nothing has been typed in\n"
 #~ "Please enter an answer."
diff --git a/tde-i18n-hr/messages/tdeedu/klatin.po b/tde-i18n-hr/messages/tdeedu/klatin.po
index 7799819f5e3..d1b686e4cad 100644
--- a/tde-i18n-hr/messages/tdeedu/klatin.po
+++ b/tde-i18n-hr/messages/tdeedu/klatin.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2002-01-05 14:56CET\n"
 "Last-Translator: Vlatko Kosturjak <kost@iname.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr ""
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -271,12 +271,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 
@@ -290,8 +291,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr ""
@@ -320,144 +321,151 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr ""
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
+msgid "The language selected by the user"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr ""
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr ""
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr ""
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr ""
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
 "Please Choose Section of Revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -466,422 +474,353 @@ msgid ""
 "Line 4"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr ""
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr ""
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr ""
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
diff --git a/tde-i18n-hu/messages/tdeedu/klatin.po b/tde-i18n-hu/messages/tdeedu/klatin.po
index 4ddc8d9a3c1..3e9d45629b6 100644
--- a/tde-i18n-hu/messages/tdeedu/klatin.po
+++ b/tde-i18n-hu/messages/tdeedu/klatin.po
@@ -1,7 +1,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 19:28+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"
@@ -10,13 +10,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Szántó Tamás"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -97,8 +97,8 @@ msgstr "5. ragozás, nőnemű"
 #: klatingrammar.cpp:119
 msgid "Could not load grammar-definition file, check KLatin installation."
 msgstr ""
-"Nem sikerült betölteni a nyelvtani leírófájlt, ellenőrizze, megfelelően van-e "
-"telepítve a program."
+"Nem sikerült betölteni a nyelvtani leírófájlt, ellenőrizze, megfelelően van-"
+"e telepítve a program."
 
 #: klatingrammar.cpp:119 klatinverbs.cpp:109 klatinvocab.cpp:110
 msgid "Error with KLatin"
@@ -271,12 +271,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "%1. személy, %2, %3, %4, %5 - %6?"
 
@@ -285,15 +286,15 @@ msgid ""
 "Could not load vocabulary file; there is a problem with your KLatin "
 "installation."
 msgstr ""
-"Nem sikerült betölteni a szótárfájljt, ellenőrizze, hogy a program megfelelően "
-"van-e telepítve."
+"Nem sikerült betölteni a szótárfájljt, ellenőrizze, hogy a program "
+"megfelelően van-e telepítve."
 
 #: main.cpp:23
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - segédprogram a latin nyelv tanulásához"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -323,14 +324,37 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr "A szótáradatok lefordítása lengyelre"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "Sza&kasz"
+msgid "The language selected by the user"
+msgstr "A felhasználó által választott nyelv"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "egy szakaszban ennyi kérdést tesz fel a program."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "a program korlátlan számú kérdést fog feltenni."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "az alapértelmezett szótárfájl."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "a kérdések latin nyelvről a felhasználó nyelvére történjenek."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "a kérdések a felhasználó nyelvéről latin nyelvre történjenek."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -339,80 +363,67 @@ msgstr ""
 "Üdvözöljük a KLatinban!\n"
 "Válassza ki, mit szeretne gyakorolni"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Ellenőrzések"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Szótár"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Szókincs-teszt"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Feleletválasztós szókincsteszt"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "Nyel&vtan"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "A főnevek nyelvtanjának gyakorlása"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Főnevek és végződések tesztje"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "&Igék"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Az igealakok gyakorlása"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Főnevek és végződések tesztje"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Kibocsátási megjegyzések"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "A kibocsátási megjegyzések betöltése"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -421,50 +432,47 @@ msgstr ""
 "Kibocsátási megjegyzések\n"
 "ige- és főnévtáblázatokkal"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "Ke&zdés"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "A választott gyakorlási rész megkezdése"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "A kiválasztott rész elkezdése"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Kilépés"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Kilépés"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Kilépés a programból"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Nyelvtan"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Az ellenőrzéshez használható főnevek"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -477,286 +485,264 @@ msgstr ""
 "3. sor\n"
 "4. sor"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "A kérdés itt fog megjelenni"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Pontszám"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Az eddig elért százalékos eredmény"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Válasz:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Ide kerül a válasz"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Ide kell beírni a választ"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "A válasz ellenőrzése"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Vissza"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Vissza a választóképernyőre"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Vissza a választóképernyőre"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Eredmények"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Az elért eredmény</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Kérdés"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Az adott válasz"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Helyes válasz"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Az eredmények táblázata"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Százalék:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "A helyes válaszok százalékos aránya"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 "Itt látható, hogy a feltett kérdések hány százalékát tudta helyesen "
 "megválaszolni."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "A próbálkozások száma:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "A kapott kérdések száma"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "A megválaszolt kérdések száma."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "A párbeszédablak bezárása"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "A párbeszédablak bezárása, visszatérés a KLatin főablakába."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "A szótár beállításai"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Tesztelési mód"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Latinra"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "A kérdések magyarul, a válaszok latinul legyenek"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 "Ha ezt választja, a magyarról latinra való fordítást lehet gyakorolni. "
-"Megjelenik egy szó magyarul, és Önnek ki kell választania a felajánlott 4 latin "
-"fordításból a helyeset."
+"Megjelenik egy szó magyarul, és Önnek ki kell választania a felajánlott 4 "
+"latin fordításból a helyeset."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Latinról"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "A kérdések latinul, a válaszok magyarul lesznek"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 "Ha ezt választja, a latinról magyarra való fordítást lehet gyakorolni. "
-"Megjelenik egy szó latinul, és Önnek ki kell választania a felajánlott 4 magyar "
-"fordításból a helyeset."
+"Megjelenik egy szó latinul, és Önnek ki kell választania a felajánlott 4 "
+"magyar fordításból a helyeset."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "A szóellenőrzés alapjául szolgáló fájl"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Itt lehet megadni, melyik fájl alapján történjen a szókincs tesztelése"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "A kérdések száma:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Adja meg, hány kérdést tegyen fel a program"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
-"Itt lehet beállítani, hány kérdést szeretne kapni. A megadott számú kérdés után "
-"megjelenik az eredményt összesítő ablak."
+"Itt lehet beállítani, hány kérdést szeretne kapni. A megadott számú kérdés "
+"után megjelenik az eredményt összesítő ablak."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Ennyi kérdést tegyen fel a program"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Egyszerre ennyi kérdést tegyen fel a program"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "Sza&kasz"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Igék"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Az igeragozás kiválasztása"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -765,14 +751,12 @@ msgstr ""
 "A tesztelendő ige\n"
 "konjugációja"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Az igehang kiválasztása"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -781,14 +765,12 @@ msgstr ""
 "A tesztelendő igéhez\n"
 "tartozó hang"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Az igemód kiválasztása"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -797,120 +779,77 @@ msgstr ""
 "A tesztelni\n"
 "kívánt igemód"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Váltás más típusú tesztre"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "A válaszok ellenőrzése"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Szótárszakasz"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Kérdőszó"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Itt jelenik meg a kérdőszó"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Eddigi pontszám"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 "A kiírt pontszám. A helyes válaszok száma osztva az összes kérdés számával, "
 "százalékosan."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "1. válasz"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Kattintson ide, ha úgy gondolja, ez a helyes válasz."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "2. válasz"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "3. válasz"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "4. válasz"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Vissza a választóképernyőre"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "A felhasználó által választott nyelv"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "egy szakaszban ennyi kérdést tesz fel a program."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "a program korlátlan számú kérdést fog feltenni."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "az alapértelmezett szótárfájl."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "a kérdések latin nyelvről a felhasználó nyelvére történjenek."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "a kérdések a felhasználó nyelvéről latin nyelvre történjenek."
diff --git a/tde-i18n-is/messages/tdeedu/klatin.po b/tde-i18n-is/messages/tdeedu/klatin.po
index 9b49fca16b5..beab6b2f7ad 100644
--- a/tde-i18n-is/messages/tdeedu/klatin.po
+++ b/tde-i18n-is/messages/tdeedu/klatin.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2004-11-21 20:50+0000\n"
 "Last-Translator: Stefán Sigurjónson <mute47@gmail.com>\n"
 "Language-Team: íslenska <kde-isl@molar.is>\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Stefán Sigurjónsson"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -274,12 +274,13 @@ msgstr "Gat ekki lesið inn sagnaskilgreiningar, athugið uppsetningu KLatin."
 #, fuzzy
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Hver er %1 persóna %2 %3 %4 %5 af %6?"
 
@@ -290,15 +291,15 @@ msgid ""
 "installation."
 msgstr ""
 "Gat ekki hlaðið inn orðaforðaskrá; það er annaðhvort vandamál með "
-"uppsetningunaþína á KLatin eða þá að það sé engin i18n stuðningur fyrir þetta "
-"tungumál."
+"uppsetningunaþína á KLatin eða þá að það sé engin i18n stuðningur fyrir "
+"þetta tungumál."
 
 #: main.cpp:23
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - forrit til að hjálpa til við upprifjun á latínu"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -329,14 +330,38 @@ msgstr "Pólskt orðaforðagagna þýðing"
 msgid "Polish Vocabulary Data Translation"
 msgstr "Pólskt orðaforðagagna þýðing"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&Hluti"
+msgid "The language selected by the user"
+msgstr "Tungumálið valið af notandanum"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "hversu margar spurningar eru bornar fram í hverri lotu."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "hvort KLatin á að spyrja ótakmarkaðra spurninga."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "hinn sjálfgefni orðaforði"
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "hvort spurningarnar eigi að vera frá latínu yfir í tungumál notandans."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+"hvort spurningarnar eigi að vera frá tungumáli notandans yfir í latínu."
+
+#: klatinchoose.ui:46
 #, fuzzy, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -345,80 +370,67 @@ msgstr ""
 "Velkomin/n í KLatin\n"
 "Vinsamlegast veldu hluta til að fara yfir"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Yfirferðar hlutar"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, fuzzy, no-c-format
 msgid "&Vocabulary"
 msgstr "Orðaforði"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Orðaforðapróf"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Orðaforðapróf með krossaspurningum"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, fuzzy, no-c-format
 msgid "&Grammar"
 msgstr "Málfræði"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Próf í málfræði nafnorða"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Próf í algengum nafnorðum og endingum"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, fuzzy, no-c-format
 msgid "Ver&bs"
 msgstr "Sagnir"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Próf í sagnbeygingu"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Próf í algengum sögnum og endingum"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, fuzzy, no-c-format
 msgid "&Revision notes"
 msgstr "Upprifjunar skýringar"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Hlaða inn upprifjunar skýringum"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -427,50 +439,47 @@ msgstr ""
 "KLatin upprifjunar skýringarnar með\n"
 "sagna og nafnorðatöflum"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, fuzzy, no-c-format
 msgid "S&tart"
 msgstr "&Byrja!"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Byrja á völdu upprifjunarsviðið"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Byrja á hlutanum sem þú hefur valið"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Hættir"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Hættir"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Hætta í KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Málfræði hluti"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Val um nafnorð til að prófa úr"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -483,251 +492,229 @@ msgstr ""
 "Lína 3\n"
 "Lína 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Spurningin birtist hér"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Stig"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Prófsprósenta þín hingað til"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Svar:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Svarið þitt fer hingað"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Sláðu inn svarið þitt hér"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Athuga svar"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Til baka"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Fara til baka á valskjá"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Til baka á valskjá"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Niðurstöður"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Niðurstöðurnar þínar</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Spurning"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Svarið þitt"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Rétt svar"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Niðurstöðutafla"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Prósenta:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, fuzzy, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Rétt svar er %1"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Fjöldi tilrauna:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, fuzzy, no-c-format
 msgid "Number of questions attempted"
 msgstr "Fjöldi spurninga:"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, fuzzy, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Stilltu fjölda spurninga sem þú vilt fá á prófinu."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Loka þessum skilaboðaglugga"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Stilla orðaorða"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Próftegund"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Á latínu"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Spurningar á tungumálinu þínu og svör á latínu"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Veldu þetta til að vera spurður úr þínu tungumáli yfir á latínu, sem þýðir að "
-"orðið verðurbirt á tungumálinu þínu og þú þarft að velja milli 4 þýðinga á "
-"latínu."
+"Veldu þetta til að vera spurður úr þínu tungumáli yfir á latínu, sem þýðir "
+"að orðið verðurbirt á tungumálinu þínu og þú þarft að velja milli 4 þýðinga "
+"á latínu."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Úr latínu"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Spurningar á latínu og svör á tungumálinu þínu"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 "Veldu þetta til að vera spurður úr latínu yfir þitt tungumál, sem þýðir að "
 "orðið verðurbirt á latínu og þú þarft að velja milli 4 þýðinga á tungumálið "
 "þitt."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Skráin sem þú ert prófaður úr í orðaforða"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 "Þú getur breytt því úr hvaða skrá þú ert prófaður úr í orðaforða hlutanum"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Fjöldi spurninga:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Stilltu fjölda spurninga sem þú vilt fá á prófinu."
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -736,32 +723,32 @@ msgstr ""
 "Hér getur þú stillt fjölda spurninga sem þú vilt fá á prófinu þínu. Þegar "
 "þessumfjölda er náð birtist niðurstöðugluggi."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Fjöldi spurninga til að spyrja fyrir lok"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Fjöldi spurninga til að spyrja að í einu"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&Hluti"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Hluti sagnorða"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Val um tíð sagnarinnar"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -770,14 +757,12 @@ msgstr ""
 "Tið sagnarinnar sem á að\n"
 "prófa úr"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Val um persónu sagnarinnar"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -786,14 +771,12 @@ msgstr ""
 "Persóna sagnarinnar sem á að\n"
 "prófa úr"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Val um hátt sagnarinnar"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -802,123 +785,79 @@ msgstr ""
 "Háttur sagnarinnar sem á að\n"
 "prófað úr"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Breyta prófinu í nýja tegund"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Athugaðu svarið  þitt"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Hluti orðaforðans"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Spurnarorðið"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Spurnarorðið birtist hérr"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Svar 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Smelltu hér ef þú heldur að þetta sé rétt svar."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Svar 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Svar 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Svar 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Til baka í aðalskjáinn"
 
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Tungumálið valið af notandanum"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "hversu margar spurningar eru bornar fram í hverri lotu."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "hvort KLatin á að spyrja ótakmarkaðra spurninga."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "hinn sjálfgefni orðaforði"
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "hvort spurningarnar eigi að vera frá latínu yfir í tungumál notandans."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
-"hvort spurningarnar eigi að vera frá tungumáli notandans yfir í latínu."
-
 #, fuzzy
 #~ msgid ""
 #~ "_: Inform the user that nothing has been typed in\n"
diff --git a/tde-i18n-it/messages/tdeedu/klatin.po b/tde-i18n-it/messages/tdeedu/klatin.po
index 9873e21a52e..2f0e54eeca5 100644
--- a/tde-i18n-it/messages/tdeedu/klatin.po
+++ b/tde-i18n-it/messages/tdeedu/klatin.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-08-12 00:39+0200\n"
 "Last-Translator: Pino Toscano <toscano.pino@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Pino Toscano"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -268,18 +268,19 @@ msgstr "futuro anteriore"
 #: klatinverbs.cpp:109
 msgid "Could not load verb-definition file, check KLatin installation."
 msgstr ""
-"Impossibile aprire il file di definizione dei verbi, controlla l'installazione "
-"di KLatin."
+"Impossibile aprire il file di definizione dei verbi, controlla "
+"l'installazione di KLatin."
 
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Qual è la %1 persona %2 del %3 %4 %5 di %6?"
 
@@ -288,15 +289,15 @@ msgid ""
 "Could not load vocabulary file; there is a problem with your KLatin "
 "installation."
 msgstr ""
-"Impossibile aprire il file di vocabolario; c'è un problema con l'installazione "
-"di KLatin."
+"Impossibile aprire il file di vocabolario; c'è un problema con "
+"l'installazione di KLatin."
 
 #: main.cpp:23
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - un programma per aiutare nel ripasso del latino"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -320,21 +321,44 @@ msgstr "Icona SVG"
 #: main.cpp:44
 msgid "Bug fixes and code improvement, Italian Vocabulary Data Translation"
 msgstr ""
-"Correzioni di bug e miglioramenti del codice, traduzione dei file di dati del "
-"vocabolario in italiano"
+"Correzioni di bug e miglioramenti del codice, traduzione dei file di dati "
+"del vocabolario in italiano"
 
 #: main.cpp:45
 msgid "Polish Vocabulary Data Translation"
 msgstr "Traduzione dei file di dati del vocabolario in polacco"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "S&ezione"
+msgid "The language selected by the user"
+msgstr "La lingua scelta dall'utente"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "come molte domande sono chieste in una sessione."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "se KLatin dovrebbe chiedere un numero non specificato di domande."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "il file di vocabolario predefinito."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "se le domande dovrebbero essere dal latino alla lingua dell'utente."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "se le domande dovrebbero essere dalla lingua dell'utente al latino."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -343,80 +367,67 @@ msgstr ""
 "Benvenuto in KLatin\n"
 "Scegli una sezione di ripasso"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Sezioni di ripasso"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Vocabolario"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Test sul vocabolario"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Test a scelta multipla sul vocabolario"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Grammatica"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Test sulla grammatica dei nomi"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Test sui nomi comuni e sulle desinenze"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Ver&bi"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Test sulle forme verbali"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Test sui verbi comuni e sulle desinenze"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "Note per il &ripasso"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Apri note del ripasso"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -425,50 +436,47 @@ msgstr ""
 "Le note di KLatin per il ripasso\n"
 "con le tavole dei verbi e dei nomi"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Inizia"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Avvia l'area scelta di ripasso"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Avvia la sezione scelta"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Esci"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Esci"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Esce da KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Sezione grammatica"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Scelta dei nomi per il test"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -481,288 +489,266 @@ msgstr ""
 "Linea 3\n"
 "Linea 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "La domanda apparirà qui"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Punteggio"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "La tua percentuale nel test fino a questo punto"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Risposta:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Qui va la tua risposta"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Inserisci la tua risposta qui"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Controlla risposta"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Indietro"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Ritorna indietro alla schermata di selezione"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Ritorna alla schermata di selezione"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Risultati"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>I tuoi risultati</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Domanda"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "La tua risposta"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Risposta corretta"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Tabella dei risultati"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Percentuale:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Percentuale di risposte corrette"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 "Questo mostra la percentuale di domande a cui hai risposto correttamente tra "
 "tutte quelle provate."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Numero domande:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Numero di domande provate"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Questo mostra il numero di domande a cui hai risposto."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Chiudi questa finestra di dialogo"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
 "Chiudi questa finestra di dialogo e ritorna nella finestra principale di "
 "KLatin."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Configura il vocabolario"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Stile del test"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "In latino"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Domanda nella tua lingua e risposte in latino"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Scegli di rispondere alle domande dalla tua lingua al latino, e ciò significa "
-"che la parola sarà visualizzata nella tua lingua e dovrai scegliere tra 4 "
-"traduzioni in latino."
+"Scegli di rispondere alle domande dalla tua lingua al latino, e ciò "
+"significa che la parola sarà visualizzata nella tua lingua e dovrai "
+"scegliere tra 4 traduzioni in latino."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Dal latino"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Domanda in latino e risposte nella tua lingua"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
-"Scegli di rispondere alle domande dal latino alla tua lingua, e ciò significa "
-"che la parola sarà visualizzata in latino e dovrai scegliere tra 4 traduzioni "
-"nella tua lingua."
+"Scegli di rispondere alle domande dal latino alla tua lingua, e ciò "
+"significa che la parola sarà visualizzata in latino e dovrai scegliere tra 4 "
+"traduzioni nella tua lingua."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Il file con le domande sul vocabolario"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Puoi cambiare il file con le domande per la sezione sul vocabolario"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Numero di domande:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Imposta il numero di domande da chiedere"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
-"Qui puoi impostare il numero di domande da proporti. Quando è raggiunto questo "
-"numero, appare una finestra di dialogo con i risultati."
+"Qui puoi impostare il numero di domande da proporti. Quando è raggiunto "
+"questo numero, appare una finestra di dialogo con i risultati."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Numero di domande da chiedere prima di finire"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Numero di domande da chiedere ogni volta"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "S&ezione"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Sezione verbi"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Scelta della coniugazione verbale"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -771,14 +757,12 @@ msgstr ""
 "Coniugazione del verbo su cui\n"
 "chiedere le domande"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Scelta della voce verbale"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -787,14 +771,12 @@ msgstr ""
 "Voce verbale su cui\n"
 "chiedere le domande"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Scelta del modo verbale"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -803,120 +785,77 @@ msgstr ""
 "Modo verbale su cui\n"
 "chiedere le domande"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Cambia il test al nuovo tipo"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Controlla la risposta"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Sezione vocabolario"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Domanda"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "La domanda apparirà qui"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Il tuo attuale punteggio"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
-"Il tuo punteggio appare su questo display. Numero di risposte corrette/numero "
-"totale di risposte."
+"Il tuo punteggio appare su questo display. Numero di risposte corrette/"
+"numero totale di risposte."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Risposta 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Fai clic qui se pensi che sia la risposta giusta."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Risposta 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Risposta 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Risposta 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Ritorna alla schermata di selezione"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "La lingua scelta dall'utente"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "come molte domande sono chieste in una sessione."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "se KLatin dovrebbe chiedere un numero non specificato di domande."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "il file di vocabolario predefinito."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "se le domande dovrebbero essere dal latino alla lingua dell'utente."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "se le domande dovrebbero essere dalla lingua dell'utente al latino."
diff --git a/tde-i18n-ja/messages/tdeedu/klatin.po b/tde-i18n-ja/messages/tdeedu/klatin.po
index a134bc9dd27..80dcd2506e4 100644
--- a/tde-i18n-ja/messages/tdeedu/klatin.po
+++ b/tde-i18n-ja/messages/tdeedu/klatin.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2007-01-24 23:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "KIMIZUKA Tomokazu"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -102,7 +102,9 @@ msgstr "第五女性詞"
 
 #: klatingrammar.cpp:119
 msgid "Could not load grammar-definition file, check KLatin installation."
-msgstr "文法定義ファイルをロードできませんでした。KLatin が正しくインストールされているか確認してください。"
+msgstr ""
+"文法定義ファイルをロードできませんでした。KLatin が正しくインストールされてい"
+"るか確認してください。"
 
 #: klatingrammar.cpp:119 klatinverbs.cpp:109 klatinvocab.cpp:110
 msgid "Error with KLatin"
@@ -271,17 +273,20 @@ msgstr "未来完了"
 
 #: klatinverbs.cpp:109
 msgid "Could not load verb-definition file, check KLatin installation."
-msgstr "動詞定義ファイルをロードできませんでした。KLatin が正しくインストールされているか確認してください。"
+msgstr ""
+"動詞定義ファイルをロードできませんでした。KLatin が正しくインストールされてい"
+"るか確認してください。"
 
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "%6 の%4・%5・%3・%1人称%2は？"
 
@@ -289,14 +294,15 @@ msgstr "%6 の%4・%5・%3・%1人称%2は？"
 msgid ""
 "Could not load vocabulary file; there is a problem with your KLatin "
 "installation."
-msgstr "語彙ファイルをロードできませんでした。KLatin のインストールに問題があります。"
+msgstr ""
+"語彙ファイルをロードできませんでした。KLatin のインストールに問題があります。"
 
 #: main.cpp:23
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - ラテン語復習支援プログラム"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -325,14 +331,37 @@ msgstr "バグ修正およびコード改良、イタリア語の語彙データ
 msgid "Polish Vocabulary Data Translation"
 msgstr "ポーランド語の語彙データ翻訳"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "セクション(&E)"
+msgid "The language selected by the user"
+msgstr "ユーザが選択した言語"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "一回のセッションで出題する問題の数。"
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "KLatin が無限に出題し続けるかどうか。"
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "デフォルトの語彙ファイル。"
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "問題をラテン語からユーザの言語にするかどうか。"
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "問題をユーザの言語からラテン語にするかどうか。"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -341,130 +370,114 @@ msgstr ""
 "KLatin へようこそ\n"
 "復習するセクションを選んでください"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "復習セクション"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "語彙(&V)"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "語彙のテスト"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "選択式の語彙のテスト"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "文法(&G)"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "名詞文法のテスト"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "一般的な名詞の格変化のテスト"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "動詞(&B)"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "動詞の活用のテスト"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "一般的な動詞の活用語尾のテスト"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "復習ノート(&R)"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "復習ノートを開く"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr "動詞テーブルと名詞テーブルを含む KLatin 復習ノートを開きます"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "開始(&T)"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "選択した復習セクションを開始"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "選択したセクションを開始します"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "KLatin を終了"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "KLatin を終了"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "KLatin を終了します"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "文法セクション"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "テストする名詞の種類を選択"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -477,422 +490,359 @@ msgstr ""
 "行 3\n"
 "行 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "ここに問題が表示されます"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "スコア"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "ここまでのテストの正解率"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "答え:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "ここに答えを入力します"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "ここに答えを入力"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "答えをチェック"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "戻る(&B)"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "選択画面に戻る"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "セクションの選択画面に戻ります"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "結果"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>結果</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "問題"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "あなたの答え"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "正解"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "結果表"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "正解率:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "正解した答えの割合"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr "答えた問題のうち正解した問題のパーセンテージです。"
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "答えた問題数:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "答えた問題の数"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "答えた問題の数です。"
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "このダイアログを閉じる"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "このダイアログを閉じて KLatin のメイン画面に戻ります。"
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "語彙を設定"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "テストのスタイル"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "ラテン語に"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "出題はあなたの言語で。答えはラテン語で。"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
-msgstr "このスタイルでは、あなたの言語で単語が表示され、ラテン語でそれに相当する単語を 4 つの選択肢から選びます。"
+msgstr ""
+"このスタイルでは、あなたの言語で単語が表示され、ラテン語でそれに相当する単語"
+"を 4 つの選択肢から選びます。"
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "ラテン語から"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "出題はラテン語で。答えはあなたの言語で。"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
-msgstr "このスタイルでは、ラテン語で単語が表示され、あなたの言語でそれに相当する単語を 4 つの選択肢から選びます。"
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+"このスタイルでは、ラテン語で単語が表示され、あなたの言語でそれに相当する単語"
+"を 4 つの選択肢から選びます。"
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "語彙テストに使用するファイル"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "語彙セクションのテストに使用するファイルを変更できます。"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "問題数:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "テストの問題数をセット"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
-msgstr "一回のテストの問題数をここでセットできます。この数まで達すると結果ダイアログが表示されます。"
+msgstr ""
+"一回のテストの問題数をここでセットできます。この数まで達すると結果ダイアログ"
+"が表示されます。"
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "テストを終了するまでに出題する問題の数"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "一回のテストで出題する問題数"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "セクション(&E)"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "動詞セクション"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "動詞の活用を選択"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr "テストする動詞の活用"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "動詞の態を選択"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr "テストする動詞の態"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "動詞の法を選択"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr "テストする動詞の法"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "テストを新しいタイプに変更"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "答えをチェック"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "語彙セクション"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "問題の単語"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "ここに問題の単語が表示されます"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "現在のスコア"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr "ここにあなたのスコアが表示されます。正解数/問題数の合計です。"
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "答え 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "これが正解だと思ったらここをクリック。"
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "答え 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "答え 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "答え 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "選択画面に戻る"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "ユーザが選択した言語"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "一回のセッションで出題する問題の数。"
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "KLatin が無限に出題し続けるかどうか。"
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "デフォルトの語彙ファイル。"
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "問題をラテン語からユーザの言語にするかどうか。"
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "問題をユーザの言語からラテン語にするかどうか。"
diff --git a/tde-i18n-km/messages/tdeedu/klatin.po b/tde-i18n-km/messages/tdeedu/klatin.po
index 7d48e50d614..a91a097309b 100644
--- a/tde-i18n-km/messages/tdeedu/klatin.po
+++ b/tde-i18n-km/messages/tdeedu/klatin.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2008-07-15 14:44+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <en@li.org>\n"
@@ -17,19 +17,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "ខឹម សុខែម, លី សួស្ដី, អេង វណ្ណៈ, អោក ពិសិដ្ឋ"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr ""
-"khoemsokhem@khmeros.info,soursdey@khmeros.info, "
-"evannak@khmeros.info,piseth_dv@khmeros.info"
+"khoemsokhem@khmeros.info,soursdey@khmeros.info, evannak@khmeros.info,"
+"piseth_dv@khmeros.info"
 
 #: klatin.cpp:57
 msgid "Load &Vocabulary"
@@ -105,9 +105,7 @@ msgstr "ឥត្ថីលិង្គ​ទី ៥​"
 
 #: klatingrammar.cpp:119
 msgid "Could not load grammar-definition file, check KLatin installation."
-msgstr ""
-"មិនអាច​ផ្ទុក​ឯកសារ​និយមន័យ​ក្នុង​វេយ្យាករណ៍បានទេ សូម​ពិនិត្យ​មើល​ការដំឡើង "
-"KLatin ។"
+msgstr "មិនអាច​ផ្ទុក​ឯកសារ​និយមន័យ​ក្នុង​វេយ្យាករណ៍បានទេ សូម​ពិនិត្យ​មើល​ការដំឡើង KLatin ។"
 
 #: klatingrammar.cpp:119 klatinverbs.cpp:109 klatinvocab.cpp:110
 msgid "Error with KLatin"
@@ -282,12 +280,13 @@ msgstr "មិន​អាច​ផ្ទុក​ឯកសារ​និយម
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "តើ​​អ្វី​ដែល​ជា​បុរស %1 %2 %3 %4 %5 នៃ %6?"
 
@@ -295,16 +294,15 @@ msgstr "តើ​​អ្វី​ដែល​ជា​បុរស %1 %2 %3 %4
 msgid ""
 "Could not load vocabulary file; there is a problem with your KLatin "
 "installation."
-msgstr ""
-"មិន​អាច​ផ្ទុក​ឯកសារ​វាក្យសព្ទ មាន​បញ្ហា​ជាមួយ​ការ​ដំឡើង Klatin របស់​អ្នក ។"
+msgstr "មិន​អាច​ផ្ទុក​ឯកសារ​វាក្យសព្ទ មាន​បញ្ហា​ជាមួយ​ការ​ដំឡើង Klatin របស់​អ្នក ។"
 
 #: main.cpp:23
 #, fuzzy
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - កម្មវិធី​សម្រាប់​ជួយ​កែ​ភាសា​ឡាតាំង"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -328,21 +326,43 @@ msgstr "រូបតំណាង SVG"
 
 #: main.cpp:44
 msgid "Bug fixes and code improvement, Italian Vocabulary Data Translation"
-msgstr ""
-"ជួសជុល​កំហុស និង​ធ្វើ​ឲ្យ​កូដ​ប្រសើរ​ឡើង បកប្រែ​ទិន្នន័យ​វាក្យសព្ទ​អ៊ីតាលី"
+msgstr "ជួសជុល​កំហុស និង​ធ្វើ​ឲ្យ​កូដ​ប្រសើរ​ឡើង បកប្រែ​ទិន្នន័យ​វាក្យសព្ទ​អ៊ីតាលី"
 
 #: main.cpp:45
 msgid "Polish Vocabulary Data Translation"
 msgstr "បកប្រែ​ទិន្នន័យ​វាក្យសព្ទ​ប៉ូឡូញ"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "ផ្នែក"
+msgid "The language selected by the user"
+msgstr "ភាសា​ដែល​បាន​ជ្រើស​ដោយ​អ្នក​ប្រើ"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "តើ​សំណួរ​ប៉ុន្មាន​ដែល​ត្រូវ​សួរ​ក្នុង​មួយ​សម័យ ។"
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "ថា​តើ KLatin គួរ​សួរ​សំណួរ​ដែល​មិន​មាន​ការ​កំណត់​ឬ​ទេ"
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "ឯកសារ​វាក្យសព្ទ​លំនាំ​ដើម ។"
+
+#: klatin.kcfg:51
+#, fuzzy, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "ថា​តើ​សំណួរ​គួរ​តែ​ជា​ភាសា​ឡាតាំង​ទៅ​ភាសា​របស់​អ្នក​ប្រើ ។"
+
+#: klatin.kcfg:55
+#, fuzzy, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "ថា​តើ​សំណួរ​គួរ​តែ​ជា​ភាសា​របស់​អ្នក​ប្រើ​ទៅ​ភាសា​ឡាតាំង ។"
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -351,80 +371,67 @@ msgstr ""
 "សូម​ស្វាគមន៍​មក​កាន់ KLatin\n"
 "សូម​ជ្រើស​ផ្នែក​នៃ​កំណែ"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, fuzzy, no-c-format
 msgid "Revision Sections"
 msgstr "ផ្នែក​កំណែ"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "វាក្យសព្ទ"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "ការ​ប្រលង​ជា​វាក្យសព្ទ"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "ការ​ប្រលង​វាក្យសព្ទ​ពហុ​ជ្រើសរើស"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "វេយ្យាករណ៍"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "ការ​ប្រលង​លើ​វេយ្យាករណ៍​នាម"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "ការ​ប្រលង​លើ​សាធារណ​នាម និង​ការ​បញ្ចប់"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "កិរិយាសព្ទ"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "ការ​ប្រលង​លើ​ទម្រង់​កិរិយាសព្ទ"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "ការ​ប្រលង​លើ​កិរិយាសព្ទ​ទូទៅ​និង​ការ​បញ្ចប់"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, fuzzy, no-c-format
 msgid "&Revision notes"
 msgstr "ចំណាំ​កំណែ"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, fuzzy, no-c-format
 msgid "Load revision notes"
 msgstr "ផ្ទុក​ចំណាំ​កំណែ"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, fuzzy, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -433,50 +440,47 @@ msgstr ""
 "ចំណាំ​កំណែ KLatin ដែល​មាន\n"
 "តារាង​កិរិយាសព្ទ និង​នាម"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "ចាប់ផ្ដើម"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, fuzzy, no-c-format
 msgid "Start chosen area of revision"
 msgstr "ចាប់ផ្ដើម​ផ្ទៃ​នៃ​កំណែ​ដែល​បាន​ជ្រើស"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "ចាប់ផ្ដើម​ផ្នែក​ដែល​អ្នក​បាន​ជ្រើស"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "ចេញ"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "ចេញ"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "ចេញ​ពី KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "ផ្នែក​វេយ្យាករណ៍"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "ជម្រើស​នៃ​នាម​សម្រាប់​ការ​ប្រលង"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -489,286 +493,258 @@ msgstr ""
 "បន្ទាត់ ៣\n"
 "បន្ទាត់ ៤"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "សំណួរ​នឹង​លេច​ឡើង​ទីនេះ"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "ពិន្ទុ"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "០"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "ភាគរយ​ការ​ប្រលង​របស់​អ្នក​តាំង​ពី​យូរ"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "ចម្លង ៖"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "ចម្លើយ​របស់​អ្នក​ទៅ​ទីនេះ"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "បញ្ចូល​ចម្លើយ​របស់​អ្នក​ទីនេះ"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "ពិនិត្យ​ចម្លើយ"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "​ថយ​ក្រោយ"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "ត្រឡប់​ទៅ​អេក្រង់​ជម្រើស"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "ត្រឡប់​ទៅ​អេក្រង់​ជម្រើស"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "លទ្ធផល"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>លទ្ធផល​របស់​អ្នក</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "សំណួរ"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "ចម្លើយ​របស់អ្នក"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "ចម្លើយ​ត្រឹមត្រូវ"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "តារាង​លទ្ធផល"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "ភាគរយ ៖"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "ភាគរយ​ចម្លើយ​ត្រឹមត្រូវ"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
-msgstr ""
-"នេះ​បង្ហាញ​ភាគរយ​នៃ​សំណួរ​ដែល​អ្នក​ឆ្លើយ​យ៉ាង​ត្រឹមត្រូវ​ពី​សំណួរ​ដែល​បានព្យាយាម"
-"​ទាំង​នេះ ។"
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
+msgstr "នេះ​បង្ហាញ​ភាគរយ​នៃ​សំណួរ​ដែល​អ្នក​ឆ្លើយ​យ៉ាង​ត្រឹមត្រូវ​ពី​សំណួរ​ដែល​បានព្យាយាម​ទាំង​នេះ ។"
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "ចំនួន​ដែល​បាន​ព្យាយាម ៖"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "ចំនួន​សំណួរ​ដែល​បាន​ព្យាយាម"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "នេះ​បង្ហាញ​ចំនួន​សំណួរ​ដែល​អ្នក​បាន​ឆ្លើយ ។"
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "បិទ​ប្រអប់​នេះ​"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "បិទ​ប្រអប់​នេះ និង​ត្រឡប់​ទៅ​បង្អួច​មេ​របស់ KLatin ។"
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "កំណត់​រចនា​សម្ព័ន្ធ​វាក្យសព្ទ"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "រចនាប័ទ្ម​ការ​ប្រលង"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "ទៅ​ជា​ឡាតាំង"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "សំណួរ​ជា​ភាសា​របស់​អ្នក និង​ចម្លើយ​ជា​ភាសា​ឡាតាំង"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, fuzzy, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"ជ្រើស​ដើម្បី​សាកល្បង​ពី​ភាសា​របស់​អ្នក​ទៅ​ឡាតាំង "
-"ដែល​មាន​ន័យ​ថា​ពាក្យ​នឹង​ត្រូវ​បាន​បង្ហាញ​ជា​ភាសា​របស់​អ្នក "
-"ហើយ​អ្នក​នឹង​ត្រូវ​តែ​ជ្រើស​ពី​ការ​បកប្រែ​ភាសា​ឡាតាំង​ទាំង ៤ ។"
+"ជ្រើស​ដើម្បី​សាកល្បង​ពី​ភាសា​របស់​អ្នក​ទៅ​ឡាតាំង ដែល​មាន​ន័យ​ថា​ពាក្យ​នឹង​ត្រូវ​បាន​បង្ហាញ​ជា​ភាសា​របស់​អ្នក ហើយ​"
+"អ្នក​នឹង​ត្រូវ​តែ​ជ្រើស​ពី​ការ​បកប្រែ​ភាសា​ឡាតាំង​ទាំង ៤ ។"
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "ពី​ឡាតាំង"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "សំណួរ​ជា​ភាសា​ឡាតាំង និង​ចម្លើយ​ជា​ភាសា​របស់​អ្នក"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, fuzzy, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
-"ជ្រើស​ដើម្បី​សាកល្បង​ពី​ភាសា​ឡាតាំង​ទៅ​ភាសា​របស់​អ្នក "
-"ដែល​មាន​ន័យ​ថា​ពាក្យ​នឹង​ត្រូវ​បាន​បង្ហាញ​ជា​ភាសា​ឡាតាំង "
+"ជ្រើស​ដើម្បី​សាកល្បង​ពី​ភាសា​ឡាតាំង​ទៅ​ភាសា​របស់​អ្នក ដែល​មាន​ន័យ​ថា​ពាក្យ​នឹង​ត្រូវ​បាន​បង្ហាញ​ជា​ភាសា​ឡាតាំង "
 "ហើយ​អ្នក​ត្រូវ​តែ​ជ្រើស​ពី​ការ​បកប្រែ​ទាំង ៤ ជា​ភាសា​របស់​អ្នក ។"
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "ឯកសារ​ដែល​អ្នក​ត្រូវ​ប្រលង​វាក្យសព្ទ"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "អ្នក​អាច​ផ្លាស់ប្ដូរ​ឯកសារ​ដែល​អ្នក​កំពុង​ប្រលង ទៅ​ជា​ផ្នែក​វាក្យសព្ទ"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "ចំនួន​សំណួរ ៖"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "កំណត់​ចំនួន​សំណួរ​ដែល​អ្នក​ចង់​ប្រលង"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
-msgstr ""
-"អ្នក​អាច​កំណត់​ចំនួន​សំណួរ​ដែល​អ្នក​ចង់​ប្រលង​នៅ​ទីនេះ ។ ពេល​ដល់​ចំនួន​នេះ "
-"ប្រអប់​លិទ្ធផល​លេចឡើង ។"
+msgstr "អ្នក​អាច​កំណត់​ចំនួន​សំណួរ​ដែល​អ្នក​ចង់​ប្រលង​នៅ​ទីនេះ ។ ពេល​ដល់​ចំនួន​នេះ ប្រអប់​លិទ្ធផល​លេចឡើង ។"
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "ចំនួន​សំណួរ​ដែល​ត្រូវ​សួរ​មុន​នឹង​បញ្ចប់"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "ចំនួន​សំណួរ​ដែល​ត្រូវ​សួរ​ក្នុង​ពេល​តែ​មួយ"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "ផ្នែក"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "ផ្នែក​កិរិយាសព្ទ"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "ជម្រើស​នៃ​ការ​បំបែក​កិរិយាសព្ទ"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -777,14 +753,12 @@ msgstr ""
 "ការ​បំបែក​ករិយាសព្ទ​ដែល\n"
 "ត្រូវ​ប្រលង"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "ជម្រើស​សំឡេង​កិរិយាសព្ទ"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -793,14 +767,12 @@ msgstr ""
 "សំឡេង​កិរិយាសព្ទ​ដែល\n"
 "ត្រូវ​ប្រលង"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, fuzzy, no-c-format
 msgid "Choice of verb mood"
 msgstr "ជម្រើសបែបផែន​កិរិយាស័ព្ទ​​"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, fuzzy, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -809,120 +781,75 @@ msgstr ""
 "បែបផែន​កិរិយាស័ព្ទ​\n"
 "បាន​សាកល្បងលើ​"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "ផ្លាស់ប្ដូរ​ការ​ប្រលង​ទៅ​ប្រភេទ​ថ្មី"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "ពិនិត្យ​ចម្លើយ​របស់​អ្នក"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "ផ្នែក​វាក្យសព្ទ"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "ពាក្យ​សំណួរ"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "ពាក្យ​សំណួរ​នឹង​លេច​ឡើង​នៅ​ទីនេះ"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "ពិន្ទុ​បច្ចុប្បន្ន​របស់​អ្នក"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
-msgstr ""
-"ពិន្ទុ​របស់​អ្នក​លេច​ឡើង​នៅ​លើ​ការ​បង្ហាញ​នេះ ។ "
-"ចំនួន​ចម្លើយ​ត្រឹមត្រូវ/ចំនួន​សរុប​នៃ​ចម្លើយ ។"
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
+msgstr "ពិន្ទុ​របស់​អ្នក​លេច​ឡើង​នៅ​លើ​ការ​បង្ហាញ​នេះ ។ ចំនួន​ចម្លើយ​ត្រឹមត្រូវ/ចំនួន​សរុប​នៃ​ចម្លើយ ។"
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "ចម្លើយ ១"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "ចុច​វា​បើ​អ្នក​គិត​ថា វា​គឹ​ជា​ចម្លើយ​ត្រឹមត្រូវ ។"
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "ចម្លើយ ២"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "ចម្លើយ ៣"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "ចម្លើយ ៤"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "ត្រឡប់​ទៅ​អេក្រង់​ជម្រើស"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "ភាសា​ដែល​បាន​ជ្រើស​ដោយ​អ្នក​ប្រើ"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "តើ​សំណួរ​ប៉ុន្មាន​ដែល​ត្រូវ​សួរ​ក្នុង​មួយ​សម័យ ។"
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "ថា​តើ KLatin គួរ​សួរ​សំណួរ​ដែល​មិន​មាន​ការ​កំណត់​ឬ​ទេ"
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "ឯកសារ​វាក្យសព្ទ​លំនាំ​ដើម ។"
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, fuzzy, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "ថា​តើ​សំណួរ​គួរ​តែ​ជា​ភាសា​ឡាតាំង​ទៅ​ភាសា​របស់​អ្នក​ប្រើ ។"
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, fuzzy, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "ថា​តើ​សំណួរ​គួរ​តែ​ជា​ភាសា​របស់​អ្នក​ប្រើ​ទៅ​ភាសា​ឡាតាំង ។"
diff --git a/tde-i18n-lt/messages/tdeedu/klatin.po b/tde-i18n-lt/messages/tdeedu/klatin.po
index ea631dee94b..f04da438b75 100644
--- a/tde-i18n-lt/messages/tdeedu/klatin.po
+++ b/tde-i18n-lt/messages/tdeedu/klatin.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+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,17 +15,17 @@ 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"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 #, fuzzy
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "nobody"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 #, fuzzy
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
@@ -278,12 +278,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 
@@ -297,8 +298,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr ""
@@ -327,144 +328,151 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr ""
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
+msgid "The language selected by the user"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr ""
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr ""
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr ""
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr ""
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
 "Please Choose Section of Revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, fuzzy, no-c-format
 msgid "S&tart"
 msgstr "&Pradžia:"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -473,422 +481,353 @@ msgid ""
 "Line 4"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Įvertinimas"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Atgal"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Klausimas"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr ""
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr ""
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr ""
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
diff --git a/tde-i18n-lv/messages/tdeedu/klatin.po b/tde-i18n-lv/messages/tdeedu/klatin.po
index 9e1313dfa95..b5ceb06753b 100644
--- a/tde-i18n-lv/messages/tdeedu/klatin.po
+++ b/tde-i18n-lv/messages/tdeedu/klatin.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 19:28+0100\n"
 "PO-Revision-Date: 2002-10-23 03:51+0300\n"
 "Last-Translator: Gints Polis <gintam@inbox.lv>\n"
 "Language-Team: Latviešu <lv@li.org>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Gints Polis"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -286,12 +286,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 
@@ -306,8 +307,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - Mācīties vai atkārtot Latīņu valodu"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -337,144 +338,151 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr ""
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
+msgid "The language selected by the user"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr ""
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr ""
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr ""
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr ""
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
 "Please Choose Section of Revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, fuzzy, no-c-format
 msgid "Quit KLatin"
 msgstr "KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -483,146 +491,130 @@ msgid ""
 "Line 4"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, fuzzy, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "KLatin- Jūsu rezultāti"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, fuzzy, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 "Uzstādīt testa jautājumu skaitu.\n"
 "\n"
 "Tad izvēlaties kurā\n"
 "virzienā veikt testu."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, fuzzy, no-c-format
 msgid "Number of questions attempted"
 msgstr ""
@@ -631,8 +623,7 @@ msgstr ""
 "Tad izvēlaties kurā\n"
 "virzienā veikt testu."
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, fuzzy, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr ""
@@ -641,92 +632,88 @@ msgstr ""
 "Tad izvēlaties kurā\n"
 "virzienā veikt testu."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, fuzzy, no-c-format
 msgid "To Latin"
 msgstr "KLatin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, fuzzy, no-c-format
 msgid "From Latin"
 msgstr "KLatin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, fuzzy, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr ""
@@ -735,190 +722,142 @@ msgstr ""
 "Tad izvēlaties kurā\n"
 "virzienā veikt testu."
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr ""
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr ""
 
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr ""
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
-
 #, fuzzy
 #~ msgid "KLatinChoose"
 #~ msgstr "KLatin"
diff --git a/tde-i18n-mk/messages/tdeedu/klatin.po b/tde-i18n-mk/messages/tdeedu/klatin.po
index f7853633374..bd72fd5731f 100644
--- a/tde-i18n-mk/messages/tdeedu/klatin.po
+++ b/tde-i18n-mk/messages/tdeedu/klatin.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2006-04-23 20:23+0200\n"
 "Last-Translator: Bozidar Proevski <bobibobi@freemail.com.mk>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Божидар Проевски,Ели Јосифовска"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -276,12 +276,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Како гласи %1 лице %2 %3 %4 %5 од %6?"
 
@@ -297,8 +298,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "КЛатин - програма за вежбање латински"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "КЛатин"
@@ -322,21 +323,44 @@ msgstr "SVG-икона"
 #: main.cpp:44
 msgid "Bug fixes and code improvement, Italian Vocabulary Data Translation"
 msgstr ""
-"Поправки на бубачки и подобрување на кодот, превод на податоците од речникот на "
-"италијански"
+"Поправки на бубачки и подобрување на кодот, превод на податоците од речникот "
+"на италијански"
 
 #: main.cpp:45
 msgid "Polish Vocabulary Data Translation"
 msgstr "Превод на податоците од речникот на полски"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&Форма"
+msgid "The language selected by the user"
+msgstr "Јазикот избран од корисникот"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "Прашања поставени во една сесија."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "Неограничени прашања во КЛатин."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "Стандардна датотека со речник."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "Прашањата ќе бидат од латински на јазикот на корисникот."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "Прашањата ќе бидат од јазикот на корисникот на латински."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -345,80 +369,67 @@ msgstr ""
 "Добредојдовте во КЛатин\n"
 "Изберете форма за вежбање"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Форми за вежбање"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Речник"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Тест за зборови"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Тест со повеќе опции на зборови"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Граматика"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Тест за граматика на именки"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Тест за општи именки и завршетоци"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "&Глаголи"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Тест за глаголски форми"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Тест за општи глаголи и завршетоци"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Белешки за повторување"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Вчитува белешки за повторување"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -427,50 +438,47 @@ msgstr ""
 "Белешки за повторување на КЛатин\n"
 "со таблици со глаголи и именки"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "С&тарт"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Стартува избрана област за вежбање"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Стартува форма што сте ја избрале"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Напушта"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Напушта"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Го напушта КЛатин"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Граматика"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Избор на именки за тестирање"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -483,251 +491,230 @@ msgstr ""
 "Линија 3\n"
 "Линија 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Тука ќе се појави прашањето"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Резултат"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "од"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Вашиот досегашен процент на тестот"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Одговор:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Вашиот одговор треба да биде тука"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Внесете го тука вашиот одговор"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Провери одговор"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Назад"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Се враќа назад на екранот за избор"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Вратете се на екранот за избор"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Резултати"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Вашите резултати</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Прашање"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Вашиот одговор"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Точен одговор"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Табела со резултати"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Процент:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Процент на точни одговори"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 "Ова е процентот на прашањата што сте ги одговориле точно од поставените."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Број на поставени:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Број на поставени прашања"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Ова е бројот на прашањата што сте ги одговориле."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Затвори го дијалогот"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Го затвора дијалогот и се враќа на главниот прозорец на КЛатин."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Конфигурирајте речник"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Форма за тестирање"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "На латински"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Прашањето е на вашиот јазик, а одговорот е на латински"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Изберете тестирање од вашиот јазик на латински, што значи дека зборот ќе биде "
-"прикажан на вашиот јазик и ќе треба да одберете од четири латински преводи."
+"Изберете тестирање од вашиот јазик на латински, што значи дека зборот ќе "
+"биде прикажан на вашиот јазик и ќе треба да одберете од четири латински "
+"преводи."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Од латински"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Прашањето е на латински, а одговорот е на вашиот јазик"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+"Изберете тестирање од латински на вашиот јазик, што значи дека зборот ќе "
+"биде прикажан на латински јазик и ќе треба да одберете од четири преводи на "
+"вашиот јазик."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
-"Изберете тестирање од латински на вашиот јазик, што значи дека зборот ќе биде "
-"прикажан на латински јазик и ќе треба да одберете од четири преводи на вашиот "
-"јазик."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Датотеката со речникот според која ќе бидете тестирани"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 "Сменете ја датотеката со зборови од речникот, според која ќе бидете тестирани"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Број на прашања:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Со колку прашања сакате да бидете тестирани"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -736,32 +723,32 @@ msgstr ""
 "Тука може да поставите со колку прашања сакате да бидете тестирани. Кога ќе "
 "биде достигнат бројот, ќе се појават резултатите."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Број на поставени прашања пред завршување на тестот"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Број на поставени прашања на секоја вежба"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&Форма"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Глаголи"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Избор на конјугација на глаголи"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -770,14 +757,12 @@ msgstr ""
 "Конјугација на глаголот\n"
 "за тестирање"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Избор на актив или пасив"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -786,14 +771,12 @@ msgstr ""
 "Пасив или актив на глаголот\n"
 "за тестирање"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Избор на индикатив или конјунктив"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -802,120 +785,77 @@ msgstr ""
 "Избор на индикатив или конјунктив\n"
 "на глаголот за тестирање"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Изменете го тестот во нов тип"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Проверете го одговорот"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Речник на зборови"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Прашање"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Прашањето ќе се појави тука"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Вашиот моментален резултат"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
-"Тука е вашиот моментален резултат. Број на точни одговори од вкупно поставените "
-"прашања."
+"Тука е вашиот моментален резултат. Број на точни одговори од вкупно "
+"поставените прашања."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Одговор 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Кликнете тука ако мислите дека е тоа точниот одговор."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Одговор 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Одговор 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Одговор 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Се враќа на екранот за избор"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Јазикот избран од корисникот"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "Прашања поставени во една сесија."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "Неограничени прашања во КЛатин."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "Стандардна датотека со речник."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "Прашањата ќе бидат од латински на јазикот на корисникот."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "Прашањата ќе бидат од јазикот на корисникот на латински."
diff --git a/tde-i18n-ms/messages/tdeedu/klatin.po b/tde-i18n-ms/messages/tdeedu/klatin.po
index 51651d17f95..d48ff023cde 100644
--- a/tde-i18n-ms/messages/tdeedu/klatin.po
+++ b/tde-i18n-ms/messages/tdeedu/klatin.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2008-07-06 23:02+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <kedidiemas@yahoogroups.com>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Sharuzzaman Ahmat Raslan"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -186,8 +186,7 @@ msgstr "Pilihan Anda? (1-%d) "
 #: klatingrammar.cpp:205 klatinverbs.cpp:229
 #, fuzzy, c-format
 msgid "The correct answer was %1."
-msgstr ""
-"Fail pertolongan tidak dijumpai\n"
+msgstr "Fail pertolongan tidak dijumpai\n"
 
 #: klatingrammar.cpp:205 klatinverbs.cpp:229
 #, fuzzy
@@ -308,17 +307,18 @@ msgstr "fail."
 #, fuzzy
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 "Nota ialah 1 2 3 ialah atau ialah bagi Ada ialah bagi ialah bagi Aktif ialah "
-"nama ialah inci Latin dan output inci Bahasa Inggeris ialah seperti ialah bagi "
-"ialah bagi?"
+"nama ialah inci Latin dan output inci Bahasa Inggeris ialah seperti ialah "
+"bagi ialah bagi?"
 
 #: klatinvocab.cpp:110
 #, fuzzy
@@ -332,8 +332,8 @@ msgstr "fail ialah."
 msgid "KLatin - a program to help revise Latin"
 msgstr "hingga Latin"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -368,144 +368,151 @@ msgstr "dan Italia Data Terjemahan"
 msgid "Polish Vocabulary Data Translation"
 msgstr "Poland Data Terjemahan"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
-#, fuzzy, no-c-format
-msgid "S&ection"
-msgstr "K&eratan "
+#: klatin.kcfg:9
+#, no-c-format
+msgid "The language selected by the user"
+msgstr "Bahasa yang dipilih oleh pengguna"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "berapa banyak soalan yang ditanya dalam satu sesi."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "sama ada KLatin perlu bertanya soalan tanpa had."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "fail tatabahasa default."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "sama ada soalan perlu dalam Latin ke bahasa pengguna."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "sama ada soalan perlu dalam bahasa pengguna ke Latin."
+
+#: klatinchoose.ui:46
 #, fuzzy, no-c-format
 msgid ""
 "Welcome to KLatin\n"
 "Please Choose Section of Revision"
 msgstr "Selamat Datang hingga Keratan  bagi Semakan"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, fuzzy, no-c-format
 msgid "Revision Sections"
 msgstr "Terim&a semakan"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, fuzzy, no-c-format
 msgid "&Vocabulary"
 msgstr "Jurulatih Perbendaharaan Kata"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, fuzzy, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Dokumen Jurulatih Perbendaharaan Kata"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, fuzzy, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Gandaan "
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, fuzzy, no-c-format
 msgid "&Grammar"
 msgstr "Semakan Tatabahasa Automatik"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, fuzzy, no-c-format
 msgid "Test on noun grammar"
 msgstr "Uji buka"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, fuzzy, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Uji buka dan"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, fuzzy, no-c-format
 msgid "Test on verb forms"
 msgstr "Uji buka"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, fuzzy, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Uji buka dan"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, fuzzy, no-c-format
 msgid "&Revision notes"
 msgstr "Nota Lekat"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, fuzzy, no-c-format
 msgid "Load revision notes"
 msgstr "Nota Keluaran Fedora"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, fuzzy, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr "dan"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, fuzzy, no-c-format
 msgid "S&tart"
 msgstr "Mula"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, fuzzy, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Mula semakan berbeza dari yang semasa"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, fuzzy, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Anda telah memilih fail, bukan direktori"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, fuzzy, no-c-format
 msgid "Quit KLatin"
 msgstr "Name=KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, fuzzy, no-c-format
 msgid "Grammar Section"
 msgstr "&Seksyen RTL"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, fuzzy, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "bagi for"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, fuzzy, no-c-format
 msgid ""
 "Question Word\n"
@@ -514,287 +521,265 @@ msgid ""
 "Line 4"
 msgstr "Dokumen Microsoft Word"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, fuzzy, no-c-format
 msgid "The question will appear here"
 msgstr "Teks servis disini"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, fuzzy, no-c-format
 msgid "Score"
 msgstr "Markah semasa anda"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, fuzzy, no-c-format
 msgid "Answer:"
 msgstr "Jawab"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, fuzzy, no-c-format
 msgid "Enter your answer here"
 msgstr "Sila masukkan namapengguna anda"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, fuzzy, no-c-format
 msgid "Check answer"
 msgstr "&Semak Ejaan"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, fuzzy, no-c-format
 msgid "&Back"
 msgstr " Kembali "
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, fuzzy, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Pergi belakang hingga"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, fuzzy, no-c-format
 msgid "Return to selection screen"
 msgstr "Tambah sempadan dan legapan kepada pilihan"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, fuzzy, no-c-format
 msgid "Results"
 msgstr "Keputusan"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, fuzzy, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "Pasukan Mandriva Anda."
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Soalan"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, fuzzy, no-c-format
 msgid "Your Answer"
 msgstr "Pasukan Mandriva Anda."
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, fuzzy, no-c-format
 msgid "Correct Answer"
 msgstr "Comment=Jawapan betul"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, fuzzy, no-c-format
 msgid "Table of results"
 msgstr "&Automuat Jadual"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, fuzzy, no-c-format
 msgid "Percentage:"
 msgstr "Pengskalaan (peratusan)"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Peratusan jawapan yang betul"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 "Ini memaparkan peratusan soalan yang ada jawab dengan betul dari keseluruhan "
 "dicuba."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Jumlah dicuba:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Jumlah soalan dicuba"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Ini memaparkan jumlah soalan yang anda jawab."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Tutup dialog ini"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Tutup dialog ini dan kembali ke tetingkap utama KLatin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Tetapkan Perbendaharaan Kata"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Gaya Ujian"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Ke Latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Soalan didalam bahasa anda dan jawapan dalam Latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 "Pilih untuk diuji dari bahasa anda ke Latin, dimana maksud perkataan akan "
 "dipaparkan dalam bahasa anda dan anda perlu memilih dari 4 terjemahan Latin."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Dari Latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Soalan dalam Latin dan jawapan dalam bahasa anda"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
-"Pilih untuk diuji dari Latin ke bahasa anda, dimana makna setiap perkataan akan "
-"dipaparkan dalam Latin dan anda perlu memilih dari 4 terjemahan dalam bahasa "
-"anda."
+"Pilih untuk diuji dari Latin ke bahasa anda, dimana makna setiap perkataan "
+"akan dipaparkan dalam Latin dan anda perlu memilih dari 4 terjemahan dalam "
+"bahasa anda."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Fail yang anda sedang diuji dalam perbendaharaan kata"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 "Anda boleh menukar fail yang anda sedang diuji untuk seksyen perbendaharaan "
 "kata"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Jumlah soalan:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Tetap jumlah soalan yang anda hendak diuji"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
-"Disini anda boleh menetapkan jumlah soalan yang anda mahu untuk diuji. Apabila "
-"jumlah ini telah dicapai, dialog keputusan akan dipaparkan."
+"Disini anda boleh menetapkan jumlah soalan yang anda mahu untuk diuji. "
+"Apabila jumlah ini telah dicapai, dialog keputusan akan dipaparkan."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Jumlah soalan untuk ditanya sebelum penamat"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Jumlah soalan untuk ditanya pada satu-satu masa"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, fuzzy, no-c-format
+msgid "S&ection"
+msgstr "K&eratan "
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Seksyen Kata Kerja"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Pilihan kata kerja berkonjugat"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -803,14 +788,12 @@ msgstr ""
 "Konjugat kata kerja untuk\n"
 "diuji"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Pilihan suara kata kerja"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -819,14 +802,12 @@ msgstr ""
 "Suara bagi kata kerja\n"
 "untuk diuji"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Pilihan mood kata kerja"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -835,120 +816,77 @@ msgstr ""
 "Mood bagi kata kerja\n"
 "untuk diuji"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Tukar ujian kepada jenis baru"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Periksa jawapan anda"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Seksyen Tatabahasa"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Perkataan Soalan"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Markah semasa anda"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
-"Markah anda kelihatan dalam paparan ini. Bilangan jawapan betul/jumlah bilangan "
-"jawapan."
+"Markah anda kelihatan dalam paparan ini. Bilangan jawapan betul/jumlah "
+"bilangan jawapan."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Jawapan 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Klik ini jika anda fikir ia adalah jawapan yang betul."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Jawapan 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Jawapan 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Jawapan 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Kembali ke skrin pilihan"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Bahasa yang dipilih oleh pengguna"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "berapa banyak soalan yang ditanya dalam satu sesi."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "sama ada KLatin perlu bertanya soalan tanpa had."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "fail tatabahasa default."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "sama ada soalan perlu dalam Latin ke bahasa pengguna."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "sama ada soalan perlu dalam bahasa pengguna ke Latin."
diff --git a/tde-i18n-nb/messages/tdeedu/klatin.po b/tde-i18n-nb/messages/tdeedu/klatin.po
index 48f5eac394c..1abffc9150f 100644
--- a/tde-i18n-nb/messages/tdeedu/klatin.po
+++ b/tde-i18n-nb/messages/tdeedu/klatin.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-11-07 21:52+0100\n"
 "Last-Translator: Axel Bojer <axelb@skolelinux.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Jørgen Grønlund"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -274,12 +274,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Hva er %1-person %2 %3 %4 %5 av %6?"
 
@@ -295,8 +296,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin – et program for å lære Latin"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -325,14 +326,37 @@ msgstr "Feilfikser og forbedringer, Dataoversettelse av italiensk vokabular"
 msgid "Polish Vocabulary Data Translation"
 msgstr "Dataoversettelse av polsk vokabular"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&Bolk"
+msgid "The language selected by the user"
+msgstr "Språket som er valgt av brukeren"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "hvor mange spørsmål som blir stilt i en økt."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "skal KLatin stille et uendelig antall spørsmål?"
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "standard vokabular-fil."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "skal spørsmålene være fra latinsk til brukerens språk?"
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "skal spørsmålene være fra brukerens språk til latin?"
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -341,80 +365,67 @@ msgstr ""
 "Velkommen til KLatin!\n"
 "Velg en bolk for øvelser"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Øvingsbolker"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Vokabular"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Øvelse i vokabular"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Flervalgsøvelse av vokabularet"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Grammatikk"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Øvelse i formen på substantivene"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Øvelse i vanlige endelser til substantiv"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Ver&ber"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Øvelse i verbformer"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Øvelse i vanlige verbendelser"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Notater angående øvelsen"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Hent inn notater om øvelsen"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -423,50 +434,47 @@ msgstr ""
 "KLatin-øvelsesnotater med\n"
 "verb- og substantiv-tabeller"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Start!"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Start valgt område fra øvinger"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Start den valgte bolken"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Avslutter"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Avslutter"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Avslutt KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Bolk for grammatikk"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Valg av substantiv for øvelse"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -479,284 +487,263 @@ msgstr ""
 "Linje 3\n"
 "Linje 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Spørsmålet vil komme her"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Poeng"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Din øvelsesprosent hittil"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Svar:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Svaret ditt kommer her"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Skriv inn svaret ditt her"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Sjekk svar"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Tilbake"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Gå tilbake til valgskjermen"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Gå tilbake til valgskjermen"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Resultat"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Dine resultater<b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Spørsmål"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Ditt svar"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Riktig svar"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Resultattabell"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Prosentdel:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Prosent riktige svar"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
-"Dette viser hvor mange prosent av spørsmålene du svarte på var riktig besvart."
+"Dette viser hvor mange prosent av spørsmålene du svarte på var riktig "
+"besvart."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Antall som er forsøkt:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Antall spørsmål forsøkt:"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Dette viser antall spørsmål du svarte på."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Lukk dette dialogvinduet"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Lukk dette dialogvinduet og gå tilbake til KLatins hovedvindu."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Oppsett av vokabularet"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Øvelsesstil"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Til latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Spørsmål på ditt språk,og svarene på latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Velg om du skal bli testet i oversettelse fra ditt språk til latin. Dette betyr "
-"at ordene blir vist i ditt eget språk, og så må du velge mellom fire "
+"Velg om du skal bli testet i oversettelse fra ditt språk til latin. Dette "
+"betyr at ordene blir vist i ditt eget språk, og så må du velge mellom fire "
 "forskjellige latinske oversettelser."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Fra latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Spørsmålene på latin, og svarene i ditt språk"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+"Velg å bli testet fra latin til ditt eget språk, noe som betyr at ord vil "
+"bli vist i latin, mens du må velge fra fire oversettelser i ditt språk."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
-"Velg å bli testet fra latin til ditt eget språk, noe som betyr at ord vil bli "
-"vist i latin, mens du må velge fra fire oversettelser i ditt språk."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Fila som du blir testet på i vokabularet"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Du kan endre fila som du blir testet på for vokabular-bolken"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Antall spørsmål:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Bestem antall spørsmål som du skal bli testet på"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
-"Her kan du bestemme antall spørsmål som du vil bli testet i. Når dette antallet "
-"er nådd, vil et diaolgvindu med resultatene fra øvelsen bli vist."
+"Her kan du bestemme antall spørsmål som du vil bli testet i. Når dette "
+"antallet er nådd, vil et diaolgvindu med resultatene fra øvelsen bli vist."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Antall spørsmål som skal bli vist før man er ferdig"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Antall spørsmål som skal vises på en gang"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&Bolk"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Bolk for verb"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Velg verb-bøyning"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -765,14 +752,12 @@ msgstr ""
 "Verb-bøyninger du\n"
 "vil bli testet i"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Velg verbform"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -781,14 +766,12 @@ msgstr ""
 "Velg verbform du vil\n"
 "bli testet i"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Velg tid av verbet"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -797,118 +780,75 @@ msgstr ""
 "Tid av verbet som du vil\n"
 "bli testet i"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Endre øvelsen til en annen type"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Sjekk svarene dine"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Bolk for vokabular"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Bli spurt om ord"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Ordet du blir spurt om vil bli vist her"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Dine poeng nå"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr "Dine poeng vises her. Antall riktige svar/totalt antall svar."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Svar 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Trykk her hvis du tror dette er riktig svar."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Svar 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Svar 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Svar 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Gå tilbake til valgskjermen"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Språket som er valgt av brukeren"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "hvor mange spørsmål som blir stilt i en økt."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "skal KLatin stille et uendelig antall spørsmål?"
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "standard vokabular-fil."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "skal spørsmålene være fra latinsk til brukerens språk?"
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "skal spørsmålene være fra brukerens språk til latin?"
diff --git a/tde-i18n-nds/messages/tdeedu/klatin.po b/tde-i18n-nds/messages/tdeedu/klatin.po
index 996152152c2..c3eb6992e71 100644
--- a/tde-i18n-nds/messages/tdeedu/klatin.po
+++ b/tde-i18n-nds/messages/tdeedu/klatin.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2008-02-03 23:11+0100\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Manfred Wiese, Sönke Dibbern"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -102,8 +102,8 @@ msgstr "5. feminiensch"
 #: klatingrammar.cpp:119
 msgid "Could not load grammar-definition file, check KLatin installation."
 msgstr ""
-"De Datei för de Grammatik-Definitschoon lett sik nich laden, bitte prööv Dien "
-"KLatin-Installatschoon."
+"De Datei för de Grammatik-Definitschoon lett sik nich laden, bitte prööv "
+"Dien KLatin-Installatschoon."
 
 #: klatingrammar.cpp:119 klatinverbs.cpp:109 klatinvocab.cpp:110
 msgid "Error with KLatin"
@@ -276,12 +276,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Wo heet de %1 Persoon %2 vun de %3 in %4 %5 vun \"%6\"?"
 
@@ -290,15 +291,15 @@ msgid ""
 "Could not load vocabulary file; there is a problem with your KLatin "
 "installation."
 msgstr ""
-"De Vokavelsett lett sik nich laden. Dat gifft en Problem mit Dien "
-"KLatin-Installatschoon."
+"De Vokavelsett lett sik nich laden. Dat gifft en Problem mit Dien KLatin-"
+"Installatschoon."
 
 #: main.cpp:23
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - En Programm för't Öven vun Latiensch"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -328,14 +329,41 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr "Poolsch Översetten vun de Vokaveldaten"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&Lex"
+msgid "The language selected by the user"
+msgstr "De vun den Bruker fastleggte Spraak"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "De Tall vun Fragen in en Törn"
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "Leggt fast, wat KLatin Fragen ahn Enn stellen schall."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "De vörinstellt Vokavelsett"
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr ""
+"Leggt fast, wat de Fragen vun Latiensch na den Bruker sien Spraak wesen "
+"schöölt."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+"Leggt fast, wat de Fragen vun den Bruker sien Spraak na Latiensch wesen "
+"schöölt."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -344,80 +372,67 @@ msgstr ""
 "Willkamen bi KLatin\n"
 "Bitte söök den Lex ut, den Du bruken wullt"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Lexen"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Vokavelsett"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Vokaveltest"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Vokaveltest (Ankrüüztörn)"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Grammatik"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Grammatik-Test för Naamwöör"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Test mit faken bruukt Naamwöör un Ennen"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "&Verben"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Verbformtest"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Test mit faken bruukt Verben un Ennen"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Lehrtexten"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Lehrtexten laden"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -426,50 +441,47 @@ msgstr ""
 "De Verb- un Naamwoort-Tabellen\n"
 "vun KLatin"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Start"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Utsöcht Lex starten"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Start Dien utsöcht Lex"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Beendt"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Beendt"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "KLatin beennen"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Grammatik-Lex"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Naamwöör för den Test utsöken"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -482,251 +494,229 @@ msgstr ""
 "Reeg 3\n"
 "Reeg 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Hier warrt de Fraag wiest"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Pünkt"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr " /"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Dien Testperzentsatz betherto"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Antwoort:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Dien Antwoort kummt hierhen"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Giff hier Dien Antwoort in"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Antwoort pröven"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Torüch"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Torüchgahn na de Utwahl"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Torüch na de Utwahl gahn"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Resultaten"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Dien Resultaten</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Fraag"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Dien Antwoort"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Richtig Antwoort"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Resultatentabell"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Perzentsatz:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Perzentsatz vun richtige Antwoorden"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 "Dit is de Perzentsatz vun richtigen Antwoorden vun all versöcht Fragen."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Tall vun Versöök:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Tall vun Fragen"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Dit is de Tall vun Fragen, op de Du antert hest."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Dissen Dialoog tomaken"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Maakt dissen Dialoog to un geiht na't Hööftfinster vun KLatin torüch."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Vokavelsett inrichten"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Fraagricht"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Na Latiensch"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Fraag in Dien Spraak un Antwoorden op Latiensch"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 "Söök dit ut, wenn Du vun Dien Spraak na Latiensch pröövt warrn wullt. Dat "
 "bedüüdt, dat Woort warrt in Dien Spraak utgeven, un Du muttst een vun veer "
 "latiensch Översetten utsöken."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Vun Latiensch"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Fraag op Latiensch un Antwoorden in Dien Spraak"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 "Söök dit ut, wenn Du vun Latiensch na Dien Spraak pröövt warrn wullt. Dat "
 "bedüüdt, dat Woort warrt op Latiensch utgeven, un Du muttst een vun veer "
 "Översetten in Dien Spraak utsöken."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "De Vokavelsett för Dien Test"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Du kannst de Datei ännern, de för Dien Vokavel-Lex bruukt warrt."
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Tall vun Fragen:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Leggt de Tall vun Fragen för Dien Test fast"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -735,32 +725,32 @@ msgstr ""
 "Hier kannst Du de Tall vun Fragen för Dien Test fastleggen. Wenn Du bi disse "
 "Tall anlangt büst, warrt en Resultaatdialoog wiest."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Tall vun Fragen för den Test"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Tall vun Fragen, de op eenmaal stellt warrt"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&Lex"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Verben-Lex"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Böögoort utsöken"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -769,14 +759,12 @@ msgstr ""
 "Böögoort vun Verben\n"
 "för den Test"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Doonricht utsöken"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -785,14 +773,12 @@ msgstr ""
 "Richt vun't Doon bi de\n"
 "Verben för den Test"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Verb-Utsaagform utsöken"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -801,124 +787,77 @@ msgstr ""
 "Form vun de Utsaag bi de\n"
 "Verben för den Test"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Test op anner Typ ännern"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Prööv Dien Antwoort"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Vokavel-Lex"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Fraagwoort"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Hier warrt dat Fraagwoort wiest"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Dien aktuelle Pünkt"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
-"Hier warrt Dien Pünkt wiest. Tall vun richtige Antwoorden / Tall vun Antwoorden "
-"tosamen."
+"Hier warrt Dien Pünkt wiest. Tall vun richtige Antwoorden / Tall vun "
+"Antwoorden tosamen."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Antwoort 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Klick hier, wenn Du meenst, dat dit de richtige Antwoort is."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Antwoort 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Antwoort 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Antwoort 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Torüch na de Utwahl"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "De vun den Bruker fastleggte Spraak"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "De Tall vun Fragen in en Törn"
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "Leggt fast, wat KLatin Fragen ahn Enn stellen schall."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "De vörinstellt Vokavelsett"
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr ""
-"Leggt fast, wat de Fragen vun Latiensch na den Bruker sien Spraak wesen "
-"schöölt."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
-"Leggt fast, wat de Fragen vun den Bruker sien Spraak na Latiensch wesen "
-"schöölt."
diff --git a/tde-i18n-nl/messages/tdeedu/klatin.po b/tde-i18n-nl/messages/tdeedu/klatin.po
index e81e1995a23..fc6039536fb 100644
--- a/tde-i18n-nl/messages/tdeedu/klatin.po
+++ b/tde-i18n-nl/messages/tdeedu/klatin.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-09-28 14:40+0200\n"
 "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -24,13 +24,13 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Otto Bruggeman,Rinse de Vries,Ruurd Pels"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -111,8 +111,8 @@ msgstr "5e vrouwelijk"
 #: klatingrammar.cpp:119
 msgid "Could not load grammar-definition file, check KLatin installation."
 msgstr ""
-"Kan het bestand met grammaticadefinities niet laden. Controleer uw installatie "
-"van KLatin."
+"Kan het bestand met grammaticadefinities niet laden. Controleer uw "
+"installatie van KLatin."
 
 #: klatingrammar.cpp:119 klatinverbs.cpp:109 klatinvocab.cpp:110
 msgid "Error with KLatin"
@@ -279,18 +279,19 @@ msgstr "toekomend voltooide tijd"
 #: klatinverbs.cpp:109
 msgid "Could not load verb-definition file, check KLatin installation."
 msgstr ""
-"Kan het bestand met werkwoorddefinities niet laden. Controleer uw "
-"KLatin-installatie."
+"Kan het bestand met werkwoorddefinities niet laden. Controleer uw KLatin-"
+"installatie."
 
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Wat is de %1 persoon %2 %3 %4 %5 of %6?"
 
@@ -305,8 +306,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - een programma om Latijn te leren"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -337,14 +338,39 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr "Vertaling van Poolse vocabulairebestanden"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "S&ectie"
+msgid "The language selected by the user"
+msgstr "De taal die door de gebruiker is gekozen"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "Hoeveel vragen worden er per sessie gesteld."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "Of KLatin een onbeperkt aantal vragen dient te stellen."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "het standaardwoordenschatbestand."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr ""
+"of de vragen in het Latijn of in de door u ingestelde taal worden gesteld."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+"of de vragen in de door u ingestelde taal of het Latijn worden gesteld."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -353,80 +379,67 @@ msgstr ""
 "Welkom bij KLatin\n"
 "Kies een Revisiesectie"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Oefensecties"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Woordenschat"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Woordenschattoets"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Woordenschattoets met meerkeuzevragen"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Grammatica"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Toets van de grammatica van zelfstandige naamwoorden"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Toets op algemene zelfstandige naamwoorden en einden"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Wer&kwoorden"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Toets van werkwoordvormen"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Toets op algemene werkwoorden en einden"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "Oefenaantekenin&gen"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Oefenaantekeningen laden"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -435,50 +448,47 @@ msgstr ""
 "De KLatin oefenaantekeningen\n"
 "met werkwoord- en zelfstandig naamwoord-tabbellen"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "S&tarten"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Start het gekozen oefengebied"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Start de selectie die u hebt gekozen"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Verlaat het programma"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Verlaat het programma"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "KLatin afsluiten"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Grammaticasectie"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Keuze van de te toetsen zelfstandige naamwoorden"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -491,251 +501,229 @@ msgstr ""
 "Regel 3\n"
 "Regel 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "De vraag zal hier verschijnen"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Waardering"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Uw testpercentage tot nu toe"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Antwoord:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Uw antwoord hier"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Voer hier uw antwoord in"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Antwoord controleren"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Terug"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Ga terug naar het selectiescherm"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Terug naar selectiescherm"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Resultaten"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Uw resultaten:</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Vraag"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Uw antwoord"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Goed antwoord"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Tabel met resultaten"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Percentage:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Percentage goede antwoorden"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr "Dit toont het percentage vragen die u goed hebt beantwoord."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Aantal pogingen:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Aantal gestelde vragen"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Dit toont het aantal vragen dat u hebt beantwoord."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Dit dialoog sluiten"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Sluit dit dialoog en ga terug naar het hoofdvenster."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Woordenschat instellen"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Toetsstijl"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Naar Latijn"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr " Vragen in de door u gekozen taal met antwoorden in het Latijn"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 "Kies de test vanuit de door u gekozen taal naar Latijn. Dit betekent dat het "
 "woord in uw taal (in de meeste gevallen Engels) wordt getoond en dat u kunt "
 "kiezen uit 4 vertalingen in het Latijn."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Vanuit Latijn"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Vragen in het Latijn met antwoorden in de door u gekozen taal"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+"Kies de test vanuit Latijn naar uw taal. Dit betekent dat het woord zal "
+"worden getoond in Latijn en dat u kunt kiezen uit 4 vertalingen in uw taal "
+"(meestal Engels)."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
-"Kies de test vanuit Latijn naar uw taal. Dit betekent dat het woord zal worden "
-"getoond in Latijn en dat u kunt kiezen uit 4 vertalingen in uw taal (meestal "
-"Engels)."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Het bestand waarmee uw woordenschat wordt getest"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 "U kunt het bestand dat wordt gebruikt om uw woordenschat te testen veranderen"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Aantal vragen:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Stel het aantal vragen voor de toets in "
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -744,32 +732,32 @@ msgstr ""
 "Hier kunt u het aantal vragen voor uw toets instellen. Als dit aantal is "
 "bereikt krijgt u het resultaat van de toets te zien."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Aantal te stellen vragen voor beëindiging"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Aantal vragen om op een binnen een tijd te stellen"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "S&ectie"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Werkwoordensectie"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Keuze van werkwoordverbuiging"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -778,14 +766,12 @@ msgstr ""
 "Te toetsen werkwoords-\n"
 "verbuiging"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Keuze van werkwoordsvorm"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -794,14 +780,12 @@ msgstr ""
 "Te toetsen werk-\n"
 "woordtijd"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Keuze van werkwoordtijd"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -810,122 +794,77 @@ msgstr ""
 "Te toetsen werk-\n"
 "woordtijd"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Test veranderen in nieuw type"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Controleer uw antwoord"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Woordenschatsectie"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Gevraagd woord"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Het gevraagde woord verschijnt hier"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Uw huidige score"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 "Uw score verschijnt in deze weergave. Aantal goede antworden/totaal aantal "
 "antwoorden."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Antwoord 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Klik hier als u denkt dat dit het goede antwoord is."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Antwoord 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Antwoord 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Antwoord 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Ga terug naar het selectiescherm"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "De taal die door de gebruiker is gekozen"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "Hoeveel vragen worden er per sessie gesteld."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "Of KLatin een onbeperkt aantal vragen dient te stellen."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "het standaardwoordenschatbestand."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr ""
-"of de vragen in het Latijn of in de door u ingestelde taal worden gesteld."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
-"of de vragen in de door u ingestelde taal of het Latijn worden gesteld."
diff --git a/tde-i18n-nn/messages/tdeedu/klatin.po b/tde-i18n-nn/messages/tdeedu/klatin.po
index 3ed5d84b128..f1c2cdf454e 100644
--- a/tde-i18n-nn/messages/tdeedu/klatin.po
+++ b/tde-i18n-nn/messages/tdeedu/klatin.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeedu/klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2002-03-02 23:51+0100\n"
 "Last-Translator: Bjarne Hugo Hansen <hoelerk@online.no>\n"
 "Language-Team: Norwegian (Nynorsk) <i18n-nn@lister.ping.uio.no>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Bjarne Hugo Hansen"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -279,12 +279,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 
@@ -298,8 +299,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -329,14 +330,37 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr ""
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
-#, fuzzy, no-c-format
-msgid "S&ection"
-msgstr "&Start Seksjon"
+#: klatin.kcfg:9
+#, no-c-format
+msgid "The language selected by the user"
+msgstr ""
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr ""
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr ""
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr ""
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr ""
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+
+#: klatinchoose.ui:46
 #, fuzzy, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -345,130 +369,114 @@ msgstr ""
 "Velkommen til KLatin\n"
 "Vel seksjon!"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, fuzzy, no-c-format
 msgid "Revision Sections"
 msgstr "Revisjon"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, fuzzy, no-c-format
 msgid "&Vocabulary"
 msgstr "Vokabular"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, fuzzy, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Vokabular"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, fuzzy, no-c-format
 msgid "&Grammar"
 msgstr "Grammatikk"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, fuzzy, no-c-format
 msgid "Ver&bs"
 msgstr "Verb"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, fuzzy, no-c-format
 msgid "&Revision notes"
 msgstr "Revisjon"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, fuzzy, no-c-format
 msgid "Quit KLatin"
 msgstr "KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Grammatikkseksjon"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -477,426 +485,357 @@ msgid ""
 "Line 4"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Poeng:"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Svar:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Tilbake"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, fuzzy, no-c-format
 msgid "Question"
 msgstr "Spørsmålsord:"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, fuzzy, no-c-format
 msgid "Your Answer"
 msgstr "Svar 4"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, fuzzy, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Vokabular"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, fuzzy, no-c-format
 msgid "To Latin"
 msgstr "KLatin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, fuzzy, no-c-format
 msgid "From Latin"
 msgstr "KLatin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, fuzzy, no-c-format
+msgid "S&ection"
+msgstr "&Start Seksjon"
+
+#: klatinverbswidget.ui:40
 #, fuzzy, no-c-format
 msgid "Verbs Section"
 msgstr "&Start Seksjon"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Vokabularseksjonen"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Spørsmålsord:"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, fuzzy, no-c-format
 msgid "Answer 1"
 msgstr "Svar 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, fuzzy, no-c-format
 msgid "Answer 2"
 msgstr "Svar 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, fuzzy, no-c-format
 msgid "Answer 3"
 msgstr "Svar 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, fuzzy, no-c-format
 msgid "Answer 4"
 msgstr "Svar 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr ""
 
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr ""
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
-
 #, fuzzy
 #~ msgid "Type"
 #~ msgstr "Skriv:"
diff --git a/tde-i18n-pl/messages/tdeedu/klatin.po b/tde-i18n-pl/messages/tdeedu/klatin.po
index af8c14e02f4..dbf8bb4ac6d 100644
--- a/tde-i18n-pl/messages/tdeedu/klatin.po
+++ b/tde-i18n-pl/messages/tdeedu/klatin.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-09-23 12:44+0200\n"
 "Last-Translator: Mikolaj Machowski <mikmach@wp.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Mikołaj Machowski"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -273,12 +273,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Jaka jest %1 osoba %2 %3 %4 %5 %6?"
 
@@ -293,8 +294,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - program wspomagający naukę łaciny"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -323,14 +324,37 @@ msgstr "Poprawianie błędów, usprawnienia, przekład danych na włoski"
 msgid "Polish Vocabulary Data Translation"
 msgstr "Polskie tłumaczenie słownika"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "Dzi&ał"
+msgid "The language selected by the user"
+msgstr "Język wybrany przez użytkownika"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "ile pytań ma być zadanych w jednej sesji."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "czy KLatin powinien zadań nielimitowaną  ilość pytań."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "domyślny plik słownictwa."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "czy pytania powinny być z łaciny na język użytkownika."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "czy pytania powinny być z języka użytkownika na łacinę."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -339,80 +363,67 @@ msgstr ""
 "Witaj w KLatin\n"
 "Proszę wybrać dział do powtórzenia"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Działy powtarzania"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Słownictwo"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Test słownictwa"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Test wielokrotnego wyboru, utrwalający słownictwo"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Gramatyka"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Test gramatyki przymiotników"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Test popularnych przymiotników i końcówek"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Cza&sowniki"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Test form czasownikowych"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Test popularnych czasowników i końcówek"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Notatki powtarzania"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Wczytaj notatki powtarzania"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -421,50 +432,47 @@ msgstr ""
 "Notatki powtarzania KLatin z tabelami\n"
 "czasowników i przymiotników"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "S&tart"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Rozpocznij test wybranego działu"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Zacznij wybrany dział"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Zakończ"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Zakończ"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Zakończ KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Dział gramatyki"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Wybór przymiotników do testów"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -477,248 +485,227 @@ msgstr ""
 "Wiersz 3\n"
 "Wiersz 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Tutaj pojawi się pytanie"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Punkty"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Dotychczasowy dorobek procentowo"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Odpowiedź:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Tutaj wpisz odpowiedź"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Podaj tu swoją odpowiedź"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Sprawdź odpowiedź"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Wróć"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Wróć do ekranu wyboru"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Powróć do ekranu wyboru"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Wyniki"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Twoje wyniki</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Pytanie"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Twoja odpowiedź"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Poprawna odpowiedź"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Tabela wyników"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Procentowo:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Procent prawidłowych odpowiedzi"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr "Pokazuje jaki procent udzielonych odpowiedzi jest prawidłowy."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Ilość prób:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Liczba prób odpowiedzi"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Pokazuje liczbę udzielonych odpowiedzi."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Zamknij to okno dialogowe"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Zamknij okno i wróć do głównego okna KLatin."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Konfiguracja słownictwa"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Metoda testowania"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Na łacinę"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Pytanie w twoim języku i odpowiedzi po łacinie"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Wybierz aby tłumaczyć z twojego języka na łacinę. Oznacza to, że słowo zostanie "
-"pokazane w twoim języku i musisz wybrać jedno z 4 łacińskich tłumaczeń."
+"Wybierz aby tłumaczyć z twojego języka na łacinę. Oznacza to, że słowo "
+"zostanie pokazane w twoim języku i musisz wybrać jedno z 4 łacińskich "
+"tłumaczeń."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Z łaciny"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Pytanie po łacinie i odpowiedź w twoim języku"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 "Wybierz aby tłumaczyć z łaciny na twój język. Oznacza to, że słowo zostanie "
 "pokazane w łacinie i musisz wybrać jedno z 4 tłumaczeń."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Plik testujący słownictwo"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Możesz zmienić plik testujący słownictwo"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Liczba pytań:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Ustaw liczbę pytań z jakiej ma się składać test"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -727,32 +714,32 @@ msgstr ""
 "Ustawiasz tutaj liczbę pytań w czasie jednej sesji. Kiedy osiągniesz tę "
 "granicę, pojawi się okienko z wynikami."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Liczba pytań do końca testu"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Ilość pytań do zadania za jednym razem"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "Dzi&ał"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Dział czasowników"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Wybierz koniugację czasownika"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -761,14 +748,12 @@ msgstr ""
 "Testowanie wiedzy na\n"
 "temat danej koniugacji"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Wybór strony czasownika"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -777,14 +762,12 @@ msgstr ""
 "Testowanie wiedzy na\n"
 "temat danej strony"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Wybór trybu czasownika"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -793,120 +776,77 @@ msgstr ""
 "Testowanie wiedzy na\n"
 "temat danego trybu"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Zmień typ testu"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Sprawdź odpowiedź"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Dział słownictwa"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Pytanie o słowo"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Tutaj pojawi się słowo"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Bieżąca punktacja"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 "Pokazuje bieżącą punktację. Liczba poprawnych odpowiedzi/liczba wszystkich "
 "odpowiedzi."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Odpowiedź 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Wciśnij jeśli myślisz, że jest to prawidłowa odpowiedź."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Odpowiedź 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Odpowiedź 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Odpowiedź 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Powróć do ekranu wyboru"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Język wybrany przez użytkownika"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "ile pytań ma być zadanych w jednej sesji."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "czy KLatin powinien zadań nielimitowaną  ilość pytań."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "domyślny plik słownictwa."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "czy pytania powinny być z łaciny na język użytkownika."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "czy pytania powinny być z języka użytkownika na łacinę."
diff --git a/tde-i18n-pt/messages/tdeedu/klatin.po b/tde-i18n-pt/messages/tdeedu/klatin.po
index c81eaf68684..f6ae048b4b2 100644
--- a/tde-i18n-pt/messages/tdeedu/klatin.po
+++ b/tde-i18n-pt/messages/tdeedu/klatin.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-09-25 19:01+0100\n"
 "Last-Translator: José Nuno Pires <jncp@netcabo.pt>\n"
 "Language-Team: pt <kde-i18n-pt@kde.org>\n"
@@ -11,13 +11,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-POFile-SpellExtra: KLatin\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "José Nuno Pires,Pedro Morais"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -272,12 +272,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Qual é a %1 pessoa do %2 %3 %4 %5 de %6?"
 
@@ -293,8 +294,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - um programa para rever o Latim"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -324,14 +325,37 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr "Tradução dos Dados de Vocabulário Polaco"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "S&ecção"
+msgid "The language selected by the user"
+msgstr "A língua seleccionada pelo utilizador"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "Quantas perguntas são feitas por sessão."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "Se o KLatin deve fazer perguntas sem limite."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "O ficheiro de vocabulário por omissão."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "se as perguntas devem ser de Latim para a língua do utilizador."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "se as perguntas devem ser da língua do utilizador para Latim."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -340,80 +364,67 @@ msgstr ""
 "Bem Vindo ao KLatin\n"
 "Por Pavor Escolha a Secção a Rever"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Secção de Revisão"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Vocabulário"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Teste de Vocabulário"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Teste de vocabulário de escolha múltipla"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Gramática"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Teste de gramática de nomes"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Teste em nomes e terminações comuns"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Ver&bos"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Teste de formas verbais"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Teste em verbos e terminações comuns"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "Notas de &revisão"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Carregar notas de revisão"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -422,50 +433,47 @@ msgstr ""
 "As notas de revisão do KLatin com\n"
 "tabelas de verbos e nomes"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Iniciar"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Iniciar a área de revisão escolhida"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Inicia a secção que escolheu"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Sai"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Sai"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Sair do KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Secção de Gramática"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Escolha de nomes para teste"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -478,251 +486,230 @@ msgstr ""
 "Linha 3\n"
 "Linha 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "A pergunta aparece aqui"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Pontuação"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "A percentagem do teste até agora"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Resposta:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "A sua resposta aqui"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Indique a sua resposta aqui"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Verificar resposta"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Recuar"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Voltar ao ecrã de selecção"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Voltar ao ecrã de selecção"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Resultados"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Os Seus Resultados</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Pergunta"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "A Sua Resposta"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Resposta Correcta"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Tabela de resultados"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Percentagem:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Percentagem de respostas correctas"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
-"Mostra a percentagem de perguntas respondidas correctamente em relação às que "
-"tentou responder."
+"Mostra a percentagem de perguntas respondidas correctamente em relação às "
+"que tentou responder."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Número de tentativas:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Número de perguntas tentadas"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Mostra o número de perguntas a que respondeu."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Fechar esta janela"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Fechar esta janela e voltar à janela principal do KLatin."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Configurar o Vocabulário"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Estilo de Teste"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Para Latim"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "As perguntas são na sua língua, as respostas em Latim"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 "Escolhe ser testado na sua língua para Latim, o que significa que a palavra "
 "aparece na sua língua e que terá que escolher entre 4 traduções para Latim."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Do Latim"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "As perguntas são em Latim, as respostas na sua língua"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+"Escolhe ser testado de Latim para a sua língua, o que significa que a "
+"palavra aparece em Latim e que terá que escolher entre 4 traduções para a "
+"sua língua."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
-"Escolhe ser testado de Latim para a sua língua, o que significa que a palavra "
-"aparece em Latim e que terá que escolher entre 4 traduções para a sua língua."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "O ficheiro para o teste de vocabulário"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 "Pode modificar o ficheiro utilizado nos testes da secção de vocabulário"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Número de perguntas:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Número de perguntas a incluir no teste"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -731,32 +718,32 @@ msgstr ""
 "Aqui pode escolher o número de perguntas no teste. Quando este número é "
 "atingido aparece a janela de resultados."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Número de perguntar a fazer antes de terminar"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Número de perguntar a fazer de cada vez"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "S&ecção"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Secção de Verbos"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Escolha de conjugação do verbo"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -765,14 +752,12 @@ msgstr ""
 "Conjugação do verbo\n"
 "a ser testado"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Escolha da voz do verbo"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -781,14 +766,12 @@ msgstr ""
 "Voz do verbo\n"
 "a ser testado"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Escolha do âmbito do verbo"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -797,120 +780,77 @@ msgstr ""
 "Âmbito de verbo\n"
 "a ser testado"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Muda o teste para novo tipo"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Verifica a sua resposta"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Secção de vocabulário"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Palavra Perguntada"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "A palavra perguntada vai aparecer aqui"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "A pontuação actual"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 "A sua pontuação aparece aqui. Número de respostas correctas/número total de "
 "respostas."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Resposta 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Carregue aqui se pensar ser a resposta certa."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Resposta 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Resposta 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Resposta 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Voltar ao ecrã de selecção"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "A língua seleccionada pelo utilizador"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "Quantas perguntas são feitas por sessão."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "Se o KLatin deve fazer perguntas sem limite."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "O ficheiro de vocabulário por omissão."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "se as perguntas devem ser de Latim para a língua do utilizador."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "se as perguntas devem ser da língua do utilizador para Latim."
diff --git a/tde-i18n-pt_BR/messages/tdeedu/klatin.po b/tde-i18n-pt_BR/messages/tdeedu/klatin.po
index 8e136a586d1..feba861853f 100644
--- a/tde-i18n-pt_BR/messages/tdeedu/klatin.po
+++ b/tde-i18n-pt_BR/messages/tdeedu/klatin.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-04-07 14:44-0300\n"
 "Last-Translator: Lisiane Sztoltz Teixeira <lisiane@kdemail.net>\n"
 "Language-Team: Brazilian portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
@@ -29,7 +29,7 @@ msgstr ""
 "Lisiane Sztoltz Teixeira, Antonio Sergio de Mello e Souza, Wanderlei Antonio "
 "Cavassin"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -284,12 +284,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Qual é a %1 pessoa do %2 do %3 do %4 %5 de %6?"
 
@@ -305,8 +306,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - um programa para auxiliar a revisar Latim"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -337,14 +338,41 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr "Trandução dos Dados do Vocabulário Polonês"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&Seção"
+msgid "The language selected by the user"
+msgstr "O idioma selecionado pelo usuário"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "quantas questões serão perguntadas em uma sessão."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "se o KLatin deve perguntar questões sem quantidade definida."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "o arquivo de vocabulário padrão."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr ""
+"marque se você quer que as questões devam ser do Latim para o idioma do "
+"usuário."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+"marque se você quer que as questões devam ser do idioma do usuário para o "
+"Latim."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -353,80 +381,67 @@ msgstr ""
 "Bem-vindo ao KLatin!\n"
 "Por favor, escolha uma seção de revisão"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Seções de Revisão"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Vocabulário"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Teste no Vocabulário"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Teste de vocabulário de múltipla escolha"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Gramática"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Testes na gramática"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Testa pronomes comuns e conclusões"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Ver&bos"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Teste em formas verbais"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Teste com verbos comuns e conclusões"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Notas de revisão"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Carregar notas da revisão"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -435,50 +450,47 @@ msgstr ""
 "As notas de revisão do KLatin com\n"
 "as tabelas de verbos e pronomes"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Iniciar!"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Inicia área escolhida de revisão"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Iniciar a seção que você escolheu"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Sair"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Sair"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Sair do KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Seção de Gramática"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Escolha de pronomes para teste"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -491,287 +503,265 @@ msgstr ""
 "Linha 3\n"
 "Linha 4 "
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "A questão aparecerá aqui"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Pontuação"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "A porcentagem do seu teste até agora"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Resposta:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Sua resposta vai aqui"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Sua resposta vai aqui"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Verificar resposta"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Voltar"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Voltar para a tela de seleção"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Voltar para a tela de seleção"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Resultados"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Seus resultados</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Questão"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Sua Resposta"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Resposta Correta"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Tabela de resultados"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Porcentagem:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Porcentagem de respostas corretas"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
-"Isto mostra a porcentagem de questões que você respondeu corretamente de todas "
-"as respondidas por você."
+"Isto mostra a porcentagem de questões que você respondeu corretamente de "
+"todas as respondidas por você."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Número de tentativas:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Número total de questões respondidas"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Isto mostra o número total de questões que foram respondidas por você."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Fechar este diálogo"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Fecha este diálogo e retorna para a janela principal do KLatin."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Configurar Vocabulário"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Testando Estilo"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "para o Latim"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "As questões são em seu idioma e as respostas em Latim"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Escolha, para ser testada do seu idioma para o Latim, o significado da palavra "
-"que será exibida em seu idioma, e você terá que escolher entre 4 traduções para "
-"o Latim."
+"Escolha, para ser testada do seu idioma para o Latim, o significado da "
+"palavra que será exibida em seu idioma, e você terá que escolher entre 4 "
+"traduções para o Latim."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Do Latim"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "As questões são em Latim, com respostas em seu idioma"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+"Escolha, para ser testada do Latim para o seu idioma, o significado da "
+"palavra que será exibida em Latim, e você terá que escolher entre 4 "
+"traduções para o seu idioma."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
-"Escolha, para ser testada do Latim para o seu idioma, o significado da palavra "
-"que será exibida em Latim, e você terá que escolher entre 4 traduções para o "
-"seu idioma."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "O arquivo com o qual você irá testar o seu vocabulário"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 "Você pode modificar o arquivo que usará para o teste, na seção de vocabulário"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Número de questões:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Configure o número de questões a serem perguntadas no teste"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
-"Aqui você pode configurar o conjunto de número de questões que deseja testar. "
-"Quando este número for alcançado, o diálogo de resultados aparecerá."
+"Aqui você pode configurar o conjunto de número de questões que deseja "
+"testar. Quando este número for alcançado, o diálogo de resultados aparecerá."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Número de questões a serem perguntadas antes do fim"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Número de questões a serem perguntadas até o fim"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&Seção"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Seção de Verbos"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Escolha da conjugação do verbo"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -780,14 +770,12 @@ msgstr ""
 "Conjugação do verbo a ser\n"
 "testada"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Escolha da voz do verbo"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -796,14 +784,12 @@ msgstr ""
 "Voz verbal para ser\n"
 "testada"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Escolha da modo verbal"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -812,124 +798,77 @@ msgstr ""
 "Modo verbal a ser\n"
 "testado"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Modificar teste para o novo tipo"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Verifique sua resposta"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Seção de Vocabulário"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Palavra da Questão"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "A palavra da questão aparecerá aqui"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Sua pontuação atual"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 "Sua pontuação aparece nesta tela. Isto mostra o número de respostas corretas "
 "dividido pelo número total de questões respondidas."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Resposta 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Clique aqui se você pensa que a resposta está correta."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Resposta 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Resposta 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Resposta 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Volta para a tela de seleção"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "O idioma selecionado pelo usuário"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "quantas questões serão perguntadas em uma sessão."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "se o KLatin deve perguntar questões sem quantidade definida."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "o arquivo de vocabulário padrão."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr ""
-"marque se você quer que as questões devam ser do Latim para o idioma do "
-"usuário."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
-"marque se você quer que as questões devam ser do idioma do usuário para o "
-"Latim."
diff --git a/tde-i18n-ro/messages/tdeedu/klatin.po b/tde-i18n-ro/messages/tdeedu/klatin.po
index 0fc00a320fd..3f4f192ea8a 100644
--- a/tde-i18n-ro/messages/tdeedu/klatin.po
+++ b/tde-i18n-ro/messages/tdeedu/klatin.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2003-12-04 20:21+0200\n"
 "Last-Translator: Claudiu Costin <claudiuc@kde.org>\n"
 "Language-Team: Romanian <ro-kde@yahoogroups.com>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Claudiu Costin"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -272,12 +272,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 
@@ -291,8 +292,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr ""
@@ -321,144 +322,151 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr ""
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
+msgid "The language selected by the user"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr ""
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr ""
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr ""
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr ""
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr ""
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
 "Please Choose Section of Revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, no-c-format
+msgid "&Quit"
+msgstr ""
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -467,422 +475,353 @@ msgid ""
 "Line 4"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr ""
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr ""
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr ""
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr ""
diff --git a/tde-i18n-ru/messages/tdeedu/klatin.po b/tde-i18n-ru/messages/tdeedu/klatin.po
index 8d132d31f5f..f46b519ea33 100644
--- a/tde-i18n-ru/messages/tdeedu/klatin.po
+++ b/tde-i18n-ru/messages/tdeedu/klatin.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2007-12-02 00:42+0300\n"
 "Last-Translator: Andrey Cherepanov <sibskull@mail.ru>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -15,16 +15,16 @@ 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"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Андрей Дорошенко,Андрей Черепанов"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -275,12 +275,13 @@ msgstr "Невозможно загрузить файл глаголов. Пр�
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Какая форма глагола %6 будет во времени %3 %4 %5 и %1 лице %2 числе?"
 
@@ -294,8 +295,8 @@ msgstr "Невозможно загрузить файл словаря: воз�
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - программа обучения латыни"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -324,14 +325,37 @@ msgstr "Исправление ошибок и улучшения кода, ит
 msgid "Polish Vocabulary Data Translation"
 msgstr "Польский перевод словаря"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&Раздел"
+msgid "The language selected by the user"
+msgstr "Язык, выбранный пользователем"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "количество вопросов в упражнении."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "количество вопросов не ограничено."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "словарь по умолчанию."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "вопросы на латыни."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "ответы на латыни."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -340,130 +364,114 @@ msgstr ""
 "Добро пожаловать в KLatin\n"
 "Пожалуйста, выберите раздел"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Разделы обучения"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Лексика"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Проверка словарного запаса"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Проверка словарного запаса с вариантами"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Грамматика"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Тест по существительным"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Тест по основным существительным и окончаниям"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Г&лаголы"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Тест по формам глаголов"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Тест по основным глаголам и окончаниям"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Краткий курс"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Загрузка заметок"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr "Краткий курс по латыни с таблицами существительных и глаголов"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Запустить"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Выберите раздел"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Открыть выбранный раздел"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Выйти из программы"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Выйти из программы"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Выход из программы KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Грамматика"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Выберите "
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -476,248 +484,226 @@ msgstr ""
 "Строка 3\n"
 "Строка 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Здесь показывается вопрос"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Счёт"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Ошибка определения процента"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Ответ:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Здесь вы должны указать ответ на вопрос"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Укажите ответ"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Проверить ответ"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Назад"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Перейти к выбору"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Выбрать другой раздел"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Результаты"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Результаты</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Вопрос"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Ваш ответ"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Правильный ответ"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Таблица результатов"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Правильных ответов:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Доля правильных ответов"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr "Доля правильных ответов в упражнении."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Количество вопросов:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Количество вопросов"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Количество вопросов, на которые вы дали ответ."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Закрыть окно"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Закрыть диалог и вернуться в главное окно KLatin."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Настроить словарь"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Тип проверки"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Перевести на латынь"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Вопросы на вашем родном языке и ответы на латыни"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Вы должны выбрать ответ на вопрос, заданный на вашем родном языке, из четырёх "
-"вариантов на латыни."
+"Вы должны выбрать ответ на вопрос, заданный на вашем родном языке, из "
+"четырёх вариантов на латыни."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Перевести с латыни"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Вопросы на латыни и ответы на вашем родном языке"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+"Вы должны выбрать ответ на вопрос, заданный на латыни, из четырёх вариантов "
+"на вашем родном языке."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
-"Вы должны выбрать ответ на вопрос, заданный на латыни, из четырёх вариантов на "
-"вашем родном языке."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Файл словаря"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Вы можете изменить файл словаря в настройках программы"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Количество вопросов:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Количество вопросов, задаваемых в одном упражнении"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -726,180 +712,133 @@ msgstr ""
 "Здесь вы можете указать количество вопросов, которые будут заданы в одном "
 "упражнении."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Количество вопросов до конца упражнения"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Количество вопросов в упражнении"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&Раздел"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Раздел глаголов"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Спряжение глаголов"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr "Проверка знаний спряжения глаголов"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Залоги"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr "Проверка знаний залогов"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Наклонения глаголов"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr "Проверка знаний наклонений глаголов"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Изменить тип вопросов"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Проверка ответа"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Раздел словаря"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Вопрос"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Здесь показывается вопрос"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Текущий счёт"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
-"Здесь показывается ваш текущий счёт. Доля правильных ответов определяется как "
-"отношение правильных ответов к общему числу ответов."
+"Здесь показывается ваш текущий счёт. Доля правильных ответов определяется "
+"как отношение правильных ответов к общему числу ответов."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Ответ 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Нажмите здесь, если вы считаете это правильным ответом."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Ответ 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Ответ 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Ответ 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Выбор раздела"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Язык, выбранный пользователем"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "количество вопросов в упражнении."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "количество вопросов не ограничено."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "словарь по умолчанию."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "вопросы на латыни."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "ответы на латыни."
diff --git a/tde-i18n-rw/messages/tdeedu/klatin.po b/tde-i18n-rw/messages/tdeedu/klatin.po
index 9155ca0550a..8f9318a59de 100644
--- a/tde-i18n-rw/messages/tdeedu/klatin.po
+++ b/tde-i18n-rw/messages/tdeedu/klatin.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin 3.4\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-05-25 18:08-0600\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
@@ -32,7 +32,7 @@ msgstr ""
 "Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien "
 "NSENGIYUMVA"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -336,12 +336,13 @@ msgstr ""
 #, fuzzy
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "ni i %1 %2 %3 %4 %5 Bya %6 ? "
 
@@ -357,8 +358,8 @@ msgstr "OYA Ibirimo Idosiye ; ni A Na: iyinjizaporogaramu . "
 msgid "KLatin - a program to help revise Latin"
 msgstr "- A Porogaramu Kuri Ifashayobora "
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, fuzzy, no-c-format
 msgid "KLatin"
 msgstr "Ikiratini"
@@ -392,144 +393,151 @@ msgstr "na Inyandikoporogaramu , "
 msgid "Polish Vocabulary Data Translation"
 msgstr ""
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, fuzzy, no-c-format
-msgid "S&ection"
-msgstr "Icyiciro"
+msgid "The language selected by the user"
+msgstr "Ururimi: Byahiswemo ku i Umukoresha "
+
+#: klatin.kcfg:30
+#, fuzzy, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "in Rimwe Umukoro . "
+
+#: klatin.kcfg:34
+#, fuzzy, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "ask Bitarangira . "
+
+#: klatin.kcfg:38
+#, fuzzy, no-c-format
+msgid "the default vocabulary file."
+msgstr "i Mburabuzi Idosiye . "
+
+#: klatin.kcfg:51
+#, fuzzy, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "i Kuri i Ururimi: . "
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:55
+#, fuzzy, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "i i Ururimi: Kuri . "
+
+#: klatinchoose.ui:46
 #, fuzzy, no-c-format
 msgid ""
 "Welcome to KLatin\n"
 "Please Choose Section of Revision"
 msgstr "Kuri Bya "
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, fuzzy, no-c-format
 msgid "Revision Sections"
 msgstr "Ihitamo ry'akarere..."
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, fuzzy, no-c-format
 msgid "&Vocabulary"
 msgstr "by'imbonerahamwe"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, fuzzy, no-c-format
 msgid "Test on Vocabulary"
 msgstr "ku "
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, fuzzy, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Igerageza "
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, fuzzy, no-c-format
 msgid "&Grammar"
 msgstr "Gama"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, fuzzy, no-c-format
 msgid "Test on noun grammar"
 msgstr "ku Izina "
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, fuzzy, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "ku na "
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, fuzzy, no-c-format
 msgid "Ver&bs"
 msgstr "Ishinga"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, fuzzy, no-c-format
 msgid "Test on verb forms"
 msgstr "ku Ishinga Amafishi "
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, fuzzy, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "ku na "
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, fuzzy, no-c-format
 msgid "&Revision notes"
 msgstr "Ibisobanuro "
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, fuzzy, no-c-format
 msgid "Load revision notes"
 msgstr "Isubiramo Ibisobanuro "
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, fuzzy, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr "Isubiramo Ibisobanuro na Izina Imbonerahamwe "
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, fuzzy, no-c-format
 msgid "S&tart"
 msgstr "Tangira"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, fuzzy, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Gutangira Umwanya Bya Isubiramo "
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, fuzzy, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Gutangira i Icyiciro "
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Kuvamo"
+
+#: klatinchoose.ui:226
 #, fuzzy, no-c-format
 msgid "Quits"
 msgstr "Kuvamo"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, fuzzy, no-c-format
 msgid "Quit KLatin"
 msgstr "Gusubiramo ibyavuzwe"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, fuzzy, no-c-format
 msgid "Grammar Section"
 msgstr "Gukosora Gama"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, fuzzy, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Bya ya:  Igerageza, ... "
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, fuzzy, no-c-format
 msgid ""
 "Question Word\n"
@@ -538,246 +546,225 @@ msgid ""
 "Line 4"
 msgstr "4 "
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, fuzzy, no-c-format
 msgid "The question will appear here"
 msgstr "Ikibazo Kugaragara "
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, fuzzy, no-c-format
 msgid "Score"
 msgstr "Igishushanyombonera"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, fuzzy, no-c-format
 msgid "Your test percentage so far"
 msgstr "Igerageza Ijanisha Far "
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, fuzzy, no-c-format
 msgid "Answer:"
 msgstr "Nta gisubizo"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, fuzzy, no-c-format
 msgid "Enter your answer here"
 msgstr "Injiza Ijambobanga yawe:"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, fuzzy, no-c-format
 msgid "Check answer"
 msgstr "Genzura amahuza"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "Garuka inyuma"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, fuzzy, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Inyuma Kuri i Ihitamo Mugaragaza "
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, fuzzy, no-c-format
 msgid "Return to selection screen"
 msgstr "Kuri Ihitamo Mugaragaza "
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Ibisubizo"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, fuzzy, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Urugero:</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Ikibazo"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, fuzzy, no-c-format
 msgid "Your Answer"
 msgstr "Nta gisubizo"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, fuzzy, no-c-format
 msgid "Correct Answer"
 msgstr "Nta gisubizo"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, fuzzy, no-c-format
 msgid "Table of results"
 msgstr "Bya ibisubizo "
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, fuzzy, no-c-format
 msgid "Percentage:"
 msgstr "Ijanisha"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, fuzzy, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Bya "
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, fuzzy, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr "i Ijanisha Bya i Inyuma Bya . "
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, fuzzy, no-c-format
 msgid "Number attempted:"
 msgstr "ubwoko bw'itanganomero"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, fuzzy, no-c-format
 msgid "Number of questions attempted"
 msgstr "Bya "
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, fuzzy, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "i Umubare Bya . "
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, fuzzy, no-c-format
 msgid "Close this dialog"
 msgstr "Funga iyi Ikiganiro "
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, fuzzy, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Funga iyi Ikiganiro na Garuka Kuri Idirishya . "
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, fuzzy, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Kuboneza imyanyabikoresho"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, fuzzy, no-c-format
 msgid "Testing Style"
 msgstr "Imisusire y'inyandiko"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, fuzzy, no-c-format
 msgid "To Latin"
 msgstr "Ikiratini"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, fuzzy, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "in Ururimi: na in "
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, fuzzy, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 "Kuri Kuva: Ururimi: Kuri , i ijambo in Ururimi: na Kuri Hitamo... Kuva: 4 . "
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, fuzzy, no-c-format
 msgid "From Latin"
 msgstr "Ihinduramiterere"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, fuzzy, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "in na in Ururimi: "
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, fuzzy, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
-"Kuri Kuva: Kuri Ururimi: , i ijambo in na Kuri Hitamo... Kuva: 4 in Ururimi: . "
+"Kuri Kuva: Kuri Ururimi: , i ijambo in na Kuri Hitamo... Kuva: 4 in "
+"Ururimi: . "
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, fuzzy, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Idosiye ku in "
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, fuzzy, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Guhindura... i Idosiye ku ya:  i Icyiciro "
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, fuzzy, no-c-format
 msgid "Number of questions:"
 msgstr "Bya : "
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, fuzzy, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "i Umubare Bya Kuri ku "
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, fuzzy, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -785,178 +772,131 @@ msgid ""
 msgstr ""
 "Gushyiraho i Umubare Bya Kuri ku . iyi Umubare ni , A Igisubizo Ikiganiro . "
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, fuzzy, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Bya Kuri Mbere "
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, fuzzy, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Bya Kuri ask Ku A Igihe "
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, fuzzy, no-c-format
+msgid "S&ection"
+msgstr "Icyiciro"
+
+#: klatinverbswidget.ui:40
 #, fuzzy, no-c-format
 msgid "Verbs Section"
 msgstr "Gerageza Intoranya"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, fuzzy, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Bya Ishinga "
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, fuzzy, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr "Bya Ishinga Kuri ku "
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, fuzzy, no-c-format
 msgid "Choice of verb voice"
 msgstr "Bya Ishinga Ijwi "
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, fuzzy, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr "Bya Ishinga Kuri ku "
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, fuzzy, no-c-format
 msgid "Choice of verb mood"
 msgstr "Bya Ishinga "
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, fuzzy, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr "Bya Ishinga Kuri ku "
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, fuzzy, no-c-format
 msgid "Change test to new type"
 msgstr "Igerageza Kuri Gishya Ubwoko: "
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, fuzzy, no-c-format
 msgid "Check your answer"
 msgstr "Hitamo ampaji yawe"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, fuzzy, no-c-format
 msgid "Vocabulary Section"
 msgstr "Ihitamo ry'Umuyoboro wa Hafi"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, fuzzy, no-c-format
 msgid "Question Word"
 msgstr "Ikibazo"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, fuzzy, no-c-format
 msgid "The question word will appear here"
 msgstr "Ikibazo ijambo Kugaragara "
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, fuzzy, no-c-format
 msgid "Your current score"
 msgstr "KIGEZWEHO "
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, fuzzy, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr "ku iyi Kugaragaza: . Bya /Igiteranyo: %S Umubare Bya . "
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, fuzzy, no-c-format
 msgid "Answer 1"
 msgstr "1 "
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, fuzzy, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "iyi NIBA ni i Iburyo: . "
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, fuzzy, no-c-format
 msgid "Answer 2"
 msgstr "2 "
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, fuzzy, no-c-format
 msgid "Answer 3"
 msgstr "3 "
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, fuzzy, no-c-format
 msgid "Answer 4"
 msgstr "4 "
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, fuzzy, no-c-format
 msgid "Return to the selection screen"
 msgstr "Kuri i Ihitamo Mugaragaza "
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, fuzzy, no-c-format
-msgid "The language selected by the user"
-msgstr "Ururimi: Byahiswemo ku i Umukoresha "
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, fuzzy, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "in Rimwe Umukoro . "
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, fuzzy, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "ask Bitarangira . "
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, fuzzy, no-c-format
-msgid "the default vocabulary file."
-msgstr "i Mburabuzi Idosiye . "
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, fuzzy, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "i Kuri i Ururimi: . "
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, fuzzy, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "i i Ururimi: Kuri . "
diff --git a/tde-i18n-sk/messages/tdeedu/klatin.po b/tde-i18n-sk/messages/tdeedu/klatin.po
index a230e9c3584..47c61aec0ce 100644
--- a/tde-i18n-sk/messages/tdeedu/klatin.po
+++ b/tde-i18n-sk/messages/tdeedu/klatin.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2006-08-30 19:13+0200\n"
 "Last-Translator: Jozef Riha <jose1711@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -18,13 +18,13 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Stanislav Višňovský,Stanislav Visnovsky,Jozef Říha"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -278,12 +278,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Aká je %1. osoba pre %2 %3 %4 %5 slova %6?"
 
@@ -299,8 +300,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - program na precvičovanie latinčiny"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -329,14 +330,37 @@ msgstr "Oprava chýb a zlepšovanie kódu, preklad talianskeho slovníka"
 msgid "Polish Vocabulary Data Translation"
 msgstr "Preklad poľského slovníka"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&Oddiel"
+msgid "The language selected by the user"
+msgstr "Jazyk vybraný užívateľom"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "počet otázok na jedno sedenie"
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "či sa má KLatin pýtat donekonečna."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "východzí súbor so slovníkom"
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "či majú byť otázky vo forme z latinčiny do jazyku užívateľa"
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "či majú byť otázky vo forme z jazyka užívateľa do latinčiny"
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -345,80 +369,67 @@ msgstr ""
 "Víta vás KLatin\n"
 "Vyberte si oddiel pre opakovanie"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Oddiely opakovania"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Slovník"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Skúšanie slovnej zásoby"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Test slovnej zásoby s viacerými možnými odpoveďami"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Gramatika"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Test na gramatiku podstatných mien"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Test na všeobecné podstatné mená a prípony"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "&Slovesá"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Test na slovesné tvary"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Test na všeobecné slovesá a prípony"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "Revízia"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Nahrať revíziu"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -427,50 +438,47 @@ msgstr ""
 "Poznámky KLatin pre opakovanie\n"
 "s tabuľkami slovies a podstatných mien"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "Š&tart"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Spustiť vybraný oddiel pre opakovanie"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Spustí oddiel, ktorý ste vybrali"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Ukončí"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Ukončí"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Ukončiť KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Oddiel gramatiky"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Výber podstatných mien pre skúšanie"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -483,252 +491,230 @@ msgstr ""
 "Riadok 3\n"
 "Riadok 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Otázka sa zobrazí tu"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Skóre"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Vaše priebežné skóre"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Odpoveď:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Vašu odpoveď napíšte sem"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Zadajte vašu odpoveď"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Skontrolovať odpoveď"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Dozadu"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Vrátiť sa na obrazovku výberu"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Späť na obrazovku s výberom"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Výsledky"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Vaše výsledky</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Otázka"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Vaša odpoveď"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Správna odpoveď"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Tabuľka výsledkov"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Percentuálne:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Percento správne zodpovedaných"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 "Toto je percentuálne vyjadrenie počtu správne zodpovedaných otázok z tých, "
 "ktoré ste riešili."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Počet riešených:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Počet zodpovedaných otázok"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Toto je počet otázok, na ktoré ste odpovedali"
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Zavrieť toto okno"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Zavrieť toto okno a vrátiť sa do hlavného okna KLatin."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Nastaviť slovník"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Štýl skúšania"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Do latinčiny"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Otázky vo vašom jazyku a vy odpovedáte po latinsky"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Vyberte túto voľbu, ak chcete byť skúšaný z prekladu do latinčiny, teda slovo "
-"bude zobrazené vo vašom jazyku a vy si budete musieť vybrať jedno zo štyroch "
-"latinských slov."
+"Vyberte túto voľbu, ak chcete byť skúšaný z prekladu do latinčiny, teda "
+"slovo bude zobrazené vo vašom jazyku a vy si budete musieť vybrať jedno zo "
+"štyroch latinských slov."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Z latinčiny"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Otázky po latinsky a vy odpovedáte vaším jazykom"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 "Vyberte túto voľbu, ak chcete byť skúšaný z prekladu z latinčiny, teda slovo "
-"bude zobrazené v latinčine a vy si budete musieť vybrať jedno zo štyroch slov "
-"vašeho jazyka."
+"bude zobrazené v latinčine a vy si budete musieť vybrať jedno zo štyroch "
+"slov vašeho jazyka."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Súbor, ktorý je použitý pre test slovnej zásoby"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Tu môžete zmeniť súbor, ktorý je použitý pre test slovnej zásoby"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Počet otázok:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Nastaviť počet otázok, ktoré sa zobrazia v teste"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -737,32 +723,32 @@ msgstr ""
 "Tu môžete nastaviť počet otázok, na ktoré sa vás bude program pýtať. Ak "
 "dosiahne počet skúšaných otázok toto číslo, zobrazí sa okno s výsledkami."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Počet skúšaných otázok pred koncom"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Počet naraz zobrazených otázok"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&Oddiel"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Oddiel slovesá"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Výber časovania slovesa"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -771,14 +757,12 @@ msgstr ""
 "Časovanie slovesa, ktoré\n"
 "bude skúšané"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Výber slovesného rodu"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -787,14 +771,12 @@ msgstr ""
 "Slovesný rod slovesa, ktoré\n"
 "bude skúšané"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Výber slovesného modusu"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -803,120 +785,77 @@ msgstr ""
 "Modus slovesa, ktoré\n"
 "bude skúšané"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Zmeniť typ testu na nový"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Skontrolujte vašu odpoveď"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Oddiel slovník"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Slovo otázky"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Odpoveď sa zobrazí tu"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Vaše aktuálne skóre"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
-"Vaše skóre sa zobrazí na tomto displeji. Počet správne zodpovedaných otázok z "
-"celkového počtu."
+"Vaše skóre sa zobrazí na tomto displeji. Počet správne zodpovedaných otázok "
+"z celkového počtu."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Odpoveď 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Kliknite sem, ak považujete toto za správnu odpoveď."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Odpoveď 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Odpoveď 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Odpoveď 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Návrať na obrazovku s výberom"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Jazyk vybraný užívateľom"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "počet otázok na jedno sedenie"
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "či sa má KLatin pýtat donekonečna."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "východzí súbor so slovníkom"
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "či majú byť otázky vo forme z latinčiny do jazyku užívateľa"
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "či majú byť otázky vo forme z jazyka užívateľa do latinčiny"
diff --git a/tde-i18n-sl/messages/tdeedu/klatin.po b/tde-i18n-sl/messages/tdeedu/klatin.po
index 3f2ec8fa8d3..54e80815fb3 100644
--- a/tde-i18n-sl/messages/tdeedu/klatin.po
+++ b/tde-i18n-sl/messages/tdeedu/klatin.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2006-03-14 23:22+0100\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
 "n%100==4 ? 2 : 3);\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Gregor Rakar,Jure Repinc"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -274,12 +274,13 @@ msgstr "Ni moč naložiti datoteke z glagoli. Preverite namestitev."
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Kaj je %6 v tej obliki: %1 oseba %2, %3, %4 %5?"
 
@@ -294,8 +295,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "Program za pregled znanja latinščine"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -324,14 +325,37 @@ msgstr "Popravki in izboljšava kode, italijanski prevod besedišča"
 msgid "Polish Vocabulary Data Translation"
 msgstr "Poljski prevod besedišča"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&Razdelek"
+msgid "The language selected by the user"
+msgstr "Jezik, ki ga je izbral uporabnik"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "Koliko vprašanj je zastavljenih v eni seji."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "Naj KLatin zastavi neomejeno število vprašanj."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "Privzeta datoteka z besediščem."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "Naj bodo vprašanja iz latinščine v uporabnikov jezik."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "Naj bodo vprašanja iz uporabnikovega jezika v latinščino."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -340,80 +364,67 @@ msgstr ""
 "Dobrodošli v KLatin!\n"
 "Prosim izberite razdelek za pregled."
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Razdelki za pregled"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Besedišče"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Preverjanje besedišča"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Preverjanje besedišča z več možnimi odgovori"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Slovnica"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Preverjanje slovnice (samostalniki)"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Preverjanje slovnice s pogostimi samostalniki in končnicami"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "&Glagoli"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Preverjanje glagolskih oblik"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Preverjanje pogostih glagolov in končnic"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Opombe k pregledu"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Naloži opombe k pregledu"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -422,50 +433,47 @@ msgstr ""
 "Opombe k pregledu s tabelami\n"
 "glagolov in samostalnikov."
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Začetek"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Začni z izbranim področjem pregleda"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Začnite z razdelkom, ki ste ga izbrali"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Konča"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Konča"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Zapre KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Razdelek s slovnico"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Izbira samostalnikov za preverjanje"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -478,430 +486,361 @@ msgstr ""
 "Vrstica 3\n"
 "Vrstica 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Tu se pojavi vprašanje"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Rezultat"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Vaš dosedanji uspeh v odstotkih"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Odgovor:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Vaš odgovor gre sem"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Sem vnesite vaš odgovor"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Preveri odgovor"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Nazaj"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Nazaj na izbor razdelka"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Vrnite se nazaj na izbor razdelka"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Rezultati"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Vaši rezultati</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Vprašanje"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Vaš odgovor"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Pravilen odgovor"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Tabela rezultatov"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Odstotki:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Odstotek pravilnih odgovorov"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr "Tu je prikazan odstotek pravilnih odgovorov na vprašanja."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Število poskusov:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Število vprašanj"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Tu je prikazano število vprašanj, na katere ste odgovorili."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Zapri to okno"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Zapre to pogovorno okno in se vrne v glavno okno."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Nastavi besedišče"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Način preverjanja"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "V latinščino"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Vprašanje v vašem jeziku in odgovor v latinščini"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Beseda bo prikazana v vašem jeziku, vi pa boste morali izbrati eno izmed štirih "
-"možnih rešitev v latinščini."
+"Beseda bo prikazana v vašem jeziku, vi pa boste morali izbrati eno izmed "
+"štirih možnih rešitev v latinščini."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Iz latinščine"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Vprašanje v latinščini in odgovor v vašem jeziku"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+"Beseda bo prikazana v latinščini, vi pa boste morali izbrati eno izmed "
+"štirih možnih rešitev v vašem jeziku."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
-"Beseda bo prikazana v latinščini, vi pa boste morali izbrati eno izmed štirih "
-"možnih rešitev v vašem jeziku."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Datoteka za preverjanje besedišča"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Izberete lahko datoteko za preverjanje besedišča"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Število vprašanj:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Število vprašanj pri preverjanju"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
-"Nastavite število vprašanj pri preverjanju. Ko to število dosežete, se pojavi "
-"okno z rezultati."
+"Nastavite število vprašanj pri preverjanju. Ko to število dosežete, se "
+"pojavi okno z rezultati."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Število vprašanj pred koncem"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Število vprašanj naenkrat"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&Razdelek"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Razdelek z glagoli"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Izbira spregatve glagola"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr "Spregatev glagola za preverjanje"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Izbira glagolskega načina"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr "Glagolski način za preverjanje"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Izbira glagolske oblike"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr "Glagolska oblika za preverjanje"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Spremeni vrsto preverjanja"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Preverite vaš odgovor"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Razdelek besedišča"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Beseda v vprašanju"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Beseda v vprašanju se bo prikazala tu"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Trenutni rezultat"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 "Tu je prikazan vaš trenutni rezultat. Število pravilnih odgovorov / število "
 "vseh odgovorov."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Odgovor 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Kliknite, če mislite, da je to pravi odgovor."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Odgovor 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Odgovor 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Odgovor 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Vrnite se na izbor razdelka"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Jezik, ki ga je izbral uporabnik"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "Koliko vprašanj je zastavljenih v eni seji."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "Naj KLatin zastavi neomejeno število vprašanj."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "Privzeta datoteka z besediščem."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "Naj bodo vprašanja iz latinščine v uporabnikov jezik."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "Naj bodo vprašanja iz uporabnikovega jezika v latinščino."
diff --git a/tde-i18n-sr/messages/tdeedu/klatin.po b/tde-i18n-sr/messages/tdeedu/klatin.po
index ac82f3bfa51..0acc7673207 100644
--- a/tde-i18n-sr/messages/tdeedu/klatin.po
+++ b/tde-i18n-sr/messages/tdeedu/klatin.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-10-24 18:02+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Часлав Илић"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -101,8 +101,8 @@ msgstr "5. женска"
 #: klatingrammar.cpp:119
 msgid "Could not load grammar-definition file, check KLatin installation."
 msgstr ""
-"Нисам могао да учитам фајл са граматичким дефиницијама, проверите инсталацију "
-"KLatin-а."
+"Нисам могао да учитам фајл са граматичким дефиницијама, проверите "
+"инсталацију KLatin-а."
 
 #: klatingrammar.cpp:119 klatinverbs.cpp:109 klatinvocab.cpp:110
 msgid "Error with KLatin"
@@ -275,12 +275,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Шта је %1 лице %2 %3 %4 %5 од %6?"
 
@@ -296,8 +297,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin — програм који помаже да обновите латински"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -327,14 +328,37 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr "Превод података за пољски речник"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&Одељак"
+msgid "The language selected by the user"
+msgstr "Језик који је изабрао корисник"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "колико питања ће бити постављено у једној сесији."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "да ли би KLatin требало да поставља неограничено питања."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "подразумевани речнички фајл."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "да ли би питања требало да буду са латинског на језик корисника."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "да ли би питања требало да буду са језика корисника на латински."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -343,80 +367,67 @@ msgstr ""
 "Добродошли у KLatin\n"
 "Изаберите секцију ревизије"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Одељци ревизије"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Речник"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Тест речника"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Тест речника са вишеструким избором"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Граматика"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Тест граматике именица"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Тест честих именица и суфикса"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Глаго&ли"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Тест глаголских облика"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Тест честих глагола и суфикса"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "Забелешке о &ревизији"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Учитај забелешке о ревизији"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -425,50 +436,47 @@ msgstr ""
 "Забелешке KLatin-а о ревизији, са\n"
 "табелама глагола и именица"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Почни"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Покреће изабрано подручје ревизије"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Покреће одељак који сте изабрали"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Излази"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Излази"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Изађи из KLatin-а"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Одељак граматике"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Избор именица за тестирање"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -481,285 +489,264 @@ msgstr ""
 "Линија 3\n"
 "Линија 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Питање ће се појавити овде"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Резултат"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Ваш проценат на тесту до сада"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Одговор:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Ваш одговор иде овде"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Овде унесите свој одговор"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Провери одговор"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Назад"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Врати се на претходни изборни екран"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Врати се на изборни екран"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Резултати"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Ваши резултати</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Питање"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Ваш одговор"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Тачан одговор"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Табела резултата"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Проценат:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Проценат тачних одговора"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
-"Ово приказује проценат питања на која сте одговорили од укупног броја покушаја."
+"Ово приказује проценат питања на која сте одговорили од укупног броја "
+"покушаја."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Број покушаја:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Број покушаја"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Ово приказује број питања на која сте одговорили."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Затвори овај дијалог"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Затвори овај прозор и врати се у главни прозор KLatin-а."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Подеси речник"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Стил тестирања"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "На латинском"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Питања на вашем језику а одговори на латинском"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Изаберите да будете тестирани са вашег језика на латински, што значи да ће реч "
-"бити приказана на вашем језику и да ћете моћи да бирате између четири латинска "
-"превода."
+"Изаберите да будете тестирани са вашег језика на латински, што значи да ће "
+"реч бити приказана на вашем језику и да ћете моћи да бирате између четири "
+"латинска превода."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Са латинског"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Питања на латинском а одговори на вашем језику"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 "Изаберите да будете тестирани са латинског на ваш језик, што значи да ће реч "
-"бити приказана на латинском и да ћете моћи да бирате између четири превода на "
-"ваш језик."
+"бити приказана на латинском и да ћете моћи да бирате између четири превода "
+"на ваш језик."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Фајл на коме се тестира ваше познавање речника"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Можете променити фајл на коме се тестирате у одељку речника"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Број питања:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Поставите број питања на којем желите да се тестирате"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
-"Овде можете поставити број питања на коме желите да се тестирате. Кад се овај "
-"број достигне, појавиће се дијалог са резултатима."
+"Овде можете поставити број питања на коме желите да се тестирате. Кад се "
+"овај број достигне, појавиће се дијалог са резултатима."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Број питања која ће бити постављена пре краја"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Број питања који ће бити постављен одједном"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&Одељак"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Одељак глагола"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Избор конјугације глагола"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -768,14 +755,12 @@ msgstr ""
 "Конјугација глагола на којој\n"
 "ћете се тестирати"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Избор глаголског стања"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -784,14 +769,12 @@ msgstr ""
 "Стање глагола на коме\n"
 "ћете се тестирати"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Избор глаголског начина"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -800,120 +783,77 @@ msgstr ""
 "Начин глагола на коме\n"
 "ћете се тестирати"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Промени тест на нови тип"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Проверите свој одговор"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Одељак речника"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Упитна реч"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Упитна реч ће се појавити овде"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Ваш тренутни резултат"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 "На овом екрану се приказује Ваш резултат. Број тачних одговора/укупан број "
 "одговора."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Одговор 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Кликните на ово ако мислите да је то прави одговор."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Одговор 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Одговор 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Одговор 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Врати се на изборни екран"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Језик који је изабрао корисник"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "колико питања ће бити постављено у једној сесији."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "да ли би KLatin требало да поставља неограничено питања."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "подразумевани речнички фајл."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "да ли би питања требало да буду са латинског на језик корисника."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "да ли би питања требало да буду са језика корисника на латински."
diff --git a/tde-i18n-sr@Latn/messages/tdeedu/klatin.po b/tde-i18n-sr@Latn/messages/tdeedu/klatin.po
index b961382b633..668652f7b2f 100644
--- a/tde-i18n-sr@Latn/messages/tdeedu/klatin.po
+++ b/tde-i18n-sr@Latn/messages/tdeedu/klatin.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-10-24 18:02+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -14,13 +14,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Časlav Ilić"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -101,8 +101,8 @@ msgstr "5. ženska"
 #: klatingrammar.cpp:119
 msgid "Could not load grammar-definition file, check KLatin installation."
 msgstr ""
-"Nisam mogao da učitam fajl sa gramatičkim definicijama, proverite instalaciju "
-"KLatin-a."
+"Nisam mogao da učitam fajl sa gramatičkim definicijama, proverite "
+"instalaciju KLatin-a."
 
 #: klatingrammar.cpp:119 klatinverbs.cpp:109 klatinvocab.cpp:110
 msgid "Error with KLatin"
@@ -275,12 +275,13 @@ msgstr ""
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Šta je %1 lice %2 %3 %4 %5 od %6?"
 
@@ -296,8 +297,8 @@ msgstr ""
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin — program koji pomaže da obnovite latinski"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -327,14 +328,37 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr "Prevod podataka za poljski rečnik"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&Odeljak"
+msgid "The language selected by the user"
+msgstr "Jezik koji je izabrao korisnik"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "koliko pitanja će biti postavljeno u jednoj sesiji."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "da li bi KLatin trebalo da postavlja neograničeno pitanja."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "podrazumevani rečnički fajl."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "da li bi pitanja trebalo da budu sa latinskog na jezik korisnika."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "da li bi pitanja trebalo da budu sa jezika korisnika na latinski."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -343,80 +367,67 @@ msgstr ""
 "Dobrodošli u KLatin\n"
 "Izaberite sekciju revizije"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Odeljci revizije"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Rečnik"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Test rečnika"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Test rečnika sa višestrukim izborom"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Gramatika"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Test gramatike imenica"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Test čestih imenica i sufiksa"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Glago&li"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Test glagolskih oblika"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Test čestih glagola i sufiksa"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "Zabeleške o &reviziji"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Učitaj zabeleške o reviziji"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -425,50 +436,47 @@ msgstr ""
 "Zabeleške KLatin-a o reviziji, sa\n"
 "tabelama glagola i imenica"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "&Počni"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Pokreće izabrano područje revizije"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Pokreće odeljak koji ste izabrali"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Izlazi"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Izlazi"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Izađi iz KLatin-a"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Odeljak gramatike"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Izbor imenica za testiranje"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -481,286 +489,264 @@ msgstr ""
 "Linija 3\n"
 "Linija 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Pitanje će se pojaviti ovde"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Rezultat"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Vaš procenat na testu do sada"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Odgovor:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Vaš odgovor ide ovde"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Ovde unesite svoj odgovor"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Proveri odgovor"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Nazad"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Vrati se na prethodni izborni ekran"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Vrati se na izborni ekran"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Rezultati"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Vaši rezultati</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Pitanje"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Vaš odgovor"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Tačan odgovor"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Tabela rezultata"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Procenat:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Procenat tačnih odgovora"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 "Ovo prikazuje procenat pitanja na koja ste odgovorili od ukupnog broja "
 "pokušaja."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Broj pokušaja:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Broj pokušaja"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Ovo prikazuje broj pitanja na koja ste odgovorili."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Zatvori ovaj dijalog"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Zatvori ovaj prozor i vrati se u glavni prozor KLatin-a."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Podesi rečnik"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Stil testiranja"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Na latinskom"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Pitanja na vašem jeziku a odgovori na latinskom"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Izaberite da budete testirani sa vašeg jezika na latinski, što znači da će reč "
-"biti prikazana na vašem jeziku i da ćete moći da birate između četiri latinska "
-"prevoda."
+"Izaberite da budete testirani sa vašeg jezika na latinski, što znači da će "
+"reč biti prikazana na vašem jeziku i da ćete moći da birate između četiri "
+"latinska prevoda."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Sa latinskog"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Pitanja na latinskom a odgovori na vašem jeziku"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 "Izaberite da budete testirani sa latinskog na vaš jezik, što znači da će reč "
-"biti prikazana na latinskom i da ćete moći da birate između četiri prevoda na "
-"vaš jezik."
+"biti prikazana na latinskom i da ćete moći da birate između četiri prevoda "
+"na vaš jezik."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Fajl na kome se testira vaše poznavanje rečnika"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Možete promeniti fajl na kome se testirate u odeljku rečnika"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Broj pitanja:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Postavite broj pitanja na kojem želite da se testirate"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
-"Ovde možete postaviti broj pitanja na kome želite da se testirate. Kad se ovaj "
-"broj dostigne, pojaviće se dijalog sa rezultatima."
+"Ovde možete postaviti broj pitanja na kome želite da se testirate. Kad se "
+"ovaj broj dostigne, pojaviće se dijalog sa rezultatima."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Broj pitanja koja će biti postavljena pre kraja"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Broj pitanja koji će biti postavljen odjednom"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&Odeljak"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Odeljak glagola"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Izbor konjugacije glagola"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -769,14 +755,12 @@ msgstr ""
 "Konjugacija glagola na kojoj\n"
 "ćete se testirati"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Izbor glagolskog stanja"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -785,14 +769,12 @@ msgstr ""
 "Stanje glagola na kome\n"
 "ćete se testirati"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Izbor glagolskog načina"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -801,120 +783,77 @@ msgstr ""
 "Način glagola na kome\n"
 "ćete se testirati"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Promeni test na novi tip"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Proverite svoj odgovor"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Odeljak rečnika"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Upitna reč"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Upitna reč će se pojaviti ovde"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Vaš trenutni rezultat"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 "Na ovom ekranu se prikazuje Vaš rezultat. Broj tačnih odgovora/ukupan broj "
 "odgovora."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Odgovor 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Kliknite na ovo ako mislite da je to pravi odgovor."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Odgovor 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Odgovor 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Odgovor 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Vrati se na izborni ekran"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Jezik koji je izabrao korisnik"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "koliko pitanja će biti postavljeno u jednoj sesiji."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "da li bi KLatin trebalo da postavlja neograničeno pitanja."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "podrazumevani rečnički fajl."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "da li bi pitanja trebalo da budu sa latinskog na jezik korisnika."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "da li bi pitanja trebalo da budu sa jezika korisnika na latinski."
diff --git a/tde-i18n-sv/messages/tdeedu/klatin.po b/tde-i18n-sv/messages/tdeedu/klatin.po
index be83ee72a49..a81f8db4a27 100644
--- a/tde-i18n-sv/messages/tdeedu/klatin.po
+++ b/tde-i18n-sv/messages/tdeedu/klatin.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-09-05 23:45+0200\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
 "Language-Team: Svenska <sv@li.org>\n"
@@ -13,13 +13,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Stefan Asserhäll"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -271,12 +271,13 @@ msgstr "Kunde inte ladda verbdefinitionsfil. Kontrollera Klatins installation."
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Vad är %1 person %2 %3 %4 %5 av %6?"
 
@@ -285,14 +286,15 @@ msgid ""
 "Could not load vocabulary file; there is a problem with your KLatin "
 "installation."
 msgstr ""
-"Kunde inte ladda ordförrådsfil. Det finns ett problem med Klatins installation."
+"Kunde inte ladda ordförrådsfil. Det finns ett problem med Klatins "
+"installation."
 
 #: main.cpp:23
 msgid "KLatin - a program to help revise Latin"
 msgstr "Klatin - Ett program för att hjälpa till att förbättra latin"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "Klatin"
@@ -323,14 +325,37 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr "Översättning av ordförrådsdata till polska"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "A&vsnitt"
+msgid "The language selected by the user"
+msgstr "Språket som valts av användaren"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "hur många frågor som ställs under en session."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "om Klatin ska fråga obegränsade frågor."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "förvald ordförrådsfil."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "om frågorna ska vara från latin till användarens språk."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "om frågorna ska vara från användarens språk till latin."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -339,80 +364,67 @@ msgstr ""
 "Välkommen till Klatin!\n"
 "Välj ett avsnitt att gå igenom"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Avsnitt att gå igenom"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Ordförråd"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Ordförrådsprov"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Ordförrådsprov med flerval"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Grammatik"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Grammatikprov av substantiv"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Prov med vanliga substantiv och ändelser"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "&Verb"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Prov av verbformer"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Prov med vanliga verb och ändelser"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Repetitionsanteckningar"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Ladda repetitionsanteckningar"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -421,50 +433,47 @@ msgstr ""
 "Klatins repetitionsanteckningar med\n"
 "tabeller över verb och substantiv"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "S&tarta"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Starta valt repetitionsområde"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Starta avsnittet du har valt"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Avslutar"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Avslutar"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Avsluta Klatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Grammatikavdelning"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Val av substativ för prov"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -477,250 +486,228 @@ msgstr ""
 "Rad 3\n"
 "Rad 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Frågan visas här"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Poäng"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Ditt procenttal hittills i provet"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Svar:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Ditt svar skrivs in här"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Skriv in ditt svar här"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Kontrollera svar"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "Till&baka"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Gå tillbaka till urvalsskärmen"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Gå tillbaka till urvalsskärmen"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Resultat"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Dina resultat</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Fråga"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Ditt svar"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Rätt svar"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Resultattabell"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Procenttal:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Procent riktiga svar"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 "Det här visar antal frågor som du besvarade rätt i procent av antalet som du "
 "försökte besvara."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Antal försök:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Antal frågor som du försökt besvara"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Det här visar antalet frågor som du besvarat."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Stäng dialogrutan"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Stäng dialogrutan och återgå till Klatins huvudfönster."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Anpassa ordförråd"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Provstil"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Till latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Frågor är på ditt språk och svaren på latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 "Välj prov från ditt språk till latin, vilket betyder att ordet visas på ditt "
 "språk, och att du ska välja bland fyra översättningar till latin."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Från latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Frågor är på latin och svar på ditt språk"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
-"Välj prov från latin till ditt språk, vilket betyder att ordet visas på latin, "
-"och att du ska välja bland fyra översättningar till ditt språk."
+"Välj prov från latin till ditt språk, vilket betyder att ordet visas på "
+"latin, och att du ska välja bland fyra översättningar till ditt språk."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Filen som används för ordförrådsprovet"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Du kan ändra filen som används för provet i ordförrådsavsnittet"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Antal frågor:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Ange antal frågor som ska ställas"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -729,32 +716,32 @@ msgstr ""
 "Här kan du ange antal frågor som du vill ska ingå i provet. När antalet nås, "
 "visas en resultatdialogruta."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Antal frågor som ska ställas innan avslutning"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Antal frågor som ska ställas åt gången"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "A&vsnitt"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Verbavsnitt"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Val av verbets konjugation"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -763,14 +750,12 @@ msgstr ""
 "Verbkonjugation som\n"
 "provet gäller"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Val av verbform"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -779,14 +764,12 @@ msgstr ""
 "Verbform som\n"
 "provet gäller"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Val av verbets modus"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -795,119 +778,76 @@ msgstr ""
 "Verbmodus som\n"
 "provet gäller"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Ändra prov till ny typ"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Kontrollera ditt svar"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Ordförrådsavsnitt"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Frågeord"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Frågeordet visas här"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Dina nuvarande poäng"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 "Dina poäng visas i den här rutan. Antal korrekta svar/totalt antal svar."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Svar 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Klicka på den här om du anser att det är rätt svar."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Svar 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Svar 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Svar 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Gå tillbaka till urvalsskärmen"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Språket som valts av användaren"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "hur många frågor som ställs under en session."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "om Klatin ska fråga obegränsade frågor."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "förvald ordförrådsfil."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "om frågorna ska vara från latin till användarens språk."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "om frågorna ska vara från användarens språk till latin."
diff --git a/tde-i18n-ta/messages/tdeedu/klatin.po b/tde-i18n-ta/messages/tdeedu/klatin.po
index 430cfe14257..122b1779b24 100644
--- a/tde-i18n-ta/messages/tdeedu/klatin.po
+++ b/tde-i18n-ta/messages/tdeedu/klatin.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2004-11-30 00:36-0800\n"
 "Last-Translator: Tamil PC <tamilpc@ambalam.com>\n"
 "Language-Team:  <ta@li.org>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "velmurugan"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -269,43 +269,43 @@ msgstr "முழுமையான எதிர்காலம்"
 
 #: klatinverbs.cpp:109
 msgid "Could not load verb-definition file, check KLatin installation."
-msgstr ""
-"வினைச்சொல்-வரையறுக்க கோப்பினை ஏற்ற முடியவில்லை, KLatin நிறுவலை பரிசோதி."
+msgstr "வினைச்சொல்-வரையறுக்க கோப்பினை ஏற்ற முடியவில்லை, KLatin நிறுவலை பரிசோதி."
 
 #: klatinverbs.cpp:205
 #, fuzzy
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 
 #: klatinvocab.cpp:110
 msgid ""
 "Could not load vocabulary file; there is a problem with your KLatin "
 "installation."
-msgstr ""
-"சொல்வள கோப்பினை ஏற்ற முடியவில்லை; உங்கள் KLatin நிறுவலில் பிரச்சனை இருக்கலாம்."
+msgstr "சொல்வள கோப்பினை ஏற்ற முடியவில்லை; உங்கள் KLatin நிறுவலில் பிரச்சனை இருக்கலாம்."
 
 #: main.cpp:23
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - Latin யை திருத்த உதவும் நிரல்"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -336,14 +336,37 @@ msgstr "இத்தாலியன் சொல்லகராதி தகவ�
 msgid "Polish Vocabulary Data Translation"
 msgstr "போலிஷ் சொல்லகராதி தகவல் மொழிப்பெயர்ப்பு"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "பகுதி"
+msgid "The language selected by the user"
+msgstr "பயனரால் தேர்ந்தெடுக்கப்பட்ட மொழி"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "ஒரு அமர்வில் எத்தணை கேள்விகள் கேட்கப்பட்டன."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "KLatin கண்டிப்பாக எல்லை இல்லா கேள்விகளை கேட்கும்."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "முன்னிருப்பு சொல்வள கோப்பு."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "கேள்வி கண்டிப்பாக லத்தீனில் இருந்து பயனரின் மொழிக்கு மாற்ற வேண்டுமா."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "கேள்விகளை கண்டிப்பாக ஆங்கிலத்தில் இருந்து லத்தீனில் இருக்க வேண்டுமா"
+
+#: klatinchoose.ui:46
 #, fuzzy, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -352,80 +375,67 @@ msgstr ""
 "KLatin க்கு நல்வரவு!\n"
 "தயவுசெய்து திருத்தத்தின் பிரிவை தேர்ந்தெடு"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "திருத்தத்தின் பிரிவுகள்"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&சொல்லகராதி"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "சொல்வளத்தை பரிசோதி"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "பல தேர்வு சொல்வள தேர்வு"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&இலக்கணம்"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "பெயர்ச்சொல் இலக்கனத்தின் தேர்வு"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "பொதுவான பெயர்ச்சொல் மற்றும் முடிவுகளின் தேர்வு"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "வினைச்சொற்கள்"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "வினைச்சொல் வடிவத்தின் பரிசோதனை"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "பொதுவான வினைச்சொல் மற்றும் முடிவுகளின் தேர்வு"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&திருத்த குறிப்புகள்"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "திருத்த குறிப்புகளை ஏற்று"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -434,50 +444,47 @@ msgstr ""
 "வினைச்சொல் மற்றும் பெயர்ச்சொல் அட்டவணையோடு\n"
 "KLatin திருத்தி குறிப்பு"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, fuzzy, no-c-format
 msgid "S&tart"
 msgstr "துவக்கு!"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "தேர்ந்தெடுத்த பகுதியில் திருத்தத்தை ஆரம்பி"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "நீங்கள் தேர்ந்தெடுத்த பகுதியை ஆரம்பி"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "வெளியேறு"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "வெளியேறு"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "KLatin விட்டு வெளியேறு"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "இலக்கண பிரிவு"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "பரிசோதிக்க பெயர்ச்சொல்லின் தேர்வு"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -490,284 +497,262 @@ msgstr ""
 "வரி 3\n"
 "வரி 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "கேள்வி இங்கு காட்டப்படும்"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "புள்ளிகள்"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "தற்போது வரை உங்கள் தேர்வின் சதவீதம்"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "விடை:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "உங்கள் விடை இங்கு செல்லும்"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "உங்கள் விடையை இங்கு இடவும்"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "விடையை பரிசோதி"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "பின்"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "தேர்வு திரைக்கு செல்"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "தேர்வு திரைக்கு திரும்பி செல்"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "முடிவுகள்"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>உங்கள் முடிவுகள்</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "கேள்வி"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "உங்கள் விடை"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "சரியான விடை"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "முடிவுகளின் அட்டவணை"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "சதவீதம்"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "சரியான விடைகளின் சதவிகிதம்"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr "இது நீங்கள் சரியாக பதில் அளித்த கேள்விகளின் சதவிகிதத்தைக்காட்டும்."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "முயன்ற எண்ணிக்கை:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "முயற்சிக்கப்பட்ட கேள்விகளின் எண்ணிக்கை:"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "இது நீங்கள் விடையளித்த கேள்விகளின் எண்ணிக்கையை காட்டுகிறது."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "இந்த உரையாடலை மூடு"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "இந்த உரையாடலை மூடி கேலத்தினின் பிரதான சாளரத்துக்கு திரும்பவும்."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "சொல்வளத்தை கட்டமை"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "பரிசோதிக்கும் பாணி"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "லத்தீனுக்கு"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "கேள்விகள் உங்கள் மொழியில், விடைகள் ஆங்கிலத்தில்."
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"உங்கள் மொழியில் இருந்து லத்தீனுக்கு சோதிக்கவேண்டியதை தேர்ந்தெடுக்கவும். அதாவது "
-"வார்த்தை உங்கள் மொழியில் காட்டப்படும். பிறகு நீங்கள் 4 லத்தீன் "
-"மொழிப்பெயர்ப்புகளில் இருந்து தேர்ந்தெடுக்கவேண்டும்."
+"உங்கள் மொழியில் இருந்து லத்தீனுக்கு சோதிக்கவேண்டியதை தேர்ந்தெடுக்கவும். அதாவது வார்த்தை "
+"உங்கள் மொழியில் காட்டப்படும். பிறகு நீங்கள் 4 லத்தீன் மொழிப்பெயர்ப்புகளில் இருந்து "
+"தேர்ந்தெடுக்கவேண்டும்."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "லத்தீனில் இருந்து"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "கேள்விகள் லத்தீனில், விடைகள் உங்கள் மொழியில்"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
-"லத்தீன் மொழியில் இருந்து உங்கள் மொழிக்கு சோதிக்கவேண்டியதை தேர்ந்தெடுக்கவும். "
-"அதாவது வார்த்தை லத்தீன் மொழியில் தெரியும். பிறகு நீங்கள் உங்கள் மொழியில் 4 "
-"மொழிப்பெயர்ப்புகளை தேர்ந்தெடுக்கவேண்டும்."
+"லத்தீன் மொழியில் இருந்து உங்கள் மொழிக்கு சோதிக்கவேண்டியதை தேர்ந்தெடுக்கவும். அதாவது வார்த்தை "
+"லத்தீன் மொழியில் தெரியும். பிறகு நீங்கள் உங்கள் மொழியில் 4 மொழிப்பெயர்ப்புகளை "
+"தேர்ந்தெடுக்கவேண்டும்."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "நீங்கள் சோதித்த கோப்பு சொல்லகராதியில் உள்ளது."
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "சொல்லகராதி பகுதிக்காக சோதிக்கப்பட்ட கோப்பை நீங்கள் மாற்றலாம்."
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "கேள்விகளின் எண்ணிக்கை:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "முடிவுக்கு முன்னால் கேட்கப்பட்ட கேள்விகளின் எண்ணிக்கையை அமை"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
-"இங்கே நீங்கள் சோதிக்கவேண்டிய கேள்விகளின் எண்ணிக்கையை அமைக்கலாம். இந்த "
-"எண்ணிக்கையை அடைந்தவுடன், ஒரு முடிவு உரையாடல் பெட்டி தோன்றும்."
+"இங்கே நீங்கள் சோதிக்கவேண்டிய கேள்விகளின் எண்ணிக்கையை அமைக்கலாம். இந்த எண்ணிக்கையை "
+"அடைந்தவுடன், ஒரு முடிவு உரையாடல் பெட்டி தோன்றும்."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "முடிவுக்கு முன்னால் கேட்கப்பட்ட கேள்விகளின் எண்ணிக்கை"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "ஒரு நேரத்தில் கேட்கும் கேள்வியின் எண்ணிக்கை"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "பகுதி"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "வினைச்சொல் பிரிவு"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "வினைச்சொல் வடிவமைத்தலின் தேர்வு"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -776,14 +761,12 @@ msgstr ""
 "பரிசோதிக்க வேண்டிய வினைச்சொல்லின்\n"
 "மாற்றம்"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "வினைச்சொல் காலத்தின் தேர்வு"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -792,14 +775,12 @@ msgstr ""
 "பரிசோதிக்க வேண்டிய வினைச்சொல்லின்\n"
 "காலம்"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "வினைச்சொல் நிலையின் தேர்வு"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -808,124 +789,81 @@ msgstr ""
 "பரிசோதிக்க வேண்டிய வினைச்சொல்லின்\n"
 "நிலை"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "தேவை புதிய வகையாக மாற்று"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "உங்கள் விடையை சரிபார்க்கவும்"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "சொல்வள பகுதி"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "கேள்வி வார்த்தை"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "கேள்வி வார்த்தை இங்கு காட்டப்படும்"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "உங்கள் தற்போதைய மதிப்பெண்"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
-"உங்கள் மதிப்பெண் இந்த திரையில் தெரியும். சரியான விடைகளின் எண்ணிக்கை/விடைகளின் "
-"மொத்த எண்ணிக்கை"
+"உங்கள் மதிப்பெண் இந்த திரையில் தெரியும். சரியான விடைகளின் எண்ணிக்கை/விடைகளின் மொத்த "
+"எண்ணிக்கை"
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "விடை 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "இது சரியான விடை என்று நீங்கள் நினைத்தால் இதை தேர்வு செய்யவும்."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "விடை 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "விடை 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "விடை 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "தேர்வு திரைக்கு திரும்பிச் செல்"
 
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "பயனரால் தேர்ந்தெடுக்கப்பட்ட மொழி"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "ஒரு அமர்வில் எத்தணை கேள்விகள் கேட்கப்பட்டன."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "KLatin கண்டிப்பாக எல்லை இல்லா கேள்விகளை கேட்கும்."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "முன்னிருப்பு சொல்வள கோப்பு."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "கேள்வி கண்டிப்பாக லத்தீனில் இருந்து பயனரின் மொழிக்கு மாற்ற வேண்டுமா."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "கேள்விகளை கண்டிப்பாக ஆங்கிலத்தில் இருந்து லத்தீனில் இருக்க வேண்டுமா"
-
 #, fuzzy
 #~ msgid ""
 #~ "_: Inform the user that nothing has been typed in\n"
diff --git a/tde-i18n-tg/messages/tdeedu/klatin.po b/tde-i18n-tg/messages/tdeedu/klatin.po
index 31083afabc5..b6340aad551 100644
--- a/tde-i18n-tg/messages/tdeedu/klatin.po
+++ b/tde-i18n-tg/messages/tdeedu/klatin.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-09-23 19:25+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr ""
-"НПО \"Имкониятҳои ҷавонон\" ва Khujand Computer Technologies, Inc. USA, Роҷер "
-"Ковакс, Виктор Ибрагимов, Марина Колючева"
+"НПО \"Имкониятҳои ҷавонон\" ва Khujand Computer Technologies, Inc. USA, "
+"Роҷер Ковакс, Виктор Ибрагимов, Марина Колючева"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -274,18 +274,19 @@ msgstr "ояндаи пурра"
 #: klatinverbs.cpp:109
 msgid "Could not load verb-definition file, check KLatin installation."
 msgstr ""
-"Пур кардани файли феъли-муқарраршуда намешавад, барқароркунии KLatin-ро тафтиш "
-"кунед."
+"Пур кардани файли феъли-муқарраршуда намешавад, барқароркунии KLatin-ро "
+"тафтиш кунед."
 
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Ин кадом %1 шахсият %2 %3 %4 %5 of %6?"
 
@@ -295,15 +296,15 @@ msgid ""
 "Could not load vocabulary file; there is a problem with your KLatin "
 "installation."
 msgstr ""
-"Файли луғат пур карда намешавад; бо барқарошавии KLatin шумо хатогие рӯй дод ё "
-"дастёри 18 ба ин забон нест. "
+"Файли луғат пур карда намешавад; бо барқарошавии KLatin шумо хатогие рӯй дод "
+"ё дастёри 18 ба ин забон нест. "
 
 #: main.cpp:23
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - барнома барои ёри додани Latin."
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -333,14 +334,37 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr ""
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "И&нтихоб"
+msgid "The language selected by the user"
+msgstr "Забон аз тарафи истифода баранда интихоб карда шуд"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "Дар як сесия чанд саволҳо пурсида шуд"
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "KLatin бояд саволҳои ғайримаҳдуд диҳад"
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "Файли луғати норасоӣ"
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "Саволҳо бо Лотинӣ ба забони истифодабаранда бояд бошад"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "Саволҳо бояд бо забони истифодабаранда бо Лотинӣ бошад"
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -349,80 +373,67 @@ msgstr ""
 "Марҳамат ба KLatin!\n"
 "Шӯъбаи тафтиши дубораро интихоб кунед"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Шӯбаи Тафтиши дубора"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, fuzzy, no-c-format
 msgid "&Vocabulary"
 msgstr "Луғат"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Тест дар Луғат"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Зиёд кардани алтернативаи тести луғат"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, fuzzy, no-c-format
 msgid "&Grammar"
 msgstr "Грамматика"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Тест дар исми грамматика"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Тест дар исмҳои оддӣ ва анҷомҳо"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, fuzzy, no-c-format
 msgid "Ver&bs"
 msgstr "Феълҳо"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Санҷиш дар шаклҳои феъл"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Тест дар феълҳои оддӣ ва анҷомҳо"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, fuzzy, no-c-format
 msgid "&Revision notes"
 msgstr "Қайдҳои тафтиши дубора"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Пур кардани қайдҳои тафтиши дубора"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -431,50 +442,47 @@ msgstr ""
 "Тафтиши қайдҳои дубораи KLatin бо\n"
 "феълҳо ва ҷадвали феълҳо"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, fuzzy, no-c-format
 msgid "S&tart"
 msgstr "&Сар кардан!"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Интихобшудаи майдони тафтиши дубораро сар кунед"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Шӯбаи интихобшудаатонро сар кунед"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Рафтан"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Рафтан"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "KLatin кор намекунад"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Шӯбаи грамматика"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Алтернативаи исмҳо барои тест"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -487,250 +495,228 @@ msgstr ""
 "Хати 3\n"
 "Хати 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Савол дар ин ҷо пайдо мешавад"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Ҳисоб"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Фоизи тести шумо хеле дур аст"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Ҷавоб:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Ҷавоби шумо ба ин ҷо меояд"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Ҷавобатонро дар ин ҷо ворид кунед"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Саволро тавтиш кунед"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Ақиб"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Ба экрани интихобшуда баргардед"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Баргаштан ба экрани интихобшуда"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Натиҷатҳо"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Натиҷатҳои Шумо</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Савол"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Ҷавоби Шумо"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Ҷавоби дуруст"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Ҷадвали натиҷатҳо"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Фоиз:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, fuzzy, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Ҷавоби дуруст %1 буд."
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, fuzzy, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr "Рақамҳои саволҳое, ки мехоҳед тест карда шаванд, гузоред"
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Рақам кӯшиш карда шуд:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, fuzzy, no-c-format
 msgid "Number of questions attempted"
 msgstr "Миқдори саволҳо:"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, fuzzy, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Рақамҳои саволҳое, ки мехоҳед тест карда шаванд, гузоред"
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Ин диалогро маҳкам кунед"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Танзимоти луғат"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Намуди тестӣ"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Ба Latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Саволҳо дар забони шумо ва ҷавобҳо дар Latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Интихоби санҷиш аз забони Шумо ба Лотинӣ, ин маънои онро дорад, ки калимаи Шумо "
-"бо забони Шумо пайдо мешавад ва Шумо бояд интихоб намоед аз Лотини 4 "
+"Интихоби санҷиш аз забони Шумо ба Лотинӣ, ин маънои онро дорад, ки калимаи "
+"Шумо бо забони Шумо пайдо мешавад ва Шумо бояд интихоб намоед аз Лотини 4 "
 "тарҷумаҳоро."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Аз Latin"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Cаволҳо дар Latin ва ҷавобҳо дар забони шумо"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
-"Интихоби санҷиш аз Лотинӣ ба забони Шумо, ин маънои онро дорад, ки калимаи Шумо "
-"бо Лотинӣ пайдо мешавад ва Шумо бояд интихоб намоед аз тарҷумаҳои 4-ум ба "
-"забони шахсиятон"
+"Интихоби санҷиш аз Лотинӣ ба забони Шумо, ин маънои онро дорад, ки калимаи "
+"Шумо бо Лотинӣ пайдо мешавад ва Шумо бояд интихоб намоед аз тарҷумаҳои 4-ум "
+"ба забони шахсиятон"
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Файле, ки шумо тест кардед дар луғат аст"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Шумо метавонед файле, ки дар шӯбаи луғат тест кардед, дигар кунед "
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Миқдори саволҳо:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Рақамҳои саволҳое, ки мехоҳед тест карда шаванд, гузоред"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
@@ -739,32 +725,32 @@ msgstr ""
 "Дар ин ҷо шумо рақамҳои саволҳоеро, мехоҳед, ки тест карда шаванд, гузоред. "
 "Вақте, ки рақам мерасад, хулосаи диалог пайдо карда мешавад."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Рақами саволҳое, ки пеш аз тамом шудан, пурсида мешаванд"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Пурсидани миқдори саволҳо дар вақташ"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "И&нтихоб"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Феълҳои шуъба"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Тасрифкунии феълро интихоб намоед"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -773,14 +759,12 @@ msgstr ""
 "Тасрифкунии феъл \n"
 "тест карда шавад "
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Феъли интихоб карда шударо баён намоед"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -789,14 +773,12 @@ msgstr ""
 "Баёни феъл \n"
 "тест карда шавад "
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Сиғаи феълро интихоб намоед"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -805,118 +787,75 @@ msgstr ""
 "Сиғаи феъл \n"
 "санҷиш карада шавад"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Тестро ба намуди нав дароред"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Саволатонро тафтиш намоед"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Шуъбаи луғат"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Савол"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Саволҳо дар инҷо пайдо мешавад"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Ҷавоб 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Инҷоро интихоб намоед агар ба фикри Шумо ин ҷавоб дуруст бошад"
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Ҷавоб 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Ҷавоб 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Ҷавоб 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Ба экрани интихоб карда боз гардед"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Забон аз тарафи истифода баранда интихоб карда шуд"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "Дар як сесия чанд саволҳо пурсида шуд"
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "KLatin бояд саволҳои ғайримаҳдуд диҳад"
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "Файли луғати норасоӣ"
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "Саволҳо бо Лотинӣ ба забони истифодабаранда бояд бошад"
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "Саволҳо бояд бо забони истифодабаранда бо Лотинӣ бошад"
diff --git a/tde-i18n-tr/messages/tdeedu/klatin.po b/tde-i18n-tr/messages/tdeedu/klatin.po
index e26c2d1f6ec..10ff271564b 100644
--- a/tde-i18n-tr/messages/tdeedu/klatin.po
+++ b/tde-i18n-tr/messages/tdeedu/klatin.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-07-16 01:10+0300\n"
 "Last-Translator: Engin Çağatay <engincagatay@yahoo.com>\n"
 "Language-Team: Türkçe <yerelleştirme@kde.org.tr>\n"
@@ -15,13 +15,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Engin Çağatay"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -273,12 +273,13 @@ msgstr "Fiil tanımlama dosyası yüklenemedi, KLatin kurulumunuzu kontrol edin.
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr ""
 
@@ -292,8 +293,8 @@ msgstr "Sözlük dosyası yüklenemedi, KLatin kurulumunuzla ilgili bir hata var
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - Latince çalışmalarınız için bir uygulama"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -323,14 +324,37 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr ""
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "&Bölüm"
+msgid "The language selected by the user"
+msgstr "Kullanıcının seçtiği dil"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "bir oturumda kaç sorunun sorulacağı."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "KLatin'in sınırsız soru sorup sormayacağı."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "öntanımlı sözlük dosyası."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "soruların Latince'den kullanıcının diline olup olmayacağı."
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "soruların kullanıcının dilinden Latince'ye  olup olmayacağı."
+
+#: klatinchoose.ui:46
 #, fuzzy, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -339,130 +363,114 @@ msgstr ""
 "KLatin'e hoşgeldiniz\n"
 "Lütfen gözden geçirmenin bir bölümünü seçin"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Gözden Geçirme Bölümleri"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Sözlük"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Sözcük Testi"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Çoktan seçmeli sözcük testi"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Dilbilgisi"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "F&iiller"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "Gözden Geçi&rme notları"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Gözden geçirme notlarını yükle"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, fuzzy, no-c-format
 msgid "S&tart"
 msgstr "&Başla!"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Seçilen bölüme başla"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Seçtiğiniz bölüme başlayın"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Çıkar"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Çıkar"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "KLatin'den çıkar"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Dilbilgisi Bölümü"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -475,422 +483,353 @@ msgstr ""
 "Satır 3\n"
 "Satır 4 "
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Soru burada gözükecek"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Puan"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Şimdiye kadarki test yüzdeniz"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Cevap:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Cevabınız buraya yazılır"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Cevabınızı buraya yazın"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Cevabı kontrol et"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Geri"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Bölüm ekranına geri dön"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Bölüm ekranına geri dön"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Sonuçlar"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Sonuçlarınız</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Soru"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Cevabınız"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Doğru Cevap"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Sonuç tablosu"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Yüzde:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Doğru yanıt yüzdesi"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Deneme sayısı:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Cevapladığınız soru sayısını gösterir."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Bu iletişim kutusunu kapat"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Sözlüğü Yapılandır"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Test Tarzı"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Latince'ye"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Sorular sizin dilinizde ve cevaplar Latince olur"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Latince'den"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Sorular Latince ve cevaplar sizin dilinizde olur"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Sözlükte üzerinde test edildiğiniz dosya"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Sözlükte üzerinde test edildiğiniz dosyayı değiştirebilirsiniz"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Soru sayısı:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Testteki soru sayısını ayarlayın"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "&Bölüm"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Fiil Bölümü"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr ""
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Yeni test türü seçin"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Cevabınızı kontrol edin"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Sözlük Bölümü"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Soru Kelimesi"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Soru kelimesi burada görüntülenecek"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Mevcut puanınız"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Cevap 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Doğru cevabın bu olduğunu düşünüyorsanız bunu işaretleyin."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Cevap 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Cevap 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Cevap 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Seçim ekranına dön"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Kullanıcının seçtiği dil"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "bir oturumda kaç sorunun sorulacağı."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "KLatin'in sınırsız soru sorup sormayacağı."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "öntanımlı sözlük dosyası."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "soruların Latince'den kullanıcının diline olup olmayacağı."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "soruların kullanıcının dilinden Latince'ye  olup olmayacağı."
diff --git a/tde-i18n-uk/messages/tdeedu/klatin.po b/tde-i18n-uk/messages/tdeedu/klatin.po
index 4ad95a093a2..ef3dbab7784 100644
--- a/tde-i18n-uk/messages/tdeedu/klatin.po
+++ b/tde-i18n-uk/messages/tdeedu/klatin.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-10-09 23:46-0700\n"
 "Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -15,19 +15,19 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.1\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"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Іван Петрущак"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -278,12 +278,13 @@ msgstr "Не вдалось завантажити файл дієслів. Пе
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "Яка форма дієслова %6 буде в часі %3 %4 %5 і %1 особі %2?"
 
@@ -297,8 +298,8 @@ msgstr "Не вдалось завантажити файл словника. П
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - програма для допомоги при повторенні латининської"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -327,14 +328,37 @@ msgstr "Зневадження, вдосконалення коду, італі�
 msgid "Polish Vocabulary Data Translation"
 msgstr "Польський переклад словника"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "Р&озділ"
+msgid "The language selected by the user"
+msgstr "Вибрана користувачем мова"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "скільки питань задаються в одній вправі."
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "чи кількість питань необмежена."
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "типовий файл словника."
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "чи питання мають бути на латинській."
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "чи відповіді мають бути на латинській."
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -343,80 +367,67 @@ msgstr ""
 "Ласкаво просимо до KLatin!\n"
 "Будь ласка, виберіть розділ"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "Розділи повторення"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "&Словник"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "Тест по знанню слів"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "Тест з варіантами по знанню слів"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "&Граматика"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "Тест по іменниках"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "Тест по основних іменниках та закінченнях"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "Ді&єслова"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "Тест по формах дієслова"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "Тест по основних дієсловах та закінченнях"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "&Примітки"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "Завантажити примітки"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
@@ -425,50 +436,47 @@ msgstr ""
 "Примітки KLatin з\n"
 "таблицями дієслів та іменників"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "По&чати"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "Приступити до вибраної ділянки повторення"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "Приступити до вибраного розділу"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "Вихід з програми"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "Вихід з програми"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "Вийти з програми KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "Розділ граматики"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "Вибір іменників для перевірки"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -481,282 +489,262 @@ msgstr ""
 "Рядок 3\n"
 "Рядок 4"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "Тут з'явиться питання"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "Рахунок"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "Поточний результат вашого тесту"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "Відповідь:"
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "Сюди йде ваша відповідь"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "Введіть вашу відповідь сюди"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "Перевірити відповідь"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "&Назад"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "Назад до вікна вибору"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "Повернутись до вікна вибору"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "Результати"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>Ваші результати</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "Питання"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "Ваша відповідь"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "Правильна відповідь"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "Таблиця результатів"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "Відсоток:"
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "Відсоток правильних відповідей"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr "Показує відсоток правильних відповідей."
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "Кількість спроб:"
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "Кількість питань з відповідями"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "Показує кількість питань, на які ви відповіли."
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "Закрити це вікно"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "Закрити це вікно і повернутись до головного вікна KLatin."
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "Налаштувати словник"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "Тип перевірки"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "Перекласти на латинську"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "Питання на вашій мові і відповіді на латинській"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
-"Виберіть, щоб перевірка була з вашої мови на латинську: слово буде показане на "
-"вашій мові, а ви маєте вибрати одну відповідь із 4 перекладів на латинську."
+"Виберіть, щоб перевірка була з вашої мови на латинську: слово буде показане "
+"на вашій мові, а ви маєте вибрати одну відповідь із 4 перекладів на "
+"латинську."
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "Перекласти з латинської"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "Питання на латинській, а відповіді на вашій мові"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
+msgstr ""
+"Виберіть, щоб перевірка була з латинської мови на вашу: слово буде показане "
+"на латинській мові, а ви маєте вибрати одну відповідь із 4 перекладів на "
+"вашу."
+
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
 msgstr ""
-"Виберіть, щоб перевірка була з латинської мови на вашу: слово буде показане на "
-"латинській мові, а ви маєте вибрати одну відповідь із 4 перекладів на вашу."
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "Файл словника, по якому ведеться перевірка"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "Можна змінити файл словника в налаштуванні програми"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "Кількість питань:"
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "Вказати кількість питань у тесті"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
-"Тут можна вказати кількість питань для тестів. Коли досягається ця кількість, "
-"то з'являється вікно із результатами."
+"Тут можна вказати кількість питань для тестів. Коли досягається ця "
+"кількість, то з'являється вікно із результатами."
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "Кількість питань до закінчення"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "Скільки питань задавати на раз"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "Р&озділ"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "Розділ дієслів"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "Вибір дієвідмін дієслів"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
@@ -765,14 +753,12 @@ msgstr ""
 "Перевірка знання\n"
 "дієвідміни дієслів"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "Вибір стану дієслів"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
@@ -781,14 +767,12 @@ msgstr ""
 "Перевірка знання\n"
 "стану дієслів"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "Вибір способу дієслів"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
@@ -797,120 +781,77 @@ msgstr ""
 "Перевірка знання\n"
 "способу дієслів"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "Змінити тип тесту"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "Перевірте вашу відповідь"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "Розділ словника"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "Питання"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "Тут з'явиться питання"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "Ваш поточний рахунок"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
-"Тут показується ваш поточний рахунок. Кількість правильних відповідей поділена "
-"на загальну кількість відповідей."
+"Тут показується ваш поточний рахунок. Кількість правильних відповідей "
+"поділена на загальну кількість відповідей."
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "Відповідь 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "Клацніть сюди, якщо ви думаєте, що це правильна відповідь."
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "Відповідь 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "Відповідь 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "Відповідь 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "Повернутись до вікна вибору"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "Вибрана користувачем мова"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "скільки питань задаються в одній вправі."
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "чи кількість питань необмежена."
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "типовий файл словника."
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "чи питання мають бути на латинській."
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "чи відповіді мають бути на латинській."
diff --git a/tde-i18n-zh_CN/messages/tdeedu/klatin.po b/tde-i18n-zh_CN/messages/tdeedu/klatin.po
index 388b57dedf1..317e3960222 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/klatin.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/klatin.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2005-12-25 21:13+0800\n"
 "Last-Translator: Wu XiaoGuang <woohsiaokuang@yahoo.com.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -16,13 +16,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "Wu XiaoGuang"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -273,12 +273,13 @@ msgstr "无法装入动词定义文件，请检查 KLatin 安装。"
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "%6 的%1人称%2%4语气%5%3是什么？"
 
@@ -292,8 +293,8 @@ msgstr "无法装入词汇表文件；您的 KLatin 安装可能有问题。"
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - 帮助复习拉丁文的程序"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -322,14 +323,37 @@ msgstr ""
 msgid "Polish Vocabulary Data Translation"
 msgstr "波兰语词汇表数据翻译"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "章节(&E)"
+msgid "The language selected by the user"
+msgstr "用户所选择的语言"
+
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr ""
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr ""
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "默认词汇表文件。"
+
+#: klatin.kcfg:51
+#, fuzzy, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "这是您答错的问题。"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:55
+#, fuzzy, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "这是您答错的问题。"
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -338,130 +362,114 @@ msgstr ""
 "欢迎使用 KLatin\n"
 "请选择要复习的章节"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "复习章节"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "词汇表(&V)"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "词汇表测试"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "词汇表测试多选题"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "语法(&G)"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "测试名词语法"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "动词(&B)"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "动词形式测试"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "复习指南(&R)"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "装入复习指南"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "开始(&T)"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr ""
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "退出"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "退出"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "退出 KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "语法章节"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "选择要测试的名词"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -470,238 +478,217 @@ msgid ""
 "Line 4"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "问题将显示在此处"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "分数"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr ""
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "答案："
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, fuzzy, no-c-format
 msgid "Your answer goes here"
 msgstr "您的答案："
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "在此输入您的答案"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "检查答案"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "返回(&B)"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "返回到选择屏幕"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "返回到选择屏幕"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "结果"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>您的结果</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "问题"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "您的答案"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "正确答案"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "结果表"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "百分比："
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "正确答案的百分比"
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr ""
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "尝试次数："
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, fuzzy, no-c-format
 msgid "Number of questions attempted"
 msgstr "问题"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, fuzzy, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "回答问题的百分比"
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "关闭该对话框"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "关闭此对话框并返回到 KLatin 的主窗口。"
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "配置词汇表"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "测试样式"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "到拉丁文"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "从拉丁文"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "问题数："
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, fuzzy, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr ""
@@ -711,186 +698,138 @@ msgstr ""
 "然后选择您想要\n"
 "的测验类型。"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr ""
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "结束前提问的问题数"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "一次提问的问题数"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "章节(&E)"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "动词章节"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "动词人称选择"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr "要测试的动词人称"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "动词语态选择"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr "要测试的动词语态"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "动词语气选择"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr "要测试的动词语气"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "将测试更改为新类型"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "检查您的答案"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "词汇表章节"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "问题"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "您目前的分数"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr ""
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "答案 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "如果您认为此答案正确，请单击此处 。"
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "答案 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "答案 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "答案 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "返回到选择屏幕"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "用户所选择的语言"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr ""
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "默认词汇表文件。"
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, fuzzy, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "这是您答错的问题。"
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, fuzzy, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "这是您答错的问题。"
diff --git a/tde-i18n-zh_TW/messages/tdeedu/klatin.po b/tde-i18n-zh_TW/messages/tdeedu/klatin.po
index bd0e780f80b..5a11011f7c3 100644
--- a/tde-i18n-zh_TW/messages/tdeedu/klatin.po
+++ b/tde-i18n-zh_TW/messages/tdeedu/klatin.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-26 19:28+0100\n"
 "PO-Revision-Date: 2006-06-20 16:19+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -18,13 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "陳英傑,Frank Weng (a.k.a. Franklin)"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -275,12 +275,13 @@ msgstr "無法載入動詞定義檔，請檢查 KLatin 的安裝。"
 #: klatinverbs.cpp:205
 msgid ""
 "_: Note: ARGUMENT %1 is an ordinal number (1st, 2nd, 3rd). ARGUMENT %2 "
-"indicates whether the person is singular or plural. ARGUMENT %3 is the tense of "
-"the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the verb "
-"(Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb (Active, "
-"Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in Latin and "
-"should not be translated. The output string in English is something like: What "
-"is the first person singular present indicative active of amo?\n"
+"indicates whether the person is singular or plural. ARGUMENT %3 is the tense "
+"of the verb (Present, Imperfect, Perfect). ARGUMENT %4 is the mood of the "
+"verb (Indicative, Subjunctive). ARGUMENT %5 is the voice of the verb "
+"(Active, Passive). ARGUMENT %6 is the verb name (amo, moneo etc). This is in "
+"Latin and should not be translated. The output string in English is "
+"something like: What is the first person singular present indicative active "
+"of amo?\n"
 "What is the %1 person %2 %3 %4 %5 of %6?"
 msgstr "%6 的%1人稱%2%3%4%5是？"
 
@@ -294,8 +295,8 @@ msgstr "無法載入字彙檔；您的 KLatin 安裝有問題。"
 msgid "KLatin - a program to help revise Latin"
 msgstr "KLatin - 協助復習拉丁文的程式"
 
-#. i18n: file klatingrammarwidget.ui line 22
-#: main.cpp:35 rc.cpp:68 rc.cpp:230 rc.cpp:308
+#: klatingrammarwidget.ui:22 klatinverbswidget.ui:16 klatinvocabwidget.ui:16
+#: main.cpp:35
 #, no-c-format
 msgid "KLatin"
 msgstr "KLatin"
@@ -324,14 +325,37 @@ msgstr "程式修正與改進，義大利文字彙資料翻譯"
 msgid "Polish Vocabulary Data Translation"
 msgstr "波蘭字彙資料翻譯"
 
-#. i18n: file klatinui.rc line 5
-#: rc.cpp:3
+#: klatin.kcfg:9
 #, no-c-format
-msgid "S&ection"
-msgstr "章節(&E)"
+msgid "The language selected by the user"
+msgstr "使用者選擇的語言"
 
-#. i18n: file klatinchoose.ui line 47
-#: rc.cpp:6
+#: klatin.kcfg:30
+#, no-c-format
+msgid "how many questions are asked in one session."
+msgstr "在一次測驗中要問多少問題"
+
+#: klatin.kcfg:34
+#, no-c-format
+msgid "whether KLatin should ask unlimited questions."
+msgstr "KLatin 是否可以不限問題數。"
+
+#: klatin.kcfg:38
+#, no-c-format
+msgid "the default vocabulary file."
+msgstr "預設字彙檔。"
+
+#: klatin.kcfg:51
+#, no-c-format
+msgid "whether the questions should be Latin to the user's language."
+msgstr "是否要用拉丁文提問。"
+
+#: klatin.kcfg:55
+#, no-c-format
+msgid "whether the questions should be the user's language to Latin."
+msgstr "是否要用拉丁文回答。"
+
+#: klatinchoose.ui:46
 #, no-c-format
 msgid ""
 "Welcome to KLatin\n"
@@ -340,130 +364,114 @@ msgstr ""
 "歡迎來到 KLatin。\n"
 "請選擇要復習的章節"
 
-#. i18n: file klatinchoose.ui line 74
-#: rc.cpp:10
+#: klatinchoose.ui:74
 #, no-c-format
 msgid "Revision Sections"
 msgstr "要復習的章節"
 
-#. i18n: file klatinchoose.ui line 102
-#: rc.cpp:13
+#: klatinchoose.ui:102
 #, no-c-format
 msgid "&Vocabulary"
 msgstr "字彙(&V)"
 
-#. i18n: file klatinchoose.ui line 108
-#: rc.cpp:16
+#: klatinchoose.ui:108
 #, no-c-format
 msgid "Test on Vocabulary"
 msgstr "字彙測驗"
 
-#. i18n: file klatinchoose.ui line 111
-#: rc.cpp:19
+#: klatinchoose.ui:111
 #, no-c-format
 msgid "Multiple choice vocabulary test"
 msgstr "多重選擇字彙測驗"
 
-#. i18n: file klatinchoose.ui line 119
-#: rc.cpp:22
+#: klatinchoose.ui:119
 #, no-c-format
 msgid "&Grammar"
 msgstr "文法(&G)"
 
-#. i18n: file klatinchoose.ui line 125
-#: rc.cpp:25
+#: klatinchoose.ui:125
 #, no-c-format
 msgid "Test on noun grammar"
 msgstr "名詞字彙測驗"
 
-#. i18n: file klatinchoose.ui line 128
-#: rc.cpp:28
+#: klatinchoose.ui:128
 #, no-c-format
 msgid "Test on common nouns and endings"
 msgstr "通用名詞與字尾測驗"
 
-#. i18n: file klatinchoose.ui line 136
-#: rc.cpp:31
+#: klatinchoose.ui:136
 #, no-c-format
 msgid "Ver&bs"
 msgstr "動詞(&B)"
 
-#. i18n: file klatinchoose.ui line 139
-#: rc.cpp:34
+#: klatinchoose.ui:139
 #, no-c-format
 msgid "Test on verb forms"
 msgstr "動詞格式測驗"
 
-#. i18n: file klatinchoose.ui line 142
-#: rc.cpp:37
+#: klatinchoose.ui:142
 #, no-c-format
 msgid "Test on common verbs and endings"
 msgstr "通用動詞與字尾測驗"
 
-#. i18n: file klatinchoose.ui line 150
-#: rc.cpp:40
+#: klatinchoose.ui:150
 #, no-c-format
 msgid "&Revision notes"
 msgstr "復習筆記(&R)"
 
-#. i18n: file klatinchoose.ui line 153
-#: rc.cpp:43
+#: klatinchoose.ui:153
 #, no-c-format
 msgid "Load revision notes"
 msgstr "載入復習筆記"
 
-#. i18n: file klatinchoose.ui line 157
-#: rc.cpp:46
+#: klatinchoose.ui:156
 #, no-c-format
 msgid ""
 "The KLatin revision notes with\n"
 "verb and noun tables"
 msgstr "KLatin 動詞與名詞表格的復習筆記"
 
-#. i18n: file klatinchoose.ui line 209
-#: rc.cpp:50
+#: klatinchoose.ui:209
 #, no-c-format
 msgid "S&tart"
 msgstr "開始(&T)"
 
-#. i18n: file klatinchoose.ui line 212
-#: rc.cpp:53
+#: klatinchoose.ui:212
 #, no-c-format
 msgid "Start chosen area of revision"
 msgstr "開始復習所選的區域"
 
-#. i18n: file klatinchoose.ui line 215
-#: rc.cpp:56
+#: klatinchoose.ui:215
 #, no-c-format
 msgid "Start the section you have chosen"
 msgstr "開始您選擇的章節"
 
-#. i18n: file klatinchoose.ui line 226
-#: rc.cpp:62
+#: klatinchoose.ui:223
+#, fuzzy, no-c-format
+msgid "&Quit"
+msgstr "離開"
+
+#: klatinchoose.ui:226
 #, no-c-format
 msgid "Quits"
 msgstr "離開"
 
-#. i18n: file klatinchoose.ui line 229
-#: rc.cpp:65
+#: klatinchoose.ui:229
 #, no-c-format
 msgid "Quit KLatin"
 msgstr "離開 KLatin"
 
-#. i18n: file klatingrammarwidget.ui line 44
-#: rc.cpp:71
+#: klatingrammarwidget.ui:44
 #, no-c-format
 msgid "Grammar Section"
 msgstr "文法章節"
 
-#. i18n: file klatingrammarwidget.ui line 65
-#: rc.cpp:74
+#: klatingrammarwidget.ui:65
 #, no-c-format
 msgid "Choice of nouns for testing"
 msgstr "選擇要測試的名詞"
 
-#. i18n: file klatingrammarwidget.ui line 111
-#: rc.cpp:77 rc.cpp:263
+#: klatingrammarwidget.ui:108 klatinverbswidget.ui:152
 #, no-c-format
 msgid ""
 "Question Word\n"
@@ -476,422 +484,353 @@ msgstr ""
 "第三行\n"
 "第四行"
 
-#. i18n: file klatingrammarwidget.ui line 119
-#: rc.cpp:83 rc.cpp:269
+#: klatingrammarwidget.ui:119 klatinverbswidget.ui:163
 #, no-c-format
 msgid "The question will appear here"
 msgstr "問題會出現在這裡"
 
-#. i18n: file klatingrammarwidget.ui line 188
-#: rc.cpp:86 rc.cpp:272 rc.cpp:326
+#: klatingrammarwidget.ui:188 klatinverbswidget.ui:232 klatinvocabwidget.ui:153
 #, no-c-format
 msgid "Score"
 msgstr "分數"
 
-#. i18n: file klatingrammarwidget.ui line 229
-#: rc.cpp:89 rc.cpp:95 rc.cpp:275 rc.cpp:281 rc.cpp:329 rc.cpp:335
+#: klatingrammarwidget.ui:229 klatingrammarwidget.ui:255
+#: klatinverbswidget.ui:273 klatinverbswidget.ui:299 klatinvocabwidget.ui:194
+#: klatinvocabwidget.ui:220
 #, no-c-format
 msgid "0"
 msgstr "0"
 
-#. i18n: file klatingrammarwidget.ui line 242
-#: rc.cpp:92 rc.cpp:278 rc.cpp:332
+#: klatingrammarwidget.ui:242 klatinverbswidget.ui:286 klatinvocabwidget.ui:207
 #, no-c-format
 msgid "/"
 msgstr "/"
 
-#. i18n: file klatingrammarwidget.ui line 270
-#: rc.cpp:98 rc.cpp:284 rc.cpp:338
+#: klatingrammarwidget.ui:270 klatinverbswidget.ui:314 klatinvocabwidget.ui:235
 #, no-c-format
 msgid "Your test percentage so far"
 msgstr "目前為止您的測驗百分比"
 
-#. i18n: file klatingrammarwidget.ui line 294
-#: rc.cpp:101 rc.cpp:287
+#: klatingrammarwidget.ui:294 klatinverbswidget.ui:338
 #, no-c-format
 msgid "Answer:"
 msgstr "答案："
 
-#. i18n: file klatingrammarwidget.ui line 302
-#: rc.cpp:104
+#: klatingrammarwidget.ui:302
 #, no-c-format
 msgid "Your answer goes here"
 msgstr "您的答案放在這裡"
 
-#. i18n: file klatingrammarwidget.ui line 305
-#: rc.cpp:107 rc.cpp:290
+#: klatingrammarwidget.ui:305 klatinverbswidget.ui:346
 #, no-c-format
 msgid "Enter your answer here"
 msgstr "在此輸入您的答案"
 
-#. i18n: file klatingrammarwidget.ui line 322
-#: rc.cpp:113
+#: klatingrammarwidget.ui:313 klatinverbswidget.ui:354
+#, no-c-format
+msgid "&OK"
+msgstr ""
+
+#: klatingrammarwidget.ui:322
 #, no-c-format
 msgid "Check answer"
 msgstr "檢查答案"
 
-#. i18n: file klatingrammarwidget.ui line 357
-#: rc.cpp:116 rc.cpp:299 rc.cpp:365
+#: klatingrammarwidget.ui:357 klatinverbswidget.ui:398 klatinvocabwidget.ui:364
 #, no-c-format
 msgid "&Back"
 msgstr "往回(&B)"
 
-#. i18n: file klatingrammarwidget.ui line 360
-#: rc.cpp:119 rc.cpp:302 rc.cpp:368
+#: klatingrammarwidget.ui:360 klatinverbswidget.ui:401 klatinvocabwidget.ui:367
 #, no-c-format
 msgid "Go back to the selection screen"
 msgstr "回到選擇螢幕"
 
-#. i18n: file klatingrammarwidget.ui line 363
-#: rc.cpp:122 rc.cpp:305
+#: klatingrammarwidget.ui:363 klatinverbswidget.ui:404
 #, no-c-format
 msgid "Return to selection screen"
 msgstr "回到選擇螢幕"
 
-#. i18n: file klatinresultsdialog.ui line 16
-#: rc.cpp:125
+#: klatinresultsdialog.ui:16
 #, no-c-format
 msgid "Results"
 msgstr "結果"
 
-#. i18n: file klatinresultsdialog.ui line 32
-#: rc.cpp:128
+#: klatinresultsdialog.ui:32
 #, no-c-format
 msgid "<b>Your Results</b>"
 msgstr "<b>您的結果為</b>"
 
-#. i18n: file klatinresultsdialog.ui line 41
-#: rc.cpp:131
+#: klatinresultsdialog.ui:41
 #, no-c-format
 msgid "Question"
 msgstr "問題"
 
-#. i18n: file klatinresultsdialog.ui line 52
-#: rc.cpp:134
+#: klatinresultsdialog.ui:52
 #, no-c-format
 msgid "Your Answer"
 msgstr "您的答案"
 
-#. i18n: file klatinresultsdialog.ui line 63
-#: rc.cpp:137
+#: klatinresultsdialog.ui:63
 #, no-c-format
 msgid "Correct Answer"
 msgstr "正確答案"
 
-#. i18n: file klatinresultsdialog.ui line 90
-#: rc.cpp:140
+#: klatinresultsdialog.ui:90
 #, no-c-format
 msgid "Table of results"
 msgstr "結果表格"
 
-#. i18n: file klatinresultsdialog.ui line 106
-#: rc.cpp:143
+#: klatinresultsdialog.ui:106
 #, no-c-format
 msgid "Percentage:"
 msgstr "百分比："
 
-#. i18n: file klatinresultsdialog.ui line 109
-#: rc.cpp:146 rc.cpp:152
+#: klatinresultsdialog.ui:109 klatinresultsdialog.ui:126
 #, no-c-format
 msgid "Percentage of correct answers"
 msgstr "答對百分比："
 
-#. i18n: file klatinresultsdialog.ui line 112
-#: rc.cpp:149 rc.cpp:155
+#: klatinresultsdialog.ui:112 klatinresultsdialog.ui:129
 #, no-c-format
 msgid ""
-"This shows the percentage of the questions you answered correctly out of those "
-"attempted."
+"This shows the percentage of the questions you answered correctly out of "
+"those attempted."
 msgstr "這裡顯示您正確回答題目的百分比。"
 
-#. i18n: file klatinresultsdialog.ui line 137
-#: rc.cpp:158
+#: klatinresultsdialog.ui:137
 #, no-c-format
 msgid "Number attempted:"
 msgstr "題數："
 
-#. i18n: file klatinresultsdialog.ui line 140
-#: rc.cpp:161 rc.cpp:167
+#: klatinresultsdialog.ui:140 klatinresultsdialog.ui:157
 #, no-c-format
 msgid "Number of questions attempted"
 msgstr "答題的題數"
 
-#. i18n: file klatinresultsdialog.ui line 143
-#: rc.cpp:164 rc.cpp:170
+#: klatinresultsdialog.ui:143 klatinresultsdialog.ui:160
 #, no-c-format
 msgid "This shows the number of questions you answered."
 msgstr "顯示您回答的問題題數"
 
-#. i18n: file klatinresultsdialog.ui line 201
-#: rc.cpp:176
+#: klatinresultsdialog.ui:195
+#, no-c-format
+msgid "&Close"
+msgstr ""
+
+#: klatinresultsdialog.ui:201
 #, no-c-format
 msgid "Close this dialog"
 msgstr "關閉對話框"
 
-#. i18n: file klatinresultsdialog.ui line 204
-#: rc.cpp:179
+#: klatinresultsdialog.ui:204
 #, no-c-format
 msgid "Close this dialog and return to KLatin's main window."
 msgstr "關閉此對話框並回到 KLatin 主視窗。"
 
-#. i18n: file klatinsettings_vocabpage.ui line 16
-#: rc.cpp:182
+#: klatinsettings_vocabpage.ui:16
 #, no-c-format
 msgid "Configure Vocabulary"
 msgstr "設定字彙"
 
-#. i18n: file klatinsettings_vocabpage.ui line 27
-#: rc.cpp:185
+#: klatinsettings_vocabpage.ui:27
 #, no-c-format
 msgid "Testing Style"
 msgstr "測驗風格"
 
-#. i18n: file klatinsettings_vocabpage.ui line 54
-#: rc.cpp:188
+#: klatinsettings_vocabpage.ui:54
 #, no-c-format
 msgid "To Latin"
 msgstr "到拉丁文"
 
-#. i18n: file klatinsettings_vocabpage.ui line 60
-#: rc.cpp:191
+#: klatinsettings_vocabpage.ui:60
 #, no-c-format
 msgid "Question in your language and answers in Latin"
 msgstr "以您的語言顯示問題，並以拉丁文回答"
 
-#. i18n: file klatinsettings_vocabpage.ui line 63
-#: rc.cpp:194
+#: klatinsettings_vocabpage.ui:63
 #, no-c-format
 msgid ""
-"Choose to be tested from your language to Latin, which means the word will be "
-"displayed in your language and you will have to choose from 4 Latin "
+"Choose to be tested from your language to Latin, which means the word will "
+"be displayed in your language and you will have to choose from 4 Latin "
 "translations."
 msgstr "選擇用您的語言來顯示問題，而您要從四個拉丁翻譯中選擇答案。"
 
-#. i18n: file klatinsettings_vocabpage.ui line 71
-#: rc.cpp:197
+#: klatinsettings_vocabpage.ui:71
 #, no-c-format
 msgid "From Latin"
 msgstr "從拉丁文"
 
-#. i18n: file klatinsettings_vocabpage.ui line 74
-#: rc.cpp:200
+#: klatinsettings_vocabpage.ui:74
 #, no-c-format
 msgid "Question in Latin and answers in your language"
 msgstr "以拉丁文顯示問題，並以您的語言回答"
 
-#. i18n: file klatinsettings_vocabpage.ui line 77
-#: rc.cpp:203
+#: klatinsettings_vocabpage.ui:77
 #, no-c-format
 msgid ""
-"Choose  to be tested from Latin to your language, which means the word will be "
-"displayed in Latin and you will have to choose from 4 translations in your "
-"language."
+"Choose  to be tested from Latin to your language, which means the word will "
+"be displayed in Latin and you will have to choose from 4 translations in "
+"your language."
 msgstr "選擇用拉丁來顯示問題，而四個答案以您的語言顯示。"
 
-#. i18n: file klatinsettings_vocabpage.ui line 110
-#: rc.cpp:209
+#: klatinsettings_vocabpage.ui:91
+#, no-c-format
+msgid "Miscellaneous"
+msgstr ""
+
+#: klatinsettings_vocabpage.ui:110
 #, no-c-format
 msgid "The file you are tested on in vocabulary"
 msgstr "您做字彙測驗的檔案"
 
-#. i18n: file klatinsettings_vocabpage.ui line 113
-#: rc.cpp:212
+#: klatinsettings_vocabpage.ui:113
 #, no-c-format
 msgid "You can change the file you are tested on for the vocabulary section"
 msgstr "您可以改變做字彙測驗的檔案"
 
-#. i18n: file klatinsettings_vocabpage.ui line 129
-#: rc.cpp:215
+#: klatinsettings_vocabpage.ui:129
 #, no-c-format
 msgid "Number of questions:"
 msgstr "題數："
 
-#. i18n: file klatinsettings_vocabpage.ui line 135
-#: rc.cpp:218
+#: klatinsettings_vocabpage.ui:135
 #, no-c-format
 msgid "Set the number of questions you want to be tested on"
 msgstr "設定您要測驗的題數"
 
-#. i18n: file klatinsettings_vocabpage.ui line 138
-#: rc.cpp:221
+#: klatinsettings_vocabpage.ui:138
 #, no-c-format
 msgid ""
 "Here you can set the number of questions you want to be tested on. When this "
 "number is reached, a result dialog appears."
 msgstr "您可以在此設定您要測驗的題數。答到此題數後，就會顯示結果對話框。"
 
-#. i18n: file klatinsettings_vocabpage.ui line 160
-#: rc.cpp:224
+#: klatinsettings_vocabpage.ui:160
 #, no-c-format
 msgid "Number of questions to be asked before ending"
 msgstr "結束前被問的題數"
 
-#. i18n: file klatinsettings_vocabpage.ui line 163
-#: rc.cpp:227
+#: klatinsettings_vocabpage.ui:163
 #, no-c-format
 msgid "Numbers of questions to ask at a time"
 msgstr "一次詢問的題數"
 
-#. i18n: file klatinverbswidget.ui line 40
-#: rc.cpp:233
+#: klatinui.rc:5
+#, no-c-format
+msgid "S&ection"
+msgstr "章節(&E)"
+
+#: klatinverbswidget.ui:40
 #, no-c-format
 msgid "Verbs Section"
 msgstr "動詞章節"
 
-#. i18n: file klatinverbswidget.ui line 61
-#: rc.cpp:236
+#: klatinverbswidget.ui:61
 #, no-c-format
 msgid "Choice of verb conjugation"
 msgstr "選擇動詞變化"
 
-#. i18n: file klatinverbswidget.ui line 65
-#: rc.cpp:239
+#: klatinverbswidget.ui:64
 #, no-c-format
 msgid ""
 "Conjugation of verb to be\n"
 "tested on"
 msgstr "測驗動詞變化"
 
-#. i18n: file klatinverbswidget.ui line 79
-#: rc.cpp:243
+#: klatinverbswidget.ui:79
 #, no-c-format
 msgid "Choice of verb voice"
 msgstr "選擇動詞語態"
 
-#. i18n: file klatinverbswidget.ui line 83
-#: rc.cpp:246
+#: klatinverbswidget.ui:82
 #, no-c-format
 msgid ""
 "Voice of verb to be\n"
 "tested on"
 msgstr "測驗動詞語態"
 
-#. i18n: file klatinverbswidget.ui line 91
-#: rc.cpp:250
+#: klatinverbswidget.ui:91
 #, no-c-format
 msgid "Choice of verb mood"
 msgstr "選擇動詞語氣"
 
-#. i18n: file klatinverbswidget.ui line 95
-#: rc.cpp:253
+#: klatinverbswidget.ui:94
 #, no-c-format
 msgid ""
 "Mood of verb to be\n"
 "tested on"
 msgstr "測驗動詞語氣"
 
-#. i18n: file klatinverbswidget.ui line 115
-#: rc.cpp:260
+#: klatinverbswidget.ui:112
+#, no-c-format
+msgid "Apply"
+msgstr ""
+
+#: klatinverbswidget.ui:115
 #, no-c-format
 msgid "Change test to new type"
 msgstr "變更測驗到新型態"
 
-#. i18n: file klatinverbswidget.ui line 363
-#: rc.cpp:296
+#: klatinverbswidget.ui:363
 #, no-c-format
 msgid "Check your answer"
 msgstr "檢查您的答案"
 
-#. i18n: file klatinvocabwidget.ui line 38
-#: rc.cpp:311
+#: klatinvocabwidget.ui:38
 #, no-c-format
 msgid "Vocabulary Section"
 msgstr "字彙章節"
 
-#. i18n: file klatinvocabwidget.ui line 78
-#: rc.cpp:314
+#: klatinvocabwidget.ui:78
 #, no-c-format
 msgid "Question Word"
 msgstr "問題單字"
 
-#. i18n: file klatinvocabwidget.ui line 86
-#: rc.cpp:317
+#: klatinvocabwidget.ui:86
 #, no-c-format
 msgid "The question word will appear here"
 msgstr "問題單字會出現在這裡"
 
-#. i18n: file klatinvocabwidget.ui line 114
-#: rc.cpp:320
+#: klatinvocabwidget.ui:114
 #, no-c-format
 msgid "Your current score"
 msgstr "您目前的分數"
 
-#. i18n: file klatinvocabwidget.ui line 117
-#: rc.cpp:323
+#: klatinvocabwidget.ui:117
 #, no-c-format
 msgid ""
-"Your score appears on this display. Number of correct answers/total number of "
-"answers."
+"Your score appears on this display. Number of correct answers/total number "
+"of answers."
 msgstr "顯示您目前的分數。正確的答案數/總共答案數。"
 
-#. i18n: file klatinvocabwidget.ui line 265
-#: rc.cpp:341
+#: klatinvocabwidget.ui:265
 #, no-c-format
 msgid "Answer 1"
 msgstr "答案 1"
 
-#. i18n: file klatinvocabwidget.ui line 268
-#: rc.cpp:344 rc.cpp:350 rc.cpp:356 rc.cpp:362
+#: klatinvocabwidget.ui:268 klatinvocabwidget.ui:285 klatinvocabwidget.ui:312
+#: klatinvocabwidget.ui:329
 #, no-c-format
 msgid "Click this if you think it is the right answer."
 msgstr "如果您認為它是正確答案，請點選這裡"
 
-#. i18n: file klatinvocabwidget.ui line 282
-#: rc.cpp:347
+#: klatinvocabwidget.ui:282
 #, no-c-format
 msgid "Answer 2"
 msgstr "答案 2"
 
-#. i18n: file klatinvocabwidget.ui line 309
-#: rc.cpp:353
+#: klatinvocabwidget.ui:309
 #, no-c-format
 msgid "Answer 3"
 msgstr "答案 3"
 
-#. i18n: file klatinvocabwidget.ui line 326
-#: rc.cpp:359
+#: klatinvocabwidget.ui:326
 #, no-c-format
 msgid "Answer 4"
 msgstr "答案 4"
 
-#. i18n: file klatinvocabwidget.ui line 370
-#: rc.cpp:371
+#: klatinvocabwidget.ui:370
 #, no-c-format
 msgid "Return to the selection screen"
 msgstr "回到選擇螢幕"
-
-#. i18n: file klatin.kcfg line 9
-#: rc.cpp:374
-#, no-c-format
-msgid "The language selected by the user"
-msgstr "使用者選擇的語言"
-
-#. i18n: file klatin.kcfg line 30
-#: rc.cpp:377
-#, no-c-format
-msgid "how many questions are asked in one session."
-msgstr "在一次測驗中要問多少問題"
-
-#. i18n: file klatin.kcfg line 34
-#: rc.cpp:380
-#, no-c-format
-msgid "whether KLatin should ask unlimited questions."
-msgstr "KLatin 是否可以不限問題數。"
-
-#. i18n: file klatin.kcfg line 38
-#: rc.cpp:383
-#, no-c-format
-msgid "the default vocabulary file."
-msgstr "預設字彙檔。"
-
-#. i18n: file klatin.kcfg line 51
-#: rc.cpp:386
-#, no-c-format
-msgid "whether the questions should be Latin to the user's language."
-msgstr "是否要用拉丁文提問。"
-
-#. i18n: file klatin.kcfg line 55
-#: rc.cpp:389
-#, no-c-format
-msgid "whether the questions should be the user's language to Latin."
-msgstr "是否要用拉丁文回答。"