Git commit 052b0954a83929a9604213ca6f88892f90677c97 by Burkhard L?ck. Committed on 09/07/2013 at 19:09. Pushed by lueck into branch 'KDE/4.11'.
update for 4.11 + updated screenshots (cherry picked from commit d16d403e6bccea9b8fd77537b89c4b3e6bb14bed) M +- -- doc/Parley_create_new_exercise_collective_names1.png M +- -- doc/Parley_create_new_exercise_collective_names10.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_edit_comparison_form_1.png D +- -- doc/Parley_edit_comparison_form_2.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_new_lesson1.png M +- -- doc/Parley_new_lesson2.png M +- -- doc/Parley_trainer_eng-deu_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_009.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 +19 -18 doc/index.docbook http://commits.kde.org/parley/052b0954a83929a9604213ca6f88892f90677c97 diff --git a/doc/Parley_create_new_exercise_collective_names1.png b/doc/Parley_create_new_exercise_collective_names1.png index 902b8a4..5bf2a71 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_names10.png b/doc/Parley_create_new_exercise_collective_names10.png index 22d5911..7ad774d 100644 Binary files a/doc/Parley_create_new_exercise_collective_names10.png and b/doc/Parley_create_new_exercise_collective_names10.png differ diff --git a/doc/Parley_create_new_exercise_collective_names4.png b/doc/Parley_create_new_exercise_collective_names4.png index 74c0d11..e4f9728 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 843a4ab..593b947 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 8850633..4a0f9e7 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 e3f291d..31c0e16 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_edit_comparison_form_1.png b/doc/Parley_edit_comparison_form_1.png index 07b76c5..0d54954 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_2.png b/doc/Parley_edit_comparison_form_2.png deleted file mode 100644 index b2931ac..0000000 Binary files a/doc/Parley_edit_comparison_form_2.png and /dev/null differ diff --git a/doc/Parley_edit_comparison_form_3.png b/doc/Parley_edit_comparison_form_3.png index 40e2f13..30c5723 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 8f93d37..c54dcde 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 5ab78e0..3d01b19 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 056d772..0fd40cd 100644 Binary files a/doc/Parley_edit_main.png and b/doc/Parley_edit_main.png differ diff --git a/doc/Parley_new_lesson1.png b/doc/Parley_new_lesson1.png index 34fff92..d631d88 100644 Binary files a/doc/Parley_new_lesson1.png and b/doc/Parley_new_lesson1.png differ diff --git a/doc/Parley_new_lesson2.png b/doc/Parley_new_lesson2.png index 22da021..cc033d8 100644 Binary files a/doc/Parley_new_lesson2.png and b/doc/Parley_new_lesson2.png differ diff --git a/doc/Parley_trainer_eng-deu_0-9-4_001.png b/doc/Parley_trainer_eng-deu_0-9-4_001.png index 357c999..49e4c4e 100644 Binary files a/doc/Parley_trainer_eng-deu_0-9-4_001.png and b/doc/Parley_trainer_eng-deu_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 95ece6f..04e9ed3 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 684da8d..eb2894e 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 11e6cfb..24f98cc 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 406d29c..ae2cf21 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 7b3160d..b581e2c 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 a4d5327..efd1e36 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_009.png b/doc/Parley_trainer_eng-deu_0-9-4_009.png index 70c5e9a..5a55113 100644 Binary files a/doc/Parley_trainer_eng-deu_0-9-4_009.png and b/doc/Parley_trainer_eng-deu_0-9-4_009.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 fe4007b..ea701ca 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 3a6027d..2768e37 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 dde55b6..99da1f4 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 88f0b21..1572573 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 f510d06..4d0eeed 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 0869f5a..85a7eb8 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -3,7 +3,7 @@ <!-- Define an entity for your application if it is not part of KDE CVS --> <!ENTITY kappname "&parley;"> - <!ENTITY package "kdeedu"> + <!ENTITY package "parley"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE">]> @@ -44,8 +44,8 @@ </copyright> <legalnotice>&FDLNotice;</legalnotice> -<date>2011-09-26</date> -<releaseinfo>0.9.4 (&kde; SC 4.7)</releaseinfo> +<date>2013-07-09</date> +<releaseinfo>0.9.4 (&kde; SC 4.11)</releaseinfo> <!-- Abstract about this handbook --> @@ -670,7 +670,7 @@ limited to language learning but supports a multitude of subjects. <sect2 id="conjugations"><title>Conjugations</title> <para>To practice conjugations choose the <guilabel>Conjugations</guilabel> mode and the tenses you wish to exercise. </para> -<para>In the document the conjugation forms of the words have to be entered in order to allow this practice mode to work. See <link linkend="entering-conjugation-forms">Entering Conjugation Forms</link>. +<para>In the document the conjugation forms of the words have to be entered in order to allow this practice mode to work. See <link linkend="entering-inflection-forms">Entering Inflection Forms</link>. </para> <para> <screenshot> @@ -802,7 +802,7 @@ limited to language learning but supports a multitude of subjects. </para> <para>Tenses: Depending on the language, you can enter the right tenses which you later want to learn how to conjugate. Examples are: Simple Present, Simple Past, Future I etc. </para> -<para>Btw. by clicking on the <guilabel>Add New Language</guilabel> button you can add an additional language to your collection. +<para>Btw. by clicking on the <guilabel>Add Language</guilabel> button you can add an additional language to your collection. </para> <sect3 id="lets-have-a-closer-look-at-spanish"><title>Let's Have a Closer Look at Spanish</title> <para>On the <guilabel>General</guilabel> tab the basic language settings, like here @@ -957,7 +957,7 @@ limited to language learning but supports a multitude of subjects. <sect2 id="editing-words"><title>Editing Words</title> <para>If you want to replace a word, select its entry and start typing. To change the word instead, double click the entry and you can change the contents of the cell without losing the old word. </para> -<para>Press 	 to go to the next word. &Enter; leaves the editing mode. You can use the arrow keys to move around. +<para>Press 	 to go to the next word while staying in editing mode. &Enter; leaves this mode. You can use the arrow keys to move around. </para> </sect2> </sect1> @@ -1033,7 +1033,7 @@ limited to language learning but supports a multitude of subjects. </para> <para>Click the <guilabel>Adjective</guilabel> or <guilabel>Adverb</guilabel> button in the comparison forms tool. </para> -<para> +<!--para> <screenshot> <screeninfo></screeninfo> <mediaobject> @@ -1045,7 +1045,7 @@ limited to language learning but supports a multitude of subjects. </textobject> </mediaobject> </screenshot> -</para> +</para--> <para>Enter the comparison forms. </para> <para> @@ -1064,8 +1064,8 @@ limited to language learning but supports a multitude of subjects. <para>Now you can use the <link linkend="comparison-forms-of-adjectives-and-adverbs">Comparison Forms Practice</link> mode. </para> </sect1> -<sect1 id="entering-conjugation-forms"><title>Entering Conjugation Forms</title> -<para>In order to enter conjugation forms, make sure the conjugation forms tool is enabled. You open it with the menu: <menuchoice><guimenu>View</guimenu><guimenuitem>Conjugation</guimenuitem></menuchoice>. +<sect1 id="entering-inflection-forms"><title>Entering Inflection Forms</title> +<para>In order to enter inflection forms, make sure the inflection forms tool is enabled. You open it with the menu: <menuchoice><guimenu>View</guimenu><guimenuitem>Inflection (verbs, adjectives, nouns)</guimenuitem></menuchoice>. </para> <para>First select a word that is a verb. </para> @@ -1082,7 +1082,7 @@ limited to language learning but supports a multitude of subjects. </mediaobject> </screenshot> </para> -<para>Click the <guilabel>... is a Verb</guilabel> button in the conjugations tool. +<para>Click the <guilabel>Verb</guilabel> button in the inflections tool. </para> <para> <screenshot> @@ -1103,7 +1103,8 @@ limited to language learning but supports a multitude of subjects. </para> <para>Now you can use the <link linkend="conjugations">Conjugations Practice</link> mode. </para> -</sect1> +<para>Use the <guibutton>Noun</guibutton> or <guibutton>Adjective</guibutton> button to add declension forms to your vocabulary. +</para></sect1> <sect1 id="creating-new-files"><title>Creating New Files</title> <para>In this section we will describe how to create new files and this not only with the usual vocabulary learning part, but also for grammar exercises, mathematics etc. </para> @@ -1183,7 +1184,7 @@ limited to language learning but supports a multitude of subjects. <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="Parley_trainer_eng-deu_0-9-4_003.png" format="PNG"/> + <imagedata fileref="Parley_trainer_eng-deu_0-9-4_003.png" format="PNG"/> <!--FIXME Lessons wrong in png--> </imageobject> <textobject> <phrase></phrase> @@ -1204,7 +1205,7 @@ limited to language learning but supports a multitude of subjects. <screeninfo></screeninfo> <mediaobject> <imageobject> - <imagedata fileref="Parley_trainer_eng-deu_0-9-4_004.png" format="PNG"/> + <imagedata fileref="Parley_trainer_eng-deu_0-9-4_004.png" format="PNG"/> <!--FIXME Lessons wrong in png--> </imageobject> <textobject> <phrase></phrase> @@ -1318,7 +1319,7 @@ limited to language learning but supports a multitude of subjects. </mediaobject> </screenshot> </para> -<para>By clicking on the fields in the column <guilabel>Word Type</guilabel> you can select the word type and for those languages where nouns have a gender you can also select the <emphasis>Noun/Gender</emphasis> combination. Below the <guilabel>Word Type</guilabel> column with part of the selections already done. +<para>By clicking on the fields in the column <guilabel>Word Type</guilabel> you can select the word type and for those languages where nouns have a gender you can also select the <emphasis>Noun/Gender</emphasis> combination. Alternatively start to type the first characters of a word type to select it. Below the <guilabel>Word Type</guilabel> column with part of the selections already done. </para> <para> <screenshot> @@ -1433,7 +1434,7 @@ limited to language learning but supports a multitude of subjects. </para> <para>Fill in the title, here <guilabel>nomi singoli e collettivi</guilabel>, your name, e-mail address, in the <guilabel>Comment</guilabel> section you can write down a more detailed description, select your category and license. Then there we have something special: instead of indicating the first and second language, like it normally would happen, we added <emphasis>nome singolo</emphasis> (single name) and <emphasis>nome collettivo</emphasis> (collective name). <guilabel>Setup Grammar Details</guilabel> and <guilabel>Download Grammar</guilabel> are not needed here. In the screenshot they are still activated - please deactivate them by just clicking on the checkboxes. When you are done, please click on <guilabel>OK</guilabel>. </para> -<para>The <guilabel>Properties</guilabel> page for <emphasis>nome singolo</emphasis> comes up and here you see it already with the necessary changes made: +<para>Select <menuchoice><guimenu>View</guimenu><guimenuitem>Languages</guimenuitem></menuchoice> and the <guilabel>Properties for nome singolo</guilabel> page comes up and here you see it already with the necessary changes made: </para> <para> <screenshot> @@ -1450,7 +1451,7 @@ limited to language learning but supports a multitude of subjects. </para> <para>On the left hand side you can see where the data you are adding belongs to. <emphasis>nome singolo</emphasis>. Choose the language, here <emphasis>Italian</emphasis> and insert <emphasis>nome singolo</emphasis> in the following editable field. Then click on <guilabel>OK</guilabel>. </para> -<para>Now the <guilabel>Properties</guilabel> page for <emphasis>nome collettivo</emphasis> is shown: +<para>Now the <guilabel>Properties for nome collettivo</guilabel> page is shown: </para> <para> <screenshot> @@ -1695,7 +1696,7 @@ limited to language learning but supports a multitude of subjects. <sect1 id="upload-and-share-collections"><title>Upload and Share Collections</title> <para>You can upload your files and share them with others. </para> -<para>Use the upload button from the file menu in the Editor within Parley. +<para>Use <guimenuitem>Upload Vocabulary Document</guimenuitem> from the file menu in the Editor within Parley. </para> <para>If that does not work, you can also visit <ulink url="http://kde-files.org/?xcontentmode=687";>kde-files.org</ulink>. </para>
