Git commit aad9089108cf97b16863c4b94bdc4fcfc6ff65ea by Yuri Chornoivan. Committed on 19/07/2014 at 17:09. Pushed by yurchor into branch 'master'.
Further updates M +- -- doc/Parley_configure_parley_0-9-4_001.png M +- -- doc/Parley_configure_parley_0-9-4_002.png M +- -- doc/Parley_configure_parley_0-9-4_003.png M +- -- doc/Parley_configure_parley_0-9-4_004.png M +- -- doc/Parley_create_new_exercise_collective_names1.png M +- -- doc/Parley_create_new_exercise_collective_names4.png M +- -- doc/Parley_create_new_exercise_collective_names5.png M +- -- doc/Parley_create_new_exercise_collective_names7.png M +- -- doc/Parley_create_new_exercise_collective_names8.png M +- -- doc/Parley_document_properties.png M +- -- doc/Parley_edit_comparison_form_1.png M +- -- doc/Parley_edit_comparison_form_3.png M +- -- doc/Parley_edit_conjugation_1.png M +- -- doc/Parley_edit_conjugation_2.png M +- -- doc/Parley_edit_main.png M +- -- doc/Parley_get_new_stuff_0-9-4_001.png M +- -- doc/Parley_trainer_eng-deu_0-9-4_002.png M +- -- doc/Parley_trainer_eng-deu_0-9-4_004.png M +- -- doc/Parley_trainer_eng-deu_0-9-4_005.png M +- -- doc/Parley_trainer_eng-deu_0-9-4_006.png M +- -- doc/Parley_trainer_eng-deu_0-9-4_007.png M +- -- doc/Parley_trainer_eng-deu_0-9-4_008.png M +- -- doc/Parley_trainer_eng-deu_0-9-4_011.png M +- -- doc/Parley_trainer_eng-deu_0-9-4_012.png M +- -- doc/Parley_trainer_eng-deu_0-9-4_013.png M +- -- doc/Parley_trainer_eng-deu_0-9-4_014.png M +- -- doc/Parley_trainer_eng-deu_0-9-4_015.png M +8 -8 doc/index.docbook http://commits.kde.org/parley/aad9089108cf97b16863c4b94bdc4fcfc6ff65ea diff --git a/doc/Parley_configure_parley_0-9-4_001.png b/doc/Parley_configure_parley_0-9-4_001.png index 637dca6..d810e63 100644 Binary files a/doc/Parley_configure_parley_0-9-4_001.png and b/doc/Parley_configure_parley_0-9-4_001.png differ diff --git a/doc/Parley_configure_parley_0-9-4_002.png b/doc/Parley_configure_parley_0-9-4_002.png index 5fbd4fb..050f619 100644 Binary files a/doc/Parley_configure_parley_0-9-4_002.png and b/doc/Parley_configure_parley_0-9-4_002.png differ diff --git a/doc/Parley_configure_parley_0-9-4_003.png b/doc/Parley_configure_parley_0-9-4_003.png index 6d79999..5f81165 100644 Binary files a/doc/Parley_configure_parley_0-9-4_003.png and b/doc/Parley_configure_parley_0-9-4_003.png differ diff --git a/doc/Parley_configure_parley_0-9-4_004.png b/doc/Parley_configure_parley_0-9-4_004.png index f7f9572..786f575 100644 Binary files a/doc/Parley_configure_parley_0-9-4_004.png and b/doc/Parley_configure_parley_0-9-4_004.png differ diff --git a/doc/Parley_create_new_exercise_collective_names1.png b/doc/Parley_create_new_exercise_collective_names1.png index 5bf2a71..a31ff1e 100644 Binary files a/doc/Parley_create_new_exercise_collective_names1.png and b/doc/Parley_create_new_exercise_collective_names1.png differ diff --git a/doc/Parley_create_new_exercise_collective_names4.png b/doc/Parley_create_new_exercise_collective_names4.png index e4f9728..efbd206 100644 Binary files a/doc/Parley_create_new_exercise_collective_names4.png and b/doc/Parley_create_new_exercise_collective_names4.png differ diff --git a/doc/Parley_create_new_exercise_collective_names5.png b/doc/Parley_create_new_exercise_collective_names5.png index 593b947..3c6f376 100644 Binary files a/doc/Parley_create_new_exercise_collective_names5.png and b/doc/Parley_create_new_exercise_collective_names5.png differ diff --git a/doc/Parley_create_new_exercise_collective_names7.png b/doc/Parley_create_new_exercise_collective_names7.png index 4a0f9e7..aa3299b 100644 Binary files a/doc/Parley_create_new_exercise_collective_names7.png and b/doc/Parley_create_new_exercise_collective_names7.png differ diff --git a/doc/Parley_create_new_exercise_collective_names8.png b/doc/Parley_create_new_exercise_collective_names8.png index 31c0e16..cf97783 100644 Binary files a/doc/Parley_create_new_exercise_collective_names8.png and b/doc/Parley_create_new_exercise_collective_names8.png differ diff --git a/doc/Parley_document_properties.png b/doc/Parley_document_properties.png index 8e1c320..33560d1 100644 Binary files a/doc/Parley_document_properties.png and b/doc/Parley_document_properties.png differ diff --git a/doc/Parley_edit_comparison_form_1.png b/doc/Parley_edit_comparison_form_1.png index 0d54954..50cf0a2 100644 Binary files a/doc/Parley_edit_comparison_form_1.png and b/doc/Parley_edit_comparison_form_1.png differ diff --git a/doc/Parley_edit_comparison_form_3.png b/doc/Parley_edit_comparison_form_3.png index 30c5723..f61e126 100644 Binary files a/doc/Parley_edit_comparison_form_3.png and b/doc/Parley_edit_comparison_form_3.png differ diff --git a/doc/Parley_edit_conjugation_1.png b/doc/Parley_edit_conjugation_1.png index c54dcde..e1a5964 100644 Binary files a/doc/Parley_edit_conjugation_1.png and b/doc/Parley_edit_conjugation_1.png differ diff --git a/doc/Parley_edit_conjugation_2.png b/doc/Parley_edit_conjugation_2.png index 3d01b19..2e3ca03 100644 Binary files a/doc/Parley_edit_conjugation_2.png and b/doc/Parley_edit_conjugation_2.png differ diff --git a/doc/Parley_edit_main.png b/doc/Parley_edit_main.png index 0fd40cd..210ef95 100644 Binary files a/doc/Parley_edit_main.png and b/doc/Parley_edit_main.png differ diff --git a/doc/Parley_get_new_stuff_0-9-4_001.png b/doc/Parley_get_new_stuff_0-9-4_001.png index 343a490..18939c2 100644 Binary files a/doc/Parley_get_new_stuff_0-9-4_001.png and b/doc/Parley_get_new_stuff_0-9-4_001.png differ diff --git a/doc/Parley_trainer_eng-deu_0-9-4_002.png b/doc/Parley_trainer_eng-deu_0-9-4_002.png index 04e9ed3..6a7d7fa 100644 Binary files a/doc/Parley_trainer_eng-deu_0-9-4_002.png and b/doc/Parley_trainer_eng-deu_0-9-4_002.png differ diff --git a/doc/Parley_trainer_eng-deu_0-9-4_004.png b/doc/Parley_trainer_eng-deu_0-9-4_004.png index eb2894e..a63e141 100644 Binary files a/doc/Parley_trainer_eng-deu_0-9-4_004.png and b/doc/Parley_trainer_eng-deu_0-9-4_004.png differ diff --git a/doc/Parley_trainer_eng-deu_0-9-4_005.png b/doc/Parley_trainer_eng-deu_0-9-4_005.png index 24f98cc..a784424 100644 Binary files a/doc/Parley_trainer_eng-deu_0-9-4_005.png and b/doc/Parley_trainer_eng-deu_0-9-4_005.png differ diff --git a/doc/Parley_trainer_eng-deu_0-9-4_006.png b/doc/Parley_trainer_eng-deu_0-9-4_006.png index 62cfaa3..65dd1ff 100644 Binary files a/doc/Parley_trainer_eng-deu_0-9-4_006.png and b/doc/Parley_trainer_eng-deu_0-9-4_006.png differ diff --git a/doc/Parley_trainer_eng-deu_0-9-4_007.png b/doc/Parley_trainer_eng-deu_0-9-4_007.png index a513eb1..94cdd2b 100644 Binary files a/doc/Parley_trainer_eng-deu_0-9-4_007.png and b/doc/Parley_trainer_eng-deu_0-9-4_007.png differ diff --git a/doc/Parley_trainer_eng-deu_0-9-4_008.png b/doc/Parley_trainer_eng-deu_0-9-4_008.png index 4790ac1..958ea23 100644 Binary files a/doc/Parley_trainer_eng-deu_0-9-4_008.png and b/doc/Parley_trainer_eng-deu_0-9-4_008.png differ diff --git a/doc/Parley_trainer_eng-deu_0-9-4_011.png b/doc/Parley_trainer_eng-deu_0-9-4_011.png index ea701ca..48e9b37 100644 Binary files a/doc/Parley_trainer_eng-deu_0-9-4_011.png and b/doc/Parley_trainer_eng-deu_0-9-4_011.png differ diff --git a/doc/Parley_trainer_eng-deu_0-9-4_012.png b/doc/Parley_trainer_eng-deu_0-9-4_012.png index 2768e37..e2a674a 100644 Binary files a/doc/Parley_trainer_eng-deu_0-9-4_012.png and b/doc/Parley_trainer_eng-deu_0-9-4_012.png differ diff --git a/doc/Parley_trainer_eng-deu_0-9-4_013.png b/doc/Parley_trainer_eng-deu_0-9-4_013.png index 99da1f4..6677a39 100644 Binary files a/doc/Parley_trainer_eng-deu_0-9-4_013.png and b/doc/Parley_trainer_eng-deu_0-9-4_013.png differ diff --git a/doc/Parley_trainer_eng-deu_0-9-4_014.png b/doc/Parley_trainer_eng-deu_0-9-4_014.png index 1572573..0901585 100644 Binary files a/doc/Parley_trainer_eng-deu_0-9-4_014.png and b/doc/Parley_trainer_eng-deu_0-9-4_014.png differ diff --git a/doc/Parley_trainer_eng-deu_0-9-4_015.png b/doc/Parley_trainer_eng-deu_0-9-4_015.png index 4d0eeed..6c5f48b 100644 Binary files a/doc/Parley_trainer_eng-deu_0-9-4_015.png and b/doc/Parley_trainer_eng-deu_0-9-4_015.png differ diff --git a/doc/index.docbook b/doc/index.docbook index 269fcdc..a559163 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -120,9 +120,9 @@ limited to language learning but supports a multitude of subjects. </para> <para>A vocabulary collection is a file that contains words and their translations into other languages or other pairs of words and sentences that you want to memorize. The words are organized in units. </para> -<para>To <emphasis>start practicing</emphasis>, click one of the vocabulary collections in the list. You are taken to the <link linkend="practice-setup">practice setup</link>. +<para>To <emphasis>start practicing</emphasis>, click one of the vocabulary collection names in the list. You are taken to the <link linkend="practice-setup">practice setup</link>. </para> -<para>Note that a small <guilabel>Editor Icon</guilabel> appears to the right of the document name when you move the mouse over it. The <guilabel>Editor Icon</guilabel> lets you open the collection in the editor instead of practice mode. +<para>Note that a small <guilabel>Delete Icon</guilabel> appears to the left of the document name. The <guilabel>Delete Icon</guilabel> lets you remove the collection from the list. </para> <para>To <link linkend="vocabulary-editing">edit</link> a collection, click on the <guilabel>Editor Icon</guilabel> on its right hand side. </para> @@ -475,14 +475,14 @@ limited to language learning but supports a multitude of subjects. <sect3 id="with-yes-no-answers"><title>With yes/no answers</title> <para>Normally &parley; automatically proposes one correct and several wrong answers in Multiple Choice mode. For some exercises instead you will have preset answers like yes/no or similar. And for these you have to configure the practice by clicking on <link linkend="advanced-practice-configuration"><guilabel>Configure Practice</guilabel></link>. </para> -<para>Select the tab <guilabel>Advanced</guilabel> and you will get something very similar to the following screenshot: +<para>Select the tab <guilabel>Specific</guilabel> and you will get something very similar to the following screenshot: </para> <para> <screenshot> <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="Parley_configure_advanced.png" format="PNG"/> + <imagedata fileref="Parley_configure_specific.png" format="PNG"/> </imageobject> <textobject> <phrase></phrase> @@ -1272,9 +1272,9 @@ The sound file will be saved next to the current vocabulary file in the <filenam </para> <para>If you now check your folder where the sound-files and pictures are, you will also find the file <guilabel>Trainer eng-deu.kvtml</guilabel> </para> -<para>Let's have a short look at the words we want to add: <emphasis>apple, bird, cat, cherry, cow, orange, pear, snake, strawberry</emphasis>. We have animals and fruit and therefore we decide to create two units that are called: <guilabel>Animals</guilabel> and <guilabel>Fruit</guilabel>. +<para>Let's have a short look at the words we want to add: <emphasis>apple, bird, cat, cherry, cow, orange, pear, snake, strawberry</emphasis>. We have animals and fruit and therefore we decide to create two units that are called: <guilabel>Animals</guilabel> and <guilabel>Fruits</guilabel>. </para> -<para>We now rename <guilabel>Lesson 1</guilabel> to <guilabel>Animals</guilabel> and then we add a unit called <guilabel>Fruit</guilabel>. Right-click on <guilabel>Lesson 1</guilabel> and choose <guilabel>Rename Unit</guilabel> from the options shown. Now <guilabel>Lesson 1</guilabel> is highlighted and you can simply overwrite it by typing in <guilabel>Animals</guilabel>. When done, hit the &Enter; key. Now right-click on <guilabel>Collection: Vocabulary trainer E...</guilabel> which is the root of the unit tree and choose <guilabel>New Unit</guilabel> from the options shown. In the new field write <guilabel>Fruit</guilabel> and hit the &Enter; key again. +<para>We now rename <guilabel>Lesson 1</guilabel> to <guilabel>Animals</guilabel> and then we add a unit called <guilabel>Fruits</guilabel>. Right-click on <guilabel>Lesson 1</guilabel> and choose <guilabel>Rename Unit</guilabel> from the options shown. Now <guilabel>Lesson 1</guilabel> is highlighted and you can simply overwrite it by typing in <guilabel>Animals</guilabel>. When done, hit the &Enter; key. Now right-click on <guilabel>Collection: Vocabulary trainer E...</guilabel> which is the root of the unit tree and choose <guilabel>New Unit</guilabel> from the options shown. In the new field write <guilabel>Fruits</guilabel> and hit the &Enter; key again. </para> <para>First, let's insert the animals. Please click on the unit <guilabel>Animals</guilabel> and you will get an empty table you can fill in. Click with your mouse in the first field, and insert the source terms. Then, insert the target terms in the second column. Once you've inserted all 4 English animal names with their German translation the screen looks like this: </para> @@ -1293,7 +1293,7 @@ The sound file will be saved next to the current vocabulary file in the <filenam </para> <para>In our case we want only 4 entries in the animals unit. There are many empty lines that should be deleted. To do this click on the first empty field, and keep the &Shift; key pressed while clicking on the last empty field. All lines to be deleted will be highlighted. Then, press the <keycap>Del</keycap> key and confirm the question <emphasis>Do you really want to delete the selected entries?</emphasis> by clicking on the <guilabel>Delete</guilabel> button. </para> -<para>Let's add the fruit terminology. Just click on the unit named <guilabel>Fruit</guilabel>. This second unit is completely empty. Since we have five fruit terms we need to add five lines. Therefore, press the <keycap>Ins</keycap> key five times, and then, just like before, we add our terminology. +<para>Let's add the fruit terminology. Just click on the unit named <guilabel>Fruits</guilabel>. This second unit is completely empty. Since we have five fruit terms we need to add five lines. Therefore, press the <keycap>Ins</keycap> key five times, and then, just like before, we add our terminology. </para> <para>Don't forget to save every now and then ... </para> @@ -1365,7 +1365,7 @@ The sound file will be saved next to the current vocabulary file in the <filenam </para> <para>Just go ahead like this for all terms. </para> -<para>Time to add adjectives and verbs as units to our project. So just do as before with the unit <emphasis>Fruit</emphasis> and create two new units: <emphasis>Adjectives</emphasis> and <emphasis>Verbs</emphasis>. Let's assume we will add <emphasis>big, small, old, young, narrow</emphasis> in the adjective unit and <emphasis>to go, to come, to buy, to drink, to eat</emphasis> in the verb unit. +<para>Time to add adjectives and verbs as units to our project. So just do as before with the unit <emphasis>Fruits</emphasis> and create two new units: <emphasis>Adjectives</emphasis> and <emphasis>Verbs</emphasis>. Let's assume we will add <emphasis>big, small, old, young, narrow</emphasis> in the adjective unit and <emphasis>to go, to come, to buy, to drink, to eat</emphasis> in the verb unit. </para> <para>The following shows a screenshot with all inserted terminology. Now, words are mixed and it would be nice to see what is a <emphasis>noun, adjective</emphasis> or <emphasis>verb</emphasis>. </para>
