[kde-doc-english] [skrooge] doc: Merge branch 'master' of kde:skrooge

[Stephane Mankowski]

Git commit c151bf4870f41869f18fce24842987ca9d9f3378 by Stephane Mankowski.
Committed on 13/06/2014 at 19:53.
Pushed by smankowski into branch 'master'.

Merge branch 'master' of kde:skrooge

Conflicts:
	doc/index.docbook

M  +5    -5    doc/index.docbook

http://commits.kde.org/skrooge/c151bf4870f41869f18fce24842987ca9d9f3378

diff --cc doc/index.docbook
index 9f42505,d5322d5..9fa03dc
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@@ -844,7 -826,8 +844,7 @@@
  	  <listitem><para><guimenuitem>Pin this page</guimenuitem>: Set the current page pinned. This will avoid replacement by another one or closure</para></listitem>	  
  	  <listitem><para><guimenuitem>Reset page state</guimenuitem>: Reset the status of the current page</para></listitem>	  
  	  <listitem><para><guimenuitem>Save page state</guimenuitem>: Save the status of the current page</para></listitem>	  
- 	  <listitem><para><guimenuitem>Overwrite bookmar state</guimenuitem>: Save the status of the current bookmarked page. The bookmark is updated with the new state</para></listitem>	    
+ 	  <listitem><para><guimenuitem>Overwrite bookmark state</guimenuitem>: Save the status of the current bookmarked page. The bookmark is updated with the new state</para></listitem>	  
 -	  <listitem><para><guimenuitem>Full Screen Mode</guimenuitem>: Set &appname; in full screen</para></listitem>	  
        </itemizedlist>
        </sect2>	 
        
@@@ -896,17 -879,21 +896,17 @@@
  	</screenshot>
  	
        <itemizedlist>
- 	  <listitem><para><guimenuitem>Find and group transfers</guimenuitem>: Create potential transferts</para></listitem>
+ 	  <listitem><para><guimenuitem>Find and group transfers</guimenuitem>: Create potential transfers</para></listitem>
  	  <listitem><para><guimenuitem>Clean bank's import</guimenuitem>: Clean operations after imports</para></listitem>
  	  <listitem><para><guimenuitem>Anonymize</guimenuitem>: Anonymize your document to help debugging of &appname; </para></listitem>
 -	  <listitem><para><guimenuitem></guimenuitem>: </para></listitem>
 -	  <listitem><para><guimenuitem></guimenuitem>: </para></listitem>
 -	  <listitem><para><guimenuitem></guimenuitem>: </para></listitem>
 -	  <listitem><para><guimenuitem></guimenuitem>: </para></listitem>
 -	  <listitem><para><guimenuitem></guimenuitem>: </para></listitem>
 -	  <listitem><para><guimenuitem></guimenuitem>: </para></listitem>
 -	  <listitem><para><guimenuitem></guimenuitem>: </para></listitem>
 -	  <listitem><para><guimenuitem></guimenuitem>: </para></listitem>
 -	  <listitem><para><guimenuitem></guimenuitem>: </para></listitem>
 -	  <listitem><para><guimenuitem></guimenuitem>: </para></listitem>
 -	  <listitem><para><guimenuitem></guimenuitem>: </para></listitem>
 -	  <listitem><para><guimenuitem></guimenuitem>: </para></listitem>
 +	  <listitem><para><guimenuitem>Align comment of suboperations</guimenuitem>: Correct single operations having comments not aligned</para></listitem>
 +	  <listitem><para><guimenuitem>Align date of suboperations</guimenuitem>: Correct single operations having dates not aligned</para></listitem>
 +	  <listitem><para><guimenuitem>Remove groups with only one operation</guimenuitem>: Correct alone in a group</para></listitem>
 +	  <listitem><para><guimenuitem>Delete unsued payees</guimenuitem>: nothing to add</para></listitem>
 +	  <listitem><para><guimenuitem>Delete unsued categories</guimenuitem>: nothing to add</para></listitem>
 +	  <listitem><para><guimenuitem>Delete unsued units</guimenuitem>: nothing to add</para></listitem>
 +	  <listitem><para><guimenuitem>Validate operations that do not require further action</guimenuitem>: Validate imported operations </para></listitem>
 +	  <listitem><para><guimenuitem>Process budget rules</guimenuitem>: Recompute the <link linkend="budgets">budgets</link> based on defined rules</para></listitem>
        </itemizedlist>
        </sect2>