IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2080 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Dave Peticolas 2000-03-14 23:50:36 +00:00
parent 1e307c71df
commit 97cba07559
19 changed files with 5050 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
2000-03-14 Dave Peticolas <peticola@cs.ucdavis.edu>
* src/register/gnome/gnucash-sheet.c
(gnucash_register_key_press_cb): generate activate event on a
keypad enter as well as the return key.
* Docs/C/xacc-ticker.html: updated for Yahoo Europe information.
2000-03-13 Dave Peticolas <peticola@cs.ucdavis.edu>
* src/gnome/dialog-utils.c: added Yahoo Europe to the quote source
menu.
* src/quotes/Quote.pm: added method for getting Yahoo European
quotes. Also, fixed the parsing of csv data.
* src/quotes/gnc-prices: cleanup the code, less wordy output.
* src/quotes/Quote.pm (yahoo): updates from latest YahooQuote.pm
2000-03-12 Dave Peticolas <peticola@cs.ucdavis.edu> 2000-03-12 Dave Peticolas <peticola@cs.ucdavis.edu>
* src/scm/c-interface.scm (gnc:error->string tag args): print a * src/scm/c-interface.scm (gnc:error->string tag args): print a

8
Docs/C/xacc-about.html
View File

@ -426,6 +426,10 @@
<dd>for German text and euro date rework</dd> <dd>for German text and euro date rework</dd>
<dt> <a href="mailto:tma@iis.fhg.de"> Herbert Thoma</a></dt>
<dd>gnome register patch</dd>
<dt> <a href="mailto:detrout@earthlink.net"> Diane <dt> <a href="mailto:detrout@earthlink.net"> Diane
Trout</a></dt> Trout</a></dt>
@ -435,6 +439,10 @@
<dd>guile and register patches</dd> <dd>guile and register patches</dd>
<dt> <a href="mailto:dwmw2@infradead.org"> David Woodhouse</a></dt>
<dd>Great Britain translations</dd>
<dt> <a href="mailto:gooch@ic.EECS.Berkeley.EDU"> Ken <dt> <a href="mailto:gooch@ic.EECS.Berkeley.EDU"> Ken
Yamaguchi</a></dt> Yamaguchi</a></dt>

31
Docs/C/xacc-ticker.html
View File

@ -31,14 +31,17 @@
"Security:"</li> "Security:"</li>
<li>Select a quote source from the pull-down menu. Currently <li>Select a quote source from the pull-down menu. Currently
supported quote sources include <b>Yahoo</b>, <b>Fidelity supported quote sources include <b>Yahoo</b>, <b>Yahoo
Investments</b>, <b>T. Rowe Price</b> and the <b>Vanguard Europe</b>, <b>Fidelity Investments</b>, <b>T. Rowe Price</b>
Group</b>. Note that Yahoo will provide price quotes for many and the <b>Vanguard Group</b>. Note that Yahoo will provide
mutual funds <em>including</em> Fidelity, T.Rowe Price and price quotes for many mutual funds <em>including</em> Fidelity,
Vanguard, and that the quoted prices at Yahoo <em> T.Rowe Price and Vanguard, and that the quoted prices at Yahoo
should</em> be identical to those that may be found at the <em> should</em> be identical to those that may be found at the
source sites. (Otherwise, somebody's reporting wrong source sites (otherwise, somebody's reporting wrong
information!)</li> information!). If you choose Yahoo Europe, you should append the
market code for the security, such as PA for Paris, BE for
Berlin, etc. Example: 12150.PA (a Peugot security in the Paris
market).</li>
</ul> </ul>
<p> A sample image is shown below:</p> <p> A sample image is shown below:</p>
@ -52,12 +55,11 @@
gnc-prices myaccts.xac gnc-prices myaccts.xac
</pre> </pre>
<p> Running this command will print various diagnostic messages <p> Running this command will print various diagnostic messages to
to the screen while it loads data. It will work only when the the screen while it loads data. It will work only when the host
host computer is attached to the internet. It <em> can</em> computer is attached to the internet. It can function in
function in conjunction with masquerading-style firewalls, but conjunction with masquerading-style firewalls and proxy
is not currently able to use proxy servers to get through proxy servers.</p>
or socks-style firewalls.</p>
<p> The command can be run many times in one day; however, it <p> The command can be run many times in one day; however, it
will update the accounts at most once with the most recent will update the accounts at most once with the most recent
@ -84,4 +86,3 @@
Page.</a></p> Page.</a></p>
</body> </body>
</html> </html>

2
README
View File

@ -580,8 +580,10 @@ Christopher Seawood <cls@seawood.org> for XbaeMatrix core dump
Mike Simons <msimons@fsimons01.erols.com> misc configure.in patches Mike Simons <msimons@fsimons01.erols.com> misc configure.in patches
Richard Skelton <rich@brake.demon.co.uk> for Solaris cleanup Richard Skelton <rich@brake.demon.co.uk> for Solaris cleanup
Henning Spruth <spruth@bigfoot.com> for German text & euro date rework Henning Spruth <spruth@bigfoot.com> for German text & euro date rework
Herbert Thoma <tma@iis.fhg.de> gnome register patch
Diane Trout <detrout@earthlink.net> scheme qif import patch Diane Trout <detrout@earthlink.net> scheme qif import patch
Rob Walker <rob@valinux.com> guile and register patches Rob Walker <rob@valinux.com> guile and register patches
David Woodhouse <dwmw2@infradead.org> Great Britain translations
Ken Yamaguchi <gooch@ic.EECS.Berkeley.EDU> QIF import fixes; MYM import Ken Yamaguchi <gooch@ic.EECS.Berkeley.EDU> QIF import fixes; MYM import
... and I am sure that I have missed many others ... ... and I am sure that I have missed many others ...

2
configure vendored
View File

@ -830,7 +830,7 @@ fi
ALL_LINGUAS="fr de" ALL_LINGUAS="fr de en_GB"
# Find a good install program. We prefer a C program (faster), # Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or # so one script is as good as another. But avoid the broken or

2
configure.in
View File

@ -26,7 +26,7 @@ AC_INIT(src/guile/gnucash.h.in)
AM_INIT_AUTOMAKE(gnucash,1.3.2) AM_INIT_AUTOMAKE(gnucash,1.3.2)
dnl Set of available languages. dnl Set of available languages.
ALL_LINGUAS="fr de" ALL_LINGUAS="fr de en_GB"
AC_PROG_INSTALL AC_PROG_INSTALL
AC_PROG_RANLIB AC_PROG_RANLIB

1
po/.cvsignore
View File

@ -4,7 +4,6 @@ Makefile
Makefile.in Makefile.in
POTFILES POTFILES
cat-id-tbl.c cat-id-tbl.c
gnucash.pot
pseudo-source.c pseudo-source.c
stamp-cat-id stamp-cat-id
extract-macros.perl extract-macros.perl

