r20747 - gnucash/branches/2.4/accounts - [20745] Replace deprecated xml tag in chart of accounts templates

Geert Janssens gjanssens at code.gnucash.org
Fri Jun 10 12:44:54 EDT 2011


Author: gjanssens
Date: 2011-06-10 12:44:53 -0400 (Fri, 10 Jun 2011)
New Revision: 20747
Trac: http://svn.gnucash.org/trac/changeset/20747

Modified:
   gnucash/branches/2.4/accounts/cs/acctchrt_brokerage.gnucash-xea
   gnucash/branches/2.4/accounts/cs/acctchrt_carloan.gnucash-xea
   gnucash/branches/2.4/accounts/cs/acctchrt_cdmoneymkt.gnucash-xea
   gnucash/branches/2.4/accounts/cs/acctchrt_childcare.gnucash-xea
   gnucash/branches/2.4/accounts/cs/acctchrt_common.gnucash-xea
   gnucash/branches/2.4/accounts/cs/acctchrt_currency.gnucash-xea
   gnucash/branches/2.4/accounts/cs/acctchrt_eduloan.gnucash-xea
   gnucash/branches/2.4/accounts/cs/acctchrt_fixedassets.gnucash-xea
   gnucash/branches/2.4/accounts/cs/acctchrt_homeloan.gnucash-xea
   gnucash/branches/2.4/accounts/cs/acctchrt_homeown.gnucash-xea
   gnucash/branches/2.4/accounts/cs/acctchrt_otherloan.gnucash-xea
   gnucash/branches/2.4/accounts/cs/acctchrt_renter.gnucash-xea
   gnucash/branches/2.4/accounts/cs/acctchrt_retiremt.gnucash-xea
   gnucash/branches/2.4/accounts/cs/acctchrt_spouseinc.gnucash-xea
   gnucash/branches/2.4/accounts/cs/acctchrt_spouseretire.gnucash-xea
   gnucash/branches/2.4/accounts/da/acctchrt_car.gnucash-xea
   gnucash/branches/2.4/accounts/da/acctchrt_common.gnucash-xea
   gnucash/branches/2.4/accounts/da/acctchrt_homeloan.gnucash-xea
   gnucash/branches/2.4/accounts/da/acctchrt_homeown.gnucash-xea
   gnucash/branches/2.4/accounts/es_ES/acctchrt_brokerage.gnucash-xea
   gnucash/branches/2.4/accounts/es_ES/acctchrt_carloan.gnucash-xea
   gnucash/branches/2.4/accounts/es_ES/acctchrt_cdmoneymkt.gnucash-xea
   gnucash/branches/2.4/accounts/es_ES/acctchrt_childcare.gnucash-xea
   gnucash/branches/2.4/accounts/es_ES/acctchrt_common.gnucash-xea
   gnucash/branches/2.4/accounts/es_ES/acctchrt_currency.gnucash-xea
   gnucash/branches/2.4/accounts/es_ES/acctchrt_eduloan.gnucash-xea
   gnucash/branches/2.4/accounts/es_ES/acctchrt_fixedassets.gnucash-xea
   gnucash/branches/2.4/accounts/es_ES/acctchrt_homeloan.gnucash-xea
   gnucash/branches/2.4/accounts/es_ES/acctchrt_homeown.gnucash-xea
   gnucash/branches/2.4/accounts/es_ES/acctchrt_otherloan.gnucash-xea
   gnucash/branches/2.4/accounts/es_ES/acctchrt_renter.gnucash-xea
   gnucash/branches/2.4/accounts/es_ES/acctchrt_retiremt.gnucash-xea
   gnucash/branches/2.4/accounts/es_ES/acctchrt_spouseinc.gnucash-xea
   gnucash/branches/2.4/accounts/es_ES/acctchrt_spouseretire.gnucash-xea
   gnucash/branches/2.4/accounts/es_MX/acctchrt_brokerage.gnucash-xea
   gnucash/branches/2.4/accounts/es_MX/acctchrt_carloan.gnucash-xea
   gnucash/branches/2.4/accounts/es_MX/acctchrt_cdmoneymkt.gnucash-xea
   gnucash/branches/2.4/accounts/es_MX/acctchrt_childcare.gnucash-xea
   gnucash/branches/2.4/accounts/es_MX/acctchrt_common.gnucash-xea
   gnucash/branches/2.4/accounts/es_MX/acctchrt_currency.gnucash-xea
   gnucash/branches/2.4/accounts/es_MX/acctchrt_eduloan.gnucash-xea
   gnucash/branches/2.4/accounts/es_MX/acctchrt_fixedassets.gnucash-xea
   gnucash/branches/2.4/accounts/es_MX/acctchrt_homeloan.gnucash-xea
   gnucash/branches/2.4/accounts/es_MX/acctchrt_homeown.gnucash-xea
   gnucash/branches/2.4/accounts/es_MX/acctchrt_otherloan.gnucash-xea
   gnucash/branches/2.4/accounts/es_MX/acctchrt_renter.gnucash-xea
   gnucash/branches/2.4/accounts/es_MX/acctchrt_retiremt.gnucash-xea
   gnucash/branches/2.4/accounts/es_MX/acctchrt_spouseinc.gnucash-xea
   gnucash/branches/2.4/accounts/es_MX/acctchrt_spouseretire.gnucash-xea
   gnucash/branches/2.4/accounts/fr_CH/acctchrt_brokerage.gnucash-xea
   gnucash/branches/2.4/accounts/fr_CH/acctchrt_carloan.gnucash-xea
   gnucash/branches/2.4/accounts/fr_CH/acctchrt_cdmoneymkt.gnucash-xea
   gnucash/branches/2.4/accounts/fr_CH/acctchrt_childcare.gnucash-xea
   gnucash/branches/2.4/accounts/fr_CH/acctchrt_common.gnucash-xea
   gnucash/branches/2.4/accounts/fr_CH/acctchrt_currency.gnucash-xea
   gnucash/branches/2.4/accounts/fr_CH/acctchrt_eduloan.gnucash-xea
   gnucash/branches/2.4/accounts/fr_CH/acctchrt_fixedassets.gnucash-xea
   gnucash/branches/2.4/accounts/fr_CH/acctchrt_homeloan.gnucash-xea
   gnucash/branches/2.4/accounts/fr_CH/acctchrt_homeown.gnucash-xea
   gnucash/branches/2.4/accounts/fr_CH/acctchrt_otherloan.gnucash-xea
   gnucash/branches/2.4/accounts/fr_CH/acctchrt_renter.gnucash-xea
   gnucash/branches/2.4/accounts/fr_CH/acctchrt_retiremt.gnucash-xea
   gnucash/branches/2.4/accounts/fr_CH/acctchrt_spouseinc.gnucash-xea
   gnucash/branches/2.4/accounts/fr_CH/acctchrt_spouseretire.gnucash-xea
   gnucash/branches/2.4/accounts/fr_FR/acctchrt_brokerage.gnucash-xea
   gnucash/branches/2.4/accounts/fr_FR/acctchrt_carloan.gnucash-xea
   gnucash/branches/2.4/accounts/fr_FR/acctchrt_cdmoneymkt.gnucash-xea
   gnucash/branches/2.4/accounts/fr_FR/acctchrt_childcare.gnucash-xea
   gnucash/branches/2.4/accounts/fr_FR/acctchrt_common.gnucash-xea
   gnucash/branches/2.4/accounts/fr_FR/acctchrt_currency.gnucash-xea
   gnucash/branches/2.4/accounts/fr_FR/acctchrt_eduloan.gnucash-xea
   gnucash/branches/2.4/accounts/fr_FR/acctchrt_fixedassets.gnucash-xea
   gnucash/branches/2.4/accounts/fr_FR/acctchrt_homeloan.gnucash-xea
   gnucash/branches/2.4/accounts/fr_FR/acctchrt_homeown.gnucash-xea
   gnucash/branches/2.4/accounts/fr_FR/acctchrt_otherloan.gnucash-xea
   gnucash/branches/2.4/accounts/fr_FR/acctchrt_renter.gnucash-xea
   gnucash/branches/2.4/accounts/fr_FR/acctchrt_retiremt.gnucash-xea
   gnucash/branches/2.4/accounts/fr_FR/acctchrt_spouseinc.gnucash-xea
   gnucash/branches/2.4/accounts/fr_FR/acctchrt_spouseretire.gnucash-xea
   gnucash/branches/2.4/accounts/pt_BR/acctchrt_brokerage.gnucash-xea
   gnucash/branches/2.4/accounts/pt_BR/acctchrt_carloan.gnucash-xea
   gnucash/branches/2.4/accounts/pt_BR/acctchrt_cdmoneymkt.gnucash-xea
   gnucash/branches/2.4/accounts/pt_BR/acctchrt_childcare.gnucash-xea
   gnucash/branches/2.4/accounts/pt_BR/acctchrt_common.gnucash-xea
   gnucash/branches/2.4/accounts/pt_BR/acctchrt_currency.gnucash-xea
   gnucash/branches/2.4/accounts/pt_BR/acctchrt_eduloan.gnucash-xea
   gnucash/branches/2.4/accounts/pt_BR/acctchrt_fixedassets.gnucash-xea
   gnucash/branches/2.4/accounts/pt_BR/acctchrt_homeloan.gnucash-xea
   gnucash/branches/2.4/accounts/pt_BR/acctchrt_homeown.gnucash-xea
   gnucash/branches/2.4/accounts/pt_BR/acctchrt_otherloan.gnucash-xea
   gnucash/branches/2.4/accounts/pt_BR/acctchrt_renter.gnucash-xea
   gnucash/branches/2.4/accounts/pt_BR/acctchrt_retiremt.gnucash-xea
   gnucash/branches/2.4/accounts/pt_BR/acctchrt_spouseinc.gnucash-xea
   gnucash/branches/2.4/accounts/pt_BR/acctchrt_spouseretire.gnucash-xea
   gnucash/branches/2.4/accounts/sk/acctchrt_brokerage.gnucash-xea
   gnucash/branches/2.4/accounts/sk/acctchrt_carloan.gnucash-xea
   gnucash/branches/2.4/accounts/sk/acctchrt_cdmoneymkt.gnucash-xea
   gnucash/branches/2.4/accounts/sk/acctchrt_childcare.gnucash-xea
   gnucash/branches/2.4/accounts/sk/acctchrt_common.gnucash-xea
   gnucash/branches/2.4/accounts/sk/acctchrt_currency.gnucash-xea
   gnucash/branches/2.4/accounts/sk/acctchrt_eduloan.gnucash-xea
   gnucash/branches/2.4/accounts/sk/acctchrt_fixedassets.gnucash-xea
   gnucash/branches/2.4/accounts/sk/acctchrt_homeloan.gnucash-xea
   gnucash/branches/2.4/accounts/sk/acctchrt_homeown.gnucash-xea
   gnucash/branches/2.4/accounts/sk/acctchrt_otherloan.gnucash-xea
   gnucash/branches/2.4/accounts/sk/acctchrt_renter.gnucash-xea
   gnucash/branches/2.4/accounts/sk/acctchrt_retiremt.gnucash-xea
   gnucash/branches/2.4/accounts/sk/acctchrt_spouseinc.gnucash-xea
   gnucash/branches/2.4/accounts/sk/acctchrt_spouseretire.gnucash-xea
Log:
[20745] Replace deprecated xml tag in chart of accounts templates

Modified: gnucash/branches/2.4/accounts/cs/acctchrt_brokerage.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/cs/acctchrt_brokerage.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/cs/acctchrt_brokerage.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Aktiva</act:name>
   <act:id type="new">52b5942b5beaec856eaca5a75ee71592</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktiva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Investice</act:name>
   <act:id type="new">7ff59d92615cce4d8388d7e179ee3ff6</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investice</act:description>
   <act:parent type="new">52b5942b5beaec856eaca5a75ee71592</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
     <act:name>Makléřský účet</act:name>
   <act:id type="new">f15ec9568727f08a5ebd8f3e66483876</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investice na účtu u brokera</act:description>
   <act:parent type="new">7ff59d92615cce4d8388d7e179ee3ff6</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Dluhopis</act:name>
   <act:id type="new">8196bf0015c25f501338f07a87c512d8</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dluhopis</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Akcie</act:name>
   <act:id type="new">7d7db9bed07f21fc0b1f50674702aff0</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Akcie</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Index Trhu</act:name>
   <act:id type="new">fe9db8a7eedf2990e9846f634a922143</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Index Trhu</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -85,10 +85,10 @@
   <act:name>Podílový fond</act:name>
   <act:id type="new">9da28c1aa7789e84bdc8484ba8f527b3</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Podílový fond</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -96,10 +96,10 @@
   <act:name>Příjem</act:name>
   <act:id type="new">9da3c880bd04b9db49eb7f5b06403bda</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Příjem</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -107,10 +107,10 @@
   <act:name>Dividendový příjem</act:name>
   <act:id type="new">1af1f4894aeab96d840e66254d023b88</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dividendový příjem</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -118,10 +118,10 @@
   <act:name>Úrokový příjem</act:name>
   <act:id type="new">7943bc59ffbb9a7be4afcd2996147119</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrokový příjem</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -129,10 +129,10 @@
   <act:name>Úrok dluhopisu</act:name>
   <act:id type="new">8ceb4752a11e2d342b9009b343fdba38</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok dluhopisu</act:description>
   <act:parent type="new">7943bc59ffbb9a7be4afcd2996147119</act:parent>
 </gnc:account>
@@ -140,10 +140,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">6de23244232785031501171abcc1d4aa</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -151,10 +151,10 @@
   <act:name>Poplatky</act:name>
   <act:id type="new">77fdffddc79c662c93c482cefa5a4744</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Poplatky</act:description>
   <act:parent type="new">6de23244232785031501171abcc1d4aa</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/cs/acctchrt_carloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/cs/acctchrt_carloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/cs/acctchrt_carloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Pasiva</act:name>
   <act:id type="new">33a326fe16ae360f777a94b3f5bdfbdc</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasiva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Dluhy</act:name>
   <act:id type="new">023e2343114b3d695feaeb96904e0da6</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dluhy</act:description>
   <act:parent type="new">33a326fe16ae360f777a94b3f5bdfbdc</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Úvěr na dopravní prostředek</act:name>
   <act:id type="new">3e5f44fd7bfaa9cae737a4113a749e36</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úvěr na dopravní prostředek</act:description>
   <act:parent type="new">023e2343114b3d695feaeb96904e0da6</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">acacdcb998e45fb741766622e8542f0b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Úrok</act:name>
   <act:id type="new">9e8495e80ebfb762089be917dff7ab72</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok</act:description>
   <act:parent type="new">acacdcb998e45fb741766622e8542f0b</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Úrok z úvěru na dopravní prostředek</act:name>
   <act:id type="new">e9bd8477e27361238d2f53c4fe7594ab</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok z úvěru na dopravní prostředek</act:description>
   <act:parent type="new">9e8495e80ebfb762089be917dff7ab72</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/cs/acctchrt_cdmoneymkt.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/cs/acctchrt_cdmoneymkt.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/cs/acctchrt_cdmoneymkt.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Aktiva</act:name>
   <act:id type="new">7b1a39efc6234d1db148baa722c9471e</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktiva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Běžná aktiva</act:name>
   <act:id type="new">1880e89ec9fe82622b8648df481dd2b7</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Běžná aktiva</act:description>
   <act:parent type="new">7b1a39efc6234d1db148baa722c9471e</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
     <act:name>Depozitní certifikát</act:name>
   <act:id type="new">c1620f9c3082e33d8fd559e17f90a122</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Depozitní certifikát</act:description>
   <act:parent type="new">1880e89ec9fe82622b8648df481dd2b7</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Peněžní trh</act:name>
   <act:id type="new">3a01e5b0132ba26803b49732a3242654</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Peněžní trh</act:description>
   <act:parent type="new">1880e89ec9fe82622b8648df481dd2b7</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Příjem</act:name>
   <act:id type="new">4b3e36f325569b80efc7d3331bdf851b</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Příjem</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Úrokový příjem</act:name>
   <act:id type="new">fd131cae797d1fb83c2e2bf57254eca5</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrokový příjem</act:description>
   <act:parent type="new">4b3e36f325569b80efc7d3331bdf851b</act:parent>
 </gnc:account>
@@ -85,10 +85,10 @@
   <act:name>Úrok depozitního certifikátu</act:name>
   <act:id type="new">28d311f0f38da5e35628e76ad8bcc853</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok depozitního certifikátu</act:description>
   <act:parent type="new">fd131cae797d1fb83c2e2bf57254eca5</act:parent>
 </gnc:account>
@@ -96,10 +96,10 @@
   <act:name>Úrok peněžního trhu</act:name>
   <act:id type="new">dc537946f39e84ccef7ce38f016249af</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok peněžního trhu</act:description>
   <act:parent type="new">fd131cae797d1fb83c2e2bf57254eca5</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/cs/acctchrt_childcare.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/cs/acctchrt_childcare.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/cs/acctchrt_childcare.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">ee8238ee2c2ce590160761df09b99b72</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Péče o dítě</act:name>
   <act:id type="new">8999739a6bfc46088a3ea5ec45e5f8a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Péče o dítě</act:description>
   <act:parent type="new">ee8238ee2c2ce590160761df09b99b72</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/cs/acctchrt_common.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/cs/acctchrt_common.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/cs/acctchrt_common.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
     <act:name>Aktiva</act:name>
   <act:id type="new">98f262dfab9a2b99ac42919dcf58d304</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktiva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
     <act:name>Aktuální aktiva</act:name>
   <act:id type="new">a1dd5f225156f110689c204fefded0ab</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktuální aktiva</act:description>
   <act:parent type="new">98f262dfab9a2b99ac42919dcf58d304</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>Šekový účet</act:name>
   <act:id type="new">b477aa9e0d4eb67c34e1e35903fb3f99</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Šekový účet</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Úspory</act:name>
   <act:id type="new">eeae5a1892e88adbc3b369c76ee4e889</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úspory</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -64,10 +64,10 @@
   <act:name>Hotovost v peněžence</act:name>
   <act:id type="new">07b454b9dd6f68c4b613c5f1ef76f884</act:id>
   <act:type>CASH</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Hotovost v peněžence</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -75,10 +75,10 @@
   <act:name>Pasiva</act:name>
   <act:id type="new">19a911feed9b41b8b01be036a2aed9fe</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasiva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -86,10 +86,10 @@
   <act:name>Splatné účty</act:name>
   <act:id type="new">a8186db64d71dc2ca5fdccb3234b531b</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Splatné účty</act:description>
   <act:parent type="new">19a911feed9b41b8b01be036a2aed9fe</act:parent>
 </gnc:account>
@@ -97,10 +97,10 @@
   <act:name>Kreditní karta</act:name>
   <act:id type="new">efc3caac2619666c53e6e27f02d5e716</act:id>
   <act:type>CREDIT</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Kreditní karta</act:description>
   <act:parent type="new">a8186db64d71dc2ca5fdccb3234b531b</act:parent>
 </gnc:account>
@@ -108,10 +108,10 @@
   <act:name>Příjem</act:name>
   <act:id type="new">a7ab23dd2d41616042034d5a012a0850</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Příjem</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -119,10 +119,10 @@
   <act:name>Bonus</act:name>
   <act:id type="new">59b72cd943a2ca6f077748bba9a942cd</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Bonus</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -130,10 +130,10 @@
   <act:name>Přijaté dary</act:name>
   <act:id type="new">1adcf2c65d7a66f32144ccd9ce4f438f</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Přijaté dary</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -141,10 +141,10 @@
   <act:name>Úrokový příjem</act:name>
   <act:id type="new">c47361e40d9478ec11758097e64d693c</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrokový příjem</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -152,10 +152,10 @@
   <act:name>Šekový úrok</act:name>
   <act:id type="new">73481e2da7461fc34e7003b7ec560bdf</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Šekový úrok</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -163,10 +163,10 @@
   <act:name>Ostatní úroky</act:name>
   <act:id type="new">be17363347a8578c48cecd06bc8b7aa8</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ostatní úroky</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -174,10 +174,10 @@
   <act:name>Úroky z úspor</act:name>
   <act:id type="new">2802ac0d1bff1c09a903f2ad6fde2725</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úroky z úspor</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -185,10 +185,10 @@
   <act:name>Ostatní příjmy</act:name>
   <act:id type="new">49525ad0fb4ced06b9874d365d53f505</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ostatní příjmy</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -196,10 +196,10 @@
   <act:name>Mzda</act:name>
   <act:id type="new">a750b99cb8487a5e47daedcd3a69fe85</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Mzda</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -207,10 +207,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -218,10 +218,10 @@
     <act:name>Úpravy</act:name>
   <act:id type="new">72f85277a7a7f8b4de175405e20d83bd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úpravy</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -229,10 +229,10 @@
   <act:name>Auto</act:name>
   <act:id type="new">56df186f1ce6114ddca7b9e5d03af390</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Auto</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -240,10 +240,10 @@
   <act:name>Poplatky</act:name>
   <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Poplatky</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -251,10 +251,10 @@
   <act:name>Benzín</act:name>
   <act:id type="new">e64b5eecf86ce4e27a64c477a4c77477</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Benzín</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -262,10 +262,10 @@
   <act:name>Parkovné</act:name>
   <act:id type="new">d72262c1c0e2c3388183ebb44a98b011</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Parkovné</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -273,10 +273,10 @@
   <act:name>Opravy a údržba</act:name>
   <act:id type="new">665dd78f0cc75dd331f556949337de68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Opravy a údržba</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -284,10 +284,10 @@
   <act:name>Poplatky za bankovní služby</act:name>
   <act:id type="new">fb6c8e25a50737e70fffde432a2355ee</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Poplatky za bankovní služby</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -295,10 +295,10 @@
   <act:name>Knihy</act:name>
   <act:id type="new">36479bbc17680f4b9663a9842736153f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Knihy</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -306,10 +306,10 @@
   <act:name>Kabelová TV</act:name>
   <act:id type="new">a1393344fb199f08f751ac3154694e87</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Kabelová TV</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -317,10 +317,10 @@
   <act:name>Charita</act:name>
   <act:id type="new">ec8eec3d46c69aa861fda836e11346c0</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Charita</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -328,10 +328,10 @@
   <act:name>Oděvy</act:name>
   <act:id type="new">c27a040a73eac2688d85d29b5b5309c8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Oděvy</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -339,10 +339,10 @@
   <act:name>Počítač</act:name>
   <act:id type="new">fc4390b6214ad1576c5ffffc2b3c268c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Počítač</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -350,10 +350,10 @@
   <act:name>Jídelna</act:name>
   <act:id type="new">0a59a3347e4ff02b862de41ef59d7351</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Jídelna</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -361,10 +361,10 @@
   <act:name>Vzdělání</act:name>
   <act:id type="new">5b5ac050529b0f553752babe4a6a35d2</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Vzdělání</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -372,10 +372,10 @@
   <act:name>Zábava</act:name>
   <act:id type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Zábava</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -383,10 +383,10 @@
   <act:name>Hudba/Film</act:name>
   <act:id type="new">4570ea8f4ac5cbd7d8927c905f0978ae</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Hudba/Film</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -394,10 +394,10 @@
   <act:name>Rekreace</act:name>
   <act:id type="new">7db9b0aa3bc348da9900f95fc67541a1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Rekreace</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -405,10 +405,10 @@
   <act:name>Cestování</act:name>
   <act:id type="new">def0eac939dbd668f503d84860de8d6e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cestování</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -416,10 +416,10 @@
   <act:name>Dary</act:name>
   <act:id type="new">f86b1cebc619455ada23952a0e810909</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dary</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -427,10 +427,10 @@
   <act:name>Potraviny</act:name>
   <act:id type="new">83bc2bd915ab6b74c7107b55f8783523</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Potraviny</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -438,10 +438,10 @@
   <act:name>Zájmy</act:name>
   <act:id type="new">89f6400a94cd87fea0b056faf6ab7744</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Zájmy</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -449,10 +449,10 @@
   <act:name>Pojištění</act:name>
   <act:id type="new">5bda5ff833bc395dc1b00f95c66ce555</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pojištění</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -460,10 +460,10 @@
   <act:name>Pojištění auta</act:name>
   <act:id type="new">cd72695526906a15ba1a1d9a7680b8e7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pojištění auta</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -471,10 +471,10 @@
   <act:name>Zdravotní pojištění</act:name>
   <act:id type="new">d80613194a52340c9e5eb62e853c72cf</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Zdravotní pojištění</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -482,10 +482,10 @@
   <act:name>Životní pojištění</act:name>
   <act:id type="new">70a327f54be53ef187a52b1d8df70fdd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Životní pojištění</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -493,10 +493,10 @@
     <act:name>Prádelna/Čistírna</act:name>
   <act:id type="new">1006551b2458631dfc8507b7451c9631</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Prádelna/Čistírna</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -504,10 +504,10 @@
     <act:name>Výdaje na léčení</act:name>
   <act:id type="new">62752930dd1b2b4c90c6d198bd2ff33f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje na léčení</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -515,10 +515,10 @@
   <act:name>Různé</act:name>
   <act:id type="new">759deef82e73587bf48a7dd76aa6abe8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Různé</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -526,10 +526,10 @@
   <act:name>Online služby</act:name>
   <act:id type="new">2170a1a631cc3b6fc32813fa49a12f77</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Online služby</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -537,10 +537,10 @@
   <act:name>Telefon</act:name>
   <act:id type="new">1d9d7265e25c6c84dda514d2e8899e87</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Telefon</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -548,10 +548,10 @@
   <act:name>MHD</act:name>
   <act:id type="new">64aa760163c7768518e49a104d1c171f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Městká hromadná doprava</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -559,10 +559,10 @@
   <act:name>Předplatné</act:name>
   <act:id type="new">0336712690d36bcb02e0ce59b5d7653b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Předplatné</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -570,10 +570,10 @@
   <act:name>Zásobování</act:name>
   <act:id type="new">e2b34f49d4cf916cf4d45525e1e7319d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Zásobování</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -581,10 +581,10 @@
   <act:name>Odvody a danÄ›</act:name>
   <act:id type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Odvody a danÄ›</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -592,10 +592,10 @@
   <act:name>Celostátní daně</act:name>
   <act:id type="new">090a786357463ec7fbee8066cb999097</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Celostátní daně</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -603,10 +603,10 @@
     <act:name>Zdravotní péče</act:name>
   <act:id type="new">0785932c5de43e814659420762c9b577</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Zdravotní péče</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -614,10 +614,10 @@
   <act:name>Ostatní daně</act:name>
   <act:id type="new">51875f8aaa0e4f2295a2ae13cf780b2e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ostatní daně</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -625,10 +625,10 @@
   <act:name>Sociální pojištění</act:name>
   <act:id type="new">c252f10f3d57dd05c500856164b1729e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Sociální pojištění</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -636,10 +636,10 @@
   <act:name>Místní daně a poplatky</act:name>
   <act:id type="new">cd1f1b512ed51a069fd83a5ffcaf6e11</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Místní daně a poplatky</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -647,10 +647,10 @@
   <act:name>Běžné služby</act:name>
   <act:id type="new">57635fa5f71dee8ffc207c277250e773</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Běžné služby</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -658,10 +658,10 @@
   <act:name>Elektrická energie</act:name>
   <act:id type="new">2fe462e202e2daffd845359b08a7eefe</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Elektrická energie</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -669,10 +669,10 @@
   <act:name>Odpadky</act:name>
   <act:id type="new">2d0315d7b2f8f11a8a8b32d805bca6eb</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Odpadky</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -680,10 +680,10 @@
   <act:name>Plyn</act:name>
   <act:id type="new">dcc33ce7edf402e327318aa1890d35ea</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Plyn</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -691,10 +691,10 @@
   <act:name>Voda</act:name>
   <act:id type="new">8cdc91b733444f9f0dfae9773b8f408c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Voda</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -702,10 +702,10 @@
   <act:name>Majetek</act:name>
   <act:id type="new">3ab6a6d97b216c11333e48aa2b749a91</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Majetek</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -713,10 +713,10 @@
   <act:name>Počáteční stav</act:name>
   <act:id type="new">a0a622a30410f75eba35d2875a843da8</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Počáteční stav</act:description>
   <act:parent type="new">3ab6a6d97b216c11333e48aa2b749a91</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/cs/acctchrt_currency.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/cs/acctchrt_currency.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/cs/acctchrt_currency.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Aktiva</act:name>
   <act:id type="new">b3c65be1c5d163746ddc0c506f3f4619</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktiva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Investice</act:name>
   <act:id type="new">d9c796b35784533aee4309e28a3cbfc5</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investice</act:description>
   <act:parent type="new">b3c65be1c5d163746ddc0c506f3f4619</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Měnové obchody</act:name>
   <act:id type="new">9206632307989cb5b244ad5da5d3131b</act:id>
   <act:type>CURRENCY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DEM</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Obchody s měnou</act:description>
   <act:parent type="new">d9c796b35784533aee4309e28a3cbfc5</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/cs/acctchrt_eduloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/cs/acctchrt_eduloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/cs/acctchrt_eduloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Pasiva</act:name>
   <act:id type="new">4e7e8e39487ad4aba0b62c2232c577c5</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasiva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Dluhy</act:name>
   <act:id type="new">c3219e37044b0531d66a7b64433b026d</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dluhy</act:description>
   <act:parent type="new">4e7e8e39487ad4aba0b62c2232c577c5</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
     <act:name>Studijní půjčka</act:name>
   <act:id type="new">ddeba367199bd025e00420a19d6f9ae4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Studijní půjčka</act:description>
   <act:parent type="new">c3219e37044b0531d66a7b64433b026d</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">fdbf47b39f70e8818f325eee7931039a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Úrok</act:name>
   <act:id type="new">1cfcd30ea97b954ffb550ab87d561033</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok</act:description>
   <act:parent type="new">fdbf47b39f70e8818f325eee7931039a</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Úrok ze studijní půjčky</act:name>
   <act:id type="new">04e3d970dc60d3920f40b93fce8924a2</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok ze studijní půjčky</act:description>
   <act:parent type="new">1cfcd30ea97b954ffb550ab87d561033</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/cs/acctchrt_fixedassets.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/cs/acctchrt_fixedassets.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/cs/acctchrt_fixedassets.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Aktiva</act:name>
   <act:id type="new">64b6276c060185131cecbd1ac6218440</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktiva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Fixní aktiva</act:name>
   <act:id type="new">9b171f77000bf68dd1ebbaf58336656d</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fixní aktiva</act:description>
   <act:parent type="new">64b6276c060185131cecbd1ac6218440</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Dům</act:name>
   <act:id type="new">9205ad6b6482903e5a696602d491c8f5</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dům</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Ostatní aktiva</act:name>
   <act:id type="new">ad3b239297277c9ef3840c0433cecb18</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ostatní aktiva</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
     <act:name>Dopravní prostředek</act:name>
   <act:id type="new">5913089ffc36df6f0a5d96a5d7a444c0</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dopravní prostředek</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/cs/acctchrt_homeloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/cs/acctchrt_homeloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/cs/acctchrt_homeloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Pasiva</act:name>
   <act:id type="new">6664763bd1ea41462cba5ef856d9c00c</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasiva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Dluhy</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dluhy</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Hypotéční úvěr</act:name>
   <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Hypotéční úvěr</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Úrok</act:name>
   <act:id type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok</act:description>
   <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Úrok z hypotéky</act:name>
   <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok z hypotéky</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/cs/acctchrt_homeown.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/cs/acctchrt_homeown.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/cs/acctchrt_homeown.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">84732f5fdd27b6463d75bf958e3a4b06</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Opravy domu</act:name>
   <act:id type="new">fa27de57090e107fa99fe1db53790f23</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Opravy domu</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Pojištění</act:name>
   <act:id type="new">4677fe36914ebcf23758f3bf20686b4a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pojištění</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Pojištění</act:name>
   <act:id type="new">3b5909f31bda0e0f76149fd600e0cb1d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pojištění</act:description>
   <act:parent type="new">4677fe36914ebcf23758f3bf20686b4a</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>DanÄ›</act:name>
   <act:id type="new">a931b8ffe2917ff9a069333623da96ca</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>DanÄ›</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Daň z nemovitosti</act:name>
   <act:id type="new">3994b8f5a6a8b2a0a48126fa955e03f7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Daň z nemovitosti</act:description>
   <act:parent type="new">a931b8ffe2917ff9a069333623da96ca</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/cs/acctchrt_otherloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/cs/acctchrt_otherloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/cs/acctchrt_otherloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Pasiva</act:name>
   <act:id type="new">8ec79e80d9abf58d78ce3129d3fe3365</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasiva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Dluhy</act:name>
   <act:id type="new">b5624a9d1a1b797b87b815774faccfe4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dluhy</act:description>
   <act:parent type="new">8ec79e80d9abf58d78ce3129d3fe3365</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Jiné půjčky</act:name>
   <act:id type="new">eb79670a4c9b0faab87485b7b2a4abe4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Jiné půjčky</act:description>
   <act:parent type="new">b5624a9d1a1b797b87b815774faccfe4</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">565e52a122e8acc9a67a36e61357e2ae</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Úrok</act:name>
   <act:id type="new">4a02c14e992ea79076837c164aa6fc8d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok</act:description>
   <act:parent type="new">565e52a122e8acc9a67a36e61357e2ae</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Ostatní úroky</act:name>
   <act:id type="new">f01de45e290ecc29b64d9cb8a733af68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ostatní úroky</act:description>
   <act:parent type="new">4a02c14e992ea79076837c164aa6fc8d</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/cs/acctchrt_renter.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/cs/acctchrt_renter.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/cs/acctchrt_renter.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">9a2b4520f113372f4e576f5b6dc129c6</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Pojištění</act:name>
   <act:id type="new">b79b231807a98cd562c46cf0454e9f25</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pojištění</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Pojištění nájemného</act:name>
   <act:id type="new">a4c93c964b8322d534e35b7054cbda4d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pojištění nájemného</act:description>
   <act:parent type="new">b79b231807a98cd562c46cf0454e9f25</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Nájemné</act:name>
   <act:id type="new">c1638a9a48d4d0e1b17d99219a18f34b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Nájemné</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/cs/acctchrt_retiremt.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/cs/acctchrt_retiremt.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/cs/acctchrt_retiremt.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Aktiva</act:name>
   <act:id type="new">e67ef2c52a4eaf3b9d37d317848a5812</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktiva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Investice</act:name>
   <act:id type="new">64cf99f6bafe0a539a5941ea713bdfcd</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investice</act:description>
   <act:parent type="new">e67ef2c52a4eaf3b9d37d317848a5812</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Penze</act:name>
   <act:id type="new">4173f3047238f4b5595b11d6161b2f48</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Penze</act:description>
   <act:slots>
     <slot>
