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

Stephane Mankowski stephane at mankowski.fr
Mon Jun 9 20:39:32 UTC 2014


Git commit ce0682f08bd26685ef1297198f630603d93db9a3 by Stephane Mankowski.
Committed on 09/06/2014 at 20:39.
Pushed by smankowski into branch 'master'.

Merge branch 'master' of kde:skrooge

Conflicts:
	doc/index.docbook

M  +14   -14   doc/index.docbook

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

diff --cc doc/index.docbook
index 61dd3c5,3e3da5c..4c8418c
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@@ -381,48 -303,9 +381,48 @@@
  	  </mediaobject>
  	</screenshot>
  	
 -	<para>Each context will be described in a specific chapter in this handbook.</para>
 +	<para>
 +	  When this dock is visible, it will display the custom properties of the selected object (For: Selection) or of all objects (For: All) , whether it is an account, an operation, category, unit... This dock allows to create, update or delete properties.
 +	</para>
 +	
 +	<para>
 +	  A property can be:
 +	  <itemizedlist>
 +	    
 +	    <listitem>
 +	      <para>
 +		A simple string
 +	      </para>
 +	    </listitem>
 +	    
 +	    <listitem>
 +	      <para>
 +		A copied file whatever the format (odt, png, pdf, ...).
 +		It means that the file is copied into the &appname; document.
 +		This file can be opened from &appname; by clicking on the appropriate button.
 +		Take care, all modifications of original file are not replicated in the version saved in &appname; document.
 +	      </para>
 +	    </listitem>
 +	    
 +	    <listitem>
 +	      <para>
 +		A link to an existing file whatever the format (odt, png, pdf, ...).
- 		It means that the file is not copied into the &appname; document but just linked
++		It means that the file is not copied into the &appname; document but just linked.
 +		This file can be opened from &appname; by clicking on the appropriate button.
 +	      </para>
 +	    </listitem>
 +	    
 +	    <listitem>
 +	      <para>
- 		A link to a http page. Example: the website of your bank.
++		A link to an http page. Example: the website of your bank.
 +	      </para>
 +	    </listitem>
 +	  </itemizedlist>	  
 +	  
 +	  Added properties can be displayed as a column on <link linkend="tables">tables</link>
 +	</para>	
        </sect2>
 -      
 +   
        <sect2 id="multi-tabs">
  	<title>Multiple Tabs</title>
  	
@@@ -626,22 -631,65 +626,22 @@@
  	
  	<para>One the following formats may be used:</para>
  	
 -	<variablelist>
 -	  <varlistentry>
 -	    <term>AFB120</term>
 -	    <listitem><para>A French norm.</para></listitem>
 -	  </varlistentry>		  
 -	  <varlistentry>
 -	    <term>CSV</term>
 -	    <listitem><para>Comma Separated Value. Though not strictly a financial format, it is quite often available as an export format from banks or other applications, mostly because it is so easy to use in a spreadsheet.</para></listitem>
 -	  </varlistentry>
 -	  <varlistentry>
 -	    <term>GnuCash</term>
 -	    <listitem><para>Format of the GnuCash application. If you want to migrate from this application, this is the recommended format to use.</para></listitem>
 -	  </varlistentry>
 -	  <varlistentry>
 -	    <term>Grisbi</term>
 -	    <listitem><para>Format of the Grisbi application. If you want to migrate from this application, this is the recommended format to use.</para></listitem>
 -	  </varlistentry>
 -	  <varlistentry>
 -	    <term>Homebank</term>
 -	    <listitem><para>Format of the Homebank application. If you want to migrate from this application, this is the recommended format to use.</para></listitem>
 -	  </varlistentry>
 -	  <varlistentry>
 -	    <term>Kmymoney</term>
 -	    <listitem><para>Format of the Kmymoney application. If you want to migrate from this application, this is the recommended format to use.</para></listitem>
 -	  </varlistentry>	  
 -	  <varlistentry>
 -	    <term>MT940</term>
 -	    <listitem><para>An international norm defined by SWIFT.</para></listitem>
 -	  </varlistentry>
 -	  <varlistentry>
 -	    <term>&Microsoft; Money</term>
 -	    <listitem><para>Format of the &Microsoft; Money application. If you want to migrate from this application, this is the recommended format to use.</para></listitem>
 -	  </varlistentry>
 -	  <varlistentry>
 -	    <term>Money Manager Ex</term>
 -	    <listitem><para>Format of the Money Manager Ex application. If you want to migrate from this application, this is the recommended format to use.</para></listitem>
 -	  </varlistentry>	  
 -	  <varlistentry>
 -	    <term>OFX</term>
 -	    <listitem><para>Open Financial eXchange. It is a well defined & documented format, that &appname; imports using a third party library (libofx). This is the recommended format for imports.</para></listitem>
 -	  </varlistentry>
 -	  <varlistentry>
 -	    <term>QFX</term>
 -	    <listitem><para>QFX is a customization of OFX from the commercial software <trademark>Quicken</trademark>.</para></listitem>
 -	  </varlistentry>
 -	  <varlistentry>
 -	    <term>QIF</term>
 -	    <listitem><para><trademark>Quicken</trademark> Import File. Maybe the most common financial file format. However, it has some rather annoying limitations, like not giving the unit for operation, or no strict date formatting.</para></listitem>
 -	  </varlistentry>
 -	  <varlistentry>
 -	    <term>&appname;</term>
 -	    <listitem><para>This is useful to merge 2 &appname; documents</para></listitem>
 -	  </varlistentry>	
 -	  <varlistentry>
 -	    <term>Backend</term>
 -	    <listitem><para>&appname; can also import operations by using a backend. The only one supported is WEBOOB. By using this backend you can import all operations from all your banks in only one click. For that, you just have to install WEBOOB and activate the corresponding backend from settings.</para></listitem>
 -	  </varlistentry>	  
 -	</variablelist>
 -	
 +	<itemizedlist>
 +	    <listitem><para>AFB120:A French norm.</para></listitem>	  
 +	    <listitem><para>CSV: Comma Separated Value. Though not strictly a financial format, it is quite often available as an export format from banks or other applications, mostly because it is so easy to use in a spreadsheet.</para></listitem>