157
po/de.po
View File

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnucash 1.3.1\n" "Project-Id-Version: gnucash 1.3.1\n"
"POT-Creation-Date: 2000-03-12 23:14-0800\n" "POT-Creation-Date: 2000-03-14 15:41-0800\n"
"PO-Revision-Date: 2000-03-12 15:20+0100\n" "PO-Revision-Date: 2000-03-12 15:20+0100\n"
"Last-Translator: Jan-Uwe Finck <Jan-Uwe.Finck@bigfoot.de>\n" "Last-Translator: Jan-Uwe Finck <Jan-Uwe.Finck@bigfoot.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -33,7 +33,7 @@ msgstr "Kontobezeichnung"
msgid "Date" msgid "Date"
msgstr "Datum" msgstr "Datum"
#: ../po/guile_strings.txt:6 messages-i18n.c:272 #: ../po/guile_strings.txt:6 messages-i18n.c:274
msgid "Equity" msgid "Equity"
msgstr "Nettowert" msgstr "Nettowert"
@ -87,7 +87,7 @@ msgstr ""
msgid "Time" msgid "Time"
msgstr "Zeit" msgstr "Zeit"
#: ../po/guile_strings.txt:19 messages-i18n.c:292 #: ../po/guile_strings.txt:19 messages-i18n.c:294
msgid "Memo" msgid "Memo"
msgstr "Memo" msgstr "Memo"
@ -337,7 +337,7 @@ msgstr "Durchscnitt"
msgid "A_ccount Balance Tracker" msgid "A_ccount Balance Tracker"
msgstr "Konten-Saldo-Beobachter" msgstr "Konten-Saldo-Beobachter"
#: ../po/guile_strings.txt:78 messages-i18n.c:280 #: ../po/guile_strings.txt:78 messages-i18n.c:282
msgid "From" msgid "From"
msgstr "Von" msgstr "Von"
@ -517,7 +517,7 @@ msgstr "Doppel-Modus Farben wechseln sich mit jeder Buchung ab"
msgid "General" msgid "General"
msgstr "Allgemein" msgstr "Allgemein"
#: ../po/guile_strings.txt:122 messages-i18n.c:320 #: ../po/guile_strings.txt:122 messages-i18n.c:322
msgid "Security" msgid "Security"
msgstr "Sicherheit" msgstr "Sicherheit"
@ -529,7 +529,7 @@ msgstr "Einfache Zeile"
msgid "Sub-Accounts" msgid "Sub-Accounts"
msgstr "Unter-Konten" msgstr "Unter-Konten"
#: ../po/guile_strings.txt:125 messages-i18n.c:288 #: ../po/guile_strings.txt:125 messages-i18n.c:290
msgid "Liability" msgid "Liability"
msgstr "Kreditkonto" msgstr "Kreditkonto"
@ -565,7 +565,7 @@ msgstr "Nummer"
msgid "Show both icons and text" msgid "Show both icons and text"
msgstr "Sowohl Icons, als auch Text anzeigen" msgstr "Sowohl Icons, als auch Text anzeigen"
#: ../po/guile_strings.txt:134 messages-i18n.c:296 #: ../po/guile_strings.txt:134 messages-i18n.c:298
msgid "Notes" msgid "Notes"
msgstr "Notizen" msgstr "Notizen"
@ -577,7 +577,7 @@ msgstr "Berichte"
msgid "Single mode active background" msgid "Single mode active background"
msgstr "Hintergrund der aktiven Buchung im Einzelzeilen-Modus" msgstr "Hintergrund der aktiven Buchung im Einzelzeilen-Modus"
#: ../po/guile_strings.txt:137 messages-i18n.c:314 #: ../po/guile_strings.txt:137 messages-i18n.c:316
msgid "Register" msgid "Register"
msgstr "Register" msgstr "Register"
@ -653,7 +653,7 @@ msgstr "Sortiere als zweite Bedingung hiernach"
msgid "Income.Salary.Taxable" msgid "Income.Salary.Taxable"
msgstr "Einkommen.Bezahlung.zu versteürn" msgstr "Einkommen.Bezahlung.zu versteürn"
#: ../po/guile_strings.txt:156 messages-i18n.c:284 #: ../po/guile_strings.txt:156 messages-i18n.c:286
msgid "Income" msgid "Income"
msgstr "Einnahme" msgstr "Einnahme"
@ -812,7 +812,7 @@ msgstr "Das Zeichen, das Kontennamen trennt"
msgid "__gui" msgid "__gui"
msgstr "__gui" msgstr "__gui"
#: ../po/guile_strings.txt:195 messages-i18n.c:332 #: ../po/guile_strings.txt:195 messages-i18n.c:334
msgid "To" msgid "To"
msgstr "Zu" msgstr "Zu"
@ -820,7 +820,7 @@ msgstr "Zu"
msgid "smallest to largest, earliest to latest" msgid "smallest to largest, earliest to latest"
msgstr "kleinster zu grösstem, ältester zu jüngstem" msgstr "kleinster zu grösstem, ältester zu jüngstem"
#: ../po/guile_strings.txt:197 messages-i18n.c:335 #: ../po/guile_strings.txt:197 messages-i18n.c:337
msgid "Type" msgid "Type"
msgstr "Typ" msgstr "Typ"
@ -880,7 +880,7 @@ msgstr "2 Wochen"
msgid "Nothing" msgid "Nothing"
msgstr "Nichts" msgstr "Nichts"
#: ../po/guile_strings.txt:212 messages-i18n.c:274 #: ../po/guile_strings.txt:212 messages-i18n.c:276
msgid "Expense" msgid "Expense"
msgstr "Ausgabe" msgstr "Ausgabe"
@ -957,11 +957,11 @@ msgid "Reverse Credit Card, Liability, Equity, and Income Accounts"
msgstr "" msgstr ""
"Zeige Kreditkarten-, Schulden-, Ausgleichs- und Einkommenskonten umgedreht" "Zeige Kreditkarten-, Schulden-, Ausgleichs- und Einkommenskonten umgedreht"
#: ../po/guile_strings.txt:230 messages-i18n.c:328 #: ../po/guile_strings.txt:230 messages-i18n.c:330
msgid "Stock" msgid "Stock"
msgstr "Depot" msgstr "Depot"
#: ../po/guile_strings.txt:231 messages-i18n.c:276 #: ../po/guile_strings.txt:231 messages-i18n.c:278
msgid "Extensions" msgid "Extensions"
msgstr "Erweiterungen" msgstr "Erweiterungen"
@ -2105,246 +2105,255 @@ msgid "Difference"
msgstr "Diffenrenz" msgstr "Diffenrenz"
#: messages-i18n.c:269 #: messages-i18n.c:269
msgid "Direct Debit"
msgstr ""
#: messages-i18n.c:270
msgid "Dist" msgid "Dist"
msgstr "Spende" msgstr "Spende"
#: messages-i18n.c:270 #: messages-i18n.c:271
msgid "Div" msgid "Div"
msgstr "Dividende" msgstr "Dividende"
#: messages-i18n.c:271 #: messages-i18n.c:272
#, fuzzy
msgid "Duplicate"
msgstr "Datum"
#: messages-i18n.c:273
msgid "Edit" msgid "Edit"
msgstr "Bearbeiten" msgstr "Bearbeiten"
#: messages-i18n.c:273 #: messages-i18n.c:275
msgid "Exit" msgid "Exit"
msgstr "Beenden" msgstr "Beenden"
#: messages-i18n.c:275 #: messages-i18n.c:277
msgid "Export" msgid "Export"
msgstr "Exportieren" msgstr "Exportieren"
#: messages-i18n.c:277 #: messages-i18n.c:279
msgid "Fee" msgid "Fee"
msgstr "Gebühr" msgstr "Gebühr"
#: messages-i18n.c:278 #: messages-i18n.c:280
msgid "File" msgid "File"
msgstr "Datei" msgstr "Datei"
#: messages-i18n.c:279 #: messages-i18n.c:281
msgid "Forward" msgid "Forward"
msgstr "Vorwärts" msgstr "Vorwärts"
#: messages-i18n.c:281 #: messages-i18n.c:283
msgid "GnuCash Preferences" msgid "GnuCash Preferences"
msgstr "GnuCash Einstellungen" msgstr "GnuCash Einstellungen"
#: messages-i18n.c:282 #: messages-i18n.c:284
msgid "Help" msgid "Help"
msgstr "Hilfe" msgstr "Hilfe"
#: messages-i18n.c:283 #: messages-i18n.c:285
msgid "Import" msgid "Import"
msgstr "QIF-File importieren" msgstr "QIF-File importieren"
#: messages-i18n.c:285 #: messages-i18n.c:287
msgid "Increase" msgid "Increase"
msgstr "Zunahme" msgstr "Zunahme"
#: messages-i18n.c:286 #: messages-i18n.c:288
msgid "Int" msgid "Int"
msgstr "Beteiligung" msgstr "Beteiligung"
#: messages-i18n.c:287 #: messages-i18n.c:289
msgid "Jump" msgid "Jump"
msgstr "Sprung" msgstr "Sprung"
#: messages-i18n.c:289 #: messages-i18n.c:291
msgid "License" msgid "License"
msgstr "Lizenz" msgstr "Lizenz"
#: messages-i18n.c:290 #: messages-i18n.c:292
msgid "Loan" msgid "Loan"
msgstr "Darlehen" msgstr "Darlehen"
#: messages-i18n.c:291 #: messages-i18n.c:293
msgid "LTCG" msgid "LTCG"
msgstr "Zinsen aus langfristigen Kapitalanlagen" msgstr "Zinsen aus langfristigen Kapitalanlagen"
#: messages-i18n.c:293 #: messages-i18n.c:295
msgid "New" msgid "New"
msgstr "Neu" msgstr "Neu"
#: messages-i18n.c:294 #: messages-i18n.c:296
msgid "No" msgid "No"
msgstr "Nein" msgstr "Nein"
#: messages-i18n.c:295 #: messages-i18n.c:297
msgid "(none)" msgid "(none)"
msgstr "(kein(e))" msgstr "(kein(e))"
#: messages-i18n.c:297 #: messages-i18n.c:299
msgid "Num" msgid "Num"
msgstr "Num" msgstr "Num"
#: messages-i18n.c:298 #: messages-i18n.c:300
msgid "Ok" msgid "Ok"
msgstr "Ok" msgstr "Ok"
#: messages-i18n.c:299 #: messages-i18n.c:301
msgid "Online" msgid "Online"
msgstr "Online" msgstr "Online"
#: messages-i18n.c:300 #: messages-i18n.c:302
msgid "Open" msgid "Open"
msgstr "Öffnen" msgstr "Öffnen"
#: messages-i18n.c:301 #: messages-i18n.c:303
msgid "Parameters" msgid "Parameters"
msgstr "Parameter" msgstr "Parameter"
#: messages-i18n.c:302 #: messages-i18n.c:304
msgid "Payment" msgid "Payment"
msgstr "Belastung" msgstr "Belastung"
#: messages-i18n.c:303 #: messages-i18n.c:305
msgid "Portfolio" msgid "Portfolio"
msgstr "Portfolio" msgstr "Portfolio"
#: messages-i18n.c:304 #: messages-i18n.c:306
msgid "POS" msgid "POS"
msgstr "Karten-Terminal" msgstr "Karten-Terminal"
#: messages-i18n.c:305 #: messages-i18n.c:307
msgid "Preferences" msgid "Preferences"
msgstr "Einstellungen" msgstr "Einstellungen"
#: messages-i18n.c:306 #: messages-i18n.c:308
msgid "Price" msgid "Price"
msgstr "Preis" msgstr "Preis"
#: messages-i18n.c:307 #: messages-i18n.c:309
msgid "Print" msgid "Print"
msgstr "Drucken" msgstr "Drucken"
#: messages-i18n.c:308 #: messages-i18n.c:310
msgid "Profits" msgid "Profits"
msgstr "Saldo Einnahmen/Ausgaben" msgstr "Saldo Einnahmen/Ausgaben"
#: messages-i18n.c:309 #: messages-i18n.c:311
msgid "Quit" msgid "Quit"
msgstr "Beenden" msgstr "Beenden"
#: messages-i18n.c:310 #: messages-i18n.c:312
msgid "Rebate" msgid "Rebate"
msgstr "Rabatt" msgstr "Rabatt"
#: messages-i18n.c:311 #: messages-i18n.c:313
msgid "Receive" msgid "Receive"
msgstr "Empfangen" msgstr "Empfangen"
#: messages-i18n.c:312 #: messages-i18n.c:314
msgid "Reconcile" msgid "Reconcile"
msgstr "Abstimmen" msgstr "Abstimmen"
#: messages-i18n.c:313 #: messages-i18n.c:315
msgid "Record" msgid "Record"
msgstr "Eintragen" msgstr "Eintragen"
#: messages-i18n.c:315 #: messages-i18n.c:317
msgid "Report" msgid "Report"
msgstr "Bericht" msgstr "Bericht"
#: messages-i18n.c:316 #: messages-i18n.c:318
msgid "Reports" msgid "Reports"
msgstr "Berichte" msgstr "Berichte"
#: messages-i18n.c:317 #: messages-i18n.c:319
msgid "Save" msgid "Save"
msgstr "Sichern" msgstr "Sichern"
#: messages-i18n.c:318 #: messages-i18n.c:320
msgid "Savings" msgid "Savings"
msgstr "Ersparnisse" msgstr "Ersparnisse"
#: messages-i18n.c:319 #: messages-i18n.c:321
msgid "Scrub" msgid "Scrub"
msgstr "Ausbuchen" msgstr "Ausbuchen"
#: messages-i18n.c:321 #: messages-i18n.c:323
msgid "Sell" msgid "Sell"
msgstr "Verkauf" msgstr "Verkauf"
#: messages-i18n.c:322 #: messages-i18n.c:324
msgid "Settings" msgid "Settings"
msgstr "Einstellungen" msgstr "Einstellungen"
#: messages-i18n.c:323 #: messages-i18n.c:325
msgid "Simple" msgid "Simple"
msgstr "Einfach" msgstr "Einfach"
#: messages-i18n.c:324 #: messages-i18n.c:326
msgid "Sold" msgid "Sold"
msgstr "Verkauft" msgstr "Verkauft"
#: messages-i18n.c:325 #: messages-i18n.c:327
msgid "Spend" msgid "Spend"
msgstr "Ausgabe" msgstr "Ausgabe"
#: messages-i18n.c:326 #: messages-i18n.c:328
msgid "Split" msgid "Split"
msgstr "Split" msgstr "Split"
#: messages-i18n.c:327 #: messages-i18n.c:329
msgid "STCG" msgid "STCG"
msgstr "Zinsen aus kurzfristigen Anlagen" msgstr "Zinsen aus kurzfristigen Anlagen"
#: messages-i18n.c:329 #: messages-i18n.c:331
msgid "Style" msgid "Style"
msgstr "Stil" msgstr "Stil"
#: messages-i18n.c:330 #: messages-i18n.c:332
msgid "Surplus" msgid "Surplus"
msgstr "Überschuß" msgstr "Überschuß"
#: messages-i18n.c:331 #: messages-i18n.c:333
msgid "Teller" msgid "Teller"
msgstr "" msgstr ""
#: messages-i18n.c:333 #: messages-i18n.c:335
msgid "Today" msgid "Today"
msgstr "Heute" msgstr "Heute"
#: messages-i18n.c:334 #: messages-i18n.c:336
msgid "Total" msgid "Total"
msgstr "Gesamt" msgstr "Gesamt"
#: messages-i18n.c:336 #: messages-i18n.c:338
msgid "Transaction" msgid "Transaction"
msgstr "Transaktion" msgstr "Transaktion"
#: messages-i18n.c:337 #: messages-i18n.c:339
msgid "Transfer" msgid "Transfer"
msgstr "Transfer" msgstr "Transfer"
#: messages-i18n.c:338 #: messages-i18n.c:340
#, fuzzy #, fuzzy
msgid "Value" msgid "Value"
msgstr "Wert" msgstr "Wert"
#: messages-i18n.c:339 #: messages-i18n.c:341
msgid "WARNING" msgid "WARNING"
msgstr "WARNUNG" msgstr "WARNUNG"
#: messages-i18n.c:340 #: messages-i18n.c:342
msgid "Wire" msgid "Wire"
msgstr "Telegrafische Zahlung" msgstr "Telegrafische Zahlung"
#: messages-i18n.c:341 #: messages-i18n.c:343
msgid "Withdraw" msgid "Withdraw"
msgstr "Abhebung" msgstr "Abhebung"
#: messages-i18n.c:342 #: messages-i18n.c:344
msgid "Yes" msgid "Yes"
msgstr "Ja" msgstr "Ja"