@@ -58,10 +58,10 @@
   <act:name>Dluhopis</act:name>
   <act:id type="new">9053199c1da747555d12272f48c719fd</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dluhopis</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -69,10 +69,10 @@
   <act:name>Akcie</act:name>
   <act:id type="new">9bf53e9580991e323b297999fddff988</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Akcie</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -80,10 +80,10 @@
   <act:name>Index</act:name>
   <act:id type="new">2326b032fe4e8f434159310fccf17091</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Index</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -91,10 +91,10 @@
   <act:name>Podílový fond</act:name>
   <act:id type="new">a62d804729117e74a6c880cecb818b56</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Podílový fond</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/cs/acctchrt_spouseinc.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/cs/acctchrt_spouseinc.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/cs/acctchrt_spouseinc.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Příjem</act:name>
   <act:id type="new">b4fadf6188d7f1ae7e7aa4fa27f5cc95</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Příjem</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Mzda (Partner)</act:name>
   <act:id type="new">7c4495ff132d100b0aa339ce683200dd</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Partnerova mzda</act:description>
   <act:parent type="new">b4fadf6188d7f1ae7e7aa4fa27f5cc95</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
     <act:name>DanÄ› a poplatky (Partner)</act:name>
   <act:id type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Partnerovy danÄ› a poplatky</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Celostátní daně</act:name>
   <act:id type="new">78df9cf06ee197272a695a4c3044f749</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Celostátní daně</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Zdravotní péče</act:name>
   <act:id type="new">eba0c095658c7c3a4f4294db9c7392f3</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Zdravotní péče</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -85,10 +85,10 @@
   <act:name>Ostatní daně</act:name>
   <act:id type="new">dea0cf67026749c9a5aa97be4e5cd052</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ostatní daně</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -96,10 +96,10 @@
   <act:name>Sociální pojištění</act:name>
   <act:id type="new">9bd3abb2ed8c4c0d00f8e8ec36d2744d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Sociální pojištění</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -107,10 +107,10 @@
   <act:name>Místní daně</act:name>
   <act:id type="new">aa14dbcd622024495a8a972b0f37d13a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Místní daně</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/cs/acctchrt_spouseretire.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/cs/acctchrt_spouseretire.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/cs/acctchrt_spouseretire.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Aktiva</act:name>
   <act:id type="new">96d9b17add59eb4c7edec7ed241af755</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktiva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Investice</act:name>
   <act:id type="new">f46c9f777b1730c6b5f4a1faf9e31708</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investice</act:description>
   <act:parent type="new">96d9b17add59eb4c7edec7ed241af755</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
     <act:name>Partnerova penze</act:name>
   <act:id type="new">4426b41837adc284f96b291c31022844</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Partnerova penze</act:description>
   <act:slots>
     <slot>
@@ -58,10 +58,10 @@
     <act:name>Dluhopisy</act:name>
   <act:id type="new">c8e7c315502547e51bfdd5a70b5cdd2e</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dluhopisy</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -69,10 +69,10 @@
   <act:name>Akcie</act:name>
   <act:id type="new">b8838eb77b9603e035e1f7b440d468ae</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Akcie</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -80,10 +80,10 @@
   <act:name>Tržní Index</act:name>
   <act:id type="new">0ec1a5b402ceea10d95445a2b31c41a1</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Tržní Index</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -91,10 +91,10 @@
   <act:name>Podílový fond</act:name>
   <act:id type="new">d9ed01f9b8f9845bc3f68f3e0afb021f</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Podílový fond</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/da/acctchrt_car.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/da/acctchrt_car.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/da/acctchrt_car.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Udgifter</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Udgifter</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Bil</act:name>
   <act:id type="new">56df186f1ce6114ddca7b9e5d03af390</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Bil</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Vægtafgift</act:name>
   <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Vægtafgift</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Benzin</act:name>
   <act:id type="new">e64b5eecf86ce4e27a64c477a4c77477</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Benzin</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Parking</act:name>
   <act:id type="new">d72262c1c0e2c3388183ebb44a98b011</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Parking</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Reparation og vedligehold</act:name>
   <act:id type="new">665dd78f0cc75dd331f556949337de68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Reparation og vedligehold</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -85,10 +85,10 @@
   <act:name>Forsikring</act:name>
   <act:id type="new">5bda5ff833bc395dc1b00f95c66ce555</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Forsikring</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -96,10 +96,10 @@
   <act:name>Bilforsikring</act:name>
   <act:id type="new">cd72695526906a15ba1a1d9a7680b8e7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Bilforsikring</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/da/acctchrt_common.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/da/acctchrt_common.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/da/acctchrt_common.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Aktiver</act:name>
   <act:id type="new">98f262dfab9a2b99ac42919dcf58d304</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktiver</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Aktuelle aktiver</act:name>
   <act:id type="new">a1dd5f225156f110689c204fefded0ab</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktuelle aktiver</act:description>
   <act:parent type="new">98f262dfab9a2b99ac42919dcf58d304</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>Checkkonto</act:name>
   <act:id type="new">b477aa9e0d4eb67c34e1e35903fb3f99</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Checkkonto</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Lønkonto</act:name>
   <act:id type="new">eeae5a1892e88adbc3b369c76ee4e889</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Lønkonto</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -64,10 +64,10 @@
   <act:name>Kontanter på lommen</act:name>
   <act:id type="new">07b454b9dd6f68c4b613c5f1ef76f884</act:id>
   <act:type>CASH</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Kontanter på lommen</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -75,10 +75,10 @@
   <act:name>Passiver</act:name>
   <act:id type="new">19a911feed9b41b8b01be036a2aed9fe</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passiver</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -86,10 +86,10 @@
   <act:name>Forventede udgifter</act:name>
   <act:id type="new">a8186db64d71dc2ca5fdccb3234b531b</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Forventede udgifter</act:description>
   <act:parent type="new">19a911feed9b41b8b01be036a2aed9fe</act:parent>
 </gnc:account>
@@ -97,10 +97,10 @@
   <act:name>Kreditkort</act:name>
   <act:id type="new">efc3caac2619666c53e6e27f02d5e716</act:id>
   <act:type>CREDIT</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Kreditkort</act:description>
   <act:parent type="new">a8186db64d71dc2ca5fdccb3234b531b</act:parent>
 </gnc:account>
@@ -108,10 +108,10 @@
   <act:name>Indtægter</act:name>
   <act:id type="new">a7ab23dd2d41616042034d5a012a0850</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Indtægter</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -119,10 +119,10 @@
   <act:name>Bonus</act:name>
   <act:id type="new">59b72cd943a2ca6f077748bba9a942cd</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Bonus</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -130,10 +130,10 @@
   <act:name>Modtagne gaver</act:name>
   <act:id type="new">1adcf2c65d7a66f32144ccd9ce4f438f</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Modtagne gaver</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -141,10 +141,10 @@
   <act:name>Renteindtægter</act:name>
   <act:id type="new">c47361e40d9478ec11758097e64d693c</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Renteindtægter</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -152,10 +152,10 @@
   <act:name>Checkrenter</act:name>
   <act:id type="new">73481e2da7461fc34e7003b7ec560bdf</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Checkrenter</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -163,10 +163,10 @@
   <act:name>Andre renter</act:name>
   <act:id type="new">be17363347a8578c48cecd06bc8b7aa8</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Andre renter</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -174,10 +174,10 @@
   <act:name>Lønkontorenter</act:name>
   <act:id type="new">2802ac0d1bff1c09a903f2ad6fde2725</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Lønkontorenter</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -185,10 +185,10 @@
   <act:name>Andre indtægter</act:name>
   <act:id type="new">49525ad0fb4ced06b9874d365d53f505</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Andre indtægter</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -196,10 +196,10 @@
   <act:name>Løn</act:name>
   <act:id type="new">a750b99cb8487a5e47daedcd3a69fe85</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Løn</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -207,10 +207,10 @@
   <act:name>Udgifter</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Udgifter</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -218,10 +218,10 @@
   <act:name>Justering</act:name>
   <act:id type="new">72f85277a7a7f8b4de175405e20d83bd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Justering</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -229,10 +229,10 @@
   <act:name>Bankgebyrer</act:name>
   <act:id type="new">fb6c8e25a50737e70fffde432a2355ee</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Bankgebyrer</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -240,10 +240,10 @@
   <act:name>Bøger</act:name>
   <act:id type="new">36479bbc17680f4b9663a9842736153f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Bøger</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -251,10 +251,10 @@
   <act:name>Antenne</act:name>
   <act:id type="new">a1393344fb199f08f751ac3154694e87</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Antenne</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -262,10 +262,10 @@
   <act:name>Velgørenhed</act:name>
   <act:id type="new">ec8eec3d46c69aa861fda836e11346c0</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Velgørenhed</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -273,10 +273,10 @@
   <act:name>Tøj</act:name>
   <act:id type="new">c27a040a73eac2688d85d29b5b5309c8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Tøj</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -284,10 +284,10 @@
   <act:name>Computer</act:name>
   <act:id type="new">fc4390b6214ad1576c5ffffc2b3c268c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Computer</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -295,10 +295,10 @@
   <act:name>Restaurant</act:name>
   <act:id type="new">0a59a3347e4ff02b862de41ef59d7351</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Restaurant</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -306,10 +306,10 @@
   <act:name>Uddannelse</act:name>
   <act:id type="new">5b5ac050529b0f553752babe4a6a35d2</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Uddannelse</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -317,10 +317,10 @@
   <act:name>Underholdning</act:name>
   <act:id type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Underholdning</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -328,10 +328,10 @@
   <act:name>Musik/film</act:name>
   <act:id type="new">4570ea8f4ac5cbd7d8927c905f0978ae</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Musik og film</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -339,10 +339,10 @@
   <act:name>Fritid</act:name>
   <act:id type="new">7db9b0aa3bc348da9900f95fc67541a1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fritid</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -350,10 +350,10 @@
   <act:name>Rejser</act:name>
   <act:id type="new">def0eac939dbd668f503d84860de8d6e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Rejser</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -361,10 +361,10 @@
   <act:name>Gaver</act:name>
   <act:id type="new">f86b1cebc619455ada23952a0e810909</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gaver</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -372,10 +372,10 @@
   <act:name>Husholdning</act:name>
   <act:id type="new">83bc2bd915ab6b74c7107b55f8783523</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Husholdning</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -383,10 +383,10 @@
   <act:name>Hobby</act:name>
   <act:id type="new">89f6400a94cd87fea0b056faf6ab7744</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Hobby</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -394,10 +394,10 @@
   <act:name>Forsikring</act:name>
   <act:id type="new">5bda5ff833bc395dc1b00f95c66ce555</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Forsikring</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -405,10 +405,10 @@
   <act:name>Sygesikring</act:name>
   <act:id type="new">d80613194a52340c9e5eb62e853c72cf</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Sygesikring</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -416,10 +416,10 @@
   <act:name>Indboforsikring</act:name>
   <act:id type="new">d80613194a52340c9e5eb62e853c728f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Indboforsikring</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -427,10 +427,10 @@
   <act:name>Livsforsikring</act:name>
   <act:id type="new">70a327f54be53ef187a52b1d8df70fdd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Livsforsikring</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -438,10 +438,10 @@
   <act:name>Tøjvask/rensning</act:name>
   <act:id type="new">1006551b2458631dfc8507b7451c9631</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Tøjvask og -rensning</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -449,10 +449,10 @@
   <act:name>Medicin</act:name>
   <act:id type="new">62752930dd1b2b4c90c6d198bd2ff33f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Medicin</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -460,10 +460,10 @@
   <act:name>Diverse</act:name>
   <act:id type="new">759deef82e73587bf48a7dd76aa6abe8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Diverse</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -471,10 +471,10 @@
   <act:name>Internet</act:name>
   <act:id type="new">2170a1a631cc3b6fc32813fa49a12f77</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Internet</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -482,10 +482,10 @@
   <act:name>Telefon</act:name>
   <act:id type="new">1d9d7265e25c6c84dda514d2e8899e87</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Telefon</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -493,10 +493,10 @@
   <act:name>Offentlig transport</act:name>
   <act:id type="new">64aa760163c7768518e49a104d1c171f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Offentlig transport</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -504,10 +504,10 @@
   <act:name>Cykel</act:name>
   <act:id type="new">64aa760163c7768518e49a104d1c172f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cykel</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -515,10 +515,10 @@
   <act:name>Abonnementer</act:name>
   <act:id type="new">0336712690d36bcb02e0ce59b5d7653b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Abonnementer</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -526,10 +526,10 @@
   <act:name>Skatter/afgifter</act:name>
   <act:id type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Skatter og afgifter</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -537,10 +537,10 @@
   <act:name>Stat</act:name>
   <act:id type="new">090a786357463ec7fbee8066cb999097</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Stat</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -548,10 +548,10 @@
   <act:name>Amt</act:name>
   <act:id type="new">0785932c5de43e814659420762c9b577</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Amt</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -559,10 +559,10 @@
   <act:name>Kommune</act:name>
   <act:id type="new">cd1f1b512ed51a069fd83a5ffcaf6e11</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Kommune</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -570,10 +570,10 @@
   <act:name>Andre skatter</act:name>
   <act:id type="new">51875f8aaa0e4f2295a2ae13cf780b2e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Andre skatter</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -581,10 +581,10 @@
   <act:name>Forsyning</act:name>
   <act:id type="new">57635fa5f71dee8ffc207c277250e773</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Forsyning</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -592,10 +592,10 @@
   <act:name>El</act:name>
   <act:id type="new">2fe462e202e2daffd845359b08a7eefe</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>El</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -603,10 +603,10 @@
   <act:name>Affald</act:name>
   <act:id type="new">2d0315d7b2f8f11a8a8b32d805bca6eb</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Affaldsordning</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -614,10 +614,10 @@
   <act:name>Gas</act:name>
   <act:id type="new">dcc33ce7edf402e327318aa1890d35ea</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gas</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -625,10 +625,10 @@
   <act:name>Vand</act:name>
   <act:id type="new">8cdc91b733444f9f0dfae9773b8f408c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Vand</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -636,10 +636,10 @@
   <act:name>Afstemning</act:name>
   <act:id type="new">3ab6a6d97b216c11333e48aa2b749a91</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Afstemning</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -647,10 +647,10 @@
   <act:name>Åbningssaldi</act:name>
   <act:id type="new">a0a622a30410f75eba35d2875a843da8</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Åbningssaldi</act:description>
   <act:parent type="new">3ab6a6d97b216c11333e48aa2b749a91</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/da/acctchrt_homeloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/da/acctchrt_homeloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/da/acctchrt_homeloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Passiver</act:name>
   <act:id type="new">6664763bd1ea41462cba5ef856d9c00c</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passiver</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Lån</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Lån</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Realkreditlån</act:name>
   <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Realkreditlån</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Udgifter</act:name>
   <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Udgifter</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Renter</act:name>
   <act:id type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Renter</act:description>
   <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Realkreditrenter</act:name>
   <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Realkreditrenter</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/da/acctchrt_homeown.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/da/acctchrt_homeown.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/da/acctchrt_homeown.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Udgifter</act:name>
   <act:id type="new">84732f5fdd27b6463d75bf958e3a4b06</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Udgifter</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Vedligehold af bolig</act:name>
   <act:id type="new">fa27de57090e107fa99fe1db53790f23</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Vedligehold af bolig</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Fællesudgifter</act:name>
   <act:id type="new">fa27de57090e107fa99fe1db537a0f23</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fællesudgifter til ejerforening</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Forsikring</act:name>
   <act:id type="new">4677fe36914ebcf23758f3bf20686b4a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Forsikring</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Husforsikring</act:name>
   <act:id type="new">3b5909f31bda0e0f76149fd600e0cb1d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Husforsikring</act:description>
   <act:parent type="new">4677fe36914ebcf23758f3bf20686b4a</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Skatter/afgifter</act:name>
   <act:id type="new">a931b8ffe2917ff9a069333623da96ca</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Skatter/afgifter</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -85,10 +85,10 @@
   <act:name>Ejendomsskat</act:name>
   <act:id type="new">3994b8f5a6a8b2a0a48126fa955e03f7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DKK</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ejendomsskat</act:description>
   <act:parent type="new">a931b8ffe2917ff9a069333623da96ca</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_ES/acctchrt_brokerage.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_ES/acctchrt_brokerage.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_ES/acctchrt_brokerage.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Activo</act:name>
   <act:id type="new">52b5942b5beaec856eaca5a75ee71592</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Inversiones</act:name>
   <act:id type="new">7ff59d92615cce4d8388d7e179ee3ff6</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Inversiones</act:description>
   <act:parent type="new">52b5942b5beaec856eaca5a75ee71592</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Cuenta de inversión</act:name>
   <act:id type="new">f15ec9568727f08a5ebd8f3e66483876</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cuenta de inversión</act:description>
   <act:parent type="new">7ff59d92615cce4d8388d7e179ee3ff6</act:parent>
 </gnc:account>
@@ -54,10 +54,10 @@
   <act:name>Bonos</act:name>
   <act:id type="new">8196bf0015c25f501338f07a87c512d8</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Bonos</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -65,10 +65,10 @@
   <act:name>Acciones</act:name>
   <act:id type="new">7d7db9bed07f21fc0b1f50674702aff0</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Acciones</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -76,10 +76,10 @@
   <act:name>Fondo de índice</act:name>
   <act:id type="new">fe9db8a7eedf2990e9846f634a922143</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fondo de índice</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -87,10 +87,10 @@
   <act:name>Fondo de inversión</act:name>
   <act:id type="new">9da28c1aa7789e84bdc8484ba8f527b3</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fondo de inversión</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -98,10 +98,10 @@
   <act:name>Ingresos</act:name>
   <act:id type="new">9da3c880bd04b9db49eb7f5b06403bda</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ingresos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -109,10 +109,10 @@
   <act:name>Ingresos por dividendos</act:name>
   <act:id type="new">1af1f4894aeab96d840e66254d023b88</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ingresos por dividendos</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -120,10 +120,10 @@
   <act:name>Ingresos por intereses</act:name>
   <act:id type="new">7943bc59ffbb9a7be4afcd2996147119</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ingresos por intereses</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -131,10 +131,10 @@
   <act:name>Intereses de bonos</act:name>
   <act:id type="new">8ceb4752a11e2d342b9009b343fdba38</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses de bonos</act:description>
   <act:parent type="new">7943bc59ffbb9a7be4afcd2996147119</act:parent>
 </gnc:account>
@@ -142,10 +142,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">6de23244232785031501171abcc1d4aa</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -153,10 +153,10 @@
   <act:name>Comisiones</act:name>
   <act:id type="new">77fdffddc79c662c93c482cefa5a4744</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Comisiones</act:description>
   <act:parent type="new">6de23244232785031501171abcc1d4aa</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_ES/acctchrt_carloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_ES/acctchrt_carloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_ES/acctchrt_carloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Pasivo</act:name>
   <act:id type="new">33a326fe16ae360f777a94b3f5bdfbdc</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasivo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Préstamos</act:name>
   <act:id type="new">023e2343114b3d695feaeb96904e0da6</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Préstamos</act:description>
   <act:parent type="new">33a326fe16ae360f777a94b3f5bdfbdc</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Vehículo a plazos</act:name>
   <act:id type="new">3e5f44fd7bfaa9cae737a4113a749e36</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Vehículo a plazos</act:description>
   <act:parent type="new">023e2343114b3d695feaeb96904e0da6</act:parent>
 </gnc:account>
@@ -54,10 +54,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">acacdcb998e45fb741766622e8542f0b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -65,10 +65,10 @@
   <act:name>Intereses</act:name>
   <act:id type="new">9e8495e80ebfb762089be917dff7ab72</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses</act:description>
   <act:parent type="new">acacdcb998e45fb741766622e8542f0b</act:parent>
 </gnc:account>
