Git commit 2fe596ef8d6e43ad86ebdc2535ea9bcb4320a116 by Stephane Mankowski. Committed on 11/07/2015 at 14:41. Pushed by smankowski into branch 'master'.
Documentation update M +6 -11 doc/index.docbook M +- -- doc/menu_edit.png M +- -- doc/menu_file.png M +- -- doc/menu_go1.png M +- -- doc/menu_go2.png M +- -- doc/menu_help.png M +- -- doc/menu_import.png M +- -- doc/menu_settings.png M +- -- doc/menu_tools.png M +- -- doc/menu_view.png D +- -- doc/merge_operations_menu.png M +- -- doc/tab_state_management.png http://commits.kde.org/skrooge/2fe596ef8d6e43ad86ebdc2535ea9bcb4320a116 diff --git a/doc/index.docbook b/doc/index.docbook index eb9615c..234788a 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -746,15 +746,7 @@ <title>Merge operations after import</title> <para>There are some cases where you have manually entered an operation, but also imported it from your bank. In such cases, the operation will appear twice in the list.</para> <para>You may merge these two operations by selecting them, and select <guimenuitem>Merge operations</guimenuitem> in the contextual menu. This will add all information you manually entered to the imported operation, and will delete the manually entered operation.</para> - - <screenshot> - <mediaobject> - <imageobject><imagedata fileref="merge_operations_menu.png"/></imageobject> - </mediaobject> - </screenshot> - </sect2> - </sect1> <sect1 id="export"> @@ -830,7 +822,8 @@ <listitem><para><guimenuitem>Import categories</guimenuitem>: To import a set of predefined categories. This option depends of your country</para></listitem> <listitem><para><guimenuitem>Import</guimenuitem>: To <link linkend="import">import</link> operation from files</para></listitem> <listitem><para><guimenuitem>Import with backend</guimenuitem>: To <link linkend="import">import</link> operation with a backend</para></listitem> - <listitem><para><guimenuitem>Import currency values...</guimenuitem>: To import currency values from files</para></listitem> + <listitem><para><guimenuitem>Import currency values...</guimenuitem>: To import currency values from files. Of couse, the csv file must have the three columns (unit, date and amount).</para></listitem> + <listitem><para><guimenuitem>Import rules...</guimenuitem>: To import <link linkend="search_and_process">Search and process</link> rules to associate a category to a payee. Of couse, the csv file must have the two columns (payee and category).</para></listitem> </itemizedlist> </para></listitem> <listitem><para><guimenuitem>Export...</guimenuitem>: To <link linkend="export_file">export</link> operations into a file</para></listitem> </itemizedlist> @@ -848,21 +841,23 @@ <itemizedlist> <listitem><para><guimenuitem>Undo</guimenuitem>: Cancel the previous modification done</para></listitem> <listitem><para><guimenuitem>Redo</guimenuitem>: Reapply the previous modification canceled</para></listitem> - <listitem><para><guimenuitem>Undo</guimenuitem>: Cancel the previous modifications done up to the last save</para></listitem> + <listitem><para><guimenuitem>Revert document</guimenuitem>: Cancel the previous modifications done up to the last save</para></listitem> <listitem><para><guimenuitem>Delete</guimenuitem>: Delete the selected objects (operations, accounts, categories, ...)</para></listitem> <listitem><para><guimenuitem>Add property</guimenuitem>: Add a property regularly used on the selected objects</para></listitem> <listitem><para><guimenuitem>Select all</guimenuitem>: Select all lines of the <link linkend="tables">table</link> of the current page</para></listitem> <listitem><para><guimenuitem>Fast edit:</guimenuitem>: Facilitation the creation of new <link linkend="operations">operations</link> by filling fields automatically based on previous operations created</para></listitem> <listitem><para><guimenuitem>Find...</guimenuitem>: Open the <link linkend="search_and_process">Search and process</link> page with a predefined filter corresponding to the selected objects</para></listitem> <listitem><para><guimenuitem>Switch highlight</guimenuitem>: Switch the highlight state of objects</para></listitem> + <listitem><para><guimenuitem>Switch close</guimenuitem>: Switch the close state of objects</para></listitem> <listitem><para><guimenuitem>Reconcile...</guimenuitem>: Open the <link linkend="operations">Operations</link> page in <link linkend="reconciliation">reconciliation</link> mode</para></listitem> <listitem><para><guimenuitem>Point</guimenuitem>: Point the selected operations</para></listitem> <listitem><para><guimenuitem>Group operations</guimenuitem>: Group the selected operations</para></listitem> <listitem><para><guimenuitem>Ungroup operations</guimenuitem>: Ungroup the selected operations</para></listitem> <listitem><para><guimenuitem>Duplicate</guimenuitem>: Duplicate the selected operation to create a new one from a previous one</para></listitem> <listitem><para><guimenuitem>Create template</guimenuitem>: Create a <link linkend="templates">template</link> from a selected operation</para></listitem> + <listitem><para><guimenuitem>Apply template</guimenuitem>: Apply a <link linkend="templates">template</link> on selected operations</para></listitem> <listitem><para><guimenuitem>Merge sub operations</guimenuitem>: Merge selected operations in one split operation</para></listitem> - <listitem><para><guimenuitem>Schedule</guimenuitem>: </para></listitem> + <listitem><para><guimenuitem>Schedule</guimenuitem>: Schedule the selected operation</para></listitem> <listitem><para><guimenuitem>Validate imported operations</guimenuitem>: Validate all selected imported operations</para></listitem> <listitem><para><guimenuitem>Merge imported operations</guimenuitem>: Merge one imported operation with an other operation entered manually. If amounts are different then a confirmation is requested</para></listitem> <listitem><para><guimenuitem>Split shares</guimenuitem>: Split selected <link linkend="units">shares</link></para></listitem> diff --git a/doc/menu_edit.png b/doc/menu_edit.png index 219bfe6..a764294 100644 Binary files a/doc/menu_edit.png and b/doc/menu_edit.png differ diff --git a/doc/menu_file.png b/doc/menu_file.png index 7dd4033..f671936 100644 Binary files a/doc/menu_file.png and b/doc/menu_file.png differ diff --git a/doc/menu_go1.png b/doc/menu_go1.png index d1953d4..3dd742c 100644 Binary files a/doc/menu_go1.png and b/doc/menu_go1.png differ diff --git a/doc/menu_go2.png b/doc/menu_go2.png index 7ceed44..ba5d37f 100644 Binary files a/doc/menu_go2.png and b/doc/menu_go2.png differ diff --git a/doc/menu_help.png b/doc/menu_help.png index 0f6bfa9..a7434ea 100644 Binary files a/doc/menu_help.png and b/doc/menu_help.png differ diff --git a/doc/menu_import.png b/doc/menu_import.png index 3251aa2..2a078a3 100644 Binary files a/doc/menu_import.png and b/doc/menu_import.png differ diff --git a/doc/menu_settings.png b/doc/menu_settings.png index 422eaf1..8e4c625 100644 Binary files a/doc/menu_settings.png and b/doc/menu_settings.png differ diff --git a/doc/menu_tools.png b/doc/menu_tools.png index 375becc..80d7ee0 100644 Binary files a/doc/menu_tools.png and b/doc/menu_tools.png differ diff --git a/doc/menu_view.png b/doc/menu_view.png index 12a31a1..ec945e8 100644 Binary files a/doc/menu_view.png and b/doc/menu_view.png differ diff --git a/doc/merge_operations_menu.png b/doc/merge_operations_menu.png deleted file mode 100644 index 85944fd..0000000 Binary files a/doc/merge_operations_menu.png and /dev/null differ diff --git a/doc/tab_state_management.png b/doc/tab_state_management.png index 6cd3312..75895b3 100644 Binary files a/doc/tab_state_management.png and b/doc/tab_state_management.png differ