2261
po/en_GB.po Normal file
View File

File diff suppressed because it is too large Load Diff

157
po/fr.po
View File

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gnucash 1.2.0\n" "Project-Id-Version: gnucash 1.2.0\n"
"POT-Creation-Date: 2000-03-12 23:14-0800\n" "POT-Creation-Date: 2000-03-14 15:41-0800\n"
"PO-Revision-Date: 2000-03-06 23:47+0200\n" "PO-Revision-Date: 2000-03-06 23:47+0200\n"
"Last-Translator: Yannick LE NY <y-le-ny@ifrance.com>\n" "Last-Translator: Yannick LE NY <y-le-ny@ifrance.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -33,7 +33,7 @@ msgstr "Nom du compte"
msgid "Date" msgid "Date"
msgstr "Date" msgstr "Date"
#: ../po/guile_strings.txt:6 messages-i18n.c:272 #: ../po/guile_strings.txt:6 messages-i18n.c:274
msgid "Equity" msgid "Equity"
msgstr "Capitaux propres(Actif)" msgstr "Capitaux propres(Actif)"
@ -89,7 +89,7 @@ msgstr ""
msgid "Time" msgid "Time"
msgstr "Heure" msgstr "Heure"
#: ../po/guile_strings.txt:19 messages-i18n.c:292 #: ../po/guile_strings.txt:19 messages-i18n.c:294
msgid "Memo" msgid "Memo"
msgstr "Mémo" msgstr "Mémo"
@ -342,7 +342,7 @@ msgstr "Moyenne"
msgid "A_ccount Balance Tracker" msgid "A_ccount Balance Tracker"
msgstr "Suivi du solde du compte" msgstr "Suivi du solde du compte"
#: ../po/guile_strings.txt:78 messages-i18n.c:280 #: ../po/guile_strings.txt:78 messages-i18n.c:282
msgid "From" msgid "From"
msgstr "Depuis" msgstr "Depuis"
@ -524,7 +524,7 @@ msgstr "Transactions avec couleurs altern
msgid "General" msgid "General"
msgstr "Général" msgstr "Général"
#: ../po/guile_strings.txt:122 messages-i18n.c:320 #: ../po/guile_strings.txt:122 messages-i18n.c:322
msgid "Security" msgid "Security"
msgstr "Valeur" msgstr "Valeur"
@ -536,7 +536,7 @@ msgstr "Ligne unique"
msgid "Sub-Accounts" msgid "Sub-Accounts"
msgstr "Sous-comptes" msgstr "Sous-comptes"
#: ../po/guile_strings.txt:125 messages-i18n.c:288 #: ../po/guile_strings.txt:125 messages-i18n.c:290
msgid "Liability" msgid "Liability"
msgstr "Dettes(Passif)" msgstr "Dettes(Passif)"
@ -572,7 +572,7 @@ msgstr "Num
msgid "Show both icons and text" msgid "Show both icons and text"
msgstr "Montrer ensemble les icônes et le texte" msgstr "Montrer ensemble les icônes et le texte"
#: ../po/guile_strings.txt:134 messages-i18n.c:296 #: ../po/guile_strings.txt:134 messages-i18n.c:298
msgid "Notes" msgid "Notes"
msgstr "Notes" msgstr "Notes"
@ -584,7 +584,7 @@ msgstr "Rapports"
msgid "Single mode active background" msgid "Single mode active background"
msgstr "Arrière-plan de la transaction active en mode simple" msgstr "Arrière-plan de la transaction active en mode simple"
#: ../po/guile_strings.txt:137 messages-i18n.c:314 #: ../po/guile_strings.txt:137 messages-i18n.c:316
msgid "Register" msgid "Register"
msgstr "Registre" msgstr "Registre"
@ -660,7 +660,7 @@ msgstr "Trier par ce second crit
msgid "Income.Salary.Taxable" msgid "Income.Salary.Taxable"
msgstr "Revenus.Salaire.Imposable" msgstr "Revenus.Salaire.Imposable"
#: ../po/guile_strings.txt:156 messages-i18n.c:284 #: ../po/guile_strings.txt:156 messages-i18n.c:286
msgid "Income" msgid "Income"
msgstr "Revenus" msgstr "Revenus"
@ -825,7 +825,7 @@ msgstr "Le caract
msgid "__gui" msgid "__gui"
msgstr "" msgstr ""
#: ../po/guile_strings.txt:195 messages-i18n.c:332 #: ../po/guile_strings.txt:195 messages-i18n.c:334
msgid "To" msgid "To"
msgstr "Vers" msgstr "Vers"
@ -833,7 +833,7 @@ msgstr "Vers"
msgid "smallest to largest, earliest to latest" msgid "smallest to largest, earliest to latest"
msgstr "du plus petit vers le plus grand, du plus ancien vers le plus récent" msgstr "du plus petit vers le plus grand, du plus ancien vers le plus récent"
#: ../po/guile_strings.txt:197 messages-i18n.c:335 #: ../po/guile_strings.txt:197 messages-i18n.c:337
msgid "Type" msgid "Type"
msgstr "Type" msgstr "Type"
@ -893,7 +893,7 @@ msgstr "2 semaines"
msgid "Nothing" msgid "Nothing"
msgstr "Rien" msgstr "Rien"
#: ../po/guile_strings.txt:212 messages-i18n.c:274 #: ../po/guile_strings.txt:212 messages-i18n.c:276
msgid "Expense" msgid "Expense"
msgstr "Dépenses" msgstr "Dépenses"
@ -970,11 +970,11 @@ msgid "Reverse Credit Card, Liability, Equity, and Income Accounts"
msgstr "" msgstr ""
"Inverser les comptes carte de crédit, dettes, capitaux propres, et revenus" "Inverser les comptes carte de crédit, dettes, capitaux propres, et revenus"
#: ../po/guile_strings.txt:230 messages-i18n.c:328 #: ../po/guile_strings.txt:230 messages-i18n.c:330
msgid "Stock" msgid "Stock"
msgstr "Actions" msgstr "Actions"
#: ../po/guile_strings.txt:231 messages-i18n.c:276 #: ../po/guile_strings.txt:231 messages-i18n.c:278
msgid "Extensions" msgid "Extensions"
msgstr "Extensions" msgstr "Extensions"
@ -2123,245 +2123,254 @@ msgid "Difference"
msgstr "Différence" msgstr "Différence"
#: messages-i18n.c:269 #: messages-i18n.c:269
msgid "Direct Debit"
msgstr ""
#: messages-i18n.c:270
msgid "Dist" msgid "Dist"
msgstr "Dist" msgstr "Dist"
#: messages-i18n.c:270 #: messages-i18n.c:271
msgid "Div" msgid "Div"
msgstr "Div" msgstr "Div"
#: messages-i18n.c:271 #: messages-i18n.c:272
#, fuzzy
msgid "Duplicate"
msgstr "Date"
#: messages-i18n.c:273
msgid "Edit" msgid "Edit"
msgstr "Afficher" msgstr "Afficher"
#: messages-i18n.c:273 #: messages-i18n.c:275
msgid "Exit" msgid "Exit"
msgstr "Quitter" msgstr "Quitter"
#: messages-i18n.c:275 #: messages-i18n.c:277
msgid "Export" msgid "Export"
msgstr "Exporter" msgstr "Exporter"
#: messages-i18n.c:277 #: messages-i18n.c:279
msgid "Fee" msgid "Fee"
msgstr "Taxes/Impots" msgstr "Taxes/Impots"
#: messages-i18n.c:278 #: messages-i18n.c:280
msgid "File" msgid "File"
msgstr "Fichier" msgstr "Fichier"
#: messages-i18n.c:279 #: messages-i18n.c:281
msgid "Forward" msgid "Forward"
msgstr "Suivant" msgstr "Suivant"
#: messages-i18n.c:281 #: messages-i18n.c:283
msgid "GnuCash Preferences" msgid "GnuCash Preferences"
msgstr "Préférences de GnuCash" msgstr "Préférences de GnuCash"
#: messages-i18n.c:282 #: messages-i18n.c:284
msgid "Help" msgid "Help"
msgstr "Aide" msgstr "Aide"
#: messages-i18n.c:283 #: messages-i18n.c:285
msgid "Import" msgid "Import"
msgstr "Importer" msgstr "Importer"
#: messages-i18n.c:285 #: messages-i18n.c:287
msgid "Increase" msgid "Increase"
msgstr "Augmenter" msgstr "Augmenter"
#: messages-i18n.c:286 #: messages-i18n.c:288
msgid "Int" msgid "Int"
msgstr "Int" msgstr "Int"
#: messages-i18n.c:287 #: messages-i18n.c:289
msgid "Jump" msgid "Jump"
msgstr "Sauter" msgstr "Sauter"
#: messages-i18n.c:289 #: messages-i18n.c:291
msgid "License" msgid "License"
msgstr "Licence" msgstr "Licence"
#: messages-i18n.c:290 #: messages-i18n.c:292
msgid "Loan" msgid "Loan"
msgstr "Emprunt" msgstr "Emprunt"
#: messages-i18n.c:291 #: messages-i18n.c:293
msgid "LTCG" msgid "LTCG"
msgstr "PVLT" msgstr "PVLT"
#: messages-i18n.c:293 #: messages-i18n.c:295
msgid "New" msgid "New"
msgstr "Nouveau" msgstr "Nouveau"
#: messages-i18n.c:294 #: messages-i18n.c:296
msgid "No" msgid "No"
msgstr "Non" msgstr "Non"
#: messages-i18n.c:295 #: messages-i18n.c:297
msgid "(none)" msgid "(none)"
msgstr "(aucun)" msgstr "(aucun)"
#: messages-i18n.c:297 #: messages-i18n.c:299
msgid "Num" msgid "Num"
msgstr "Num" msgstr "Num"
#: messages-i18n.c:298 #: messages-i18n.c:300
msgid "Ok" msgid "Ok"
msgstr "Ok" msgstr "Ok"
#: messages-i18n.c:299 #: messages-i18n.c:301
msgid "Online" msgid "Online"
msgstr "En ligne" msgstr "En ligne"
#: messages-i18n.c:300 #: messages-i18n.c:302
msgid "Open" msgid "Open"
msgstr "Ouvrir" msgstr "Ouvrir"
#: messages-i18n.c:301 #: messages-i18n.c:303
msgid "Parameters" msgid "Parameters"
msgstr "Paramètres" msgstr "Paramètres"
#: messages-i18n.c:302 #: messages-i18n.c:304
msgid "Payment" msgid "Payment"
msgstr "Paiement" msgstr "Paiement"
#: messages-i18n.c:303 #: messages-i18n.c:305
msgid "Portfolio" msgid "Portfolio"
msgstr "Portefeuille" msgstr "Portefeuille"
#: messages-i18n.c:304 #: messages-i18n.c:306
msgid "POS" msgid "POS"
msgstr "DAB" msgstr "DAB"
#: messages-i18n.c:305 #: messages-i18n.c:307
msgid "Preferences" msgid "Preferences"
msgstr "Préferences" msgstr "Préferences"
#: messages-i18n.c:306 #: messages-i18n.c:308
msgid "Price" msgid "Price"
msgstr "Cours" msgstr "Cours"
#: messages-i18n.c:307 #: messages-i18n.c:309
msgid "Print" msgid "Print"
msgstr "Imprimer" msgstr "Imprimer"
#: messages-i18n.c:308 #: messages-i18n.c:310
msgid "Profits" msgid "Profits"
msgstr "Profits" msgstr "Profits"
#: messages-i18n.c:309 #: messages-i18n.c:311
msgid "Quit" msgid "Quit"
msgstr "Quitter" msgstr "Quitter"
#: messages-i18n.c:310 #: messages-i18n.c:312
msgid "Rebate" msgid "Rebate"
msgstr "Rabais" msgstr "Rabais"
#: messages-i18n.c:311 #: messages-i18n.c:313
msgid "Receive" msgid "Receive"
msgstr "Reçu" msgstr "Reçu"
#: messages-i18n.c:312 #: messages-i18n.c:314
msgid "Reconcile" msgid "Reconcile"
msgstr "Rapprocher" msgstr "Rapprocher"
#: messages-i18n.c:313 #: messages-i18n.c:315
msgid "Record" msgid "Record"
msgstr "Enregistrer" msgstr "Enregistrer"
#: messages-i18n.c:315 #: messages-i18n.c:317
msgid "Report" msgid "Report"
msgstr "Rapport" msgstr "Rapport"
#: messages-i18n.c:316 #: messages-i18n.c:318
msgid "Reports" msgid "Reports"
msgstr "Rapports" msgstr "Rapports"
#: messages-i18n.c:317 #: messages-i18n.c:319
msgid "Save" msgid "Save"
msgstr "Sauvegarder" msgstr "Sauvegarder"
#: messages-i18n.c:318 #: messages-i18n.c:320
msgid "Savings" msgid "Savings"
msgstr "Epargne" msgstr "Epargne"
#: messages-i18n.c:319 #: messages-i18n.c:321
msgid "Scrub" msgid "Scrub"
msgstr "Nettoyer" msgstr "Nettoyer"
#: messages-i18n.c:321 #: messages-i18n.c:323
msgid "Sell" msgid "Sell"
msgstr "Vendre" msgstr "Vendre"
#: messages-i18n.c:322 #: messages-i18n.c:324
msgid "Settings" msgid "Settings"
msgstr "Paramètres" msgstr "Paramètres"
#: messages-i18n.c:323 #: messages-i18n.c:325
msgid "Simple" msgid "Simple"
msgstr "Simple" msgstr "Simple"
#: messages-i18n.c:324 #: messages-i18n.c:326
msgid "Sold" msgid "Sold"
msgstr "Vendu" msgstr "Vendu"
#: messages-i18n.c:325 #: messages-i18n.c:327
msgid "Spend" msgid "Spend"
msgstr "Dépenser" msgstr "Dépenser"
#: messages-i18n.c:326 #: messages-i18n.c:328
msgid "Split" msgid "Split"
msgstr "Répartition" msgstr "Répartition"
#: messages-i18n.c:327 #: messages-i18n.c:329
msgid "STCG" msgid "STCG"
msgstr "PVCT" msgstr "PVCT"
#: messages-i18n.c:329 #: messages-i18n.c:331
msgid "Style" msgid "Style"
msgstr "Style" msgstr "Style"
#: messages-i18n.c:330 #: messages-i18n.c:332
msgid "Surplus" msgid "Surplus"
msgstr "Excédent" msgstr "Excédent"
#: messages-i18n.c:331 #: messages-i18n.c:333
msgid "Teller" msgid "Teller"
msgstr "Caissier" msgstr "Caissier"
#: messages-i18n.c:333 #: messages-i18n.c:335
msgid "Today" msgid "Today"
msgstr "Aujourd'hui" msgstr "Aujourd'hui"
#: messages-i18n.c:334 #: messages-i18n.c:336
msgid "Total" msgid "Total"
msgstr "Total" msgstr "Total"
#: messages-i18n.c:336 #: messages-i18n.c:338
msgid "Transaction" msgid "Transaction"
msgstr "Transaction" msgstr "Transaction"
#: messages-i18n.c:337 #: messages-i18n.c:339
msgid "Transfer" msgid "Transfer"
msgstr "Transférer" msgstr "Transférer"
#: messages-i18n.c:338 #: messages-i18n.c:340
msgid "Value" msgid "Value"
msgstr "Montant" msgstr "Montant"
#: messages-i18n.c:339 #: messages-i18n.c:341
msgid "WARNING" msgid "WARNING"
msgstr "ATTENTION" msgstr "ATTENTION"
#: messages-i18n.c:340 #: messages-i18n.c:342
msgid "Wire" msgid "Wire"
msgstr "Télétransmission" msgstr "Télétransmission"
#: messages-i18n.c:341 #: messages-i18n.c:343
msgid "Withdraw" msgid "Withdraw"
msgstr "Se retirer" msgstr "Se retirer"
#: messages-i18n.c:342 #: messages-i18n.c:344
msgid "Yes" msgid "Yes"
msgstr "Oui" msgstr "Oui"