@@ -76,10 +76,10 @@
   <act:name>Intereses pago plazos vehículo</act:name>
   <act:id type="new">e9bd8477e27361238d2f53c4fe7594ab</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses pago plazos vehículo</act:description>
   <act:parent type="new">9e8495e80ebfb762089be917dff7ab72</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_ES/acctchrt_cdmoneymkt.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_ES/acctchrt_cdmoneymkt.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_ES/acctchrt_cdmoneymkt.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Activo</act:name>
   <act:id type="new">7b1a39efc6234d1db148baa722c9471e</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Activo circulante</act:name>
   <act:id type="new">1880e89ec9fe82622b8648df481dd2b7</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo circulante</act:description>
   <act:parent type="new">7b1a39efc6234d1db148baa722c9471e</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Pagaré de banco</act:name>
   <act:id type="new">c1620f9c3082e33d8fd559e17f90a122</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pagaré de banco</act:description>
   <act:parent type="new">1880e89ec9fe82622b8648df481dd2b7</act:parent>
 </gnc:account>
@@ -54,10 +54,10 @@
   <act:name>Mercado monetario</act:name>
   <act:id type="new">3a01e5b0132ba26803b49732a3242654</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Mercado monetario</act:description>
   <act:parent type="new">1880e89ec9fe82622b8648df481dd2b7</act:parent>
 </gnc:account>
@@ -65,10 +65,10 @@
   <act:name>Ingresos</act:name>
   <act:id type="new">4b3e36f325569b80efc7d3331bdf851b</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ingresos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -76,10 +76,10 @@
   <act:name>Ingresos por intereses</act:name>
   <act:id type="new">fd131cae797d1fb83c2e2bf57254eca5</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ingresos por intereses</act:description>
   <act:parent type="new">4b3e36f325569b80efc7d3331bdf851b</act:parent>
 </gnc:account>
@@ -87,10 +87,10 @@
   <act:name>Interés de pagarés</act:name>
   <act:id type="new">28d311f0f38da5e35628e76ad8bcc853</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Interés de pagarés</act:description>
   <act:parent type="new">fd131cae797d1fb83c2e2bf57254eca5</act:parent>
 </gnc:account>
@@ -98,10 +98,10 @@
   <act:name>Interés de mercado monetario</act:name>
   <act:id type="new">dc537946f39e84ccef7ce38f016249af</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Interés de mercado monetario</act:description>
   <act:parent type="new">fd131cae797d1fb83c2e2bf57254eca5</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_ES/acctchrt_childcare.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_ES/acctchrt_childcare.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_ES/acctchrt_childcare.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">ee8238ee2c2ce590160761df09b99b72</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Guardería</act:name>
   <act:id type="new">8999739a6bfc46088a3ea5ec45e5f8a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Guardería</act:description>
   <act:parent type="new">ee8238ee2c2ce590160761df09b99b72</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_ES/acctchrt_common.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_ES/acctchrt_common.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_ES/acctchrt_common.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -23,10 +23,10 @@
   <act:name>Activo</act:name>
   <act:id type="new">98f262dfab9a2b99ac42919dcf58d304</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -34,10 +34,10 @@
   <act:name>Activo circulante</act:name>
   <act:id type="new">a1dd5f225156f110689c204fefded0ab</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo circulante</act:description>
   <act:parent type="new">98f262dfab9a2b99ac42919dcf58d304</act:parent>
 </gnc:account>
@@ -45,10 +45,10 @@
   <act:name>Cuenta corriente</act:name>
   <act:id type="new">b477aa9e0d4eb67c34e1e35903fb3f99</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cuenta corriente</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -56,10 +56,10 @@
   <act:name>Cuenta de ahorros</act:name>
   <act:id type="new">eeae5a1892e88adbc3b369c76ee4e889</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cuenta de ahorros</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -67,10 +67,10 @@
   <act:name>Metálico</act:name>
   <act:id type="new">07b454b9dd6f68c4b613c5f1ef76f884</act:id>
   <act:type>CASH</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Metálico</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -78,10 +78,10 @@
   <act:name>Pasivo</act:name>
   <act:id type="new">19a911feed9b41b8b01be036a2aed9fe</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasivo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -89,10 +89,10 @@
   <act:name>Cuentas por pagar</act:name>
   <act:id type="new">a8186db64d71dc2ca5fdccb3234b531b</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cuentas por pagar</act:description>
   <act:parent type="new">19a911feed9b41b8b01be036a2aed9fe</act:parent>
 </gnc:account>
@@ -100,10 +100,10 @@
   <act:name>Tarjeta de crédito</act:name>
   <act:id type="new">efc3caac2619666c53e6e27f02d5e716</act:id>
   <act:type>CREDIT</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Tarjeta de crédito</act:description>
   <act:parent type="new">a8186db64d71dc2ca5fdccb3234b531b</act:parent>
 </gnc:account>
@@ -111,10 +111,10 @@
   <act:name>Ingresos</act:name>
   <act:id type="new">a7ab23dd2d41616042034d5a012a0850</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ingresos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -122,10 +122,10 @@
   <act:name>Pagas extra</act:name>
   <act:id type="new">59b72cd943a2ca6f077748bba9a942cd</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pagas extra</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -133,10 +133,10 @@
   <act:name>Regalos recibidos</act:name>
   <act:id type="new">1adcf2c65d7a66f32144ccd9ce4f438f</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Regalos recibidos</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -144,10 +144,10 @@
   <act:name>Ingresos por intereses</act:name>
   <act:id type="new">c47361e40d9478ec11758097e64d693c</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ingresos por intereses</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -155,10 +155,10 @@
   <act:name>Intereses de cuenta corriente</act:name>
   <act:id type="new">73481e2da7461fc34e7003b7ec560bdf</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses de cuenta corriente</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -166,10 +166,10 @@
   <act:name>Otros intereses</act:name>
   <act:id type="new">be17363347a8578c48cecd06bc8b7aa8</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Otros intereses</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -177,10 +177,10 @@
   <act:name>Intereses cuenta de ahorros</act:name>
   <act:id type="new">2802ac0d1bff1c09a903f2ad6fde2725</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses cuenta de ahorros</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -188,10 +188,10 @@
   <act:name>Otros ingresos</act:name>
   <act:id type="new">49525ad0fb4ced06b9874d365d53f505</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Otros ingresos</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -199,10 +199,10 @@
   <act:name>Sueldo</act:name>
   <act:id type="new">a750b99cb8487a5e47daedcd3a69fe85</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Sueldo</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -210,10 +210,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -221,10 +221,10 @@
   <act:name>Ajustes</act:name>
   <act:id type="new">72f85277a7a7f8b4de175405e20d83bd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ajustes</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -232,10 +232,10 @@
   <act:name>Automóvil</act:name>
   <act:id type="new">56df186f1ce6114ddca7b9e5d03af390</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Automóvil</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -243,10 +243,10 @@
   <act:name>Cuotas</act:name>
   <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cuotas</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -254,10 +254,10 @@
   <act:name>Gas</act:name>
   <act:id type="new">e64b5eecf86ce4e27a64c477a4c77477</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gas</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -265,10 +265,10 @@
   <act:name>Aparcamiento</act:name>
   <act:id type="new">d72262c1c0e2c3388183ebb44a98b011</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aparcamiento</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -276,10 +276,10 @@
   <act:name>Reparación y mantenimiento</act:name>
   <act:id type="new">665dd78f0cc75dd331f556949337de68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Reparación y mantenimiento</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -287,10 +287,10 @@
   <act:name>Cargo de servicio bancario</act:name>
   <act:id type="new">fb6c8e25a50737e70fffde432a2355ee</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cargo de servicio bancario</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -298,10 +298,10 @@
   <act:name>Libros</act:name>
   <act:id type="new">36479bbc17680f4b9663a9842736153f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Libros</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -309,10 +309,10 @@
   <act:name>TV Cable</act:name>
   <act:id type="new">a1393344fb199f08f751ac3154694e87</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>TV Cable</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -320,10 +320,10 @@
   <act:name>Obras benéficas</act:name>
   <act:id type="new">ec8eec3d46c69aa861fda836e11346c0</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Obras benéficas</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -331,10 +331,10 @@
   <act:name>Ropa</act:name>
   <act:id type="new">c27a040a73eac2688d85d29b5b5309c8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ropa</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -342,10 +342,10 @@
   <act:name>Informática</act:name>
   <act:id type="new">fc4390b6214ad1576c5ffffc2b3c268c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Informática</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -353,10 +353,10 @@
   <act:name>Restaurantes</act:name>
   <act:id type="new">0a59a3347e4ff02b862de41ef59d7351</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Restaurantes</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -364,10 +364,10 @@
   <act:name>Educación</act:name>
   <act:id type="new">5b5ac050529b0f553752babe4a6a35d2</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Educación</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -375,10 +375,10 @@
   <act:name>Ocio</act:name>
   <act:id type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ocio</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -386,10 +386,10 @@
   <act:name>Música/Películas</act:name>
   <act:id type="new">4570ea8f4ac5cbd7d8927c905f0978ae</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Música/Películas</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -397,10 +397,10 @@
   <act:name>Recreación</act:name>
   <act:id type="new">7db9b0aa3bc348da9900f95fc67541a1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Recreación</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -408,10 +408,10 @@
   <act:name>Viajes</act:name>
   <act:id type="new">def0eac939dbd668f503d84860de8d6e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Viajes</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -419,10 +419,10 @@
   <act:name>Regalos</act:name>
   <act:id type="new">f86b1cebc619455ada23952a0e810909</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Regalos</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -430,10 +430,10 @@
   <act:name>Comestibles</act:name>
   <act:id type="new">83bc2bd915ab6b74c7107b55f8783523</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Comestibles</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -441,10 +441,10 @@
   <act:name>Hobbies</act:name>
   <act:id type="new">89f6400a94cd87fea0b056faf6ab7744</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Hobbies</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -452,10 +452,10 @@
   <act:name>Seguros</act:name>
   <act:id type="new">5bda5ff833bc395dc1b00f95c66ce555</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguros</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -463,10 +463,10 @@
   <act:name>Seguro de automóvil</act:name>
   <act:id type="new">cd72695526906a15ba1a1d9a7680b8e7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro de automóvil</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -474,10 +474,10 @@
   <act:name>Seguro sanitario</act:name>
   <act:id type="new">d80613194a52340c9e5eb62e853c72cf</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro sanitario</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -485,10 +485,10 @@
   <act:name>Seguro de vida</act:name>
   <act:id type="new">70a327f54be53ef187a52b1d8df70fdd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro de vida</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -496,10 +496,10 @@
   <act:name>Lavandería</act:name>
   <act:id type="new">1006551b2458631dfc8507b7451c9631</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Lavandería</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -507,10 +507,10 @@
   <act:name>Gastos médicos</act:name>
   <act:id type="new">62752930dd1b2b4c90c6d198bd2ff33f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos médicos</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -518,10 +518,10 @@
   <act:name>Otros gastos</act:name>
   <act:id type="new">759deef82e73587bf48a7dd76aa6abe8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Otros gastos</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -529,10 +529,10 @@
   <act:name>Servicios Internet</act:name>
   <act:id type="new">2170a1a631cc3b6fc32813fa49a12f77</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Servicios Internet</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -540,10 +540,10 @@
   <act:name>Teléfono</act:name>
   <act:id type="new">1d9d7265e25c6c84dda514d2e8899e87</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Teléfono</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -551,10 +551,10 @@
   <act:name>Transporte público</act:name>
   <act:id type="new">64aa760163c7768518e49a104d1c171f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Transporte público</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -562,10 +562,10 @@
   <act:name>Suscripciones</act:name>
   <act:id type="new">0336712690d36bcb02e0ce59b5d7653b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Suscripciones</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -573,10 +573,10 @@
   <act:name>Material de oficina</act:name>
   <act:id type="new">e2b34f49d4cf916cf4d45525e1e7319d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Material de oficina</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -584,10 +584,10 @@
   <act:name>Impuestos</act:name>
   <act:id type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impuestos</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -595,10 +595,10 @@
   <act:name>IRPF</act:name>
   <act:id type="new">090a786357463ec7fbee8066cb999097</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>IRPF</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -606,10 +606,10 @@
   <act:name>Retenciones</act:name>
   <act:id type="new">0785932c5de43e814659420762c9b577</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Retenciones</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -617,10 +617,10 @@
   <act:name>Otros impuestos</act:name>
   <act:id type="new">51875f8aaa0e4f2295a2ae13cf780b2e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Otros impuestos</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -628,10 +628,10 @@
   <act:name>Seguridad Social</act:name>
   <act:id type="new">c252f10f3d57dd05c500856164b1729e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguridad Social</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -639,10 +639,10 @@
   <act:name>Municipales</act:name>
   <act:id type="new">cd1f1b512ed51a069fd83a5ffcaf6e11</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Municipales</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -650,10 +650,10 @@
   <act:name>Servicios</act:name>
   <act:id type="new">57635fa5f71dee8ffc207c277250e773</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Servicios</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -661,10 +661,10 @@
   <act:name>Electricidad</act:name>
   <act:id type="new">2fe462e202e2daffd845359b08a7eefe</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Electricidad</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -672,10 +672,10 @@
   <act:name>Recogida de basura</act:name>
   <act:id type="new">2d0315d7b2f8f11a8a8b32d805bca6eb</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Recogida de basura</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -683,10 +683,10 @@
   <act:name>Gas</act:name>
   <act:id type="new">dcc33ce7edf402e327318aa1890d35ea</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gas</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -694,10 +694,10 @@
   <act:name>Agua</act:name>
   <act:id type="new">8cdc91b733444f9f0dfae9773b8f408c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Agua</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -705,10 +705,10 @@
   <act:name>Resultado</act:name>
   <act:id type="new">3ab6a6d97b216c11333e48aa2b749a91</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Resultado</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -716,10 +716,10 @@
   <act:name>Balances de apertura</act:name>
   <act:id type="new">a0a622a30410f75eba35d2875a843da8</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Balances de apertura</act:description>
   <act:parent type="new">3ab6a6d97b216c11333e48aa2b749a91</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_ES/acctchrt_currency.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_ES/acctchrt_currency.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_ES/acctchrt_currency.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -23,10 +23,10 @@
   <act:name>Activo</act:name>
   <act:id type="new">b3c65be1c5d163746ddc0c506f3f4619</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -34,10 +34,10 @@
   <act:name>Inversiones</act:name>
   <act:id type="new">d9c796b35784533aee4309e28a3cbfc5</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Inversiones</act:description>
   <act:parent type="new">b3c65be1c5d163746ddc0c506f3f4619</act:parent>
 </gnc:account>
@@ -45,10 +45,10 @@
   <act:name>Comercio de monedas extranjeras</act:name>
   <act:id type="new">9206632307989cb5b244ad5da5d3131b</act:id>
   <act:type>CURRENCY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Comercio de monedas extranjeras</act:description>
   <act:parent type="new">d9c796b35784533aee4309e28a3cbfc5</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_ES/acctchrt_eduloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_ES/acctchrt_eduloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_ES/acctchrt_eduloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Pasivo</act:name>
   <act:id type="new">4e7e8e39487ad4aba0b62c2232c577c5</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasivo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Préstamos</act:name>
   <act:id type="new">c3219e37044b0531d66a7b64433b026d</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Préstamos</act:description>
   <act:parent type="new">4e7e8e39487ad4aba0b62c2232c577c5</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Préstamo para educación</act:name>
   <act:id type="new">ddeba367199bd025e00420a19d6f9ae4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Préstamo para educación</act:description>
   <act:parent type="new">c3219e37044b0531d66a7b64433b026d</act:parent>
 </gnc:account>
@@ -54,10 +54,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">fdbf47b39f70e8818f325eee7931039a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -65,10 +65,10 @@
   <act:name>Intereses</act:name>
   <act:id type="new">1cfcd30ea97b954ffb550ab87d561033</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses</act:description>
   <act:parent type="new">fdbf47b39f70e8818f325eee7931039a</act:parent>
 </gnc:account>
@@ -76,10 +76,10 @@
   <act:name>Intereses de préstamo para educación</act:name>
   <act:id type="new">04e3d970dc60d3920f40b93fce8924a2</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses de préstamo para educación</act:description>
   <act:parent type="new">1cfcd30ea97b954ffb550ab87d561033</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_ES/acctchrt_fixedassets.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_ES/acctchrt_fixedassets.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_ES/acctchrt_fixedassets.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Activo</act:name>
   <act:id type="new">64b6276c060185131cecbd1ac6218440</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Activo fijo</act:name>
   <act:id type="new">9b171f77000bf68dd1ebbaf58336656d</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo fijo</act:description>
   <act:parent type="new">64b6276c060185131cecbd1ac6218440</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>Casa</act:name>
   <act:id type="new">9205ad6b6482903e5a696602d491c8f5</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Casa</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Otros activos</act:name>
   <act:id type="new">ad3b239297277c9ef3840c0433cecb18</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Otros activos</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>
@@ -64,10 +64,10 @@
   <act:name>Vehículo</act:name>
   <act:id type="new">5913089ffc36df6f0a5d96a5d7a444c0</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Vehículo</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_ES/acctchrt_homeloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_ES/acctchrt_homeloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_ES/acctchrt_homeloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Pasivo</act:name>
   <act:id type="new">6664763bd1ea41462cba5ef856d9c00c</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasivo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Préstamos</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Préstamos</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>Préstamo hipotecario</act:name>
   <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Préstamo hipotecario</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -64,10 +64,10 @@
   <act:name>Intereses</act:name>
   <act:id type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses</act:description>
   <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
 </gnc:account>
@@ -75,10 +75,10 @@
   <act:name>Interés de hipoteca</act:name>
   <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Interés de hipoteca</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_ES/acctchrt_homeown.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_ES/acctchrt_homeown.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_ES/acctchrt_homeown.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">84732f5fdd27b6463d75bf958e3a4b06</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Reparaciones domésticas</act:name>
   <act:id type="new">fa27de57090e107fa99fe1db53790f23</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Reparaciones domésticas</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Seguros</act:name>
   <act:id type="new">4677fe36914ebcf23758f3bf20686b4a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguros</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -54,10 +54,10 @@
   <act:name>Seguro de hogar</act:name>
   <act:id type="new">3b5909f31bda0e0f76149fd600e0cb1d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro de hogar</act:description>
   <act:parent type="new">4677fe36914ebcf23758f3bf20686b4a</act:parent>
 </gnc:account>
@@ -65,10 +65,10 @@
   <act:name>Impuestos</act:name>
   <act:id type="new">a931b8ffe2917ff9a069333623da96ca</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impuestos</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -76,10 +76,10 @@
   <act:name>Contribución</act:name>
   <act:id type="new">3994b8f5a6a8b2a0a48126fa955e03f7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Contribución</act:description>
   <act:parent type="new">a931b8ffe2917ff9a069333623da96ca</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_ES/acctchrt_otherloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_ES/acctchrt_otherloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_ES/acctchrt_otherloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Pasivo</act:name>
   <act:id type="new">8ec79e80d9abf58d78ce3129d3fe3365</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasivo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Préstamos</act:name>
   <act:id type="new">b5624a9d1a1b797b87b815774faccfe4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Préstamos</act:description>
   <act:parent type="new">8ec79e80d9abf58d78ce3129d3fe3365</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Otro préstamo</act:name>
   <act:id type="new">eb79670a4c9b0faab87485b7b2a4abe4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Otro préstamo</act:description>
   <act:parent type="new">b5624a9d1a1b797b87b815774faccfe4</act:parent>
 </gnc:account>
@@ -54,10 +54,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">565e52a122e8acc9a67a36e61357e2ae</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -65,10 +65,10 @@
   <act:name>Intereses</act:name>
   <act:id type="new">4a02c14e992ea79076837c164aa6fc8d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses</act:description>
   <act:parent type="new">565e52a122e8acc9a67a36e61357e2ae</act:parent>
 </gnc:account>
@@ -76,10 +76,10 @@
   <act:name>Otro interés</act:name>
   <act:id type="new">f01de45e290ecc29b64d9cb8a733af68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Interés asociado a otro préstamo</act:description>
   <act:parent type="new">4a02c14e992ea79076837c164aa6fc8d</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_ES/acctchrt_renter.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_ES/acctchrt_renter.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_ES/acctchrt_renter.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">9a2b4520f113372f4e576f5b6dc129c6</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Seguros</act:name>
   <act:id type="new">b79b231807a98cd562c46cf0454e9f25</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguros</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>Seguro de inquilino</act:name>
   <act:id type="new">a4c93c964b8322d534e35b7054cbda4d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro de inquilino</act:description>
   <act:parent type="new">b79b231807a98cd562c46cf0454e9f25</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Alquiler</act:name>
   <act:id type="new">c1638a9a48d4d0e1b17d99219a18f34b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Alquiler</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_ES/acctchrt_retiremt.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_ES/acctchrt_retiremt.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_ES/acctchrt_retiremt.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Activo</act:name>
   <act:id type="new">e67ef2c52a4eaf3b9d37d317848a5812</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Inversiones</act:name>
   <act:id type="new">64cf99f6bafe0a539a5941ea713bdfcd</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Inversiones</act:description>
   <act:parent type="new">e67ef2c52a4eaf3b9d37d317848a5812</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Jubilación</act:name>
   <act:id type="new">4173f3047238f4b5595b11d6161b2f48</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Jubilación</act:description>
   <act:slots>
     <slot>
@@ -60,10 +60,10 @@
   <act:name>Bonos</act:name>
   <act:id type="new">9053199c1da747555d12272f48c719fd</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Bonos</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -71,10 +71,10 @@
   <act:name>Acciones</act:name>
   <act:id type="new">9bf53e9580991e323b297999fddff988</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Acciones</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -82,10 +82,10 @@
   <act:name>Fondo de índice</act:name>
   <act:id type="new">2326b032fe4e8f434159310fccf17091</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fondo de índice</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -93,10 +93,10 @@
   <act:name>Fondo de inversión</act:name>
   <act:id type="new">a62d804729117e74a6c880cecb818b56</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fondo de inversión</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_ES/acctchrt_spouseinc.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_ES/acctchrt_spouseinc.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_ES/acctchrt_spouseinc.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Ingresos</act:name>
   <act:id type="new">b4fadf6188d7f1ae7e7aa4fa27f5cc95</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ingresos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Sueldo (Cónyuge)</act:name>
   <act:id type="new">7c4495ff132d100b0aa339ce683200dd</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Sueldo (Cónyuge)</act:description>
   <act:parent type="new">b4fadf6188d7f1ae7e7aa4fa27f5cc95</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Impuestos (Cónyuge)</act:name>
   <act:id type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impuestos (Cónyuge)</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -64,10 +64,10 @@
   <act:name>IRPF</act:name>
   <act:id type="new">78df9cf06ee197272a695a4c3044f749</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>IRPF</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -75,10 +75,10 @@
   <act:name>Retenciones</act:name>
   <act:id type="new">eba0c095658c7c3a4f4294db9c7392f3</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Retenciones</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -86,10 +86,10 @@
   <act:name>Otros impuestos</act:name>
   <act:id type="new">dea0cf67026749c9a5aa97be4e5cd052</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Otros impuestos</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -97,10 +97,10 @@
   <act:name>Seguridad Social</act:name>
   <act:id type="new">9bd3abb2ed8c4c0d00f8e8ec36d2744d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguridad Social</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -108,10 +108,10 @@
   <act:name>Municipales</act:name>
   <act:id type="new">aa14dbcd622024495a8a972b0f37d13a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Municipales</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_ES/acctchrt_spouseretire.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_ES/acctchrt_spouseretire.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_ES/acctchrt_spouseretire.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Activo</act:name>
   <act:id type="new">96d9b17add59eb4c7edec7ed241af755</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Inversiones</act:name>
   <act:id type="new">f46c9f777b1730c6b5f4a1faf9e31708</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Inversiones</act:description>
   <act:parent type="new">96d9b17add59eb4c7edec7ed241af755</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Jubilación de cónyuge</act:name>
   <act:id type="new">4426b41837adc284f96b291c31022844</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Jubilación de cónyuge</act:description>
   <act:slots>
     <slot>
@@ -60,10 +60,10 @@
   <act:name>Bonos</act:name>
   <act:id type="new">c8e7c315502547e51bfdd5a70b5cdd2e</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Bonos</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -71,10 +71,10 @@
   <act:name>Acciones</act:name>
   <act:id type="new">b8838eb77b9603e035e1f7b440d468ae</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Acciones</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -82,10 +82,10 @@
   <act:name>Fondo de índice</act:name>
   <act:id type="new">0ec1a5b402ceea10d95445a2b31c41a1</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fondo de índice</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -93,10 +93,10 @@
   <act:name>Fondo de inversión</act:name>
   <act:id type="new">d9ed01f9b8f9845bc3f68f3e0afb021f</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fondos de inversión</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_MX/acctchrt_brokerage.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_MX/acctchrt_brokerage.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_MX/acctchrt_brokerage.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Activo</act:name>
   <act:id type="new">52b5942b5beaec856eaca5a75ee71592</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Inversiones</act:name>
   <act:id type="new">7ff59d92615cce4d8388d7e179ee3ff6</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Inversiones</act:description>
   <act:parent type="new">52b5942b5beaec856eaca5a75ee71592</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Cuenta de inversión</act:name>
   <act:id type="new">f15ec9568727f08a5ebd8f3e66483876</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cuenta de inversión</act:description>
   <act:parent type="new">7ff59d92615cce4d8388d7e179ee3ff6</act:parent>
 </gnc:account>
@@ -54,10 +54,10 @@
   <act:name>Bonos</act:name>
   <act:id type="new">8196bf0015c25f501338f07a87c512d8</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Bonos</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -65,10 +65,10 @@
   <act:name>Acciones</act:name>
   <act:id type="new">7d7db9bed07f21fc0b1f50674702aff0</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Acciones</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -76,10 +76,10 @@
   <act:name>Fondo de índice</act:name>
   <act:id type="new">fe9db8a7eedf2990e9846f634a922143</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fondo de índice</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -87,10 +87,10 @@
   <act:name>Fondo de inversión</act:name>
   <act:id type="new">9da28c1aa7789e84bdc8484ba8f527b3</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fondo de inversión</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -98,10 +98,10 @@
   <act:name>Ingresos</act:name>
   <act:id type="new">9da3c880bd04b9db49eb7f5b06403bda</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ingresos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -109,10 +109,10 @@
   <act:name>Ingresos por dividendos</act:name>
   <act:id type="new">1af1f4894aeab96d840e66254d023b88</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ingresos por dividendos</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -120,10 +120,10 @@
   <act:name>Ingresos por intereses</act:name>
   <act:id type="new">7943bc59ffbb9a7be4afcd2996147119</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ingresos por intereses</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -131,10 +131,10 @@
   <act:name>Intereses de bonos</act:name>
   <act:id type="new">8ceb4752a11e2d342b9009b343fdba38</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses de bonos</act:description>
   <act:parent type="new">7943bc59ffbb9a7be4afcd2996147119</act:parent>
 </gnc:account>
@@ -142,10 +142,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">6de23244232785031501171abcc1d4aa</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -153,10 +153,10 @@
   <act:name>Comisiones</act:name>
   <act:id type="new">77fdffddc79c662c93c482cefa5a4744</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Comisiones</act:description>
   <act:parent type="new">6de23244232785031501171abcc1d4aa</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_MX/acctchrt_carloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_MX/acctchrt_carloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_MX/acctchrt_carloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Pasivo</act:name>
   <act:id type="new">33a326fe16ae360f777a94b3f5bdfbdc</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasivo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Préstamos</act:name>
   <act:id type="new">023e2343114b3d695feaeb96904e0da6</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Préstamos</act:description>
   <act:parent type="new">33a326fe16ae360f777a94b3f5bdfbdc</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Vehículo a plazos</act:name>
   <act:id type="new">3e5f44fd7bfaa9cae737a4113a749e36</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Vehículo a plazos</act:description>
   <act:parent type="new">023e2343114b3d695feaeb96904e0da6</act:parent>
 </gnc:account>