- 	    <listitem><para>GnuCash: Format of the GnuCash application. If you want to migrate from this application, this is the recommanded format to use.</para></listitem>
- 	    <listitem><para>Grisbi: Format of the Grisbi application. If you want to migrate from this application, this is the recommanded format to use.</para></listitem>
- 	    <listitem><para>Homebank: Format of the Homebank application. If you want to migrate from this application, this is the recommanded format to use.</para></listitem>
- 	    <listitem><para>Kmymoney: Format of the Kmymoney application. If you want to migrate from this application, this is the recommanded format to use.</para></listitem>
++	    <listitem><para>GnuCash: Format of the GnuCash application. If you want to migrate from this application, this is the recommended format to use.</para></listitem>
++	    <listitem><para>Grisbi: Format of the Grisbi application. If you want to migrate from this application, this is the recommended format to use.</para></listitem>
++	    <listitem><para>Homebank: Format of the Homebank application. If you want to migrate from this application, this is the recommended format to use.</para></listitem>
++	    <listitem><para>Kmymoney: Format of the Kmymoney application. If you want to migrate from this application, this is the recommended format to use.</para></listitem>
 +	    <listitem><para>MT940: An international norm defined by SWIFT.</para></listitem>
- 	    <listitem><para>Microsoft Money: Format of the Microsoft Money application. If you want to migrate from this application, this is the recommanded format to use.</para></listitem>
- 	    <listitem><para>Money Manager Ex: Format of the Money Manager Ex application. If you want to migrate from this application, this is the recommanded format to use.</para></listitem>
++	    <listitem><para>Microsoft Money: Format of the Microsoft Money application. If you want to migrate from this application, this is the recommended format to use.</para></listitem>
++	    <listitem><para>Money Manager Ex: Format of the Money Manager Ex application. If you want to migrate from this application, this is the recommended format to use.</para></listitem>
 +	    <listitem><para>OFX: Open Financial eXchange. It is a well defined & documented format, that &appname; imports using a third party library (libofx). This is the recommended format for imports.</para></listitem>
 +	    <listitem><para>QFX: QFX is a customization of OFX from the commercial software <trademark>Quicken</trademark>.</para></listitem>
 +	    <listitem><para>QIF: <trademark>Quicken</trademark> Import File. Maybe the most common financial file format. However, it has some rather annoying limitations, like not giving the unit for operation, or no strict date formatting.</para></listitem>
 +	    <listitem><para>SKG: This is useful to merge 2 &appname; documents</para></listitem>
 +	    <listitem><para>Backend: &appname; can also import operations by using a backend. The only one supported is WEBOOB. By using this backend you can import all operations from all your banks in only one click. For that, you just have to install WEBOOB and activate the corresponding backend from settings.</para></listitem>	  
 +	</itemizedlist>
        </sect2>
        
        <sect2 id="csv_specificities">


More information about the kde-doc-english mailing list