diff --git a/ChangeLog b/ChangeLog
index 1094fbf412..5b700cdc89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-03  Christian Stimming  <stimming@tuhh.de>
+
+	* po/glossary/de.po, txt-to-pot.sh: Several updates from the
+	stable branch.
+
+	* po/glossary/es.po: Added Spanish translation by Raúl Miró
+	<cotin@geocities.com>
+
 2001-10-03  Robert Graham Merkel  <rgmerk@mira.net>
 
 	* */Makefile.am: changes for automake 1.5 compatibility (still not 
diff --git a/po/glossary/de.po b/po/glossary/de.po
index 856be097d1..d2bec022e7 100644
--- a/po/glossary/de.po
+++ b/po/glossary/de.po
@@ -235,7 +235,7 @@ msgstr "Symbol"
 
 #. "(a) A sum of money paid into an account. (b) A record of such a payment. (c) The state of having money in one's bank account."
 msgid "Credit (column in register)"
-msgstr "Gutschrift, (Haben, Eingang?)"
+msgstr "Haben (ist der professionelle Ausdruck für (a). Sonst: Gutschrift, Eingang?)"
 
 #. "-"
 msgid "Credit Card"
@@ -271,7 +271,7 @@ msgstr "Zeitraum"
 
 #. "(a) A written note in an account of a sum owed or paid out. (b) A sum withdrawn from an account."
 msgid "Debit (column in register)"
-msgstr "Belastung, (Soll, Ausgang?)"
+msgstr "Soll (ist der professionelle Ausdruck für (b). Sonst: Belastung, Ausgang?)"
 
 #. "Each option has a default setting that it is shipped with, until the user changes the setting."
 msgid "default"
diff --git a/po/glossary/es.po b/po/glossary/es.po
new file mode 100644
index 0000000000..ebe4785a05
--- /dev/null
+++ b/po/glossary/es.po
@@ -0,0 +1,624 @@
+# Glossary of terms in GnuCash translated into Spanish
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Raúl Miró <cotin@geocities.com>, 2001.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnucash-glossary 1.6.1\n"
+"POT-Creation-Date: 2001-09-24 23:43+0200\n"
+"PO-Revision-Date: 2001-09-29 14:00+0200\n"
+"Last-Translator: Raúl Miró <cotin@geocities.com>\n"
+"Language-Team: Spanish <traductores@es.gnome.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Transfer-Encoding: 8-bit\n"
+
+#. "English Definition"
+msgid "Term"
+msgstr ""
+
+#. "A detailed record of money spent and received"
+msgid "account"
+msgstr "cuenta"
+
+#. "-"
+msgid "account code"
+msgstr "código de cuenta"
+
+#. "the tree view of all accounts"
+msgid "account hierarchy"
+msgstr "plan de cuentas"
+
+#. "-"
+msgid "account name"
+msgstr "nombre de cuenta"
+
+#. "A thing, esp. owned by a person or company, that has value and can be used or sold to pay debts"
+msgid "account type: Asset"
+msgstr "tipo de cuenta: Activo"
+
+#. "(esp. US) (Brit = current account) a bank account from which money can be withdrawn without previous notice"
+msgid "account type: checking"
+msgstr "tipo de cuenta: cuenta corriente"
+
+#. "-"
+msgid "account type: currency"
+msgstr "tipo de cuenta: divisas"
+
+#. "see: Equity"
+msgid "account type: Equity"
+msgstr "tipo de cuenta: Patrimonio"
+
+#. "-"
+msgid "account type: Expense"
+msgstr "tipo de cuenta: Gastos"
+
+#. "-"
+msgid "account type: Income"
+msgstr "tipo de cuenta: Ingresos"
+
+#. "A debt, a financial obligation"
+msgid "account type: Liability"
+msgstr "tipo de cuenta: Pasivo"
+
+#. "-"
+msgid "account type: money-market"
+msgstr "tipo de cuenta: mercado monetario"
+
+#. "-"
+msgid "account type: Mutual fund"
+msgstr "tipo de cuenta: Fondo de Inversión"
+
+#. "1. (US) any type of account that earns interest 2. (Brit) any type of bank account that earns a higher level of interest than a current account or deposit account"
+msgid "account type: saving"
+msgstr "tipo de cuenta: cuenta de ahorro"
+
+#. "-"
+msgid "account type: Stock"
+msgstr "tipo de cuenta: Existencias"
+
+#. "-"
+msgid "account: parent account"
+msgstr "cuenta: cuenta padre"
+
+#. "-"
+msgid "account: subaccount"
+msgstr "cuenta: subcuenta"
+
+#. "-"
+msgid "account: top level account"
+msgstr "cuenta: cuenta de nivel superior"
+
+#. "The process of doing something that caused a transaction to happen"
+msgid "Action (register)"
+msgstr "Acción (registro)"
+
+#. "Automated teller machine"
+msgid "action: ATM"
+msgstr "acción: cajero"
+
+#. "Transaction was an auto deposit"
+msgid "action: autoDep"
+msgstr "acción: autoDep"
+
+#. "-"
+msgid "action: buy"
+msgstr "acción: compra"
+
+#. "-"
+msgid "action: deposit"
+msgstr "acción: ingreso"
+
+#. "When people can automatically deduct money straight from your account. The reverse of Direct Deposit."
+msgid "action: direct debit"
+msgstr "acción: cargo directo"
+
+#. "transaction is a distribution (???)"
+msgid "action: dist"
+msgstr "acción: dist"
+
+#. "transaction is a dividend"
+msgid "action: div"
+msgstr "acción: div"
+
+#. "-"
+msgid "action: fee"
+msgstr "acción: fee"
+
+#. "transaction comes from interest"
+msgid "action: int"
+msgstr "acción: int"
+
+#. "-"
+msgid "action: loan"
+msgstr "acción: préstamo"
+
+#. "see: payment 1."
+msgid "action: payment"
+msgstr "acción: pago"
+
+#. "-"
+msgid "action: POS"
+msgstr "acción: POS"
+
+#. "-"
+msgid "action: rebate"
+msgstr "acción: descuento"
+
+#. "-"
+msgid "action: sell"
+msgstr "acción: venta"
+
+#. "-"
+msgid "action: Teller"
+msgstr "acción: cajero"
+
+#. "see: transfer 2. (=credit transfer)"
+msgid "action: transfer"
+msgstr "acción: transferencia"
+
+#. "-"
+msgid "action: wire"
+msgstr ""
+
+#. "-"
+msgid "action: withdraw"
+msgstr "acción: reintegro"
+
+#. "A sum of money"
+msgid "amount"
+msgstr "suma"
+
+#. "The result of adding several amounts together and then dividing this total by the number of amounts"
+msgid "average"
+msgstr "promedio"
+
+#. "The amount of money that is in one's account"
+msgid "balance (noun)"
+msgstr "saldo"
+
+#. "A written record of money received and paid out, showing the difference between the two total amounts"
+msgid "balance sheet"
+msgstr "balance"
+
+#. "To arrange for income and spending to be equal"
+msgid "balance, to"
+msgstr ""
+
+#. "-"
+msgid "bank"
+msgstr "banco"
+
+#. "-"
+msgid "business (adjective)"
+msgstr "negocio"
+
+#. "Profits made from the sale of investments or property"
+msgid "capital gains"
+msgstr "ganancias de capital"
+
+#. "Distinguishing the uppercase and lowercase letters"
+msgid "case sensitive"
+msgstr "distinguir mayúsculas"
+
+#. "Money in coins or notes"
+msgid "cash"
+msgstr "caja"
+
+#. "(esp. US) (= cheque) A special printed form on which one writes an order to a bank to pay a sum of money from one's account to another person"
+msgid "check"
+msgstr "cheque"
+
+#. "To repair unbalanced transactions and orphan splits in an account tree. Any transactions that have debits != credits will get a balancing split added (pointing to a special new account called 'Imbalance'). Any splits that do not have accounts are put into another special account called 'Orphan'. Formerly known as 'to scrub'."
+msgid "check and repair, to"
+msgstr ""
+
+#. "To end an application's relationship with an open file so that the application will no longer be able to access the file without opening it again. "
+msgid "close, to"
+msgstr "cerrar"
+
+#. "An article that is bought and sold. The most general term of what an account keeps track of, e.g. a currency or a stock."
+msgid "commodity"
+msgstr ""
+
+#. "e.g. NASDAQ"
+msgid "commodity listing"
+msgstr ""
+
+#. "the smallest amount of a commodity that's traded (e.g. 1/100 for USD, 1 for most stocks)"
+msgid "commodity option: fraction"
+msgstr ""
+
+#. "e.g. USD, DEM"
+msgid "commodity option: Symbol"
+msgstr ""
+
+#. "(a) A sum of money paid into an account. (b) A record of such a payment. (c) The state of having money in one's bank account."
+msgid "Credit (column in register)"
+msgstr "Cobros"
+
+#. "-"
+msgid "Credit Card"
+msgstr "Tarjeta de Crédito"
+
+#. "A transfer of money direct from one bank account to another, without using a cheque"
+msgid "credit transfer"
+msgstr "transferencia"
+
+#. "The system of money used in a country"
+msgid "currency"
+msgstr "moneda"
+
+#. "Custom print format (i.e. according to the user's wishes) as opposed to a template choice."
+msgid "Custom"
+msgstr ""
+
+#. "The backend where the data is stored."
+msgid "database"
+msgstr "base de datos"
+
+#. "A specific numbered day of the month"
+msgid "Date"
+msgstr "Día"
+
+#. "DD/MM/YY or MM/DD/YY or something else"
+msgid "date format"
+msgstr "Formato de fecha"
+
+#. "A range in time that is delimited by two distinct dates."
+msgid "date range"
+msgstr "rango de fechas"
+
+#. "(a) A written note in an account of a sum owed or paid out. (b) A sum withdrawn from an account."
+msgid "Debit (column in register)"
+msgstr "Pagos"
+
+#. "Each option has a default setting that it is shipped with, until the user changes the setting."
+msgid "default"
+msgstr "defecto"
+
+#. "see credit"
+msgid "deposit (in the reconcile dialog)"
+msgstr "ingreso"
+
+#. "The process of something becoming less valuable"
+msgid "depreciation"
+msgstr "depreciación"
+
+#. "1. One textfield per transaction. The text in it should describe what the transaction was about. A short descriptive phrase (up to 40 chars) 2. One textfield per account. It is intended to be a longer, 1-5 sentence description of what this account is all about."
+msgid "Description (column in register)"
+msgstr "Descripción"
+
+#. "Important Buzzword :)"
+msgid "double entry"
+msgstr "partida doble"
+
+#. "1. The money value of a property after all charges on it have been paid. Equity isn't debt, it's a representation of long-term capital (So combining it with liability isn't really very meaningful, except in the balance sheet. 2. (a) The value of the shares issued by  a company. (b) Ordinary stocks and shares that carry no fixed interest."
+msgid "equity"
+msgstr "patrimonio"
+
+#. "The relation in value between the money used in different countries"
+msgid "exchange rate"
+msgstr "tipo de cambio"
+
+#. "in the account creation dialog??"
+msgid "field"
+msgstr "campo"
+
+#. "Any piece of information (text, graphics, executable) put together and given a name. All the information you have on the hard drive is arranged as a collection of  files."
+msgid "file"
+msgstr "archivo"
+
+#. "-"
+msgid "file type"
+msgstr "tipo de archivo"
+
+#. "-"
+msgid "financial calculator: interest rate"
+msgstr ""
+
+#. "see: payment"
+msgid "financial calculator: payments"
+msgstr ""
+
+#. "An increase in wealth; profit; advantage (See also: capital gains)"
+msgid "gain"
+msgstr ""
+
+#. "Name of an automaticly created account to get imbalanced transactions back in balance"
+msgid "imbalance"
+msgstr "descuadre"
+
+#. "Process of extracting data from a non-Gnucash format into a Gnucash file. E.g. QIF Import."
+msgid "import"
+msgstr "importar"
+
+#. "Money charged for borrowing money, or paid to somebody who invests money"
+msgid "interest"
+msgstr "interés"
+
+#. "A list of goods sold or services provided together with the prices charged; a bill"
+msgid "invoice"
+msgstr "factura"
+
+#. "A book in which a bank, business firm, etc. records its financial accounts"
+msgid "ledger"
+msgstr "mayor"
+
+#. "The heading for the right side of the balance sheet. See also: Equity."
+msgid "liabilities/equity"
+msgstr "pasivo/patrimonio"
+
+#. "The money lost in business activity"
+msgid "loss"
+msgstr "pérdida"
+
+#. "name of an automatically created account"
+msgid "Lost Accounts"
+msgstr "Cuentas Perdidas"
+
+#. "The thing that the scatter plot uses to mark each data point"
+msgid "marker"
+msgstr "punteo"
+
+#. "The way how more than one window is displayed in GnuCash at the same time. MDI = Multiple Document Interface."
+msgid "MDI modus"
+msgstr "modos MDI"
+
+#. "One textfield per split that should help you remember what this split was about."
+msgid "Memo"
+msgstr "Memo"
+
+#. "e.g. USD, DEM, see Currency."
+msgid "national currency"
+msgstr "moneda nacional"
+
+#. "(of money) remaining when nothing more is to be taken away"
+msgid "net"
+msgstr "neto"
+
+#. "net total of all assets"
+msgid "net assets"
+msgstr "activo neto"
+
+#. "The total income minus the total expenses of a given time period."
+msgid "net profit"
+msgstr "ganancia neta"
+
+#. "Your net worth is your assets minus your liabilities. If your accounts are balanced, your net worth should equal your equity plus your net profit."
+msgid "net worth"
+msgstr "patrimonio neto"
+
+#. "One textfield per transaction that can hold explanatory text about the transaction."
+msgid "notes (register)"
+msgstr "notas"
+
+#. "Abbreviation for: number; Field in a transaction. If this transaction was done by check, then the check number should be noted in this field."
+msgid "Num (column in register)"
+msgstr "Num"
+
+#. "to make accessible"
+msgid "open, to"
+msgstr "abrir"
+
+#. "If an account starts with a non-zero balance, then this amount is called the opening balance."
+msgid "opening balance"
+msgstr "saldo de apertura"
+
+#. "A menu choice in the graphical user interface that allows the user to specify how the application will act each time it is used. "
+msgid "options"
+msgstr "opciones"
+
+#. "Name of an automatically created account that holds splits that have no account."
+msgid "orphan"
+msgstr ""
+
+#. "A secret phrase that one needs to know in order to get access to a user account "
+msgid "passphrase"
+msgstr "clave de acceso"
+
+#. "An amount that must be paid / An amount for which money has not yet been received"
+msgid "Payables/Receivables"
+msgstr "Débitos/Créditos"
+
+#. "A person to whom sth is paid"
+msgid "payee"
+msgstr "tenedor"
+
+#. "A person who pays or who has to pay for sth"
+msgid "payer"
+msgstr "pagador"
+
+#. "1. The action of paying sb/sth or of being paid. 2. A sum of money paid."
+msgid "payment"
+msgstr "pago"
+
+#. "A set of investments owned by a person"
+msgid "portfolio"
+msgstr "cartera"
+
+#. "A menu choice in many graphical user interface applications that allows the user to specify how the application will act each time it is used. "
+msgid "preferences"
+msgstr "preferencias"
+
+#. "An amount of money for which sth may be bought or sold"
+msgid "price (in a split)"
+msgstr ""
+
+#. "An ask is an offer to sell, and the price you want to sell at."
+msgid "price type: ask"
+msgstr ""
+
+#. "A bid is an offer to buy, and the price you want to buy at."
+msgid "price type: bid"
+msgstr ""
+
+#. "online quotes (rather: quotation!?) A statement of the current price of stocks or commodities"
+msgid "price: quotes"
+msgstr "precio: cotizaciones"
+
+#. "Money gained in business, esp. the difference between the amount earned and the amount spent"
+msgid "profit"
+msgstr "beneficios"
+
+#. "(rather: profit and loss account!?) A list that shows the amount of money spent compared with the amount earned by a business in a particular period"
+msgid "Profit & Loss"
+msgstr "Cuenta de Pérdidas y Ganancias"
+
+#. "-"
+msgid "quick-fill"
+msgstr ""
+
+#. "-"
+msgid "rebalance, to (a transaction)"
+msgstr ""
+
+#. "reconcile an account, a reconciled split. To find a way to make the bank's account statement agree with the user's recorded transactions in an account."
+msgid "reconcile, to"
+msgstr "conciliar"
+
+#. "-"
+msgid "record keeping"
+msgstr "guardar registro"
+
+#. "A list of items; a book containing such a list"
+msgid "register"
+msgstr "registro"
+
+#. "A transaction that is divided into two or more parts"
+msgid "register entry: split transaction"
+msgstr ""
+
+#. "-"
+msgid "register entry: stock split"
+msgstr ""
+
+#. "one form of register"
+msgid "register: auto-split ledger"
+msgstr ""
+
+#. "another form of register"
+msgid "register: basic ledger"
+msgstr ""
+
+#. "another form of register"
+msgid "register: general ledger"
+msgstr ""
+
+#. "another form of register"
+msgid "register: transaction journal"
+msgstr ""
+
+#. "reload the current document"
+msgid "reload, to"
+msgstr "recargar"
+
+#. "name of an equity account (?); to be distinguished from the opening balance."
+msgid "Retained Earnings"
+msgstr "Retenciones"
+
+#. "To write data (typically a file) to a storage medium, such as a disk or tape."
+msgid "save, to (to a file)"
+msgstr "guardar"
+
+#. "DEPRECATED. To repair unbalanced transactions and orphan splits in an account tree. Any transactions that have debits != credits will get a balancing split added (pointing to a special new account called 'Imbalance'). Any splits that do not have accounts are put into another special account called 'Orphan'. Deprecated - use the term 'to check and repair' now."
+msgid "scrub, to"
+msgstr "cuadrar"
+
+#. "A document or certificate showing who owns shares"
+msgid "security"
+msgstr ""
+
+#. "-"
+msgid "Share Balance (register)"
+msgstr ""
+
+#. "Any of the equal parts into which the money of a business company is divided, giving the holder a right to a portion of the profits"
+msgid "shares"
+msgstr "acciones"
+
+#. "(of a price) A place wfrom which sth comes or is obtained"
+msgid "source"
+msgstr ""
+
+#. "One of the two or several parts a transaction is divided into"
+msgid "split"
+msgstr "apunte"
+
+#. "This sets the particular design or shape of a report."
+msgid "style sheet"
+msgstr ""
+
+#. "The total of a set of figures that are part of a larger group of figures"
+msgid "subtotal"
+msgstr "subtotal"
+
+#. "field of an account"
+msgid "tax info"
+msgstr "impuestos"
+
+#. "if you create a new e.g. style sheet, you can start from a template"
+msgid "template"
+msgstr ""
+
+#. "see: date range"
+msgid "time period"
+msgstr "período de tiempo"
+
+#. "as abbreviation for Total"
+msgid "Tot"
+msgstr "Tot"
+
+#. "The full number or amount: total of some balances, of any account's running balance etc."
+msgid "total"
+msgstr "total"
+
+#. "A piece of business done; the transfer of money from one account to one or more other accounts"
+msgid "transaction"
+msgstr "transferir"
+
+#. "-"
+msgid "transaction state: cleared"
+msgstr "estado del apunte: borrado"
+
+#. "-"
+msgid "transaction state: frozen"
+msgstr "estado del apunte: congelado"
+
+#. "A transaction that was reconciled with the bank's statement."
+msgid "transaction state: reconciled"
+msgstr "estado del apunte: conciliado"
+
+#. "1. The action of transferring sth. 2. see: credit transfer"
+msgid "transfer (noun)"
+msgstr "transferencia"
+
+#. "The account where an amount is transferred to"
+msgid "transfer account"
+msgstr "transferir a"
+
+#. "To move money from one account to another. Will create a transaction."
+msgid "transfer, to (register toolbar)"
+msgstr "contrapartida"
+
+#. "A class or things that have characteristics in common; type of an account, of a commodity etc."
+msgid "type"
+msgstr "tipo"
+
+#. "A fixed amount or number used as a standard of measurement; e.g. millimeters, inch; for absolute positioning in the custom check format."
+msgid "units"
+msgstr ""
+
+#. "-"
+msgid "URL"
+msgstr ""
+
+#. "The worth of sth in terms of money or other commodities for which it can be exchanged"
+msgid "value (in a split)"
+msgstr ""
+
+#. "see debit"
+msgid "withdraw (in the reconcile dialog)"
+msgstr "reintegro"
+
+
diff --git a/po/glossary/txt-to-pot.sh b/po/glossary/txt-to-pot.sh
index 2f87c6593a..aa461dc809 100755
--- a/po/glossary/txt-to-pot.sh
+++ b/po/glossary/txt-to-pot.sh
@@ -10,7 +10,7 @@
 if [ $# -eq 0 ]
 then
 	cat <<!
-Usage: `basename $0` gnc-glossary.txt > glossary.pot
+Usage: `basename $0` gnc-glossary.txt > gnucash-glossary.pot
 !
 	exit 1;
 fi