@@ -54,10 +54,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">acacdcb998e45fb741766622e8542f0b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -65,10 +65,10 @@
   <act:name>Intereses</act:name>
   <act:id type="new">9e8495e80ebfb762089be917dff7ab72</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses</act:description>
   <act:parent type="new">acacdcb998e45fb741766622e8542f0b</act:parent>
 </gnc:account>
@@ -76,10 +76,10 @@
   <act:name>Intereses pago plazos vehículo</act:name>
   <act:id type="new">e9bd8477e27361238d2f53c4fe7594ab</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses pago plazos vehículo</act:description>
   <act:parent type="new">9e8495e80ebfb762089be917dff7ab72</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_MX/acctchrt_cdmoneymkt.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_MX/acctchrt_cdmoneymkt.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_MX/acctchrt_cdmoneymkt.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Activo</act:name>
   <act:id type="new">7b1a39efc6234d1db148baa722c9471e</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Activo circulante</act:name>
   <act:id type="new">1880e89ec9fe82622b8648df481dd2b7</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo circulante</act:description>
   <act:parent type="new">7b1a39efc6234d1db148baa722c9471e</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Pagaré de banco</act:name>
   <act:id type="new">c1620f9c3082e33d8fd559e17f90a122</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pagaré de banco</act:description>
   <act:parent type="new">1880e89ec9fe82622b8648df481dd2b7</act:parent>
 </gnc:account>
@@ -54,10 +54,10 @@
   <act:name>Mercado de dinero</act:name>
   <act:id type="new">3a01e5b0132ba26803b49732a3242654</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Mercado de dinero</act:description>
   <act:parent type="new">1880e89ec9fe82622b8648df481dd2b7</act:parent>
 </gnc:account>
@@ -65,10 +65,10 @@
   <act:name>Ingresos</act:name>
   <act:id type="new">4b3e36f325569b80efc7d3331bdf851b</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ingresos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -76,10 +76,10 @@
   <act:name>Ingresos por intereses</act:name>
   <act:id type="new">fd131cae797d1fb83c2e2bf57254eca5</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ingresos por intereses</act:description>
   <act:parent type="new">4b3e36f325569b80efc7d3331bdf851b</act:parent>
 </gnc:account>
@@ -87,10 +87,10 @@
   <act:name>Interés de pagarés</act:name>
   <act:id type="new">28d311f0f38da5e35628e76ad8bcc853</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Interés de pagarés</act:description>
   <act:parent type="new">fd131cae797d1fb83c2e2bf57254eca5</act:parent>
 </gnc:account>
@@ -98,10 +98,10 @@
   <act:name>Interés de mercado de dinero</act:name>
   <act:id type="new">dc537946f39e84ccef7ce38f016249af</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Interés de mercado de dinero</act:description>
   <act:parent type="new">fd131cae797d1fb83c2e2bf57254eca5</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_MX/acctchrt_childcare.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_MX/acctchrt_childcare.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_MX/acctchrt_childcare.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">ee8238ee2c2ce590160761df09b99b72</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Guardería</act:name>
   <act:id type="new">8999739a6bfc46088a3ea5ec45e5f8a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Guardería</act:description>
   <act:parent type="new">ee8238ee2c2ce590160761df09b99b72</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_MX/acctchrt_common.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_MX/acctchrt_common.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_MX/acctchrt_common.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -23,10 +23,10 @@
   <act:name>Activo</act:name>
   <act:id type="new">98f262dfab9a2b99ac42919dcf58d304</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -34,10 +34,10 @@
   <act:name>Activo circulante</act:name>
   <act:id type="new">a1dd5f225156f110689c204fefded0ab</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo circulante</act:description>
   <act:parent type="new">98f262dfab9a2b99ac42919dcf58d304</act:parent>
 </gnc:account>
@@ -45,10 +45,10 @@
   <act:name>Cuenta de Cheques</act:name>
   <act:id type="new">b477aa9e0d4eb67c34e1e35903fb3f99</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cuenta de Cheques</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -56,10 +56,10 @@
   <act:name>Cuenta de ahorros</act:name>
   <act:id type="new">eeae5a1892e88adbc3b369c76ee4e889</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cuenta de ahorros</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -67,10 +67,10 @@
   <act:name>Efectivo</act:name>
   <act:id type="new">07b454b9dd6f68c4b613c5f1ef76f884</act:id>
   <act:type>CASH</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dinero en efectivo (cartera)</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -78,10 +78,10 @@
   <act:name>Pasivo</act:name>
   <act:id type="new">19a911feed9b41b8b01be036a2aed9fe</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasivo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -89,10 +89,10 @@
   <act:name>Cuentas por pagar</act:name>
   <act:id type="new">a8186db64d71dc2ca5fdccb3234b531b</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cuentas por pagar</act:description>
   <act:parent type="new">19a911feed9b41b8b01be036a2aed9fe</act:parent>
 </gnc:account>
@@ -100,10 +100,10 @@
   <act:name>Tarjeta de crédito</act:name>
   <act:id type="new">efc3caac2619666c53e6e27f02d5e716</act:id>
   <act:type>CREDIT</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Tarjeta de crédito</act:description>
   <act:parent type="new">a8186db64d71dc2ca5fdccb3234b531b</act:parent>
 </gnc:account>
@@ -111,10 +111,10 @@
   <act:name>Ingresos</act:name>
   <act:id type="new">a7ab23dd2d41616042034d5a012a0850</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ingresos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -122,10 +122,10 @@
   <act:name>Pagos extra</act:name>
   <act:id type="new">59b72cd943a2ca6f077748bba9a942cd</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pagos extra</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -133,10 +133,10 @@
   <act:name>Regalos recibidos</act:name>
   <act:id type="new">1adcf2c65d7a66f32144ccd9ce4f438f</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Regalos recibidos</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -144,10 +144,10 @@
   <act:name>Ingresos por intereses</act:name>
   <act:id type="new">c47361e40d9478ec11758097e64d693c</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ingresos por intereses</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -155,10 +155,10 @@
   <act:name>Intereses cuenta de cheques</act:name>
   <act:id type="new">73481e2da7461fc34e7003b7ec560bdf</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses de la cuenta de cheques</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -166,10 +166,10 @@
   <act:name>Otros intereses</act:name>
   <act:id type="new">be17363347a8578c48cecd06bc8b7aa8</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Otros ingresos por intereses</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -177,10 +177,10 @@
   <act:name>Intereses cuenta de ahorros</act:name>
   <act:id type="new">2802ac0d1bff1c09a903f2ad6fde2725</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses de la cuenta de ahorros</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -188,10 +188,10 @@
   <act:name>Otros ingresos</act:name>
   <act:id type="new">49525ad0fb4ced06b9874d365d53f505</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Otros ingresos</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -199,10 +199,10 @@
   <act:name>Sueldo</act:name>
   <act:id type="new">a750b99cb8487a5e47daedcd3a69fe85</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Sueldo</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -210,10 +210,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -221,10 +221,10 @@
   <act:name>Ajustes</act:name>
   <act:id type="new">72f85277a7a7f8b4de175405e20d83bd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ajustes</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -232,10 +232,10 @@
   <act:name>Automóvil</act:name>
   <act:id type="new">56df186f1ce6114ddca7b9e5d03af390</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Automóvil</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -243,10 +243,10 @@
   <act:name>Verificación</act:name>
   <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos por Verificación de emisión de contaminantes</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -254,10 +254,10 @@
   <act:name>Placas y Permisos</act:name>
   <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Placas y Permisos</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -265,10 +265,10 @@
   <act:name>Estacionamiento</act:name>
   <act:id type="new">d72262c1c0e2c3388183ebb44a98b011</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Estacionamiento</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -276,10 +276,10 @@
   <act:name>Casetas de Peaje</act:name>
   <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Casetas de Peaje</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -287,10 +287,10 @@
   <act:name>Gasolina</act:name>
   <act:id type="new">e64b5eecf86ce4e27a64c477a4c77477</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gasolina</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -298,10 +298,10 @@
   <act:name>Reparación y mantenimiento</act:name>
   <act:id type="new">665dd78f0cc75dd331f556949337de68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Reparación y mantenimiento del automóvil</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -309,10 +309,10 @@
   <act:name>Cargo de servicio bancario</act:name>
   <act:id type="new">fb6c8e25a50737e70fffde432a2355ee</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cargo de servicio bancario</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -320,10 +320,10 @@
   <act:name>Libros</act:name>
   <act:id type="new">36479bbc17680f4b9663a9842736153f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Libros</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -331,10 +331,10 @@
   <act:name>TV Cable</act:name>
   <act:id type="new">a1393344fb199f08f751ac3154694e87</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>TV por Cable</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -342,10 +342,10 @@
   <act:name>Obras de caridad</act:name>
   <act:id type="new">ec8eec3d46c69aa861fda836e11346c0</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aportaciones a obras de caridad</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -353,10 +353,10 @@
   <act:name>Ropa</act:name>
   <act:id type="new">c27a040a73eac2688d85d29b5b5309c8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ropa</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -364,10 +364,10 @@
   <act:name>Computadora</act:name>
   <act:id type="new">fc4390b6214ad1576c5ffffc2b3c268c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos relacionados con la computadora</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -375,10 +375,10 @@
   <act:name>Restaurantes</act:name>
   <act:id type="new">0a59a3347e4ff02b862de41ef59d7351</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Restaurantes</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -386,10 +386,10 @@
   <act:name>Educación</act:name>
   <act:id type="new">5b5ac050529b0f553752babe4a6a35d2</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Educación</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -397,10 +397,10 @@
   <act:name>Ocio</act:name>
   <act:id type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ocio</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -408,10 +408,10 @@
   <act:name>Música/Películas</act:name>
   <act:id type="new">4570ea8f4ac5cbd7d8927c905f0978ae</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Música/Películas</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -419,10 +419,10 @@
   <act:name>Entretenimiento</act:name>
   <act:id type="new">7db9b0aa3bc348da9900f95fc67541a1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Entretenimiento</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -430,10 +430,10 @@
   <act:name>Viajes</act:name>
   <act:id type="new">def0eac939dbd668f503d84860de8d6e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Viajes</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -441,10 +441,10 @@
   <act:name>Regalos</act:name>
   <act:id type="new">f86b1cebc619455ada23952a0e810909</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Regalos</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -452,10 +452,10 @@
   <act:name>Despensa</act:name>
   <act:id type="new">83bc2bd915ab6b74c7107b55f8783523</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Despensa</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -463,10 +463,10 @@
   <act:name>Hobbies</act:name>
   <act:id type="new">89f6400a94cd87fea0b056faf6ab7744</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Hobbies</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -474,10 +474,10 @@
   <act:name>Seguros</act:name>
   <act:id type="new">5bda5ff833bc395dc1b00f95c66ce555</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguros</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -485,10 +485,10 @@
   <act:name>Seguro del automóvil</act:name>
   <act:id type="new">cd72695526906a15ba1a1d9a7680b8e7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro del automóvil</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -496,10 +496,10 @@
   <act:name>Seguro Social</act:name>
   <act:id type="new">d80613194a52340c9e5eb62e853c72cf</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro Social</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -507,10 +507,10 @@
   <act:name>Seguro de vida</act:name>
   <act:id type="new">70a327f54be53ef187a52b1d8df70fdd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro de vida</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -518,10 +518,10 @@
   <act:name>Lavandería</act:name>
   <act:id type="new">1006551b2458631dfc8507b7451c9631</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Lavandería</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -529,10 +529,10 @@
   <act:name>Gastos médicos</act:name>
   <act:id type="new">62752930dd1b2b4c90c6d198bd2ff33f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos médicos</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -540,10 +540,10 @@
   <act:name>Otros gastos</act:name>
   <act:id type="new">759deef82e73587bf48a7dd76aa6abe8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Otros gastos</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -551,10 +551,10 @@
   <act:name>Servicios de Internet</act:name>
   <act:id type="new">2170a1a631cc3b6fc32813fa49a12f77</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Servicios de Internet</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -562,10 +562,10 @@
   <act:name>Teléfono</act:name>
   <act:id type="new">1d9d7265e25c6c84dda514d2e8899e87</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Teléfono</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -573,10 +573,10 @@
   <act:name>Transporte público</act:name>
   <act:id type="new">64aa760163c7768518e49a104d1c171f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Transporte público</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -584,10 +584,10 @@
   <act:name>Suscripciones</act:name>
   <act:id type="new">0336712690d36bcb02e0ce59b5d7653b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Suscripciones</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -595,10 +595,10 @@
   <act:name>Material de oficina</act:name>
   <act:id type="new">e2b34f49d4cf916cf4d45525e1e7319d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Material de oficina</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -606,10 +606,10 @@
   <act:name>Impuestos</act:name>
   <act:id type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impuestos</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -617,10 +617,10 @@
   <act:name>Federales</act:name>
   <act:id type="new">090a786357463ec7fbee8066cb999097</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impuestos Federales</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -628,10 +628,10 @@
   <act:name>ISR</act:name>
   <act:id type="new">30806ad38d282e15090fbd9a4a61ca28</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impuesto sobre la Renta</act:description>
   <act:parent type="new">090a786357463ec7fbee8066cb999097</act:parent>
 </gnc:account>
@@ -639,10 +639,10 @@
   <act:name>IVA</act:name>
   <act:id type="new">43c2a97b5d6d40b4b3d7b9b5f2f432bf</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impuesto del Valor Agregado</act:description>
   <act:parent type="new">090a786357463ec7fbee8066cb999097</act:parent>
 </gnc:account>
@@ -650,10 +650,10 @@
   <act:name>IETU</act:name>
   <act:id type="new">30b89467a096e0c4c40c600b8c02f6b7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impuesto Empresarial de Tasa Única</act:description>
   <act:parent type="new">090a786357463ec7fbee8066cb999097</act:parent>
 </gnc:account>
@@ -661,10 +661,10 @@
   <act:name>PTU</act:name>
   <act:id type="new">e753ffa05ffe9fe534db2ff833fb5265</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Participanción de los Trabajadores en las Utilidades</act:description>
   <act:parent type="new">090a786357463ec7fbee8066cb999097</act:parent>
 </gnc:account>
@@ -672,10 +672,10 @@
   <act:name>Tenencia</act:name>
   <act:id type="new">62fa4c9267beef0acf66cb0b55433b7f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Tenencia</act:description>
   <act:parent type="new">090a786357463ec7fbee8066cb999097</act:parent>
 </gnc:account>
@@ -683,10 +683,10 @@
   <act:name>IMSS</act:name>
   <act:id type="new">27eb9496be9d24ce0849d494ffe5ce95</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aportaciones al IMSS</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -694,10 +694,10 @@
   <act:name>Retenciones</act:name>
   <act:id type="new">0785932c5de43e814659420762c9b577</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Retenciones de impuestos por empresas o individuos</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -705,10 +705,10 @@
   <act:name>Otros impuestos</act:name>
   <act:id type="new">51875f8aaa0e4f2295a2ae13cf780b2e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Otros impuestos</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -716,10 +716,10 @@
   <act:name>Municipales</act:name>
   <act:id type="new">cd1f1b512ed51a069fd83a5ffcaf6e11</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Municipales</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -727,10 +727,10 @@
   <act:name>Servicios</act:name>
   <act:id type="new">57635fa5f71dee8ffc207c277250e773</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Servicios</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -738,10 +738,10 @@
   <act:name>Electricidad</act:name>
   <act:id type="new">2fe462e202e2daffd845359b08a7eefe</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Electricidad</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -749,10 +749,10 @@
   <act:name>Recolección de basura</act:name>
   <act:id type="new">2d0315d7b2f8f11a8a8b32d805bca6eb</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Recolección de basura</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -760,10 +760,10 @@
   <act:name>Gas</act:name>
   <act:id type="new">dcc33ce7edf402e327318aa1890d35ea</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gas</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -771,10 +771,10 @@
   <act:name>Agua</act:name>
   <act:id type="new">8cdc91b733444f9f0dfae9773b8f408c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Agua</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -782,10 +782,10 @@
   <act:name>Capital</act:name>
   <act:id type="new">3ab6a6d97b216c11333e48aa2b749a91</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aportaciones de Capital y resultados acumulados</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -793,10 +793,10 @@
   <act:name>Balances de apertura</act:name>
   <act:id type="new">a0a622a30410f75eba35d2875a843da8</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Balances de apertura</act:description>
   <act:parent type="new">3ab6a6d97b216c11333e48aa2b749a91</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_MX/acctchrt_currency.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_MX/acctchrt_currency.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_MX/acctchrt_currency.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -23,10 +23,10 @@
   <act:name>Activo</act:name>
   <act:id type="new">b3c65be1c5d163746ddc0c506f3f4619</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -34,10 +34,10 @@
   <act:name>Inversiones</act:name>
   <act:id type="new">d9c796b35784533aee4309e28a3cbfc5</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Inversiones</act:description>
   <act:parent type="new">b3c65be1c5d163746ddc0c506f3f4619</act:parent>
 </gnc:account>
@@ -45,10 +45,10 @@
   <act:name>Compra-Venta de monedas extranjeras</act:name>
   <act:id type="new">9206632307989cb5b244ad5da5d3131b</act:id>
   <act:type>CURRENCY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Compra-Venta de monedas extranjeras</act:description>
   <act:parent type="new">d9c796b35784533aee4309e28a3cbfc5</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_MX/acctchrt_eduloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_MX/acctchrt_eduloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_MX/acctchrt_eduloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Pasivo</act:name>
   <act:id type="new">4e7e8e39487ad4aba0b62c2232c577c5</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasivo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Préstamos</act:name>
   <act:id type="new">c3219e37044b0531d66a7b64433b026d</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Préstamos</act:description>
   <act:parent type="new">4e7e8e39487ad4aba0b62c2232c577c5</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Préstamo para educación</act:name>
   <act:id type="new">ddeba367199bd025e00420a19d6f9ae4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Préstamo para educación</act:description>
   <act:parent type="new">c3219e37044b0531d66a7b64433b026d</act:parent>
 </gnc:account>
@@ -54,10 +54,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">fdbf47b39f70e8818f325eee7931039a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -65,10 +65,10 @@
   <act:name>Intereses</act:name>
   <act:id type="new">1cfcd30ea97b954ffb550ab87d561033</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses</act:description>
   <act:parent type="new">fdbf47b39f70e8818f325eee7931039a</act:parent>
 </gnc:account>
@@ -76,10 +76,10 @@
   <act:name>Intereses de préstamo para educación</act:name>
   <act:id type="new">04e3d970dc60d3920f40b93fce8924a2</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses de préstamo para educación</act:description>
   <act:parent type="new">1cfcd30ea97b954ffb550ab87d561033</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_MX/acctchrt_fixedassets.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_MX/acctchrt_fixedassets.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_MX/acctchrt_fixedassets.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Activo</act:name>
   <act:id type="new">64b6276c060185131cecbd1ac6218440</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Activo fijo</act:name>
   <act:id type="new">9b171f77000bf68dd1ebbaf58336656d</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo fijo</act:description>
   <act:parent type="new">64b6276c060185131cecbd1ac6218440</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>Casa</act:name>
   <act:id type="new">9205ad6b6482903e5a696602d491c8f5</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Casa</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Otros activos</act:name>
   <act:id type="new">ad3b239297277c9ef3840c0433cecb18</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Otros activos</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>
@@ -64,10 +64,10 @@
   <act:name>Vehículo</act:name>
   <act:id type="new">5913089ffc36df6f0a5d96a5d7a444c0</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Vehículo</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_MX/acctchrt_homeloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_MX/acctchrt_homeloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_MX/acctchrt_homeloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Pasivo</act:name>
   <act:id type="new">6664763bd1ea41462cba5ef856d9c00c</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasivo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Préstamos</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Préstamos</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>Préstamo hipotecario</act:name>
   <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Préstamo hipotecario</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -64,10 +64,10 @@
   <act:name>Intereses</act:name>
   <act:id type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses</act:description>
   <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
 </gnc:account>
@@ -75,10 +75,10 @@
   <act:name>Interés de hipoteca</act:name>
   <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Interés de hipoteca</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_MX/acctchrt_homeown.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_MX/acctchrt_homeown.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_MX/acctchrt_homeown.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">84732f5fdd27b6463d75bf958e3a4b06</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Reparaciones domésticas</act:name>
   <act:id type="new">fa27de57090e107fa99fe1db53790f23</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Reparaciones domésticas</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Seguros</act:name>
   <act:id type="new">4677fe36914ebcf23758f3bf20686b4a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguros</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -54,10 +54,10 @@
   <act:name>Seguro contra siniestros</act:name>
   <act:id type="new">3b5909f31bda0e0f76149fd600e0cb1d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro contra siniestros (incendios, entre otros)</act:description>
   <act:parent type="new">4677fe36914ebcf23758f3bf20686b4a</act:parent>
 </gnc:account>
@@ -65,10 +65,10 @@
   <act:name>Impuestos</act:name>
   <act:id type="new">a931b8ffe2917ff9a069333623da96ca</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impuestos</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -76,10 +76,10 @@
   <act:name>Predial</act:name>
   <act:id type="new">3994b8f5a6a8b2a0a48126fa955e03f7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impuesto predial</act:description>
   <act:parent type="new">a931b8ffe2917ff9a069333623da96ca</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_MX/acctchrt_otherloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_MX/acctchrt_otherloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_MX/acctchrt_otherloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Pasivo</act:name>
   <act:id type="new">8ec79e80d9abf58d78ce3129d3fe3365</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasivo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Préstamos</act:name>
   <act:id type="new">b5624a9d1a1b797b87b815774faccfe4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Préstamos</act:description>
   <act:parent type="new">8ec79e80d9abf58d78ce3129d3fe3365</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Otro préstamo</act:name>
   <act:id type="new">eb79670a4c9b0faab87485b7b2a4abe4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Otro préstamo</act:description>
   <act:parent type="new">b5624a9d1a1b797b87b815774faccfe4</act:parent>
 </gnc:account>
@@ -54,10 +54,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">565e52a122e8acc9a67a36e61357e2ae</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -65,10 +65,10 @@
   <act:name>Intereses</act:name>
   <act:id type="new">4a02c14e992ea79076837c164aa6fc8d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intereses</act:description>
   <act:parent type="new">565e52a122e8acc9a67a36e61357e2ae</act:parent>
 </gnc:account>
@@ -76,10 +76,10 @@
   <act:name>Otro interés</act:name>
   <act:id type="new">f01de45e290ecc29b64d9cb8a733af68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Interés asociado a otro préstamo</act:description>
   <act:parent type="new">4a02c14e992ea79076837c164aa6fc8d</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_MX/acctchrt_renter.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_MX/acctchrt_renter.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_MX/acctchrt_renter.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">9a2b4520f113372f4e576f5b6dc129c6</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Seguros</act:name>
   <act:id type="new">b79b231807a98cd562c46cf0454e9f25</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguros</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>Seguro de inquilino</act:name>
   <act:id type="new">a4c93c964b8322d534e35b7054cbda4d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro de inquilino</act:description>
   <act:parent type="new">b79b231807a98cd562c46cf0454e9f25</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Alquiler</act:name>
   <act:id type="new">c1638a9a48d4d0e1b17d99219a18f34b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Alquiler</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_MX/acctchrt_retiremt.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_MX/acctchrt_retiremt.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_MX/acctchrt_retiremt.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Activo</act:name>
   <act:id type="new">e67ef2c52a4eaf3b9d37d317848a5812</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Inversiones</act:name>
   <act:id type="new">64cf99f6bafe0a539a5941ea713bdfcd</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Inversiones</act:description>
   <act:parent type="new">e67ef2c52a4eaf3b9d37d317848a5812</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Jubilación</act:name>
   <act:id type="new">4173f3047238f4b5595b11d6161b2f48</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Jubilación</act:description>
   <act:slots>
     <slot>
@@ -60,10 +60,10 @@
   <act:name>Bonos</act:name>
   <act:id type="new">9053199c1da747555d12272f48c719fd</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Bonos</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -71,10 +71,10 @@
   <act:name>Acciones</act:name>
   <act:id type="new">9bf53e9580991e323b297999fddff988</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Acciones</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -82,10 +82,10 @@
   <act:name>Fondo de índice</act:name>
   <act:id type="new">2326b032fe4e8f434159310fccf17091</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fondo de índice</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -93,10 +93,10 @@
   <act:name>Fondo de inversión</act:name>
   <act:id type="new">a62d804729117e74a6c880cecb818b56</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fondo de inversión</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_MX/acctchrt_spouseinc.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_MX/acctchrt_spouseinc.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_MX/acctchrt_spouseinc.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Ingresos</act:name>
   <act:id type="new">b4fadf6188d7f1ae7e7aa4fa27f5cc95</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ingresos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Sueldo (Cónyuge)</act:name>
   <act:id type="new">7c4495ff132d100b0aa339ce683200dd</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Sueldo (Cónyuge)</act:description>
   <act:parent type="new">b4fadf6188d7f1ae7e7aa4fa27f5cc95</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>Gastos</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gastos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Impuestos (Cónyuge)</act:name>
   <act:id type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impuestos (Cónyuge)</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -64,10 +64,10 @@
   <act:name>IRPF</act:name>
   <act:id type="new">78df9cf06ee197272a695a4c3044f749</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>IRPF</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -75,10 +75,10 @@
   <act:name>Retenciones</act:name>
   <act:id type="new">eba0c095658c7c3a4f4294db9c7392f3</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Retenciones</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -86,10 +86,10 @@
   <act:name>Otros impuestos</act:name>
   <act:id type="new">dea0cf67026749c9a5aa97be4e5cd052</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Otros impuestos</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -97,10 +97,10 @@
   <act:name>Seguridad Social</act:name>
   <act:id type="new">9bd3abb2ed8c4c0d00f8e8ec36d2744d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguridad Social</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -108,10 +108,10 @@
   <act:name>Municipales</act:name>
   <act:id type="new">aa14dbcd622024495a8a972b0f37d13a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Municipales</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/es_MX/acctchrt_spouseretire.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/es_MX/acctchrt_spouseretire.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/es_MX/acctchrt_spouseretire.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Activo</act:name>
   <act:id type="new">96d9b17add59eb4c7edec7ed241af755</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Activo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Inversiones</act:name>
   <act:id type="new">f46c9f777b1730c6b5f4a1faf9e31708</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Inversiones</act:description>
   <act:parent type="new">96d9b17add59eb4c7edec7ed241af755</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Jubilación de cónyuge</act:name>
   <act:id type="new">4426b41837adc284f96b291c31022844</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Jubilación de cónyuge</act:description>
   <act:slots>
     <slot>