2253
po/gnucash.pot Normal file
View File

File diff suppressed because it is too large Load Diff

1
rpm/gnucash.spec
View File

@ -46,4 +46,5 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/gnome/apps/Applications/gnucash.desktop /usr/share/gnome/apps/Applications/gnucash.desktop
/usr/share/locale/de/LC_MESSAGES/gnucash.mo /usr/share/locale/de/LC_MESSAGES/gnucash.mo
/usr/share/locale/fr/LC_MESSAGES/gnucash.mo /usr/share/locale/fr/LC_MESSAGES/gnucash.mo
/usr/share/locale/en_GB/LC_MESSAGES/gnucash.mo
%doc /usr/doc/gnucash %doc /usr/doc/gnucash

4
src/gnome/dialog-utils.c
View File

@ -193,6 +193,8 @@ gnc_get_source_name(gint source)
return NONE_STR; return NONE_STR;
case SOURCE_YAHOO : case SOURCE_YAHOO :
return "Yahoo"; return "Yahoo";
case SOURCE_YAHOO_EUROPE :
return "Yahoo Europe";
case SOURCE_FIDELITY : case SOURCE_FIDELITY :
return "Fidelity"; return "Fidelity";
case SOURCE_TROWEPRICE : case SOURCE_TROWEPRICE :
@ -215,6 +217,8 @@ gnc_get_source_code_name(gint source)
return NULL; return NULL;
case SOURCE_YAHOO : case SOURCE_YAHOO :
return "YAHOO"; return "YAHOO";
case SOURCE_YAHOO_EUROPE :
return "YAHOO_EUROPE";
case SOURCE_FIDELITY : case SOURCE_FIDELITY :
return "FIDELITY"; return "FIDELITY";
case SOURCE_TROWEPRICE : case SOURCE_TROWEPRICE :