@@ -60,10 +60,10 @@
   <act:name>Bonos</act:name>
   <act:id type="new">c8e7c315502547e51bfdd5a70b5cdd2e</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Bonos</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -71,10 +71,10 @@
   <act:name>Acciones</act:name>
   <act:id type="new">b8838eb77b9603e035e1f7b440d468ae</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Acciones</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -82,10 +82,10 @@
   <act:name>Fondo de índice</act:name>
   <act:id type="new">0ec1a5b402ceea10d95445a2b31c41a1</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fondo de índice</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -93,10 +93,10 @@
   <act:name>Fondo de inversión</act:name>
   <act:id type="new">d9ed01f9b8f9845bc3f68f3e0afb021f</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>EUR</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fondos de inversión</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_CH/acctchrt_brokerage.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_CH/acctchrt_brokerage.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_CH/acctchrt_brokerage.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Actif</act:name>
   <act:id type="new">98f262dfab9a2b99ac42919dcf58d304</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Avoir</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Investissements</act:name>
   <act:id type="new">7ff59d92615cce4d8388d7e179ee3ff6</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investissements</act:description>
   <act:parent type="new">98f262dfab9a2b99ac42919dcf58d304</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>Compte de bourse/titre</act:name>
   <act:id type="new">f15ec9568727f08a5ebd8f3e66483876</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Compte de bourse/titres</act:description>
   <act:parent type="new">7ff59d92615cce4d8388d7e179ee3ff6</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Obligation</act:name>
   <act:id type="new">8196bf0015c25f501338f07a87c512d8</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Obligation</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -64,10 +64,10 @@
   <act:name>Action</act:name>
   <act:id type="new">7d7db9bed07f21fc0b1f50674702aff0</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Action</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -75,10 +75,10 @@
   <act:name>Marché d'indice</act:name>
   <act:id type="new">fe9db8a7eedf2990e9846f634a922143</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Marché d'indice</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -86,10 +86,10 @@
   <act:name>Fond commun</act:name>
   <act:id type="new">9da28c1aa7789e84bdc8484ba8f527b3</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fond commun</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -97,10 +97,10 @@
   <act:name>Revenus</act:name>
   <act:id type="new">9da3c880bd04b9db49eb7f5b06403bda</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Revenus</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -108,10 +108,10 @@
   <act:name>Revenu de dividende</act:name>
   <act:id type="new">1af1f4894aeab96d840e66254d023b88</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Revenu de dividende</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -119,10 +119,10 @@
   <act:name>Revenu d'intérêts</act:name>
   <act:id type="new">c47361e40d9478ec11758097e64d693c</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Revenu d'intérets</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -130,10 +130,10 @@
   <act:name>Intérêts d'obligation</act:name>
   <act:id type="new">8ceb4752a11e2d342b9009b343fdba38</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêts d'obligation</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -141,10 +141,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">6de23244232785031501171abcc1d4aa</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -152,10 +152,10 @@
   <act:name>Commissions</act:name>
   <act:id type="new">77fdffddc79c662c93c482cefa5a4744</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Commissions</act:description>
   <act:parent type="new">6de23244232785031501171abcc1d4aa</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_CH/acctchrt_carloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_CH/acctchrt_carloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_CH/acctchrt_carloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Passif</act:name>
   <act:id type="new">33a326fe16ae360f777a94b3f5bdfbdc</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Emprunts</act:name>
   <act:id type="new">023e2343114b3d695feaeb96904e0da6</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Emprunts</act:description>
   <act:parent type="new">33a326fe16ae360f777a94b3f5bdfbdc</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Emprunt automobile</act:name>
   <act:id type="new">3e5f44fd7bfaa9cae737a4113a749e36</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Emprunt automobile</act:description>
   <act:parent type="new">023e2343114b3d695feaeb96904e0da6</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">acacdcb998e45fb741766622e8542f0b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Intérêts</act:name>
   <act:id type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêts</act:description>
   <act:parent type="new">acacdcb998e45fb741766622e8542f0b</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Intérêts emprunt automobile</act:name>
   <act:id type="new">e9bd8477e27361238d2f53c4fe7594ab</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêts emprunt automobile</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_CH/acctchrt_cdmoneymkt.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_CH/acctchrt_cdmoneymkt.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_CH/acctchrt_cdmoneymkt.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Actif</act:name>
   <act:id type="new">7b1a39efc6234d1db148baa722c9471e</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Actifs actuels</act:name>
   <act:id type="new">1880e89ec9fe82622b8648df481dd2b7</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actifs actuels</act:description>
   <act:parent type="new">7b1a39efc6234d1db148baa722c9471e</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>CD bancaire</act:name>
   <act:id type="new">c1620f9c3082e33d8fd559e17f90a122</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>CD bancaire</act:description>
   <act:parent type="new">1880e89ec9fe82622b8648df481dd2b7</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Marché monétaire</act:name>
   <act:id type="new">3a01e5b0132ba26803b49732a3242654</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Marché monétaire</act:description>
   <act:parent type="new">1880e89ec9fe82622b8648df481dd2b7</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Revenus</act:name>
   <act:id type="new">9da3c880bd04b9db49eb7f5b06403bda</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Revenus</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Revenu d'intérêts</act:name>
   <act:id type="new">c47361e40d9478ec11758097e64d693c</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Revenu d'intérêt</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -85,10 +85,10 @@
   <act:name>Intérêt CD</act:name>
   <act:id type="new">28d311f0f38da5e35628e76ad8bcc853</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêt CD</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -96,10 +96,10 @@
   <act:name>Intérêt du marché monétaire</act:name>
   <act:id type="new">dc537946f39e84ccef7ce38f016249af</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêt du marché monétaire</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_CH/acctchrt_childcare.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_CH/acctchrt_childcare.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_CH/acctchrt_childcare.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">ee8238ee2c2ce590160761df09b99b72</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Garderie</act:name>
   <act:id type="new">8999739a6bfc46088a3ea5ec45e5f8a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Garderie</act:description>
   <act:parent type="new">ee8238ee2c2ce590160761df09b99b72</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_CH/acctchrt_common.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_CH/acctchrt_common.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_CH/acctchrt_common.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Actif</act:name>
   <act:id type="new">98f262dfab9a2b99ac42919dcf58d304</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Actifs actuels</act:name>
   <act:id type="new">a1dd5f225156f110689c204fefded0ab</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actifs actuels</act:description>
   <act:parent type="new">98f262dfab9a2b99ac42919dcf58d304</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>Compte courant</act:name>
   <act:id type="new">b477aa9e0d4eb67c34e1e35903fb3f99</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Compte courant</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Compte d'épargne</act:name>
   <act:id type="new">eeae5a1892e88adbc3b369c76ee4e889</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Compte d'épargne</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -64,10 +64,10 @@
   <act:name>Argent du porte-monnaie</act:name>
   <act:id type="new">07b454b9dd6f68c4b613c5f1ef76f884</act:id>
   <act:type>CASH</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Argent du porte-monnaie</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -75,10 +75,10 @@
   <act:name>Passif</act:name>
   <act:id type="new">19a911feed9b41b8b01be036a2aed9fe</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -86,10 +86,10 @@
   <act:name>Comptes de dettes</act:name>
   <act:id type="new">a8186db64d71dc2ca5fdccb3234b531b</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Comptes de dettes</act:description>
   <act:parent type="new">19a911feed9b41b8b01be036a2aed9fe</act:parent>
 </gnc:account>
@@ -97,10 +97,10 @@
   <act:name>Carte de crédit</act:name>
   <act:id type="new">efc3caac2619666c53e6e27f02d5e716</act:id>
   <act:type>CREDIT</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Carte de crédit</act:description>
   <act:parent type="new">a8186db64d71dc2ca5fdccb3234b531b</act:parent>
 </gnc:account>
@@ -108,10 +108,10 @@
   <act:name>Revenus</act:name>
   <act:id type="new">9da3c880bd04b9db49eb7f5b06403bda</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Revenus</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -119,10 +119,10 @@
   <act:name>Bonus</act:name>
   <act:id type="new">59b72cd943a2ca6f077748bba9a942cd</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Bonus</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -130,10 +130,10 @@
   <act:name>Dons reçus</act:name>
   <act:id type="new">1adcf2c65d7a66f32144ccd9ce4f438f</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dons reçus</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -141,10 +141,10 @@
   <act:name>Revenu d'intérêts</act:name>
   <act:id type="new">c47361e40d9478ec11758097e64d693c</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Revenu d'intérets</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -152,10 +152,10 @@
   <act:name>Intérets du compte courant</act:name>
   <act:id type="new">73481e2da7461fc34e7003b7ec560bdf</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérets du compte courant</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -163,10 +163,10 @@
   <act:name>Autres intérêts</act:name>
   <act:id type="new">be17363347a8578c48cecd06bc8b7aa8</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Autres intérêts</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -174,10 +174,10 @@
   <act:name>Intérêts d'épargne</act:name>
   <act:id type="new">2802ac0d1bff1c09a903f2ad6fde2725</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêts d'épargne</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -185,10 +185,10 @@
   <act:name>Autre revenu</act:name>
   <act:id type="new">49525ad0fb4ced06b9874d365d53f505</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Autre revenu</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -196,10 +196,10 @@
   <act:name>Salaire</act:name>
   <act:id type="new">a750b99cb8487a5e47daedcd3a69fe85</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Salaire</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -207,10 +207,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -218,10 +218,10 @@
   <act:name>Ajustement</act:name>
   <act:id type="new">72f85277a7a7f8b4de175405e20d83bd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ajustement</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -229,10 +229,10 @@
   <act:name>Auto</act:name>
   <act:id type="new">56df186f1ce6114ddca7b9e5d03af390</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Auto</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -240,10 +240,10 @@
   <act:name>Frais</act:name>
   <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Frais</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -251,10 +251,10 @@
   <act:name>Carburant</act:name>
   <act:id type="new">e64b5eecf86ce4e27a64c477a4c77477</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Carburant</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -262,10 +262,10 @@
   <act:name>Stationnement</act:name>
   <act:id type="new">d72262c1c0e2c3388183ebb44a98b011</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Stationnement</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -273,10 +273,10 @@
   <act:name>Maintenance et réparation</act:name>
   <act:id type="new">665dd78f0cc75dd331f556949337de68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Maintenance et réparation</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -284,10 +284,10 @@
   <act:name>Frais de service bancaire</act:name>
   <act:id type="new">fb6c8e25a50737e70fffde432a2355ee</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Frais de service bancaire</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -295,10 +295,10 @@
   <act:name>Livres</act:name>
   <act:id type="new">36479bbc17680f4b9663a9842736153f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Livres</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -306,10 +306,10 @@
   <act:name>Télévision</act:name>
   <act:id type="new">a1393344fb199f08f751ac3154694e87</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Télévision</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -317,10 +317,10 @@
   <act:name>Charité</act:name>
   <act:id type="new">ec8eec3d46c69aa861fda836e11346c0</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Charité</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -328,10 +328,10 @@
   <act:name>Vêtements</act:name>
   <act:id type="new">c27a040a73eac2688d85d29b5b5309c8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Vêtements</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -339,10 +339,10 @@
   <act:name>Informatique</act:name>
   <act:id type="new">fc4390b6214ad1576c5ffffc2b3c268c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Informatique</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -350,10 +350,10 @@
   <act:name>Restaurant</act:name>
   <act:id type="new">0a59a3347e4ff02b862de41ef59d7351</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Restaurant</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -361,10 +361,10 @@
   <act:name>Education</act:name>
   <act:id type="new">5b5ac050529b0f553752babe4a6a35d2</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Education</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -372,10 +372,10 @@
   <act:name>Loisirs</act:name>
   <act:id type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Loisirs</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -383,10 +383,10 @@
   <act:name>Musique/Films</act:name>
   <act:id type="new">4570ea8f4ac5cbd7d8927c905f0978ae</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Musique/Films</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -394,10 +394,10 @@
   <act:name>Divertissements</act:name>
   <act:id type="new">7db9b0aa3bc348da9900f95fc67541a1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Divertissements</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -405,10 +405,10 @@
   <act:name>Voyage</act:name>
   <act:id type="new">def0eac939dbd668f503d84860de8d6e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Voyage</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -416,10 +416,10 @@
   <act:name>Dons/Cadeaux</act:name>
   <act:id type="new">f86b1cebc619455ada23952a0e810909</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dons/Cadeaux</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -427,10 +427,10 @@
   <act:name>Alimentaire</act:name>
   <act:id type="new">83bc2bd915ab6b74c7107b55f8783523</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Alimentaire</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -438,10 +438,10 @@
   <act:name>Passe-temps</act:name>
   <act:id type="new">89f6400a94cd87fea0b056faf6ab7744</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passe-temps</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -449,10 +449,10 @@
   <act:name>Assurances</act:name>
   <act:id type="new">5bda5ff833bc395dc1b00f95c66ce555</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurances</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -460,10 +460,10 @@
   <act:name>Assurance automobile</act:name>
   <act:id type="new">cd72695526906a15ba1a1d9a7680b8e7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurance automobile</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -471,10 +471,10 @@
   <act:name>Assurance santé</act:name>
   <act:id type="new">d80613194a52340c9e5eb62e853c72cf</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurance santé</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -482,10 +482,10 @@
   <act:name>Assurance vie</act:name>
   <act:id type="new">70a327f54be53ef187a52b1d8df70fdd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurance vie</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -493,10 +493,10 @@
   <act:name>Laverie/Pressing</act:name>
   <act:id type="new">1006551b2458631dfc8507b7451c9631</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Laverie/Pressing</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -504,10 +504,10 @@
   <act:name>Dépenses médicales</act:name>
   <act:id type="new">62752930dd1b2b4c90c6d198bd2ff33f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses médicales</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -515,10 +515,10 @@
   <act:name>Divers</act:name>
   <act:id type="new">759deef82e73587bf48a7dd76aa6abe8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Divers</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -526,10 +526,10 @@
   <act:name>Services en ligne</act:name>
   <act:id type="new">2170a1a631cc3b6fc32813fa49a12f77</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Services en ligne</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -537,10 +537,10 @@
   <act:name>Téléphone</act:name>
   <act:id type="new">1d9d7265e25c6c84dda514d2e8899e87</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Téléphone</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -548,10 +548,10 @@
   <act:name>Transports publics</act:name>
   <act:id type="new">64aa760163c7768518e49a104d1c171f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Transports publics</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -559,10 +559,10 @@
   <act:name>Abonnements</act:name>
   <act:id type="new">0336712690d36bcb02e0ce59b5d7653b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Abonnements</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -570,10 +570,10 @@
   <act:name>Fournisseurs</act:name>
   <act:id type="new">e2b34f49d4cf916cf4d45525e1e7319d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fournisseurs</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -581,10 +581,10 @@
   <act:name>Taxes</act:name>
   <act:id type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Taxes</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -592,10 +592,10 @@
   <act:name>Impôts</act:name>
   <act:id type="new">090a786357463ec7fbee8066cb999097</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impôts</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -603,10 +603,10 @@
   <act:name>Complémentaire maladie</act:name>
   <act:id type="new">0785932c5de43e814659420762c9b577</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Complémentaire maladie</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -614,10 +614,10 @@
   <act:name>Autres taxes</act:name>
   <act:id type="new">51875f8aaa0e4f2295a2ae13cf780b2e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Autres taxes</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -625,10 +625,10 @@
   <act:name>Assurance de base</act:name>
   <act:id type="new">c252f10f3d57dd05c500856164b1729e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurance maladie selon LAMAL</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -636,10 +636,10 @@
   <act:name>Etat/Province</act:name>
   <act:id type="new">cd1f1b512ed51a069fd83a5ffcaf6e11</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Etat/Province</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -647,10 +647,10 @@
   <act:name>Utilitaires</act:name>
   <act:id type="new">57635fa5f71dee8ffc207c277250e773</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Utilitaires</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -658,10 +658,10 @@
   <act:name>Electricité</act:name>
   <act:id type="new">2fe462e202e2daffd845359b08a7eefe</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Electricité</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -669,10 +669,10 @@
   <act:name>Collecte d'ordures</act:name>
   <act:id type="new">2d0315d7b2f8f11a8a8b32d805bca6eb</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Collecte d'ordures</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -680,10 +680,10 @@
   <act:name>Gaz</act:name>
   <act:id type="new">dcc33ce7edf402e327318aa1890d35ea</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gaz</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -691,10 +691,10 @@
   <act:name>Eau</act:name>
   <act:id type="new">8cdc91b733444f9f0dfae9773b8f408c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Eau</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -702,10 +702,10 @@
   <act:name>Capitaux propres</act:name>
   <act:id type="new">3ab6a6d97b216c11333e48aa2b749a91</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Capitaux propres</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -713,10 +713,10 @@
   <act:name>Soldes initiaux</act:name>
   <act:id type="new">a0a622a30410f75eba35d2875a843da8</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Soldes initiaux</act:description>
   <act:parent type="new">3ab6a6d97b216c11333e48aa2b749a91</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_CH/acctchrt_currency.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_CH/acctchrt_currency.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_CH/acctchrt_currency.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Actif</act:name>
   <act:id type="new">b3c65be1c5d163746ddc0c506f3f4619</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Investissements</act:name>
   <act:id type="new">d9c796b35784533aee4309e28a3cbfc5</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investissements</act:description>
   <act:parent type="new">b3c65be1c5d163746ddc0c506f3f4619</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Marché monétaire</act:name>
   <act:id type="new">9206632307989cb5b244ad5da5d3131b</act:id>
   <act:type>CURRENCY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DEM</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Marché monétaire</act:description>
   <act:parent type="new">d9c796b35784533aee4309e28a3cbfc5</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_CH/acctchrt_eduloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_CH/acctchrt_eduloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_CH/acctchrt_eduloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Passif</act:name>
   <act:id type="new">4e7e8e39487ad4aba0b62c2232c577c5</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Emprunts</act:name>
   <act:id type="new">c3219e37044b0531d66a7b64433b026d</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Emprunt</act:description>
   <act:parent type="new">4e7e8e39487ad4aba0b62c2232c577c5</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>emprunt étudiant</act:name>
   <act:id type="new">ddeba367199bd025e00420a19d6f9ae4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>emprunt étudiant</act:description>
   <act:parent type="new">c3219e37044b0531d66a7b64433b026d</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">fdbf47b39f70e8818f325eee7931039a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Intérêts</act:name>
   <act:id type="new">1cfcd30ea97b954ffb550ab87d561033</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêts</act:description>
   <act:parent type="new">fdbf47b39f70e8818f325eee7931039a</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Intérêts d'emprunt étudiant</act:name>
   <act:id type="new">04e3d970dc60d3920f40b93fce8924a2</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêts d'emprunt étudiant</act:description>
   <act:parent type="new">1cfcd30ea97b954ffb550ab87d561033</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_CH/acctchrt_fixedassets.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_CH/acctchrt_fixedassets.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_CH/acctchrt_fixedassets.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Actif</act:name>
   <act:id type="new">64b6276c060185131cecbd1ac6218440</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Actifs fixes</act:name>
   <act:id type="new">9b171f77000bf68dd1ebbaf58336656d</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actifs fixes</act:description>
   <act:parent type="new">64b6276c060185131cecbd1ac6218440</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Maison</act:name>
   <act:id type="new">9205ad6b6482903e5a696602d491c8f5</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Maison</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Autre actif</act:name>
   <act:id type="new">ad3b239297277c9ef3840c0433cecb18</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Autre actif</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>véhicule</act:name>
   <act:id type="new">5913089ffc36df6f0a5d96a5d7a444c0</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>véhicule</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_CH/acctchrt_homeloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_CH/acctchrt_homeloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_CH/acctchrt_homeloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Passif</act:name>
   <act:id type="new">6664763bd1ea41462cba5ef856d9c00c</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Emprunts</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Emprunts</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Hypothèque d'emprunt</act:name>
   <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Hypothèque d'emprunt</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Intérêts</act:name>
   <act:id type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêts</act:description>
   <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Hypothèque d'intérêts</act:name>
   <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Hypothèque d'intérêts</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_CH/acctchrt_homeown.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_CH/acctchrt_homeown.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_CH/acctchrt_homeown.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">84732f5fdd27b6463d75bf958e3a4b06</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Entretien logement</act:name>
   <act:id type="new">fa27de57090e107fa99fe1db53790f23</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Entretien logement</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Assurances</act:name>
   <act:id type="new">5bda5ff833bc395dc1b00f95c66ce555</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurances</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Assurance habitation</act:name>
   <act:id type="new">3b5909f31bda0e0f76149fd600e0cb1d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurance habitation</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Taxes</act:name>
   <act:id type="new">a931b8ffe2917ff9a069333623da96ca</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Taxes</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Taxe d'habitation</act:name>
   <act:id type="new">3994b8f5a6a8b2a0a48126fa955e03f7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Taxe d'habitation</act:description>
   <act:parent type="new">a931b8ffe2917ff9a069333623da96ca</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_CH/acctchrt_otherloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_CH/acctchrt_otherloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_CH/acctchrt_otherloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Passif</act:name>
   <act:id type="new">8ec79e80d9abf58d78ce3129d3fe3365</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Emprunts</act:name>
   <act:id type="new">b5624a9d1a1b797b87b815774faccfe4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Emprunts</act:description>
   <act:parent type="new">8ec79e80d9abf58d78ce3129d3fe3365</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Autre emprunt</act:name>
   <act:id type="new">eb79670a4c9b0faab87485b7b2a4abe4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Autre emprunt</act:description>
   <act:parent type="new">b5624a9d1a1b797b87b815774faccfe4</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">565e52a122e8acc9a67a36e61357e2ae</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Intérêts</act:name>
   <act:id type="new">4a02c14e992ea79076837c164aa6fc8d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêts</act:description>
   <act:parent type="new">565e52a122e8acc9a67a36e61357e2ae</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Autres intérets</act:name>
   <act:id type="new">f01de45e290ecc29b64d9cb8a733af68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Autres intérets</act:description>
   <act:parent type="new">4a02c14e992ea79076837c164aa6fc8d</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_CH/acctchrt_renter.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_CH/acctchrt_renter.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_CH/acctchrt_renter.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">9a2b4520f113372f4e576f5b6dc129c6</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Assurances</act:name>
   <act:id type="new">5bda5ff833bc395dc1b00f95c66ce555</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurances</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Assurance locative</act:name>
   <act:id type="new">a4c93c964b8322d534e35b7054cbda4d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurance locative</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Location</act:name>
   <act:id type="new">c1638a9a48d4d0e1b17d99219a18f34b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Location</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_CH/acctchrt_retiremt.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_CH/acctchrt_retiremt.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_CH/acctchrt_retiremt.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Actif</act:name>
   <act:id type="new">e67ef2c52a4eaf3b9d37d317848a5812</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Investissements</act:name>
   <act:id type="new">64cf99f6bafe0a539a5941ea713bdfcd</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investissements</act:description>
   <act:parent type="new">e67ef2c52a4eaf3b9d37d317848a5812</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Retraite</act:name>
   <act:id type="new">4173f3047238f4b5595b11d6161b2f48</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Retraite</act:description>
   <act:slots>
     <slot>
@@ -58,10 +58,10 @@
   <act:name>Obligations</act:name>
   <act:id type="new">9053199c1da747555d12272f48c719fd</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Obligations</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -69,10 +69,10 @@
   <act:name>Actions</act:name>
   <act:id type="new">9bf53e9580991e323b297999fddff988</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actions</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -80,10 +80,10 @@
   <act:name>Marché d'indices</act:name>
   <act:id type="new">2326b032fe4e8f434159310fccf17091</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Marché d'indices</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -91,10 +91,10 @@
   <act:name>Fonds communs</act:name>
   <act:id type="new">a62d804729117e74a6c880cecb818b56</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fonds communs</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_CH/acctchrt_spouseinc.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_CH/acctchrt_spouseinc.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_CH/acctchrt_spouseinc.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Revenus</act:name>
   <act:id type="new">b4fadf6188d7f1ae7e7aa4fa27f5cc95</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Revenus</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Salaire (épouse)</act:name>
   <act:id type="new">7c4495ff132d100b0aa339ce683200dd</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Salaire (épouse)</act:description>
   <act:parent type="new">b4fadf6188d7f1ae7e7aa4fa27f5cc95</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Taxes (épouse)</act:name>
   <act:id type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Taxes (épouse)</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Impôts</act:name>
   <act:id type="new">78df9cf06ee197272a695a4c3044f749</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impôts</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Complémentaire maladie</act:name>
   <act:id type="new">eba0c095658c7c3a4f4294db9c7392f3</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Complémentaire maladie</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -85,10 +85,10 @@
   <act:name>Autres taxes</act:name>
   <act:id type="new">dea0cf67026749c9a5aa97be4e5cd052</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Autres taxes</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -96,10 +96,10 @@
   <act:name>Sécurité sociale</act:name>
   <act:id type="new">9bd3abb2ed8c4c0d00f8e8ec36d2744d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Sécurité sociale</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -107,10 +107,10 @@
   <act:name>Etat/Province</act:name>
   <act:id type="new">aa14dbcd622024495a8a972b0f37d13a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Etat/Province</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_CH/acctchrt_spouseretire.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_CH/acctchrt_spouseretire.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_CH/acctchrt_spouseretire.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Actif</act:name>
   <act:id type="new">96d9b17add59eb4c7edec7ed241af755</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Investissements</act:name>
   <act:id type="new">f46c9f777b1730c6b5f4a1faf9e31708</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investissements</act:description>
   <act:parent type="new">96d9b17add59eb4c7edec7ed241af755</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Retraite de l'épouse</act:name>
   <act:id type="new">4426b41837adc284f96b291c31022844</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Retraite de l'épouse</act:description>
   <act:slots>
     <slot>
@@ -58,10 +58,10 @@
   <act:name>Obligations</act:name>
   <act:id type="new">c8e7c315502547e51bfdd5a70b5cdd2e</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Obligations</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -69,10 +69,10 @@
   <act:name>Actions</act:name>
   <act:id type="new">b8838eb77b9603e035e1f7b440d468ae</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actions</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -80,10 +80,10 @@
   <act:name>Marché d'indices</act:name>
   <act:id type="new">0ec1a5b402ceea10d95445a2b31c41a1</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Marché d'indices</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -91,10 +91,10 @@
   <act:name>Fonds communs</act:name>
   <act:id type="new">d9ed01f9b8f9845bc3f68f3e0afb021f</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fonds communs</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_FR/acctchrt_brokerage.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_FR/acctchrt_brokerage.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_FR/acctchrt_brokerage.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Actif</act:name>
   <act:id type="new">98f262dfab9a2b99ac42919dcf58d304</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Avoir</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Investissements</act:name>
   <act:id type="new">7ff59d92615cce4d8388d7e179ee3ff6</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investissements</act:description>
   <act:parent type="new">98f262dfab9a2b99ac42919dcf58d304</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>Compte de bourse/titre</act:name>
   <act:id type="new">f15ec9568727f08a5ebd8f3e66483876</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Compte de bourse/titres</act:description>
   <act:parent type="new">7ff59d92615cce4d8388d7e179ee3ff6</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Obligation</act:name>
   <act:id type="new">8196bf0015c25f501338f07a87c512d8</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Obligation</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -64,10 +64,10 @@
   <act:name>Action</act:name>
   <act:id type="new">7d7db9bed07f21fc0b1f50674702aff0</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Action</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -75,10 +75,10 @@
   <act:name>Marché d'indice</act:name>
   <act:id type="new">fe9db8a7eedf2990e9846f634a922143</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Marché d'indice</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -86,10 +86,10 @@
   <act:name>Fond commun</act:name>
   <act:id type="new">9da28c1aa7789e84bdc8484ba8f527b3</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fond commun</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -97,10 +97,10 @@
   <act:name>Revenus</act:name>
   <act:id type="new">9da3c880bd04b9db49eb7f5b06403bda</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Revenus</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -108,10 +108,10 @@
   <act:name>Revenu de dividende</act:name>
   <act:id type="new">1af1f4894aeab96d840e66254d023b88</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Revenu de dividende</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -119,10 +119,10 @@
   <act:name>Revenu d'intérêts</act:name>
   <act:id type="new">c47361e40d9478ec11758097e64d693c</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Revenu d'intérets</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -130,10 +130,10 @@
   <act:name>Intérêts d'obligation</act:name>
   <act:id type="new">8ceb4752a11e2d342b9009b343fdba38</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêts d'obligation</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -141,10 +141,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">6de23244232785031501171abcc1d4aa</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -152,10 +152,10 @@
   <act:name>Commissions</act:name>
   <act:id type="new">77fdffddc79c662c93c482cefa5a4744</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Commissions</act:description>
   <act:parent type="new">6de23244232785031501171abcc1d4aa</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_FR/acctchrt_carloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_FR/acctchrt_carloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_FR/acctchrt_carloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Passif</act:name>
   <act:id type="new">33a326fe16ae360f777a94b3f5bdfbdc</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Emprunts</act:name>
   <act:id type="new">023e2343114b3d695feaeb96904e0da6</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Emprunts</act:description>
   <act:parent type="new">33a326fe16ae360f777a94b3f5bdfbdc</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Emprunt automobile</act:name>
   <act:id type="new">3e5f44fd7bfaa9cae737a4113a749e36</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Emprunt automobile</act:description>
   <act:parent type="new">023e2343114b3d695feaeb96904e0da6</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">acacdcb998e45fb741766622e8542f0b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Intérêts</act:name>
   <act:id type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêts</act:description>
   <act:parent type="new">acacdcb998e45fb741766622e8542f0b</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Intérêts emprunt automobile</act:name>
   <act:id type="new">e9bd8477e27361238d2f53c4fe7594ab</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêts emprunt automobile</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_FR/acctchrt_cdmoneymkt.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_FR/acctchrt_cdmoneymkt.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_FR/acctchrt_cdmoneymkt.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Actif</act:name>
   <act:id type="new">7b1a39efc6234d1db148baa722c9471e</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Actifs actuels</act:name>
   <act:id type="new">1880e89ec9fe82622b8648df481dd2b7</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actifs actuels</act:description>
   <act:parent type="new">7b1a39efc6234d1db148baa722c9471e</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>CD bancaire</act:name>
   <act:id type="new">c1620f9c3082e33d8fd559e17f90a122</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>CD bancaire</act:description>
   <act:parent type="new">1880e89ec9fe82622b8648df481dd2b7</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Marché monétaire</act:name>
   <act:id type="new">3a01e5b0132ba26803b49732a3242654</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Marché monétaire</act:description>
   <act:parent type="new">1880e89ec9fe82622b8648df481dd2b7</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Revenus</act:name>
   <act:id type="new">9da3c880bd04b9db49eb7f5b06403bda</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Revenus</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Revenu d'intérêts</act:name>
   <act:id type="new">c47361e40d9478ec11758097e64d693c</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Revenu d'intérêt</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -85,10 +85,10 @@
   <act:name>Intérêt CD</act:name>
   <act:id type="new">28d311f0f38da5e35628e76ad8bcc853</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêt CD</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -96,10 +96,10 @@
   <act:name>Intérêt du marché monétaire</act:name>
   <act:id type="new">dc537946f39e84ccef7ce38f016249af</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêt du marché monétaire</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_FR/acctchrt_childcare.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_FR/acctchrt_childcare.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_FR/acctchrt_childcare.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">ee8238ee2c2ce590160761df09b99b72</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Garderie</act:name>
   <act:id type="new">8999739a6bfc46088a3ea5ec45e5f8a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Garderie</act:description>
   <act:parent type="new">ee8238ee2c2ce590160761df09b99b72</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_FR/acctchrt_common.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_FR/acctchrt_common.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_FR/acctchrt_common.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Actif</act:name>
   <act:id type="new">98f262dfab9a2b99ac42919dcf58d304</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Actifs actuels</act:name>
   <act:id type="new">a1dd5f225156f110689c204fefded0ab</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actifs actuels</act:description>
   <act:parent type="new">98f262dfab9a2b99ac42919dcf58d304</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>Compte chèques</act:name>
   <act:id type="new">b477aa9e0d4eb67c34e1e35903fb3f99</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Compte chèques</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Compte d'épargne</act:name>
   <act:id type="new">eeae5a1892e88adbc3b369c76ee4e889</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Compte d'épargne</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -64,10 +64,10 @@
   <act:name>Argent du porte-monnaie</act:name>
   <act:id type="new">07b454b9dd6f68c4b613c5f1ef76f884</act:id>
   <act:type>CASH</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Argent du porte-monnaie</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -75,10 +75,10 @@
   <act:name>Passif</act:name>
   <act:id type="new">19a911feed9b41b8b01be036a2aed9fe</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -86,10 +86,10 @@
   <act:name>Comptes de dettes</act:name>
   <act:id type="new">a8186db64d71dc2ca5fdccb3234b531b</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Comptes de dettes</act:description>
   <act:parent type="new">19a911feed9b41b8b01be036a2aed9fe</act:parent>
 </gnc:account>
@@ -97,10 +97,10 @@
   <act:name>Carte de crédit</act:name>
   <act:id type="new">efc3caac2619666c53e6e27f02d5e716</act:id>
   <act:type>CREDIT</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Carte de crédit</act:description>
   <act:parent type="new">a8186db64d71dc2ca5fdccb3234b531b</act:parent>
 </gnc:account>
@@ -108,10 +108,10 @@
   <act:name>Revenus</act:name>
   <act:id type="new">9da3c880bd04b9db49eb7f5b06403bda</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Revenus</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -119,10 +119,10 @@
   <act:name>Bonus</act:name>
   <act:id type="new">59b72cd943a2ca6f077748bba9a942cd</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Bonus</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -130,10 +130,10 @@
   <act:name>Dons reçus</act:name>
   <act:id type="new">1adcf2c65d7a66f32144ccd9ce4f438f</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dons reçus</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -141,10 +141,10 @@
   <act:name>Revenu d'intérêts</act:name>
   <act:id type="new">c47361e40d9478ec11758097e64d693c</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Revenu d'intérets</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -152,10 +152,10 @@
   <act:name>Intérets du compte chèque</act:name>
   <act:id type="new">73481e2da7461fc34e7003b7ec560bdf</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérets du compte chèque</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -163,10 +163,10 @@
   <act:name>Autres intérêts</act:name>
   <act:id type="new">be17363347a8578c48cecd06bc8b7aa8</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Autres intérêts</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -174,10 +174,10 @@
   <act:name>Intérêts d'épargne</act:name>
   <act:id type="new">2802ac0d1bff1c09a903f2ad6fde2725</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêts d'épargne</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -185,10 +185,10 @@
   <act:name>Autre revenu</act:name>
   <act:id type="new">49525ad0fb4ced06b9874d365d53f505</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Autre revenu</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -196,10 +196,10 @@
   <act:name>Salaire</act:name>
   <act:id type="new">a750b99cb8487a5e47daedcd3a69fe85</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Salaire</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -207,10 +207,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -218,10 +218,10 @@
   <act:name>Ajustement</act:name>
   <act:id type="new">72f85277a7a7f8b4de175405e20d83bd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ajustement</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -229,10 +229,10 @@
   <act:name>Auto</act:name>
   <act:id type="new">56df186f1ce6114ddca7b9e5d03af390</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Auto</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -240,10 +240,10 @@
   <act:name>Frais</act:name>
   <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Frais</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -251,10 +251,10 @@
   <act:name>Carburant</act:name>
   <act:id type="new">e64b5eecf86ce4e27a64c477a4c77477</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Carburant</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -262,10 +262,10 @@
   <act:name>Stationnement</act:name>
   <act:id type="new">d72262c1c0e2c3388183ebb44a98b011</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Stationnement</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -273,10 +273,10 @@
   <act:name>Maintenance et réparation</act:name>
   <act:id type="new">665dd78f0cc75dd331f556949337de68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Maintenance et réparation</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -284,10 +284,10 @@
   <act:name>Frais de service bancaire</act:name>
   <act:id type="new">fb6c8e25a50737e70fffde432a2355ee</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Frais de service bancaire</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -295,10 +295,10 @@
   <act:name>Livres</act:name>
   <act:id type="new">36479bbc17680f4b9663a9842736153f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Livres</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -306,10 +306,10 @@
   <act:name>Cable</act:name>
   <act:id type="new">a1393344fb199f08f751ac3154694e87</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cable</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -317,10 +317,10 @@
   <act:name>Charité</act:name>
   <act:id type="new">ec8eec3d46c69aa861fda836e11346c0</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Charité</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -328,10 +328,10 @@
   <act:name>Vêtements</act:name>
   <act:id type="new">c27a040a73eac2688d85d29b5b5309c8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Vêtements</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -339,10 +339,10 @@
   <act:name>Informatique</act:name>
   <act:id type="new">fc4390b6214ad1576c5ffffc2b3c268c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Informatique</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -350,10 +350,10 @@
   <act:name>Restaurant</act:name>
   <act:id type="new">0a59a3347e4ff02b862de41ef59d7351</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Restaurant</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -361,10 +361,10 @@
   <act:name>Education</act:name>
   <act:id type="new">5b5ac050529b0f553752babe4a6a35d2</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Education</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -372,10 +372,10 @@
   <act:name>Loisirs</act:name>
   <act:id type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Loisirs</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -383,10 +383,10 @@
   <act:name>Musique/Films</act:name>
   <act:id type="new">4570ea8f4ac5cbd7d8927c905f0978ae</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Musique/Films</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -394,10 +394,10 @@
   <act:name>Divertissements</act:name>
   <act:id type="new">7db9b0aa3bc348da9900f95fc67541a1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Divertissements</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -405,10 +405,10 @@
   <act:name>Voyage</act:name>
   <act:id type="new">def0eac939dbd668f503d84860de8d6e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Voyage</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -416,10 +416,10 @@
   <act:name>Dons/Cadeaux</act:name>
   <act:id type="new">f86b1cebc619455ada23952a0e810909</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dons/Cadeaux</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -427,10 +427,10 @@
   <act:name>Alimentaire</act:name>
   <act:id type="new">83bc2bd915ab6b74c7107b55f8783523</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Alimentaire</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -438,10 +438,10 @@
   <act:name>Passe-temps</act:name>
   <act:id type="new">89f6400a94cd87fea0b056faf6ab7744</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passe-temps</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -449,10 +449,10 @@
   <act:name>Assurances</act:name>
   <act:id type="new">5bda5ff833bc395dc1b00f95c66ce555</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurances</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -460,10 +460,10 @@
   <act:name>Assurance automobile</act:name>
   <act:id type="new">cd72695526906a15ba1a1d9a7680b8e7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurance automobile</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -471,10 +471,10 @@
   <act:name>Assurance santé</act:name>
   <act:id type="new">d80613194a52340c9e5eb62e853c72cf</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurance santé</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -482,10 +482,10 @@
   <act:name>Assurance vie</act:name>
   <act:id type="new">70a327f54be53ef187a52b1d8df70fdd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurance vie</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -493,10 +493,10 @@
   <act:name>Laverie/Pressing</act:name>
   <act:id type="new">1006551b2458631dfc8507b7451c9631</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Laverie/Pressing</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -504,10 +504,10 @@
   <act:name>Dépenses médicales</act:name>
   <act:id type="new">62752930dd1b2b4c90c6d198bd2ff33f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses médicales</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -515,10 +515,10 @@
   <act:name>Divers</act:name>
   <act:id type="new">759deef82e73587bf48a7dd76aa6abe8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Divers</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -526,10 +526,10 @@
   <act:name>Services en ligne</act:name>
   <act:id type="new">2170a1a631cc3b6fc32813fa49a12f77</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Services en ligne</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -537,10 +537,10 @@
   <act:name>Téléphone</act:name>
   <act:id type="new">1d9d7265e25c6c84dda514d2e8899e87</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Téléphone</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -548,10 +548,10 @@
   <act:name>Transports publics</act:name>
   <act:id type="new">64aa760163c7768518e49a104d1c171f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Transports publics</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -559,10 +559,10 @@
   <act:name>Abonnements</act:name>
   <act:id type="new">0336712690d36bcb02e0ce59b5d7653b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Abonnements</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -570,10 +570,10 @@
   <act:name>Fournisseurs</act:name>
   <act:id type="new">e2b34f49d4cf916cf4d45525e1e7319d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fournisseurs</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -581,10 +581,10 @@
   <act:name>Taxes</act:name>
   <act:id type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Taxes</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -592,10 +592,10 @@
   <act:name>Impôts</act:name>
   <act:id type="new">090a786357463ec7fbee8066cb999097</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impôts</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -603,10 +603,10 @@
   <act:name>Complémentaire maladie</act:name>
   <act:id type="new">0785932c5de43e814659420762c9b577</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Complémentaire maladie</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -614,10 +614,10 @@
   <act:name>Autres taxes</act:name>
   <act:id type="new">51875f8aaa0e4f2295a2ae13cf780b2e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Autres taxes</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -625,10 +625,10 @@
   <act:name>Sécurité sociale</act:name>
   <act:id type="new">c252f10f3d57dd05c500856164b1729e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Sécurité sociale</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -636,10 +636,10 @@
   <act:name>Etat/Province</act:name>
   <act:id type="new">cd1f1b512ed51a069fd83a5ffcaf6e11</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Etat/Province</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -647,10 +647,10 @@
   <act:name>Utilitaires</act:name>
   <act:id type="new">57635fa5f71dee8ffc207c277250e773</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Utilitaires</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -658,10 +658,10 @@
   <act:name>Electricité</act:name>
   <act:id type="new">2fe462e202e2daffd845359b08a7eefe</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Electricité</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -669,10 +669,10 @@
   <act:name>Collecte d'ordures</act:name>
   <act:id type="new">2d0315d7b2f8f11a8a8b32d805bca6eb</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Collecte d'ordures</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -680,10 +680,10 @@
   <act:name>Gaz</act:name>
   <act:id type="new">dcc33ce7edf402e327318aa1890d35ea</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gaz</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -691,10 +691,10 @@
   <act:name>Eau</act:name>
   <act:id type="new">8cdc91b733444f9f0dfae9773b8f408c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Eau</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -702,10 +702,10 @@
   <act:name>Capitaux propres</act:name>
   <act:id type="new">3ab6a6d97b216c11333e48aa2b749a91</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Capitaux propres</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -713,10 +713,10 @@
   <act:name>Soldes initiaux</act:name>
   <act:id type="new">a0a622a30410f75eba35d2875a843da8</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Soldes initiaux</act:description>
   <act:parent type="new">3ab6a6d97b216c11333e48aa2b749a91</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_FR/acctchrt_currency.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_FR/acctchrt_currency.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_FR/acctchrt_currency.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Actif</act:name>
   <act:id type="new">b3c65be1c5d163746ddc0c506f3f4619</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Investissements</act:name>
   <act:id type="new">d9c796b35784533aee4309e28a3cbfc5</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investissements</act:description>
   <act:parent type="new">b3c65be1c5d163746ddc0c506f3f4619</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Marché monétaire</act:name>
   <act:id type="new">9206632307989cb5b244ad5da5d3131b</act:id>
   <act:type>CURRENCY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DEM</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Marché monétaire</act:description>
   <act:parent type="new">d9c796b35784533aee4309e28a3cbfc5</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_FR/acctchrt_eduloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_FR/acctchrt_eduloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_FR/acctchrt_eduloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Passif</act:name>
   <act:id type="new">4e7e8e39487ad4aba0b62c2232c577c5</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Emprunts</act:name>
   <act:id type="new">c3219e37044b0531d66a7b64433b026d</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Emprunt</act:description>
   <act:parent type="new">4e7e8e39487ad4aba0b62c2232c577c5</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>emprunt étudiant</act:name>
   <act:id type="new">ddeba367199bd025e00420a19d6f9ae4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>emprunt étudiant</act:description>
   <act:parent type="new">c3219e37044b0531d66a7b64433b026d</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">fdbf47b39f70e8818f325eee7931039a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Intérêts</act:name>
   <act:id type="new">1cfcd30ea97b954ffb550ab87d561033</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêts</act:description>
   <act:parent type="new">fdbf47b39f70e8818f325eee7931039a</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Intérêts d'emprunt étudiant</act:name>
   <act:id type="new">04e3d970dc60d3920f40b93fce8924a2</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêts d'emprunt étudiant</act:description>
   <act:parent type="new">1cfcd30ea97b954ffb550ab87d561033</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_FR/acctchrt_fixedassets.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_FR/acctchrt_fixedassets.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_FR/acctchrt_fixedassets.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Actif</act:name>
   <act:id type="new">64b6276c060185131cecbd1ac6218440</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Actifs fixes</act:name>
   <act:id type="new">9b171f77000bf68dd1ebbaf58336656d</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actifs fixes</act:description>
   <act:parent type="new">64b6276c060185131cecbd1ac6218440</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Maison</act:name>
   <act:id type="new">9205ad6b6482903e5a696602d491c8f5</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Maison</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Autre actif</act:name>
   <act:id type="new">ad3b239297277c9ef3840c0433cecb18</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Autre actif</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>véhicule</act:name>
   <act:id type="new">5913089ffc36df6f0a5d96a5d7a444c0</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>véhicule</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_FR/acctchrt_homeloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_FR/acctchrt_homeloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_FR/acctchrt_homeloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Passif</act:name>
   <act:id type="new">6664763bd1ea41462cba5ef856d9c00c</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Emprunts</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Emprunts</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Hypothèque d'emprunt</act:name>
   <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Hypothèque d'emprunt</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Intérêts</act:name>
   <act:id type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêts</act:description>
   <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Hypothèque d'intérêts</act:name>
   <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Hypothèque d'intérêts</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_FR/acctchrt_homeown.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_FR/acctchrt_homeown.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_FR/acctchrt_homeown.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">84732f5fdd27b6463d75bf958e3a4b06</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Entretien logement</act:name>
   <act:id type="new">fa27de57090e107fa99fe1db53790f23</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Entretien logement</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Assurances</act:name>
   <act:id type="new">5bda5ff833bc395dc1b00f95c66ce555</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurances</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Assurance habitation</act:name>
   <act:id type="new">3b5909f31bda0e0f76149fd600e0cb1d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurance habitation</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Taxes</act:name>
   <act:id type="new">a931b8ffe2917ff9a069333623da96ca</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Taxes</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Taxe d'habitation</act:name>
   <act:id type="new">3994b8f5a6a8b2a0a48126fa955e03f7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Taxe d'habitation</act:description>
   <act:parent type="new">a931b8ffe2917ff9a069333623da96ca</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_FR/acctchrt_otherloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_FR/acctchrt_otherloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_FR/acctchrt_otherloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Passif</act:name>
   <act:id type="new">8ec79e80d9abf58d78ce3129d3fe3365</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Emprunts</act:name>
   <act:id type="new">b5624a9d1a1b797b87b815774faccfe4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Emprunts</act:description>
   <act:parent type="new">8ec79e80d9abf58d78ce3129d3fe3365</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Autre emprunt</act:name>
   <act:id type="new">eb79670a4c9b0faab87485b7b2a4abe4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Autre emprunt</act:description>
   <act:parent type="new">b5624a9d1a1b797b87b815774faccfe4</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">565e52a122e8acc9a67a36e61357e2ae</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Intérêts</act:name>
   <act:id type="new">4a02c14e992ea79076837c164aa6fc8d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Intérêts</act:description>
   <act:parent type="new">565e52a122e8acc9a67a36e61357e2ae</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Autres intérets</act:name>
   <act:id type="new">f01de45e290ecc29b64d9cb8a733af68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Autres intérets</act:description>
   <act:parent type="new">4a02c14e992ea79076837c164aa6fc8d</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_FR/acctchrt_renter.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_FR/acctchrt_renter.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_FR/acctchrt_renter.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">9a2b4520f113372f4e576f5b6dc129c6</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Assurances</act:name>
   <act:id type="new">5bda5ff833bc395dc1b00f95c66ce555</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurances</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Assurance locative</act:name>
   <act:id type="new">a4c93c964b8322d534e35b7054cbda4d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assurance locative</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Location</act:name>
   <act:id type="new">c1638a9a48d4d0e1b17d99219a18f34b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Location</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_FR/acctchrt_retiremt.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_FR/acctchrt_retiremt.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_FR/acctchrt_retiremt.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Actif</act:name>
   <act:id type="new">e67ef2c52a4eaf3b9d37d317848a5812</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Investissements</act:name>
   <act:id type="new">64cf99f6bafe0a539a5941ea713bdfcd</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investissements</act:description>
   <act:parent type="new">e67ef2c52a4eaf3b9d37d317848a5812</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Retraite</act:name>
   <act:id type="new">4173f3047238f4b5595b11d6161b2f48</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Retraite</act:description>
   <act:slots>
     <slot>
@@ -58,10 +58,10 @@
   <act:name>Obligations</act:name>
   <act:id type="new">9053199c1da747555d12272f48c719fd</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Obligations</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -69,10 +69,10 @@
   <act:name>Actions</act:name>
   <act:id type="new">9bf53e9580991e323b297999fddff988</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actions</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -80,10 +80,10 @@
   <act:name>Marché d'indices</act:name>
   <act:id type="new">2326b032fe4e8f434159310fccf17091</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Marché d'indices</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -91,10 +91,10 @@
   <act:name>Fonds communs</act:name>
   <act:id type="new">a62d804729117e74a6c880cecb818b56</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fonds communs</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_FR/acctchrt_spouseinc.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_FR/acctchrt_spouseinc.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_FR/acctchrt_spouseinc.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Revenus</act:name>
   <act:id type="new">b4fadf6188d7f1ae7e7aa4fa27f5cc95</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Revenus</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Salaire (épouse)</act:name>
   <act:id type="new">7c4495ff132d100b0aa339ce683200dd</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Salaire (épouse)</act:description>
   <act:parent type="new">b4fadf6188d7f1ae7e7aa4fa27f5cc95</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Dépenses</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dépenses</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Taxes (épouse)</act:name>
   <act:id type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Taxes (épouse)</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Impôts</act:name>
   <act:id type="new">78df9cf06ee197272a695a4c3044f749</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impôts</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Complémentaire maladie</act:name>
   <act:id type="new">eba0c095658c7c3a4f4294db9c7392f3</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Complémentaire maladie</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -85,10 +85,10 @@
   <act:name>Autres taxes</act:name>
   <act:id type="new">dea0cf67026749c9a5aa97be4e5cd052</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Autres taxes</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -96,10 +96,10 @@
   <act:name>Sécurité sociale</act:name>
   <act:id type="new">9bd3abb2ed8c4c0d00f8e8ec36d2744d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Sécurité sociale</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -107,10 +107,10 @@
   <act:name>Etat/Province</act:name>
   <act:id type="new">aa14dbcd622024495a8a972b0f37d13a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Etat/Province</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/fr_FR/acctchrt_spouseretire.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/fr_FR/acctchrt_spouseretire.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/fr_FR/acctchrt_spouseretire.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Actif</act:name>
   <act:id type="new">96d9b17add59eb4c7edec7ed241af755</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actif</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Investissements</act:name>
   <act:id type="new">f46c9f777b1730c6b5f4a1faf9e31708</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investissements</act:description>
   <act:parent type="new">96d9b17add59eb4c7edec7ed241af755</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Retraite de l'épouse</act:name>
   <act:id type="new">4426b41837adc284f96b291c31022844</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Retraite de l'épouse</act:description>
   <act:slots>
     <slot>
@@ -58,10 +58,10 @@
   <act:name>Obligations</act:name>
   <act:id type="new">c8e7c315502547e51bfdd5a70b5cdd2e</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Obligations</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -69,10 +69,10 @@
   <act:name>Actions</act:name>
   <act:id type="new">b8838eb77b9603e035e1f7b440d468ae</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Actions</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -80,10 +80,10 @@
   <act:name>Marché d'indices</act:name>
   <act:id type="new">0ec1a5b402ceea10d95445a2b31c41a1</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Marché d'indices</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -91,10 +91,10 @@
   <act:name>Fonds communs</act:name>
   <act:id type="new">d9ed01f9b8f9845bc3f68f3e0afb021f</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fonds communs</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/pt_BR/acctchrt_brokerage.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/pt_BR/acctchrt_brokerage.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/pt_BR/acctchrt_brokerage.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Ativos</act:name>
   <act:id type="new">52b5942b5beaec856eaca5a75ee71592</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ativos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Investimentos</act:name>
   <act:id type="new">7ff59d92615cce4d8388d7e179ee3ff6</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investimentos</act:description>
   <act:parent type="new">52b5942b5beaec856eaca5a75ee71592</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>Conta na Corretora</act:name>
   <act:id type="new">f15ec9568727f08a5ebd8f3e66483876</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Conta na Corretora</act:description>
   <act:parent type="new">7ff59d92615cce4d8388d7e179ee3ff6</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Obrigação</act:name>
   <act:id type="new">8196bf0015c25f501338f07a87c512d8</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Obrigação</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -64,10 +64,10 @@
   <act:name>Ação</act:name>
   <act:id type="new">7d7db9bed07f21fc0b1f50674702aff0</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ação</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -75,10 +75,10 @@
   <act:name>Índice de Mercado</act:name>
   <act:id type="new">fe9db8a7eedf2990e9846f634a922143</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Índice de Mercado</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -86,10 +86,10 @@
   <act:name>Fundo de Investimento</act:name>
   <act:id type="new">9da28c1aa7789e84bdc8484ba8f527b3</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fundo de Investimento</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -97,10 +97,10 @@
   <act:name>Receita</act:name>
   <act:id type="new">9da3c880bd04b9db49eb7f5b06403bda</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Receita</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -108,10 +108,10 @@
   <act:name>Receita de Dividendos</act:name>
   <act:id type="new">1af1f4894aeab96d840e66254d023b88</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Receita de Dividendos</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -119,10 +119,10 @@
   <act:name>Receita de Juros</act:name>
   <act:id type="new">7943bc59ffbb9a7be4afcd2996147119</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Receita de Juros</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -130,10 +130,10 @@
   <act:name>Juros de Obigações</act:name>
   <act:id type="new">8ceb4752a11e2d342b9009b343fdba38</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Juros de Obigações</act:description>
   <act:parent type="new">7943bc59ffbb9a7be4afcd2996147119</act:parent>
 </gnc:account>