1
src/gnome/dialog-utils.h
View File

@ -60,6 +60,7 @@ enum
{ {
SOURCE_NONE = 0, SOURCE_NONE = 0,
SOURCE_YAHOO, SOURCE_YAHOO,
SOURCE_YAHOO_EUROPE,
SOURCE_FIDELITY, SOURCE_FIDELITY,
SOURCE_TROWEPRICE, SOURCE_TROWEPRICE,
SOURCE_VANGUARD, SOURCE_VANGUARD,

8
src/gnome/window-register.c
View File

@ -773,6 +773,14 @@ gnc_register_create_tool_bar(RegWindow *regData)
0, 0, NULL 0, 0, NULL
}, },
GNOMEUIINFO_SEPARATOR, GNOMEUIINFO_SEPARATOR,
{
GNOME_APP_UI_ITEM,
DUPLICATE_STR, TOOLTIP_DUP_TRANS,
duplicateCB, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_COPY,
0, 0, NULL
},
GNOMEUIINFO_SEPARATOR,
{ {
GNOME_APP_UI_ITEM, GNOME_APP_UI_ITEM,
BLANK_STR, TOOLTIP_BLANK_TRANS, BLANK_STR, TOOLTIP_BLANK_TRANS,

228
src/quotes/Quote.pm
View File

@ -2,6 +2,7 @@
# #
# Copyright (C) 1998, Dj Padzensky <djpadz@padz.net> # Copyright (C) 1998, Dj Padzensky <djpadz@padz.net>
# Copyright (C) 1998, 1999 Linas Vepstas <linas@linas.org> # Copyright (C) 1998, 1999 Linas Vepstas <linas@linas.org>
# Copyright (C) 2000 Yannick LE NY <y-le-ny@ifrance.com>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -27,18 +28,21 @@ require 5.000;
require Exporter; require Exporter;
use strict; use strict;
use vars qw($VERSION @EXPORT @ISA $YAHOO_URL $FIDELITY_GANDI_URL use vars qw($VERSION @EXPORT @ISA $TIMEOUT
$FIDELITY_GROWTH_URL $FIDELITY_CORPBOND_URL $FIDELITY_GLBND_URL $YAHOO_URL $YAHOO_EUROPE_URL
$FIDELITY_MM_URL $FIDELITY_ASSET_URL $TROWEPRICE_URL $FIDELITY_GANDI_URL $FIDELITY_GROWTH_URL $FIDELITY_CORPBOND_URL
$FIDELITY_GLBND_URL $FIDELITY_MM_URL $FIDELITY_ASSET_URL
$TROWEPRICE_URL
$VANGUARD_QUERY_URL $VANGUARD_CSV_URL @vanguard_ids); $VANGUARD_QUERY_URL $VANGUARD_CSV_URL @vanguard_ids);
use LWP::UserAgent; use LWP::UserAgent;
use HTTP::Request::Common; use HTTP::Request::Common;
$VERSION = '0.08'; $VERSION = '0.13';
@ISA = qw(Exporter); @ISA = qw(Exporter);
$YAHOO_URL = ("http://quote.yahoo.com/d?f=snl1d1t1c1p2va2bapomwerr1dyj1&s="); $YAHOO_URL = ("http://quote.yahoo.com/d?f=snl1d1t1c1p2va2bapomwerr1dyj1&s=");
$YAHOO_EUROPE_URL = ("http://finance.fr.yahoo.com/d/quotes.csv?f=snl1d1t1c1p2va2bapomwerr1dyj1&s=");
$FIDELITY_GANDI_URL = ("http://personal441.fidelity.com/gen/prices/gandi.csv"); $FIDELITY_GANDI_URL = ("http://personal441.fidelity.com/gen/prices/gandi.csv");
$FIDELITY_GROWTH_URL = ("http://personal441.fidelity.com/gen/prices/growth.csv"); $FIDELITY_GROWTH_URL = ("http://personal441.fidelity.com/gen/prices/growth.csv");
$FIDELITY_CORPBOND_URL = ("http://personal441.fidelity.com/gen/prices/corpbond.csv"); $FIDELITY_CORPBOND_URL = ("http://personal441.fidelity.com/gen/prices/corpbond.csv");
@ -52,42 +56,109 @@ $VANGUARD_CSV_URL = ("http://www.vanguard.com/cgi-bin/Custom?ACTION=Download&Fil
# Don't export; let user invoke with Quote::getquote syntax. # Don't export; let user invoke with Quote::getquote syntax.
# @EXPORT = qw(&yahoo, &fidelity); # @EXPORT = qw(&yahoo, &fidelity);
undef $TIMEOUT;
# =======================================================================
# Grabbed from the Perl Cookbook. Parsing csv isn't as simple as you thought!
sub parse_csv
{
my $text = shift; # record containing comma-separated values
my @new = ();
push(@new, $+) while $text =~ m{
# the first part groups the phrase inside the quotes.
# see explanation of this pattern in MRE
"([^\"\\]*(?:\\.[^\"\\]*)*)",?
| ([^,]+),?
| ,
}gx;
push(@new, undef) if substr($text, -1,1) eq ',';
return @new; # list of values that were comma-separated
}
# ======================================================================= # =======================================================================
# yahoo gets quotes from the Yahoo service # yahoo gets quotes from the Yahoo service
# which is primarily the new york stock exchange. # which is primarily the new york stock exchange.
sub yahoo { sub yahoo
{
my @symbols = @_; my @symbols = @_;
my($x,@q,%aa,$ua,$url,$sym); my($x,@q,%aa,$ua,$url,$sym);
$x = $"; $x = $";
$" = "+"; $" = "+";
$url = $YAHOO_URL."@symbols"; $url = $YAHOO_URL."@symbols";
$" = $x; $" = $x;
$ua = LWP::UserAgent->new; $ua = LWP::UserAgent->new;
foreach (split('\n',$ua->request(GET $url)->content)) { $ua->timeout($TIMEOUT) if defined $TIMEOUT;
@q = grep { s/^"?(.*?)\s*"?\s*$/$1/; } split(','); $ua->env_proxy();
$sym = $q[0]; foreach (split('\015?\012',$ua->request(GET $url)->content))
$aa {$sym, "exchange"} = "NYSE"; # new york stock exchange {
$aa {$sym, "name"} = $q[1]; @q = parse_csv($_);
$aa {$sym, "last"} = $q[2];
$aa {$sym, "date"} = $q[3]; $sym = $q[0];
$aa {$sym, "time"} = $q[4]; $aa {$sym, "exchange"} = "NYSE"; # new york stock exchange
$aa {$sym, "volume"} = $q[7]; $aa {$sym, "name"} = $q[1];
$aa {$sym, "bid"} = $q[9]; $aa {$sym, "last"} = $q[2];
$aa {$sym, "ask"} = $q[10]; $aa {$sym, "date"} = $q[3];
$aa {$sym, "close"} = $q[11]; $aa {$sym, "time"} = $q[4];
$aa {$sym, "open"} = $q[12]; $aa {$sym, "volume"} = $q[7];
$aa {$sym, "eps"} = $q[15]; $aa {$sym, "bid"} = $q[9];
$aa {$sym, "pe"} = $q[16]; $aa {$sym, "ask"} = $q[10];
$aa {$sym, "cap"} = $q[20]; $aa {$sym, "close"} = $q[11];
$aa {$sym, "open"} = $q[12];
$aa {$sym, "eps"} = $q[15];
$aa {$sym, "pe"} = $q[16];
$aa {$sym, "cap"} = $q[20];
} }
# return wantarray() ? @qr : \@qr; # return wantarray() ? @qr : \@qr;
return %aa; return %aa;
} }
# ======================================================================= # =======================================================================
# the fideility routine gets quotes from fidelity investments # yahoo_europe gets quotes for European markets from Yahoo.
sub yahoo_europe
{
my @symbols = @_;
my($x,@q,%aa,$ua,$url,$sym);
$x = $";
$" = "+";
$url = $YAHOO_EUROPE_URL."@symbols";
$" = $x;
$ua = LWP::UserAgent->new;
$ua->timeout($TIMEOUT) if defined $TIMEOUT;
$ua->env_proxy();
foreach (split('\015?\012',$ua->request(GET $url)->content))
{
@q = parse_csv($_);
$sym = $q[0];
# $aa {$sym, "exchange"} = "NYSE";
$aa {$sym, "name"} = $q[1];
$aa {$sym, "last"} = $q[2];
$aa {$sym, "date"} = $q[3];
$aa {$sym, "time"} = $q[4];
$aa {$sym, "volume"} = $q[7];
$aa {$sym, "bid"} = $q[9];
$aa {$sym, "ask"} = $q[10];
$aa {$sym, "close"} = $q[11];
$aa {$sym, "open"} = $q[12];
$aa {$sym, "eps"} = $q[15];
$aa {$sym, "pe"} = $q[16];
$aa {$sym, "cap"} = $q[20];
}
# return wantarray() ? @qr : \@qr;
return %aa;
}
# =======================================================================
# the fidelity routine gets quotes from fidelity investments
# #
sub fidelity { sub fidelity
{
my @symbols = @_; my @symbols = @_;
my(%aa,%cc,$sym, $k); my(%aa,%cc,$sym, $k);
@ -169,21 +240,27 @@ sub fidelity {
} }
} }
} }
return %aa; return %aa;
} }
# ======================================================================= # =======================================================================
sub fidelity_nav { sub fidelity_nav
{
my(@q,%aa,$ua,$url,$sym, $dayte); my(@q,%aa,$ua,$url,$sym, $dayte);
my %days = ('Monday','Mon','Tuesday','Tue','Wednesday','Wed', my %days = ('Monday','Mon','Tuesday','Tue','Wednesday','Wed',
'Thursday','Thu','Friday','Fri','Saturday','Sat','Sunday','Sun'); 'Thursday','Thu','Friday','Fri','Saturday','Sat',
'Sunday','Sun');
# for Fidelity, we get them all. # for Fidelity, we get them all.
$url = $_[0]; $url = $_[0];
$ua = LWP::UserAgent->new; $ua = LWP::UserAgent->new;
foreach (split('\n',$ua->request(GET $url)->content)) { $ua->timeout($TIMEOUT) if defined $TIMEOUT;
@q = grep { s/^"?(.*?)\s*"?\s*$/$1/; } split(','); $ua->env_proxy();
foreach (split('\015?\012',$ua->request(GET $url)->content))
{
@q = parse_csv($_);
# extract the date which is usually on the second line fo the file. # extract the date which is usually on the second line fo the file.
if (! defined ($dayte)) { if (! defined ($dayte)) {
@ -204,21 +281,27 @@ sub fidelity_nav {
$aa {$sym, "date"} = $dayte; $aa {$sym, "date"} = $dayte;
} }
} }
return %aa; return %aa;
} }
# ======================================================================= # =======================================================================
sub fidelity_mm { sub fidelity_mm
{
my(@q,%aa,$ua,$url,$sym, $dayte); my(@q,%aa,$ua,$url,$sym, $dayte);
my %days = ('Monday','Mon','Tuesday','Tue','Wednesday','Wed', my %days = ('Monday','Mon','Tuesday','Tue','Wednesday','Wed',
'Thursday','Thu','Friday','Fri','Saturday','Sat','Sunday','Sun'); 'Thursday','Thu','Friday','Fri','Saturday','Sat',
'Sunday','Sun');
# for Fidelity, we get them all. # for Fidelity, we get them all.
$url = $_[0]; $url = $_[0];
$ua = LWP::UserAgent->new; $ua = LWP::UserAgent->new;
foreach (split('\n',$ua->request(GET $url)->content)) { $ua->timeout($TIMEOUT) if defined $TIMEOUT;
@q = grep { s/^"?(.*?)\s*"?\s*$/$1/; } split(','); $ua->env_proxy();
foreach (split('\015?\012',$ua->request(GET $url)->content))
{
@q = parse_csv($_);
# extract the date which is usually on the second line fo the file. # extract the date which is usually on the second line fo the file.
if (! defined ($dayte)) { if (! defined ($dayte)) {
@ -237,19 +320,24 @@ sub fidelity_mm {
$aa {$sym, "date"} = $dayte; $aa {$sym, "date"} = $dayte;
} }
} }
return %aa; return %aa;
} }
# ======================================================================= # =======================================================================
sub troweprice { sub troweprice
{
my(@q,%aa,$ua,$url,$sym); my(@q,%aa,$ua,$url,$sym);
# for T Rowe Price, we get them all. # for T Rowe Price, we get them all.
$url = $TROWEPRICE_URL; $url = $TROWEPRICE_URL;
$ua = LWP::UserAgent->new; $ua = LWP::UserAgent->new;
foreach (split('\n',$ua->request(GET $url)->content)) { $ua->timeout($TIMEOUT) if defined $TIMEOUT;
@q = grep { s/^"?(.*?)\s*"?\s*$/$1/; } split(','); $ua->env_proxy();
foreach (split('\015?\012',$ua->request(GET $url)->content))
{
@q = parse_csv($_);
# extract the date which is usually on the second line fo the file. # extract the date which is usually on the second line fo the file.
($sym = $q[0]) =~ s/^ +//; ($sym = $q[0]) =~ s/^ +//;
@ -261,16 +349,17 @@ sub troweprice {
$aa {$sym, "date"} = $q[2]; $aa {$sym, "date"} = $q[2];
} }
} }
return %aa; return %aa;
} }
# ======================================================================= # =======================================================================
sub vanguard { sub vanguard
{
# The Vanguard Group doesn't use thier ticker symbols to look up funds. # The Vanguard Group doesn't use their ticker symbols to look up funds.
# but we do use the ticker symbols. Therefore, we need to do a reverse lookup. # but we do use the ticker symbols. Therefore, we need to do a reverse
# Load the array on first use only # lookup. Load the array on first use only
if (! @vanguard_ids ) { if (! @vanguard_ids ) {
push (@vanguard_ids, ("0002", "Bal Index ", "VBINX")); push (@vanguard_ids, ("0002", "Bal Index ", "VBINX"));
push (@vanguard_ids, ("0006", "Value Idx ", "VIVAX")); push (@vanguard_ids, ("0006", "Value Idx ", "VIVAX"));
@ -395,11 +484,13 @@ sub vanguard {
# ask for a special report with these symbols in them # ask for a special report with these symbols in them
$url .="COLS=COL1%2C3&COLS=COL4&COLS=COL5&COLS=COL11%2C12&ACTION=Accept"; $url .="COLS=COL1%2C3&COLS=COL4&COLS=COL5&COLS=COL11%2C12&ACTION=Accept";
$ua = LWP::UserAgent->new; $ua = LWP::UserAgent->new;
$ua->timeout($TIMEOUT) if defined $TIMEOUT;
$ua->env_proxy();
$reply = $ua->request(GET $url)->content; $reply = $ua->request(GET $url)->content;
# now build the second url which will actually contain the data # now build the second url which will actually contain the data
undef $url; undef $url;
foreach (split('\n',$reply)) { foreach (split('\015?\012',$reply)) {
if (/FileName=V(.*)\.txt/) { if (/FileName=V(.*)\.txt/) {
$url = $VANGUARD_CSV_URL . "V" . $1 . ".txt"; $url = $VANGUARD_CSV_URL . "V" . $1 . ".txt";
last; last;
@ -409,7 +500,7 @@ sub vanguard {
$reply = $ua->request(GET $url)->content; $reply = $ua->request(GET $url)->content;
# parse the data, stick it into the array the user will get # parse the data, stick it into the array the user will get
foreach (split('\n',$reply)) { foreach (split('\015?\012',$reply)) {
@q = split (/,/); @q = split (/,/);
($sym = $q[0]) =~ s/\W//g; ($sym = $q[0]) =~ s/\W//g;
$aa {$sym, "exchange"} = "Vanguard"; # Vanguard $aa {$sym, "exchange"} = "Vanguard"; # Vanguard
@ -432,15 +523,16 @@ sub vanguard {
$aa {$sym, "name"} = $fid; $aa {$sym, "name"} = $fid;
} }
} }
return %aa; return %aa;
} }
# ======================================================================= # =======================================================================
__END__
1; 1;
__END__
=head1 NAME =head1 NAME
Finance::Quote - Get stock and mutual fund quotes from various exchanges Finance::Quote - Get stock and mutual fund quotes from various exchanges
@ -448,19 +540,21 @@ Finance::Quote - Get stock and mutual fund quotes from various exchanges
=head1 SYNOPSIS =head1 SYNOPSIS
use Finance::Quote; use Finance::Quote;
%quotes = Quote::yahoo @symbols; # Get NYSE quotes from Yahoo $Finance::Quote::TIMEOUT = 60;
%quotes = Quote::fidelity @symbols; # Get quotes from Fidelity Investments %quotes = Quote::yahoo @symbols; # Get NYSE quotes from Yahoo
%quotes = Quote::troweprice @symbols; # Get quotes from T. Rowe Price %quotes = Quote::yahoo_europe @symbols;# Get Europe quotes from Yahoo France
%quotes = Quote::vanguard @symbols; # Get quotes from the Vanguard Group %quotes = Quote::fidelity @symbols; # Get quotes from Fidelity Investments
%quotes = Quote::troweprice @symbols; # Get quotes from T. Rowe Price
%quotes = Quote::vanguard @symbols; # Get quotes from the Vanguard Group
print ("the last price was ", $quotes {"IBM", "last"} ); print ("the last price was ", $quotes {"IBM", "last"} );
=head1 DESCRIPTION =head1 DESCRIPTION
This module gets stock quotes from various internet sources, including This module gets stock quotes from various internet sources, including
Yahoo! Finance and Fidelity Investments. The Yahoo! Finance and Fidelity Investments. The B<quote_yahoo> function
B<quote_yahoo> function will return a quote for each of the stock symbols will return a quote for each of the stock symbols passed to it. The
passed to it. The return value of each of the routines is an associative return value of each of the routines is an associative array, which
array, which may include one or more of the following elements: may include one or more of the following elements:
name Company or Mutual Fund Name name Company or Mutual Fund Name
last Last Price last Last Price
@ -485,10 +579,37 @@ array, which may include one or more of the following elements:
nav Net Asset Value nav Net Asset Value
yeild Yeild (usually 30 day avg) yeild Yeild (usually 30 day avg)
You may optionally override the default LWP timeout of 180 seconds by setting
$Finance::Quote::TIMEOUT to your preferred value.
=head1 FAQ
If there's one question I get asked over and over again, it's how did
I figure out the format string? Having typed the answer in
innumerable emails, I figure sticking it directly into the man page
might help save my fingers a bit...
If you have a My Yahoo! (http://my.yahoo.com) account, go to the
following URL:
http://edit.my.yahoo.com/config/edit_pfview?.vk=v1
Viewing the source of this page, you'll come across the section that
defines the menus that let you select which elements go into a
particular view. The <option> values are the strings that pick up
the information described in the menu item. For example, Symbol
refers to the string "s" and name refers to the string "l". Using
"sl" as the format string, we would get the symbol followed by the
name of the security.
If you have questions regarding this, play around with $QURL, changing
the value of the f parameter.
=head1 COPYRIGHT =head1 COPYRIGHT
Copyright 1998, Dj Padzensky Copyright 1998, Dj Padzensky
Copyright 1998, 1999 Linas Vepstas Copyright 1998, 1999 Linas Vepstas
Copyright 2000, Yannick LE NY (update for Yahoo Europe and YahooQuote)
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -496,7 +617,7 @@ the Free Software Foundation; either version 2 of the License, or (at
your option) any later version. your option) any later version.
The information that you obtain with this library may be copyrighted The information that you obtain with this library may be copyrighted
by Yahoo! Inc., and is governed by their usage license. See by Yahoo! Inc., and is governed by their usage license. See
http://www.yahoo.com/docs/info/gen_disclaimer.html for more http://www.yahoo.com/docs/info/gen_disclaimer.html for more
information. information.
@ -504,6 +625,7 @@ information.
Dj Padzensky (C<djpadz@padz.net>), PadzNet, Inc. Dj Padzensky (C<djpadz@padz.net>), PadzNet, Inc.
Linas Vepstas (C<linas@linas.org>) Linas Vepstas (C<linas@linas.org>)
Yannick LE NY (C<y-le-ny@ifrance.com>)
The Finance::YahooQuote home page can be found at The Finance::YahooQuote home page can be found at
http://www.padz.net/~djpadz/YahooQuote/ http://www.padz.net/~djpadz/YahooQuote/

231
src/quotes/gnc-prices
View File

@ -12,7 +12,7 @@
# Copyright (c) 1999-2000 Linas Vepstas # Copyright (c) 1999-2000 Linas Vepstas
# hack alert -- this pathname should *NOT* be hard-coded. # hack alert -- this pathname should *NOT* be hard-coded.
use lib '/usr/lib/gnucash/'; use lib '/usr/lib/gnucash';
use Quote; use Quote;
use gnucash; use gnucash;
@ -23,23 +23,26 @@ use gnucash;
sub account_flatlist sub account_flatlist
{ {
local ($grp) = $_[0]; my $grp = $_[0];
local ($naccts) = gnucash::xaccGroupGetNumAccounts ($grp); my $naccts = gnucash::xaccGroupGetNumAccounts ($grp);
local ($n); my $n;
local (@acctlist, @childlist); my (@acctlist, @childlist);
local ($children); my $children;
foreach $n (0..$naccts-1) { foreach $n (0..$naccts-1)
$acct = gnucash::xaccGroupGetAccount ($grp, $n); {
push (@acctlist, $acct); $acct = gnucash::xaccGroupGetAccount ($grp, $n);
$children = gnucash::xaccAccountGetChildren ($acct); push (@acctlist, $acct);
if ($children) {
@childlist = &account_flatlist ($children);
push (@acctlist, @childlist);
}
}
return (@acctlist); $children = gnucash::xaccAccountGetChildren ($acct);
if ($children)
{
@childlist = &account_flatlist ($children);
push (@acctlist, @childlist);
}
}
return (@acctlist);
} }
# -------------------------------------------------- # --------------------------------------------------
@ -49,29 +52,32 @@ sub account_flatlist
sub checkprice sub checkprice
{ {
local ($acct) = $_[0]; my $acct = $_[0];
local ($dayte) = $_[1]; my $dayte = $_[1];
local ($query, $datesecs, $earliest, $latest); my ($query, $datesecs, $earliest, $latest);
local ($splitlist, $i, $split, $action); my ($splitlist, $i, $split, $action);
$datesecs = gnucash::xaccScanDateS ($dayte); $datesecs = gnucash::xaccScanDateS ($dayte);
$earliest = $datesecs - 16*3600; # subtract 16 hours $earliest = $datesecs - 16*3600; # subtract 16 hours
$latest = $datesecs + 16*3600; # add 16 hours $latest = $datesecs + 16*3600; # add 16 hours
$query = gnucash::xaccMallocQuery(); $query = gnucash::xaccMallocQuery();
gnucash::xaccQueryAddAccount ($query, $acct); gnucash::xaccQueryAddAccount ($query, $acct);
gnucash::xaccQuerySetDateRange ($query, $earliest, $latest); gnucash::xaccQuerySetDateRange ($query, $earliest, $latest);
$splitlist = gnucash::xaccQueryGetSplits ($query); $splitlist = gnucash::xaccQueryGetSplits ($query);
$i=0; $i = 0;
$split = gnucash::IthSplit ($splitlist, $i); $split = gnucash::IthSplit ($splitlist, $i);
while ($split) { while ($split)
$action = gnucash::xaccSplitGetAction ($split); {
if ($action eq "Price") { return 1; } $action = gnucash::xaccSplitGetAction ($split);
$i++; if ($action eq "Price") { return 1; }
$split = gnucash::IthSplit ($splitlist, $i); $i++;
} $split = gnucash::IthSplit ($splitlist, $i);
gnucash::xaccFreeQuery ($query); }
0;
gnucash::xaccFreeQuery ($query);
return 0;
} }
# -------------------------------------------------- # --------------------------------------------------
@ -81,25 +87,26 @@ sub checkprice
sub setprice sub setprice
{ {
local ($acct) = $_[0]; my $acct = $_[0];
local ($dayte) = $_[1]; my $dayte = $_[1];
local ($price) = $_[2]; my $price = $_[2];
local ($trans, $split); my ($trans, $split);
$trans = gnucash::xaccMallocTransaction(); $trans = gnucash::xaccMallocTransaction();
gnucash::xaccTransBeginEdit ($trans, 1); gnucash::xaccTransBeginEdit ($trans, 1);
gnucash::xaccTransSetDescription ($trans, "Price"); gnucash::xaccTransSetDescription ($trans, "Price");
gnucash::xaccTransSetDateStr ($trans,$dayte); gnucash::xaccTransSetDateStr ($trans,$dayte);
$split = gnucash::xaccTransGetSplit ($trans, 0); $split = gnucash::xaccTransGetSplit ($trans, 0);
gnucash::xaccSplitSetSharePriceAndAmount ($split, $price, 0.0); gnucash::xaccSplitSetSharePriceAndAmount ($split, $price, 0.0);
gnucash::xaccSplitSetAction ($split, "Price"); gnucash::xaccSplitSetAction ($split, "Price");
gnucash::xaccTransCommitEdit ($trans); gnucash::xaccTransCommitEdit ($trans);
gnucash::xaccAccountBeginEdit ($acct, 1); gnucash::xaccAccountBeginEdit ($acct, 1);
gnucash::xaccAccountInsertSplit ($acct, $split); gnucash::xaccAccountInsertSplit ($acct, $split);
gnucash::xaccAccountCommitEdit ($acct); gnucash::xaccAccountCommitEdit ($acct);
1;
return 1;
} }
# -------------------------------------------------- # --------------------------------------------------
@ -107,7 +114,7 @@ sub setprice
die "Usage: $0 <gnucash-filename>" if $#ARGV < 0; die "Usage: $0 <gnucash-filename>" if $#ARGV < 0;
# open the file, read all of the accounts # open the file, read all of the accounts
print "Info: Opening file $ARGV[0]\n"; print "Opening file $ARGV[0]\n";
$sess = gnucash::xaccMallocSession (); $sess = gnucash::xaccMallocSession ();
$grp = gnucash::xaccSessionBeginFile ($sess,$ARGV[0]); $grp = gnucash::xaccSessionBeginFile ($sess,$ARGV[0]);
@ -117,58 +124,78 @@ die "failed to read file $ARGV[0], maybe its locked? " if (! $grp);
@acctlist = &account_flatlist ($grp); @acctlist = &account_flatlist ($grp);
# loop over the accounts, look for stock and mutual funds. # loop over the accounts, look for stock and mutual funds.
ACCTLOOP: foreach $acct (@acctlist)
foreach $acct (@acctlist) { {
$name = gnucash::xaccAccountGetName ($acct); $name = gnucash::xaccAccountGetName ($acct);
print "Info: Found account $name\n"; $type = gnucash::xaccAccountGetType ($acct);
$type = gnucash::xaccAccountGetType ($acct);
if (($type == $gnucash::STOCK) || if (($type == $gnucash::STOCK) ||
($type == $gnucash::MUTUAL)) ($type == $gnucash::MUTUAL))
{
print "$name: ";
$security = gnucash::xaccAccountGetSecurity ($acct);
$accinfo = gnucash::xaccAccountGetAccInfo ($acct);
$invacct = gnucash::xaccCastToInvAcct ($accinfo);
if ($invacct)
{ {
$security = gnucash::xaccAccountGetSecurity ($acct); $quotesrc = gnucash::xaccInvAcctGetPriceSrc ($invacct);
$accinfo = gnucash::xaccAccountGetAccInfo ($acct); unless ($quotesrc)
$invacct = gnucash::xaccCastToInvAcct ($accinfo); {
if ($invacct) { print "no quote source found\n";
$quotesrc = gnucash::xaccInvAcctGetPriceSrc ($invacct); next;
print "Info: will use $quotesrc for $name price quotes\n";
undef $price; # undef to make sure later if($price) not broken
QUOTE: {
if ("YAHOO" eq $quotesrc) {
%quotes = &Quote::yahoo ($security);
$price = $quotes {$security, "last"};
last QUOTE;
}
if ("FIDELITY" eq $quotesrc) {
%quotes = &Quote::fidelity ($security);
$price = $quotes {$security, "nav"};
last QUOTE;
}
if ("TRPRICE" eq $quotesrc) {
%quotes = &Quote::troweprice ($security);
$price = $quotes {$security, "nav"};
last QUOTE;
}
if ("VANGUARD" eq $quotesrc) {
%quotes = &Quote::vanguard ($security);
$price = $quotes {$security, "nav"};
last QUOTE;
}
next ACCTLOOP; # no quote available, go to next account
}
$dayte = $quotes {$security, "date"};
$prodname = $quotes {$security, "name"};
if ($price) {
print "Info: $security $prodname last price = $price at $dayte\n";
# This || construction will store the price if its not already
# stored (in the 28 hour period surrounding "dayte")
&checkprice ($acct, $dayte) || &setprice ($acct, $dayte, $price);
}
print "\n";
} }
}
undef $price; # undef to make sure later if($price) not broken
if ("YAHOO" eq $quotesrc)
{
%quotes = &Quote::yahoo ($security);
$price = $quotes {$security, "last"};
}
elsif ("YAHOO_EUROPE" eq $quotesrc)
{
%quotes = &Quote::yahoo_europe ($security);
$price = $quotes {$security, "last"};
}
elsif ("FIDELITY" eq $quotesrc)
{
%quotes = &Quote::fidelity ($security);
$price = $quotes {$security, "nav"};
}
elsif ("TRPRICE" eq $quotesrc)
{
%quotes = &Quote::troweprice ($security);
$price = $quotes {$security, "nav"};
}
elsif ("VANGUARD" eq $quotesrc)
{
%quotes = &Quote::vanguard ($security);
$price = $quotes {$security, "nav"};
}
else
{
print "unknown quote source: $quotesrc\n";
next;
}
print "using $quotesrc\n";
print "$name: ";
$dayte = $quotes {$security, "date"};
$prodname = $quotes {$security, "name"};
if ($price)
{
print "$security $prodname last price = $price at $dayte\n";
# This || construction will store the price if its not already
# stored (in the 28 hour period surrounding "dayte")
&checkprice ($acct, $dayte) || &setprice ($acct, $dayte, $price);
}
}
}
} }
gnucash::xaccSessionSave ($sess); gnucash::xaccSessionSave ($sess);
gnucash::xaccSessionEnd ($sess); gnucash::xaccSessionEnd ($sess);

1
src/register/gnome/gnucash-sheet.c
View File

@ -2546,6 +2546,7 @@ gnucash_register_key_press_cb(GtkWidget *widget, GdkEventKey *event,
switch (event->keyval) { switch (event->keyval) {
case GDK_Return: case GDK_Return:
case GDK_KP_Enter:
gtk_signal_emit_by_name(GTK_OBJECT(reg), gtk_signal_emit_by_name(GTK_OBJECT(reg),
"activate_cursor"); "activate_cursor");
return TRUE; return TRUE;

3
src/register/splitreg.c
View File

@ -239,6 +239,9 @@ configAction (SplitRegister *reg)
xaccAddComboCellMenuItem ( reg->actionCell, ONLINE_STR); xaccAddComboCellMenuItem ( reg->actionCell, ONLINE_STR);
xaccAddComboCellMenuItem ( reg->actionCell, ACH_STR); xaccAddComboCellMenuItem ( reg->actionCell, ACH_STR);
xaccAddComboCellMenuItem ( reg->actionCell, WIRE_STR); xaccAddComboCellMenuItem ( reg->actionCell, WIRE_STR);
xaccAddComboCellMenuItem ( reg->actionCell, CREDIT_STR);
xaccAddComboCellMenuItem ( reg->actionCell, DIRECTDEBIT_STR);
xaccAddComboCellMenuItem ( reg->actionCell, TRANSFER_STR);
break; break;
case CASH_REGISTER: case CASH_REGISTER:
xaccAddComboCellMenuItem ( reg->actionCell, BUY_STR); xaccAddComboCellMenuItem ( reg->actionCell, BUY_STR);