@@ -141,10 +141,10 @@
   <act:name>Despesas</act:name>
   <act:id type="new">6de23244232785031501171abcc1d4aa</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Despesas</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -152,10 +152,10 @@
   <act:name>Comissões</act:name>
   <act:id type="new">77fdffddc79c662c93c482cefa5a4744</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Comissões</act:description>
   <act:parent type="new">6de23244232785031501171abcc1d4aa</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/pt_BR/acctchrt_carloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/pt_BR/acctchrt_carloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/pt_BR/acctchrt_carloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Passivo</act:name>
   <act:id type="new">33a326fe16ae360f777a94b3f5bdfbdc</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passivo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Empréstimos</act:name>
   <act:id type="new">023e2343114b3d695feaeb96904e0da6</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Empréstimos</act:description>
   <act:parent type="new">33a326fe16ae360f777a94b3f5bdfbdc</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Empréstimo Automóvel</act:name>
   <act:id type="new">3e5f44fd7bfaa9cae737a4113a749e36</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Empréstimo Automóvel</act:description>
   <act:parent type="new">023e2343114b3d695feaeb96904e0da6</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Despesas</act:name>
   <act:id type="new">acacdcb998e45fb741766622e8542f0b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Despesas</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Juro</act:name>
   <act:id type="new">9e8495e80ebfb762089be917dff7ab72</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Juro</act:description>
   <act:parent type="new">acacdcb998e45fb741766622e8542f0b</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Juro Empréstimo Automóvel</act:name>
   <act:id type="new">e9bd8477e27361238d2f53c4fe7594ab</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Juro Empréstimo Automóvel</act:description>
   <act:parent type="new">9e8495e80ebfb762089be917dff7ab72</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/pt_BR/acctchrt_cdmoneymkt.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/pt_BR/acctchrt_cdmoneymkt.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/pt_BR/acctchrt_cdmoneymkt.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Ativos</act:name>
   <act:id type="new">7b1a39efc6234d1db148baa722c9471e</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ativos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Ativos Atuais</act:name>
   <act:id type="new">1880e89ec9fe82622b8648df481dd2b7</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ativos Atuais</act:description>
   <act:parent type="new">7b1a39efc6234d1db148baa722c9471e</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>DP Banco</act:name>
   <act:id type="new">c1620f9c3082e33d8fd559e17f90a122</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>DP Banco</act:description>
   <act:parent type="new">1880e89ec9fe82622b8648df481dd2b7</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Mercado Monetário</act:name>
   <act:id type="new">3a01e5b0132ba26803b49732a3242654</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Mercado Monetário</act:description>
   <act:parent type="new">1880e89ec9fe82622b8648df481dd2b7</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Receita</act:name>
   <act:id type="new">4b3e36f325569b80efc7d3331bdf851b</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Receita</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Juros da Receita</act:name>
   <act:id type="new">fd131cae797d1fb83c2e2bf57254eca5</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Juros da Receita</act:description>
   <act:parent type="new">4b3e36f325569b80efc7d3331bdf851b</act:parent>
 </gnc:account>
@@ -85,10 +85,10 @@
   <act:name>Juros do DP</act:name>
   <act:id type="new">28d311f0f38da5e35628e76ad8bcc853</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Juros do DP</act:description>
   <act:parent type="new">fd131cae797d1fb83c2e2bf57254eca5</act:parent>
 </gnc:account>
@@ -96,10 +96,10 @@
   <act:name>Juros do Mercado Monetário</act:name>
   <act:id type="new">dc537946f39e84ccef7ce38f016249af</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Juros do Mercado Monetário</act:description>
   <act:parent type="new">fd131cae797d1fb83c2e2bf57254eca5</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/pt_BR/acctchrt_childcare.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/pt_BR/acctchrt_childcare.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/pt_BR/acctchrt_childcare.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Despesas</act:name>
   <act:id type="new">ee8238ee2c2ce590160761df09b99b72</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Despesas</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Cuidados Infantís</act:name>
   <act:id type="new">8999739a6bfc46088a3ea5ec45e5f8a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cuidados Infantís</act:description>
   <act:parent type="new">ee8238ee2c2ce590160761df09b99b72</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/pt_BR/acctchrt_common.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/pt_BR/acctchrt_common.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/pt_BR/acctchrt_common.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
   <act:name>Ativos</act:name>
   <act:id type="new">98f262dfab9a2b99ac42919dcf58d304</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ativos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
   <act:name>Ativos Atuais</act:name>
   <act:id type="new">a1dd5f225156f110689c204fefded0ab</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ativos Atuais</act:description>
   <act:parent type="new">98f262dfab9a2b99ac42919dcf58d304</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>Conta Corrente</act:name>
   <act:id type="new">b477aa9e0d4eb67c34e1e35903fb3f99</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Conta Corrente</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Conta Poupança</act:name>
   <act:id type="new">eeae5a1892e88adbc3b369c76ee4e889</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Conta Poupança</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -64,10 +64,10 @@
   <act:name>Dinheiro na Carteira</act:name>
   <act:id type="new">07b454b9dd6f68c4b613c5f1ef76f884</act:id>
   <act:type>CASH</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dinheiro na Carteira</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -75,10 +75,10 @@
   <act:name>Passivo</act:name>
   <act:id type="new">19a911feed9b41b8b01be036a2aed9fe</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passivo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -86,10 +86,10 @@
   <act:name>Contas a Pagar</act:name>
   <act:id type="new">a8186db64d71dc2ca5fdccb3234b531b</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Contas a Pagar</act:description>
   <act:parent type="new">19a911feed9b41b8b01be036a2aed9fe</act:parent>
 </gnc:account>
@@ -97,10 +97,10 @@
   <act:name>Cartão de Crédito</act:name>
   <act:id type="new">efc3caac2619666c53e6e27f02d5e716</act:id>
   <act:type>CREDIT</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cartão de Crédito</act:description>
   <act:parent type="new">a8186db64d71dc2ca5fdccb3234b531b</act:parent>
 </gnc:account>
@@ -108,10 +108,10 @@
   <act:name>Receitas</act:name>
   <act:id type="new">a7ab23dd2d41616042034d5a012a0850</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Receitas</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -119,10 +119,10 @@
   <act:name>Bônus</act:name>
   <act:id type="new">59b72cd943a2ca6f077748bba9a942cd</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Bônus</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -130,10 +130,10 @@
   <act:name>Presentes Recebidos</act:name>
   <act:id type="new">1adcf2c65d7a66f32144ccd9ce4f438f</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Presentes Recebidos</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -141,10 +141,10 @@
   <act:name>Juros Recebidos</act:name>
   <act:id type="new">c47361e40d9478ec11758097e64d693c</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Juros Recebidos</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -152,10 +152,10 @@
   <act:name>Juros Conta Corrente</act:name>
   <act:id type="new">73481e2da7461fc34e7003b7ec560bdf</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Juros Conta Corrente</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -163,10 +163,10 @@
   <act:name>Outros Juros</act:name>
   <act:id type="new">be17363347a8578c48cecd06bc8b7aa8</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Outros Juros</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -174,10 +174,10 @@
   <act:name>Juros Conta Poupança</act:name>
   <act:id type="new">2802ac0d1bff1c09a903f2ad6fde2725</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Juros Conta Poupança</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -185,10 +185,10 @@
   <act:name>Outras Receitas</act:name>
   <act:id type="new">49525ad0fb4ced06b9874d365d53f505</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Outras Receitas</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -196,10 +196,10 @@
   <act:name>Salário</act:name>
   <act:id type="new">a750b99cb8487a5e47daedcd3a69fe85</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Salário</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -207,10 +207,10 @@
   <act:name>Despesas</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Despesas</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -218,10 +218,10 @@
   <act:name>Ajustes</act:name>
   <act:id type="new">72f85277a7a7f8b4de175405e20d83bd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ajustes</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -229,10 +229,10 @@
   <act:name>Automóvel</act:name>
   <act:id type="new">56df186f1ce6114ddca7b9e5d03af390</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Automóvel</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -240,10 +240,10 @@
   <act:name>Impostos</act:name>
   <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impostos</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -251,10 +251,10 @@
   <act:name>Combustível</act:name>
   <act:id type="new">e64b5eecf86ce4e27a64c477a4c77477</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Combustível</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -262,10 +262,10 @@
   <act:name>Estacionamento</act:name>
   <act:id type="new">d72262c1c0e2c3388183ebb44a98b011</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Estacionamento</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -273,10 +273,10 @@
   <act:name>Reparos e Manutenção</act:name>
   <act:id type="new">665dd78f0cc75dd331f556949337de68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Reparos e Manutenção</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -284,10 +284,10 @@
   <act:name>Taxas Bancárias</act:name>
   <act:id type="new">fb6c8e25a50737e70fffde432a2355ee</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Taxas Bancárias</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -295,10 +295,10 @@
   <act:name>Livros</act:name>
   <act:id type="new">36479bbc17680f4b9663a9842736153f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Livros</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -306,10 +306,10 @@
   <act:name>Tv por assinatura</act:name>
   <act:id type="new">a1393344fb199f08f751ac3154694e87</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Tv por assinatura</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -317,10 +317,10 @@
   <act:name>Doações</act:name>
   <act:id type="new">ec8eec3d46c69aa861fda836e11346c0</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Doações</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -328,10 +328,10 @@
   <act:name>Vestuário</act:name>
   <act:id type="new">c27a040a73eac2688d85d29b5b5309c8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Vestuário</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -339,10 +339,10 @@
   <act:name>Computador</act:name>
   <act:id type="new">fc4390b6214ad1576c5ffffc2b3c268c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Computador</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -350,10 +350,10 @@
   <act:name>Refeições Fora</act:name>
   <act:id type="new">0a59a3347e4ff02b862de41ef59d7351</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Refeições Fora</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -361,10 +361,10 @@
   <act:name>Educação</act:name>
   <act:id type="new">5b5ac050529b0f553752babe4a6a35d2</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Educação</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -372,10 +372,10 @@
   <act:name>Diversão</act:name>
   <act:id type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Diversão</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -383,10 +383,10 @@
   <act:name>Música/Cinema</act:name>
   <act:id type="new">4570ea8f4ac5cbd7d8927c905f0978ae</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Música/Cinema</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -394,10 +394,10 @@
   <act:name>Passeios</act:name>
   <act:id type="new">7db9b0aa3bc348da9900f95fc67541a1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passeios</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -405,10 +405,10 @@
   <act:name>Viagens</act:name>
   <act:id type="new">def0eac939dbd668f503d84860de8d6e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Viagens</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -416,10 +416,10 @@
   <act:name>Presentes</act:name>
   <act:id type="new">f86b1cebc619455ada23952a0e810909</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Presentes</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -427,10 +427,10 @@
   <act:name>Mercearia</act:name>
   <act:id type="new">83bc2bd915ab6b74c7107b55f8783523</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Mercearia</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -438,10 +438,10 @@
   <act:name>Passatempos</act:name>
   <act:id type="new">89f6400a94cd87fea0b056faf6ab7744</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passatempos</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -449,10 +449,10 @@
   <act:name>Seguro</act:name>
   <act:id type="new">5bda5ff833bc395dc1b00f95c66ce555</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -460,10 +460,10 @@
   <act:name>Seguro Automóvel</act:name>
   <act:id type="new">cd72695526906a15ba1a1d9a7680b8e7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro Automóvel</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -471,10 +471,10 @@
   <act:name>Seguro Saúde</act:name>
   <act:id type="new">d80613194a52340c9e5eb62e853c72cf</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro Saúde</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -482,10 +482,10 @@
   <act:name>Seguro de Vida</act:name>
   <act:id type="new">70a327f54be53ef187a52b1d8df70fdd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro de Vida</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -493,10 +493,10 @@
   <act:name>Lavandaria</act:name>
   <act:id type="new">1006551b2458631dfc8507b7451c9631</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Lavandaria</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -504,10 +504,10 @@
   <act:name>Despesas com Saúde</act:name>
   <act:id type="new">62752930dd1b2b4c90c6d198bd2ff33f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Despesas com Saúde</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -515,10 +515,10 @@
   <act:name>Outras</act:name>
   <act:id type="new">759deef82e73587bf48a7dd76aa6abe8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Outras</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -526,10 +526,10 @@
   <act:name>Internet</act:name>
   <act:id type="new">2170a1a631cc3b6fc32813fa49a12f77</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Internet</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -537,10 +537,10 @@
   <act:name>Telefone</act:name>
   <act:id type="new">1d9d7265e25c6c84dda514d2e8899e87</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Telefone</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -548,10 +548,10 @@
   <act:name>Transportes Públicos</act:name>
   <act:id type="new">64aa760163c7768518e49a104d1c171f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Transportes Públicos</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -559,10 +559,10 @@
   <act:name>Assinaturas</act:name>
   <act:id type="new">0336712690d36bcb02e0ce59b5d7653b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Assinaturas de jornais, revistas...</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -570,10 +570,10 @@
   <act:name>Material de Escritório</act:name>
   <act:id type="new">e2b34f49d4cf916cf4d45525e1e7319d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Material de Escritório</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -581,10 +581,10 @@
   <act:name>Impostos</act:name>
   <act:id type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impostos</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -592,10 +592,10 @@
   <act:name>IRF</act:name>
   <act:id type="new">090a786357463ec7fbee8066cb999097</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>IRF</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -603,10 +603,10 @@
   <act:name>INSS</act:name>
   <act:id type="new">0785932c5de43e814659420762c9b577</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>INSS</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -614,10 +614,10 @@
   <act:name>Outros Impostos</act:name>
   <act:id type="new">51875f8aaa0e4f2295a2ae13cf780b2e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Outros Impostos</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -625,10 +625,10 @@
   <act:name>CPMF</act:name>
   <act:id type="new">c252f10f3d57dd05c500856164b1729e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>CPMF</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -636,10 +636,10 @@
   <act:name>Serviços</act:name>
   <act:id type="new">57635fa5f71dee8ffc207c277250e773</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Serviços</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -647,10 +647,10 @@
   <act:name>Eletricidade</act:name>
   <act:id type="new">2fe462e202e2daffd845359b08a7eefe</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Eletricidade</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -658,10 +658,10 @@
   <act:name>Gás</act:name>
   <act:id type="new">dcc33ce7edf402e327318aa1890d35ea</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Gás</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -669,10 +669,10 @@
   <act:name>Água</act:name>
   <act:id type="new">8cdc91b733444f9f0dfae9773b8f408c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Água</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -680,10 +680,10 @@
   <act:name>Líquido</act:name>
   <act:id type="new">3ab6a6d97b216c11333e48aa2b749a91</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Líquido</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -691,10 +691,10 @@
   <act:name>Saldos Iniciais</act:name>
   <act:id type="new">a0a622a30410f75eba35d2875a843da8</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Saldos Iniciais</act:description>
   <act:parent type="new">3ab6a6d97b216c11333e48aa2b749a91</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/pt_BR/acctchrt_currency.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/pt_BR/acctchrt_currency.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/pt_BR/acctchrt_currency.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Ativos</act:name>
   <act:id type="new">b3c65be1c5d163746ddc0c506f3f4619</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ativos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Investimentos</act:name>
   <act:id type="new">d9c796b35784533aee4309e28a3cbfc5</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investimentos</act:description>
   <act:parent type="new">b3c65be1c5d163746ddc0c506f3f4619</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Conversão de Moeda</act:name>
   <act:id type="new">9206632307989cb5b244ad5da5d3131b</act:id>
   <act:type>CURRENCY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Conversão de Moeda</act:description>
   <act:parent type="new">d9c796b35784533aee4309e28a3cbfc5</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/pt_BR/acctchrt_eduloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/pt_BR/acctchrt_eduloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/pt_BR/acctchrt_eduloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Passivo</act:name>
   <act:id type="new">4e7e8e39487ad4aba0b62c2232c577c5</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passivo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Empréstimos</act:name>
   <act:id type="new">c3219e37044b0531d66a7b64433b026d</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Empréstimos</act:description>
   <act:parent type="new">4e7e8e39487ad4aba0b62c2232c577c5</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Crédito Educativo</act:name>
   <act:id type="new">ddeba367199bd025e00420a19d6f9ae4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Crédito Educativo</act:description>
   <act:parent type="new">c3219e37044b0531d66a7b64433b026d</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Despesas</act:name>
   <act:id type="new">fdbf47b39f70e8818f325eee7931039a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Despesas</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Juros</act:name>
   <act:id type="new">1cfcd30ea97b954ffb550ab87d561033</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Juros</act:description>
   <act:parent type="new">fdbf47b39f70e8818f325eee7931039a</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Juros do Crédito Educativo</act:name>
   <act:id type="new">04e3d970dc60d3920f40b93fce8924a2</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Juros do Crédito Educativo</act:description>
   <act:parent type="new">1cfcd30ea97b954ffb550ab87d561033</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/pt_BR/acctchrt_fixedassets.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/pt_BR/acctchrt_fixedassets.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/pt_BR/acctchrt_fixedassets.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Ativos</act:name>
   <act:id type="new">64b6276c060185131cecbd1ac6218440</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ativos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Ativos Fixos</act:name>
   <act:id type="new">9b171f77000bf68dd1ebbaf58336656d</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ativos Fixos</act:description>
   <act:parent type="new">64b6276c060185131cecbd1ac6218440</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Casa</act:name>
   <act:id type="new">9205ad6b6482903e5a696602d491c8f5</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Casa</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Outro Ativo</act:name>
   <act:id type="new">ad3b239297277c9ef3840c0433cecb18</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Outro Ativo</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Automóvel</act:name>
   <act:id type="new">5913089ffc36df6f0a5d96a5d7a444c0</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Automóvel</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/pt_BR/acctchrt_homeloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/pt_BR/acctchrt_homeloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/pt_BR/acctchrt_homeloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Passivo</act:name>
   <act:id type="new">6664763bd1ea41462cba5ef856d9c00c</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passivo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Empréstimos</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Empréstimos</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Empréstimo Habitação</act:name>
   <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Empréstimo Habitação</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Despesas</act:name>
   <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Despesas</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Juros</act:name>
   <act:id type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Juros</act:description>
   <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Juros Empréstimo</act:name>
   <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Juros Empréstimo</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/pt_BR/acctchrt_homeown.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/pt_BR/acctchrt_homeown.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/pt_BR/acctchrt_homeown.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Despesas</act:name>
   <act:id type="new">84732f5fdd27b6463d75bf958e3a4b06</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Despesas</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Reparos na Casa</act:name>
   <act:id type="new">fa27de57090e107fa99fe1db53790f23</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Reparos na Casa</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Seguro</act:name>
   <act:id type="new">4677fe36914ebcf23758f3bf20686b4a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Seguro da Casa</act:name>
   <act:id type="new">3b5909f31bda0e0f76149fd600e0cb1d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro da Casa</act:description>
   <act:parent type="new">4677fe36914ebcf23758f3bf20686b4a</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>IPTU</act:name>
   <act:id type="new">a931b8ffe2917ff9a069333623da96ca</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>IPTU</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/pt_BR/acctchrt_otherloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/pt_BR/acctchrt_otherloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/pt_BR/acctchrt_otherloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Passivo</act:name>
   <act:id type="new">8ec79e80d9abf58d78ce3129d3fe3365</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Passivo</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Empréstimos</act:name>
   <act:id type="new">b5624a9d1a1b797b87b815774faccfe4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Empréstimos</act:description>
   <act:parent type="new">8ec79e80d9abf58d78ce3129d3fe3365</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Outros Empréstimo</act:name>
   <act:id type="new">eb79670a4c9b0faab87485b7b2a4abe4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Outros Empréstimo</act:description>
   <act:parent type="new">b5624a9d1a1b797b87b815774faccfe4</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Despesas</act:name>
   <act:id type="new">565e52a122e8acc9a67a36e61357e2ae</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Despesas</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Juro</act:name>
   <act:id type="new">4a02c14e992ea79076837c164aa6fc8d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Juro</act:description>
   <act:parent type="new">565e52a122e8acc9a67a36e61357e2ae</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Outro Juro</act:name>
   <act:id type="new">f01de45e290ecc29b64d9cb8a733af68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Outro Juro</act:description>
   <act:parent type="new">4a02c14e992ea79076837c164aa6fc8d</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/pt_BR/acctchrt_renter.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/pt_BR/acctchrt_renter.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/pt_BR/acctchrt_renter.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Despesas</act:name>
   <act:id type="new">9a2b4520f113372f4e576f5b6dc129c6</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Despesas</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Seguro</act:name>
   <act:id type="new">b79b231807a98cd562c46cf0454e9f25</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Renda</act:name>
   <act:id type="new">c1638a9a48d4d0e1b17d99219a18f34b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Renda</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/pt_BR/acctchrt_retiremt.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/pt_BR/acctchrt_retiremt.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/pt_BR/acctchrt_retiremt.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Ativos</act:name>
   <act:id type="new">e67ef2c52a4eaf3b9d37d317848a5812</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ativos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Investimentos</act:name>
   <act:id type="new">64cf99f6bafe0a539a5941ea713bdfcd</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investimentos</act:description>
   <act:parent type="new">e67ef2c52a4eaf3b9d37d317848a5812</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Aposentadoria</act:name>
   <act:id type="new">4173f3047238f4b5595b11d6161b2f48</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aposentadoria</act:description>
   <act:slots>
     <slot>
@@ -58,10 +58,10 @@
   <act:name>Obrigações</act:name>
   <act:id type="new">9053199c1da747555d12272f48c719fd</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Obrigações</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -69,10 +69,10 @@
   <act:name>Ações</act:name>
   <act:id type="new">9bf53e9580991e323b297999fddff988</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ações</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -80,10 +80,10 @@
   <act:name>Índice de Mercado</act:name>
   <act:id type="new">2326b032fe4e8f434159310fccf17091</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Índice de Mercado</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -91,10 +91,10 @@
   <act:name>Fundo de Investimento</act:name>
   <act:id type="new">a62d804729117e74a6c880cecb818b56</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fundo de Investimento</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/pt_BR/acctchrt_spouseinc.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/pt_BR/acctchrt_spouseinc.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/pt_BR/acctchrt_spouseinc.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Receita</act:name>
   <act:id type="new">b4fadf6188d7f1ae7e7aa4fa27f5cc95</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Receita</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Salário (Cônjuge)</act:name>
   <act:id type="new">7c4495ff132d100b0aa339ce683200dd</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Salário (Cônjuge)</act:description>
   <act:parent type="new">b4fadf6188d7f1ae7e7aa4fa27f5cc95</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Impostos (Cônjuge)</act:name>
   <act:id type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Impostos (Cônjuge)</act:description>
   <act:parent type="new">b4fadf6188d7f1ae7e7aa4fa27f5cc95</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>IRF</act:name>
   <act:id type="new">78df9cf06ee197272a695a4c3044f749</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>IRF</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Seguro Saúde</act:name>
   <act:id type="new">eba0c095658c7c3a4f4294db9c7392f3</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Seguro Saúde</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Outros Impostos</act:name>
   <act:id type="new">dea0cf67026749c9a5aa97be4e5cd052</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Outros Impostos</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/pt_BR/acctchrt_spouseretire.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/pt_BR/acctchrt_spouseretire.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/pt_BR/acctchrt_spouseretire.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Ativos</act:name>
   <act:id type="new">96d9b17add59eb4c7edec7ed241af755</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ativos</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Investimentos</act:name>
   <act:id type="new">f46c9f777b1730c6b5f4a1faf9e31708</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investimentos</act:description>
   <act:parent type="new">96d9b17add59eb4c7edec7ed241af755</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Aposentadoria do Cônjuge</act:name>
   <act:id type="new">4426b41837adc284f96b291c31022844</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aposentadoria do Cônjuge</act:description>
   <act:slots>
     <slot>
@@ -58,10 +58,10 @@
   <act:name>Obrigações</act:name>
   <act:id type="new">c8e7c315502547e51bfdd5a70b5cdd2e</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Obrigações</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -69,10 +69,10 @@
   <act:name>Ações</act:name>
   <act:id type="new">b8838eb77b9603e035e1f7b440d468ae</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ações</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -80,10 +80,10 @@
   <act:name>Índice de Mercado</act:name>
   <act:id type="new">0ec1a5b402ceea10d95445a2b31c41a1</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Índice de Mercado</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -91,10 +91,10 @@
   <act:name>Fundo de Investimento</act:name>
   <act:id type="new">d9ed01f9b8f9845bc3f68f3e0afb021f</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>BRL</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fundo de Investimento</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/sk/acctchrt_brokerage.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/sk/acctchrt_brokerage.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/sk/acctchrt_brokerage.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Aktíva</act:name>
   <act:id type="new">52b5942b5beaec856eaca5a75ee71592</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktíva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Investície</act:name>
   <act:id type="new">7ff59d92615cce4d8388d7e179ee3ff6</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investície</act:description>
   <act:parent type="new">52b5942b5beaec856eaca5a75ee71592</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
     <act:name>Brokerov úèet</act:name>
   <act:id type="new">f15ec9568727f08a5ebd8f3e66483876</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investície na úète u brokera</act:description>
   <act:parent type="new">7ff59d92615cce4d8388d7e179ee3ff6</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Dlhopis</act:name>
   <act:id type="new">8196bf0015c25f501338f07a87c512d8</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dlhopis</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Akcie</act:name>
   <act:id type="new">7d7db9bed07f21fc0b1f50674702aff0</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Akcie</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Trhový Index</act:name>
   <act:id type="new">fe9db8a7eedf2990e9846f634a922143</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Trhový Index</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -85,10 +85,10 @@
   <act:name>Investièný fond</act:name>
   <act:id type="new">9da28c1aa7789e84bdc8484ba8f527b3</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investièný fond</act:description>
   <act:parent type="new">f15ec9568727f08a5ebd8f3e66483876</act:parent>
 </gnc:account>
@@ -96,10 +96,10 @@
   <act:name>Príjem</act:name>
   <act:id type="new">9da3c880bd04b9db49eb7f5b06403bda</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Príjem</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -107,10 +107,10 @@
   <act:name>Dividendový príjem</act:name>
   <act:id type="new">1af1f4894aeab96d840e66254d023b88</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dividendový príjem</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -118,10 +118,10 @@
   <act:name>Úrokový príjem</act:name>
   <act:id type="new">7943bc59ffbb9a7be4afcd2996147119</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrokový príjem</act:description>
   <act:parent type="new">9da3c880bd04b9db49eb7f5b06403bda</act:parent>
 </gnc:account>
@@ -129,10 +129,10 @@
   <act:name>Úrok dlhopisu</act:name>
   <act:id type="new">8ceb4752a11e2d342b9009b343fdba38</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok dlhopisu</act:description>
   <act:parent type="new">7943bc59ffbb9a7be4afcd2996147119</act:parent>
 </gnc:account>
@@ -140,10 +140,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">6de23244232785031501171abcc1d4aa</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -151,10 +151,10 @@
   <act:name>Poplatky</act:name>
   <act:id type="new">77fdffddc79c662c93c482cefa5a4744</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Poplatky</act:description>
   <act:parent type="new">6de23244232785031501171abcc1d4aa</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/sk/acctchrt_carloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/sk/acctchrt_carloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/sk/acctchrt_carloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Pasíva</act:name>
   <act:id type="new">33a326fe16ae360f777a94b3f5bdfbdc</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasíva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Dlhy</act:name>
   <act:id type="new">023e2343114b3d695feaeb96904e0da6</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dlhy</act:description>
   <act:parent type="new">33a326fe16ae360f777a94b3f5bdfbdc</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Úver na dopravný prostriedok</act:name>
   <act:id type="new">3e5f44fd7bfaa9cae737a4113a749e36</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úver na dopravný prostriedok</act:description>
   <act:parent type="new">023e2343114b3d695feaeb96904e0da6</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">acacdcb998e45fb741766622e8542f0b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Úrok</act:name>
   <act:id type="new">9e8495e80ebfb762089be917dff7ab72</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok</act:description>
   <act:parent type="new">acacdcb998e45fb741766622e8542f0b</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Úrok z úveru na dopravný prostriedok</act:name>
   <act:id type="new">e9bd8477e27361238d2f53c4fe7594ab</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok z úveru na dopravný prostriedok</act:description>
   <act:parent type="new">9e8495e80ebfb762089be917dff7ab72</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/sk/acctchrt_cdmoneymkt.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/sk/acctchrt_cdmoneymkt.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/sk/acctchrt_cdmoneymkt.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Aktíva</act:name>
   <act:id type="new">7b1a39efc6234d1db148baa722c9471e</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktíva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Be¾né aktíva</act:name>
   <act:id type="new">1880e89ec9fe82622b8648df481dd2b7</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Be¾né aktíva</act:description>
   <act:parent type="new">7b1a39efc6234d1db148baa722c9471e</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
     <act:name>Depozitný certifikát</act:name>
   <act:id type="new">c1620f9c3082e33d8fd559e17f90a122</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Depozitný certifikát</act:description>
   <act:parent type="new">1880e89ec9fe82622b8648df481dd2b7</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Peòa¾ný trh</act:name>
   <act:id type="new">3a01e5b0132ba26803b49732a3242654</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Peòa¾ný trh</act:description>
   <act:parent type="new">1880e89ec9fe82622b8648df481dd2b7</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Príjem</act:name>
   <act:id type="new">4b3e36f325569b80efc7d3331bdf851b</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Príjem</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Úrokový príjem</act:name>
   <act:id type="new">fd131cae797d1fb83c2e2bf57254eca5</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrokový príjem</act:description>
   <act:parent type="new">4b3e36f325569b80efc7d3331bdf851b</act:parent>
 </gnc:account>
@@ -85,10 +85,10 @@
   <act:name>Úrok depozitného certifikátu</act:name>
   <act:id type="new">28d311f0f38da5e35628e76ad8bcc853</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok depozitného certifikátu</act:description>
   <act:parent type="new">fd131cae797d1fb83c2e2bf57254eca5</act:parent>
 </gnc:account>
@@ -96,10 +96,10 @@
   <act:name>Úrok peòa¾ného trhu</act:name>
   <act:id type="new">dc537946f39e84ccef7ce38f016249af</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok peòa¾ného trhu</act:description>
   <act:parent type="new">fd131cae797d1fb83c2e2bf57254eca5</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/sk/acctchrt_childcare.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/sk/acctchrt_childcare.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/sk/acctchrt_childcare.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">ee8238ee2c2ce590160761df09b99b72</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Staroslivos» o die»a</act:name>
   <act:id type="new">8999739a6bfc46088a3ea5ec45e5f8a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Starostlivos» o die»a</act:description>
   <act:parent type="new">ee8238ee2c2ce590160761df09b99b72</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/sk/acctchrt_common.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/sk/acctchrt_common.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/sk/acctchrt_common.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -20,10 +20,10 @@
     <act:name>Aktíva</act:name>
   <act:id type="new">98f262dfab9a2b99ac42919dcf58d304</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktíva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -31,10 +31,10 @@
     <act:name>Aktuálne aktíva</act:name>
   <act:id type="new">a1dd5f225156f110689c204fefded0ab</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktuálne aktíva</act:description>
   <act:parent type="new">98f262dfab9a2b99ac42919dcf58d304</act:parent>
 </gnc:account>
@@ -42,10 +42,10 @@
   <act:name>©ekový úèet</act:name>
   <act:id type="new">b477aa9e0d4eb67c34e1e35903fb3f99</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>©ekový úèet</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -53,10 +53,10 @@
   <act:name>Úspory</act:name>
   <act:id type="new">eeae5a1892e88adbc3b369c76ee4e889</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úspory</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -64,10 +64,10 @@
   <act:name>Hotovos» v peòa¾enke</act:name>
   <act:id type="new">07b454b9dd6f68c4b613c5f1ef76f884</act:id>
   <act:type>CASH</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Hotovos» v peòa¾enke</act:description>
   <act:parent type="new">a1dd5f225156f110689c204fefded0ab</act:parent>
 </gnc:account>
@@ -75,10 +75,10 @@
   <act:name>Pasíva</act:name>
   <act:id type="new">19a911feed9b41b8b01be036a2aed9fe</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasíva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -86,10 +86,10 @@
   <act:name>Splatné úèty</act:name>
   <act:id type="new">a8186db64d71dc2ca5fdccb3234b531b</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Splatné úèty</act:description>
   <act:parent type="new">19a911feed9b41b8b01be036a2aed9fe</act:parent>
 </gnc:account>
@@ -97,10 +97,10 @@
   <act:name>Platobná karta</act:name>
   <act:id type="new">efc3caac2619666c53e6e27f02d5e716</act:id>
   <act:type>CREDIT</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Platobná karta</act:description>
   <act:parent type="new">a8186db64d71dc2ca5fdccb3234b531b</act:parent>
 </gnc:account>
@@ -108,10 +108,10 @@
   <act:name>Príjem</act:name>
   <act:id type="new">a7ab23dd2d41616042034d5a012a0850</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Príjem</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -119,10 +119,10 @@
   <act:name>Bonus</act:name>
   <act:id type="new">59b72cd943a2ca6f077748bba9a942cd</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Bonus</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -130,10 +130,10 @@
   <act:name>Prijaté dary</act:name>
   <act:id type="new">1adcf2c65d7a66f32144ccd9ce4f438f</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Prijaté dary</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -141,10 +141,10 @@
   <act:name>Úrokový príjem</act:name>
   <act:id type="new">c47361e40d9478ec11758097e64d693c</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrokový príjem</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -152,10 +152,10 @@
   <act:name>©ekový úrok</act:name>
   <act:id type="new">73481e2da7461fc34e7003b7ec560bdf</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>©ekový úrok</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -163,10 +163,10 @@
   <act:name>Ostatné úroky</act:name>
   <act:id type="new">be17363347a8578c48cecd06bc8b7aa8</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ostatné úroky</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -174,10 +174,10 @@
   <act:name>Úroky z úspor</act:name>
   <act:id type="new">2802ac0d1bff1c09a903f2ad6fde2725</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úroky z úspor</act:description>
   <act:parent type="new">c47361e40d9478ec11758097e64d693c</act:parent>
 </gnc:account>
@@ -185,10 +185,10 @@
   <act:name>Ostatné príjmy</act:name>
   <act:id type="new">49525ad0fb4ced06b9874d365d53f505</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ostatné príjmy</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -196,10 +196,10 @@
   <act:name>Mzda</act:name>
   <act:id type="new">a750b99cb8487a5e47daedcd3a69fe85</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Mzda</act:description>
   <act:parent type="new">a7ab23dd2d41616042034d5a012a0850</act:parent>
 </gnc:account>
@@ -207,10 +207,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -218,10 +218,10 @@
     <act:name>Úpravy</act:name>
   <act:id type="new">72f85277a7a7f8b4de175405e20d83bd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úpravy</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -229,10 +229,10 @@
   <act:name>Auto</act:name>
   <act:id type="new">56df186f1ce6114ddca7b9e5d03af390</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Auto</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -240,10 +240,10 @@
   <act:name>Poplatky</act:name>
   <act:id type="new">2ff007a389bd23d8970afeba2d58c9a8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Poplatky</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -251,10 +251,10 @@
   <act:name>Benzín</act:name>
   <act:id type="new">e64b5eecf86ce4e27a64c477a4c77477</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Benzín</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -262,10 +262,10 @@
   <act:name>Parkovné</act:name>
   <act:id type="new">d72262c1c0e2c3388183ebb44a98b011</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Parkovné</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -273,10 +273,10 @@
   <act:name>Opravy a udr¾iavanie</act:name>
   <act:id type="new">665dd78f0cc75dd331f556949337de68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Opravy a udr¾iavanie</act:description>
   <act:parent type="new">56df186f1ce6114ddca7b9e5d03af390</act:parent>
 </gnc:account>
@@ -284,10 +284,10 @@
   <act:name>Poplatky za bankové slu¾by</act:name>
   <act:id type="new">fb6c8e25a50737e70fffde432a2355ee</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Poplatky za bankové slu¾by</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -295,10 +295,10 @@
   <act:name>Knihy</act:name>
   <act:id type="new">36479bbc17680f4b9663a9842736153f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Knihy</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -306,10 +306,10 @@
   <act:name>Káblovka</act:name>
   <act:id type="new">a1393344fb199f08f751ac3154694e87</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Káblovka</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -317,10 +317,10 @@
   <act:name>Charita</act:name>
   <act:id type="new">ec8eec3d46c69aa861fda836e11346c0</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Charita</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -328,10 +328,10 @@
   <act:name>O¹atenie</act:name>
   <act:id type="new">c27a040a73eac2688d85d29b5b5309c8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>O¹atenie</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -339,10 +339,10 @@
   <act:name>Poèítaè</act:name>
   <act:id type="new">fc4390b6214ad1576c5ffffc2b3c268c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Poèítaè</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -350,10 +350,10 @@
   <act:name>Jedáleò</act:name>
   <act:id type="new">0a59a3347e4ff02b862de41ef59d7351</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Jedáleò</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -361,10 +361,10 @@
   <act:name>Vzdelávanie</act:name>
   <act:id type="new">5b5ac050529b0f553752babe4a6a35d2</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Vzdelávanie</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -372,10 +372,10 @@
   <act:name>Zábava</act:name>
   <act:id type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Zábava</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -383,10 +383,10 @@
   <act:name>Hudba/Film</act:name>
   <act:id type="new">4570ea8f4ac5cbd7d8927c905f0978ae</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Hudba/Film</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -394,10 +394,10 @@
   <act:name>Rekreácia</act:name>
   <act:id type="new">7db9b0aa3bc348da9900f95fc67541a1</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Rekreácia</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -405,10 +405,10 @@
   <act:name>Cestovanie</act:name>
   <act:id type="new">def0eac939dbd668f503d84860de8d6e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Cestovanie</act:description>
   <act:parent type="new">0ebd1d5f40d9e9e8bb1a4bf539650dd1</act:parent>
 </gnc:account>
@@ -416,10 +416,10 @@
   <act:name>Dary</act:name>
   <act:id type="new">f86b1cebc619455ada23952a0e810909</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dary</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -427,10 +427,10 @@
   <act:name>Potraviny</act:name>
   <act:id type="new">83bc2bd915ab6b74c7107b55f8783523</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Potraviny</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -438,10 +438,10 @@
   <act:name>Záµuby</act:name>
   <act:id type="new">89f6400a94cd87fea0b056faf6ab7744</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Záµuby</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -449,10 +449,10 @@
   <act:name>Poistenie</act:name>
   <act:id type="new">5bda5ff833bc395dc1b00f95c66ce555</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Poistenie</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -460,10 +460,10 @@
   <act:name>Poistenie auta</act:name>
   <act:id type="new">cd72695526906a15ba1a1d9a7680b8e7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Poistenie auta</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -471,10 +471,10 @@
   <act:name>Zdravotné poistenie</act:name>
   <act:id type="new">d80613194a52340c9e5eb62e853c72cf</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Zdravotné poistenie</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -482,10 +482,10 @@
   <act:name>®ivotné poistenie</act:name>
   <act:id type="new">70a327f54be53ef187a52b1d8df70fdd</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>®ivotné poistenie</act:description>
   <act:parent type="new">5bda5ff833bc395dc1b00f95c66ce555</act:parent>
 </gnc:account>
@@ -493,10 +493,10 @@
     <act:name>Práèovòa/Èistiareò</act:name>
   <act:id type="new">1006551b2458631dfc8507b7451c9631</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Práèovòa/Èistiareò</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -504,10 +504,10 @@
     <act:name>Lekárske o¹etrenie</act:name>
   <act:id type="new">62752930dd1b2b4c90c6d198bd2ff33f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Lekárske o¹etrenie</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -515,10 +515,10 @@
   <act:name>Rôzne</act:name>
   <act:id type="new">759deef82e73587bf48a7dd76aa6abe8</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Rôzne</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -526,10 +526,10 @@
   <act:name>Online slu¾by</act:name>
   <act:id type="new">2170a1a631cc3b6fc32813fa49a12f77</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Online slu¾by</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -537,10 +537,10 @@
   <act:name>Telefón</act:name>
   <act:id type="new">1d9d7265e25c6c84dda514d2e8899e87</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Telefón</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -548,10 +548,10 @@
   <act:name>MHD</act:name>
   <act:id type="new">64aa760163c7768518e49a104d1c171f</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Mestká hromadná doprava</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -559,10 +559,10 @@
   <act:name>Predplatné</act:name>
   <act:id type="new">0336712690d36bcb02e0ce59b5d7653b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Predplatné</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -570,10 +570,10 @@
   <act:name>Zásobovanie</act:name>
   <act:id type="new">e2b34f49d4cf916cf4d45525e1e7319d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Zásobovanie</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -581,10 +581,10 @@
   <act:name>Odvody a dane</act:name>
   <act:id type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Odvody a dane</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -592,10 +592,10 @@
   <act:name>Celo¹tátne dane</act:name>
   <act:id type="new">090a786357463ec7fbee8066cb999097</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Celo¹tátne dane</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -603,10 +603,10 @@
     <act:name>Zdravotná starostlivos»</act:name>
   <act:id type="new">0785932c5de43e814659420762c9b577</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Zdravotná staroslivos»</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -614,10 +614,10 @@
   <act:name>Ostatné dane</act:name>
   <act:id type="new">51875f8aaa0e4f2295a2ae13cf780b2e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ostatné dane</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -625,10 +625,10 @@
   <act:name>Sociálne poistenie</act:name>
   <act:id type="new">c252f10f3d57dd05c500856164b1729e</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Sociálne poistenie</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -636,10 +636,10 @@
   <act:name>Miestne dane a poplatky</act:name>
   <act:id type="new">cd1f1b512ed51a069fd83a5ffcaf6e11</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Miestne dane a poplatky</act:description>
   <act:parent type="new">2c53a8a0c8b36f7de3f4052653886c2b</act:parent>
 </gnc:account>
@@ -647,10 +647,10 @@
   <act:name>Be¾né slu¾by</act:name>
   <act:id type="new">57635fa5f71dee8ffc207c277250e773</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Be¾né slu¾by</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -658,10 +658,10 @@
   <act:name>Elektrická energia</act:name>
   <act:id type="new">2fe462e202e2daffd845359b08a7eefe</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Elektrická energia</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -669,10 +669,10 @@
   <act:name>Zbierky bezcenností</act:name>
   <act:id type="new">2d0315d7b2f8f11a8a8b32d805bca6eb</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Zbierky bezcenností</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -680,10 +680,10 @@
   <act:name>Plyn</act:name>
   <act:id type="new">dcc33ce7edf402e327318aa1890d35ea</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Plyn</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -691,10 +691,10 @@
   <act:name>Voda</act:name>
   <act:id type="new">8cdc91b733444f9f0dfae9773b8f408c</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Voda</act:description>
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
@@ -702,10 +702,10 @@
   <act:name>Majetok</act:name>
   <act:id type="new">3ab6a6d97b216c11333e48aa2b749a91</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Majetok</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -713,10 +713,10 @@
   <act:name>Poèiatoèný stav</act:name>
   <act:id type="new">a0a622a30410f75eba35d2875a843da8</act:id>
   <act:type>EQUITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Poèiatoèný stav</act:description>
   <act:parent type="new">3ab6a6d97b216c11333e48aa2b749a91</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/sk/acctchrt_currency.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/sk/acctchrt_currency.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/sk/acctchrt_currency.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -21,10 +21,10 @@
   <act:name>Aktíva</act:name>
   <act:id type="new">b3c65be1c5d163746ddc0c506f3f4619</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktíva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -32,10 +32,10 @@
   <act:name>Investície</act:name>
   <act:id type="new">d9c796b35784533aee4309e28a3cbfc5</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investície</act:description>
   <act:parent type="new">b3c65be1c5d163746ddc0c506f3f4619</act:parent>
 </gnc:account>
@@ -43,10 +43,10 @@
   <act:name>Menové obchody</act:name>
   <act:id type="new">9206632307989cb5b244ad5da5d3131b</act:id>
   <act:type>CURRENCY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>DEM</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Obchody s menou</act:description>
   <act:parent type="new">d9c796b35784533aee4309e28a3cbfc5</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/sk/acctchrt_eduloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/sk/acctchrt_eduloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/sk/acctchrt_eduloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Pasíva</act:name>
   <act:id type="new">4e7e8e39487ad4aba0b62c2232c577c5</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasíva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Dlhy</act:name>
   <act:id type="new">c3219e37044b0531d66a7b64433b026d</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dlhy</act:description>
   <act:parent type="new">4e7e8e39487ad4aba0b62c2232c577c5</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
     <act:name>©tudijná pô¾ièka</act:name>
   <act:id type="new">ddeba367199bd025e00420a19d6f9ae4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>©tudijná pô¾ièka</act:description>
   <act:parent type="new">c3219e37044b0531d66a7b64433b026d</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">fdbf47b39f70e8818f325eee7931039a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Úrok</act:name>
   <act:id type="new">1cfcd30ea97b954ffb550ab87d561033</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok</act:description>
   <act:parent type="new">fdbf47b39f70e8818f325eee7931039a</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Úrok zo ¹tudijnej pô¾ièky</act:name>
   <act:id type="new">04e3d970dc60d3920f40b93fce8924a2</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok zo ¹tudijnej pô¾ièky</act:description>
   <act:parent type="new">1cfcd30ea97b954ffb550ab87d561033</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/sk/acctchrt_fixedassets.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/sk/acctchrt_fixedassets.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/sk/acctchrt_fixedassets.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Aktíva</act:name>
   <act:id type="new">64b6276c060185131cecbd1ac6218440</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktíva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Fixné aktíva</act:name>
   <act:id type="new">9b171f77000bf68dd1ebbaf58336656d</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Fixné aktíva</act:description>
   <act:parent type="new">64b6276c060185131cecbd1ac6218440</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Dom</act:name>
   <act:id type="new">9205ad6b6482903e5a696602d491c8f5</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dom</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Ostatné aktíva</act:name>
   <act:id type="new">ad3b239297277c9ef3840c0433cecb18</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ostatné aktíva</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
     <act:name>Dopravný prostriedok</act:name>
   <act:id type="new">5913089ffc36df6f0a5d96a5d7a444c0</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dopravný prostriedok</act:description>
   <act:parent type="new">9b171f77000bf68dd1ebbaf58336656d</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/sk/acctchrt_homeloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/sk/acctchrt_homeloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/sk/acctchrt_homeloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Pasíva</act:name>
   <act:id type="new">6664763bd1ea41462cba5ef856d9c00c</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasíva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Dlhy</act:name>
   <act:id type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dlhy</act:description>
   <act:parent type="new">6664763bd1ea41462cba5ef856d9c00c</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Hypotekárny úver</act:name>
   <act:id type="new">4df1b393c218d9047dd22d33d2737e83</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Hypotekárny úver</act:description>
   <act:parent type="new">2e6e2d91551cff7b1fd8d6eb34c12117</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">2f076f5ae073173a11d33420cd39fa4d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Úrok</act:name>
   <act:id type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok</act:description>
   <act:parent type="new">2f076f5ae073173a11d33420cd39fa4d</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Hypotekárny úrok</act:name>
   <act:id type="new">c1e23fa813d3c8c4a8ea1228a7615b79</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Hypotekárny úrok</act:description>
   <act:parent type="new">3dc58d8a51b5deaa22e0c65d81e90346</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/sk/acctchrt_homeown.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/sk/acctchrt_homeown.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/sk/acctchrt_homeown.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">84732f5fdd27b6463d75bf958e3a4b06</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Opravy domu</act:name>
   <act:id type="new">fa27de57090e107fa99fe1db53790f23</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Opravy domu</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Poistenie</act:name>
   <act:id type="new">4677fe36914ebcf23758f3bf20686b4a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Poistenie</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Poistenie</act:name>
   <act:id type="new">3b5909f31bda0e0f76149fd600e0cb1d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Poistenie</act:description>
   <act:parent type="new">4677fe36914ebcf23758f3bf20686b4a</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Dane</act:name>
   <act:id type="new">a931b8ffe2917ff9a069333623da96ca</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dane</act:description>
   <act:parent type="new">84732f5fdd27b6463d75bf958e3a4b06</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Majetková daò</act:name>
   <act:id type="new">3994b8f5a6a8b2a0a48126fa955e03f7</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Majetková daò</act:description>
   <act:parent type="new">a931b8ffe2917ff9a069333623da96ca</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/sk/acctchrt_otherloan.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/sk/acctchrt_otherloan.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/sk/acctchrt_otherloan.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Pasíva</act:name>
   <act:id type="new">8ec79e80d9abf58d78ce3129d3fe3365</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Pasíva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Dlhy</act:name>
   <act:id type="new">b5624a9d1a1b797b87b815774faccfe4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dlhy</act:description>
   <act:parent type="new">8ec79e80d9abf58d78ce3129d3fe3365</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Iné pô¾ièky</act:name>
   <act:id type="new">eb79670a4c9b0faab87485b7b2a4abe4</act:id>
   <act:type>LIABILITY</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Iné pô¾ièky</act:description>
   <act:parent type="new">b5624a9d1a1b797b87b815774faccfe4</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">565e52a122e8acc9a67a36e61357e2ae</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Úrok</act:name>
   <act:id type="new">4a02c14e992ea79076837c164aa6fc8d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Úrok</act:description>
   <act:parent type="new">565e52a122e8acc9a67a36e61357e2ae</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Ostatné úroky</act:name>
   <act:id type="new">f01de45e290ecc29b64d9cb8a733af68</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ostatné úroky</act:description>
   <act:parent type="new">4a02c14e992ea79076837c164aa6fc8d</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/sk/acctchrt_renter.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/sk/acctchrt_renter.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/sk/acctchrt_renter.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">9a2b4520f113372f4e576f5b6dc129c6</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Poistenie</act:name>
   <act:id type="new">b79b231807a98cd562c46cf0454e9f25</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Poistenie</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Poistenie nájomného</act:name>
   <act:id type="new">a4c93c964b8322d534e35b7054cbda4d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Poistenie nájomného</act:description>
   <act:parent type="new">b79b231807a98cd562c46cf0454e9f25</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
   <act:name>Nájomné</act:name>
   <act:id type="new">c1638a9a48d4d0e1b17d99219a18f34b</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Nájomné</act:description>
   <act:parent type="new">9a2b4520f113372f4e576f5b6dc129c6</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/sk/acctchrt_retiremt.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/sk/acctchrt_retiremt.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/sk/acctchrt_retiremt.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Aktíva</act:name>
   <act:id type="new">e67ef2c52a4eaf3b9d37d317848a5812</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktíva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Investície</act:name>
   <act:id type="new">64cf99f6bafe0a539a5941ea713bdfcd</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investície</act:description>
   <act:parent type="new">e67ef2c52a4eaf3b9d37d317848a5812</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Dôchodok</act:name>
   <act:id type="new">4173f3047238f4b5595b11d6161b2f48</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dôchodok</act:description>
   <act:slots>
     <slot>
@@ -58,10 +58,10 @@
   <act:name>Dlhopis</act:name>
   <act:id type="new">9053199c1da747555d12272f48c719fd</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dlhopis</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -69,10 +69,10 @@
   <act:name>Akcie</act:name>
   <act:id type="new">9bf53e9580991e323b297999fddff988</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Akcie</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -80,10 +80,10 @@
   <act:name>Trhový Index</act:name>
   <act:id type="new">2326b032fe4e8f434159310fccf17091</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Trhový Index</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>
@@ -91,10 +91,10 @@
   <act:name>Investièný fond</act:name>
   <act:id type="new">a62d804729117e74a6c880cecb818b56</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investièný fond</act:description>
   <act:parent type="new">4173f3047238f4b5595b11d6161b2f48</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/sk/acctchrt_spouseinc.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/sk/acctchrt_spouseinc.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/sk/acctchrt_spouseinc.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Príjem</act:name>
   <act:id type="new">b4fadf6188d7f1ae7e7aa4fa27f5cc95</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Príjem</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Mzda (Partnerova)</act:name>
   <act:id type="new">7c4495ff132d100b0aa339ce683200dd</act:id>
   <act:type>INCOME</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Partnerova mzda</act:description>
   <act:parent type="new">b4fadf6188d7f1ae7e7aa4fa27f5cc95</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
   <act:name>Výdaje</act:name>
   <act:id type="new">1884bbd7394883ebafec8b9e2eb091a4</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Výdaje</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -52,10 +52,10 @@
     <act:name>Dane a poplatky (Partnerove)</act:name>
   <act:id type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Partnerove dane a poplatky</act:description>
   <act:parent type="new">1884bbd7394883ebafec8b9e2eb091a4</act:parent>
 </gnc:account>
@@ -63,10 +63,10 @@
   <act:name>Celo¹tátne dane</act:name>
   <act:id type="new">78df9cf06ee197272a695a4c3044f749</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Celo¹tátne dane</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -74,10 +74,10 @@
   <act:name>Zdravotná starostlivos»</act:name>
   <act:id type="new">eba0c095658c7c3a4f4294db9c7392f3</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Zdravotná starostlivos»</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -85,10 +85,10 @@
   <act:name>Ostatné dane</act:name>
   <act:id type="new">dea0cf67026749c9a5aa97be4e5cd052</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Ostatné dane</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -96,10 +96,10 @@
   <act:name>Sociálne poistenie</act:name>
   <act:id type="new">9bd3abb2ed8c4c0d00f8e8ec36d2744d</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Sociálne poistenie</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>
@@ -107,10 +107,10 @@
   <act:name>Miestne dane</act:name>
   <act:id type="new">aa14dbcd622024495a8a972b0f37d13a</act:id>
   <act:type>EXPENSE</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Miestne dane</act:description>
   <act:parent type="new">3cd0ca7d6b0e5f44e4cde2851c3ff387</act:parent>
 </gnc:account>

Modified: gnucash/branches/2.4/accounts/sk/acctchrt_spouseretire.gnucash-xea
===================================================================
--- gnucash/branches/2.4/accounts/sk/acctchrt_spouseretire.gnucash-xea	2011-06-10 13:31:58 UTC (rev 20746)
+++ gnucash/branches/2.4/accounts/sk/acctchrt_spouseretire.gnucash-xea	2011-06-10 16:44:53 UTC (rev 20747)
@@ -19,10 +19,10 @@
   <act:name>Aktíva</act:name>
   <act:id type="new">96d9b17add59eb4c7edec7ed241af755</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Aktíva</act:description>
   <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
 </gnc:account>
@@ -30,10 +30,10 @@
   <act:name>Investície</act:name>
   <act:id type="new">f46c9f777b1730c6b5f4a1faf9e31708</act:id>
   <act:type>ASSET</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investície</act:description>
   <act:parent type="new">96d9b17add59eb4c7edec7ed241af755</act:parent>
 </gnc:account>
@@ -41,10 +41,10 @@
     <act:name>Partnerov dôchodok</act:name>
   <act:id type="new">4426b41837adc284f96b291c31022844</act:id>
   <act:type>BANK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Partnerov dôchodok</act:description>
   <act:slots>
     <slot>
@@ -58,10 +58,10 @@
     <act:name>Dlhopis</act:name>
   <act:id type="new">c8e7c315502547e51bfdd5a70b5cdd2e</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Dlhopis</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -69,10 +69,10 @@
   <act:name>Akcie</act:name>
   <act:id type="new">b8838eb77b9603e035e1f7b440d468ae</act:id>
   <act:type>STOCK</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Akcie</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -80,10 +80,10 @@
   <act:name>Trhový Index</act:name>
   <act:id type="new">0ec1a5b402ceea10d95445a2b31c41a1</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Trhový Index</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>
@@ -91,10 +91,10 @@
   <act:name>Investièný fond</act:name>
   <act:id type="new">d9ed01f9b8f9845bc3f68f3e0afb021f</act:id>
   <act:type>MUTUAL</act:type>
-  <act:currency>
+  <act:commodity>
     <cmdty:space>ISO4217</cmdty:space>
     <cmdty:id>USD</cmdty:id>
-  </act:currency>
+  </act:commodity>
   <act:description>Investièný fond</act:description>
   <act:parent type="new">4426b41837adc284f96b291c31022844</act:parent>
 </gnc:account>



More information about the gnucash-changes mailing list