[rkward-cvs] SF.net SVN: rkward: [1386] branches/release_branch_0.4.6
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Mon Feb 12 21:53:43 UTC 2007
Revision: 1386
http://svn.sourceforge.net/rkward/?rev=1386&view=rev
Author: tfry
Date: 2007-02-12 13:53:43 -0800 (Mon, 12 Feb 2007)
Log Message:
-----------
Merge 1372, 1373, ..., 1380, 1382, 1383, 1384 from trunk
Modified Paths:
--------------
branches/release_branch_0.4.6/ChangeLog
branches/release_branch_0.4.6/TODO
branches/release_branch_0.4.6/po/de.po
branches/release_branch_0.4.6/po/el.po
branches/release_branch_0.4.6/po/fr.po
branches/release_branch_0.4.6/rkward/core/rkvariable.cpp
branches/release_branch_0.4.6/rkward/core/rkvariable.h
branches/release_branch_0.4.6/rkward/core/robject.cpp
branches/release_branch_0.4.6/rkward/core/robject.h
branches/release_branch_0.4.6/rkward/dialogs/rkimportdialog.cpp
branches/release_branch_0.4.6/rkward/plugins/00saveload/import/import_csv.php
branches/release_branch_0.4.6/rkward/plugins/00saveload/import/import_csv.rkh
branches/release_branch_0.4.6/rkward/plugins/00saveload/import/import_csv.xml
branches/release_branch_0.4.6/rkward/plugins/import_export.pluginmap
branches/release_branch_0.4.6/rkward/plugins/x11device/export.php
Modified: branches/release_branch_0.4.6/ChangeLog
===================================================================
--- branches/release_branch_0.4.6/ChangeLog 2007-02-12 17:16:33 UTC (rev 1385)
+++ branches/release_branch_0.4.6/ChangeLog 2007-02-12 21:53:43 UTC (rev 1386)
@@ -1,4 +1,5 @@
--- Version 0.4.6 - Feb-15-2007
+- fix crash after changing storage type of an object in the data editor
- single line input fields in plugins no longer accept new-lines
- support for calculating p-values in correlation matrix plugin
- fixed: pressing F8 in the console would remove input focus from the console
Modified: branches/release_branch_0.4.6/TODO
===================================================================
--- branches/release_branch_0.4.6/TODO 2007-02-12 17:16:33 UTC (rev 1385)
+++ branches/release_branch_0.4.6/TODO 2007-02-12 21:53:43 UTC (rev 1386)
@@ -2,6 +2,9 @@
Also, plans change frequently. If something is listed for a specific release, that's no more than a rough plan.
All in all, this TODO list is mostly for internal purposes, and many parts may not necessarily be intellegible to anybody but the authors.
+Important:
+ - Around March 1st, write to R-devel to achieve having IS_UTF8 and IS_LATIN1 in public API (if not already available, then).
+
Advertizing:
- start being a bit bolder about RKWard (descriptions, startup notification, etc.)
@@ -18,6 +21,9 @@
- seems to happen more often with larger data frames
- more precisely: seems to happen after scrolling
- no idea, why this happens
+ - converting objects to a different type is broken (works in the editor, but the type remains unchanged in the backend)
+ - maybe we could do the change in the backend, and then sync
+ - function rk.change.vector.mode() to change the mode, keeping attributed, and adding invalid values where needed
Compilation / technical
- Incorporate FreeBSD patches http://www.freshports.org/math/rkward/files.php?message_id=200609172111.k8HLBiob081349@repoman.freebsd.org
@@ -98,6 +104,10 @@
- open link in new tab, etc.
Internal stuff:
+ - Handling locales:
+ - RThread should define an own QTextCodec.
+ - this should be updated whenever Sys.setlocale() is called
+ - Should be used for all conversion to and from local8Bit for data passed to / from the backend
- Look at package odfWeave, and find out, how to use this
- replace remaining direct HTML fragments in plugins with wrapper calls
- should we override bindingIsActive()?
@@ -149,6 +159,9 @@
- static members should be moved to the respective classes. Much cleaner!
R plugins:
+ - Generalized preview:
+ - E.g. for data import plugins
+ - Ability to pre-select some default values with a single option
- Spinbox:
- find a solution for "pending changes". Currently, if the user enters a value, manually, then presses submit, the old value will be used (the new value is only set, when the focus changes to another widget). Probably the RKSpinbox should emit signals for "pending" and "ready". The plugin spinbox should listen to those and not be satisfied as long as a change is pending. Maybe mark the spinbox in yellow, while a change is pending.
- options min_inclusive / max_inclusive for real number spinboxes (defaulting to true)
Modified: branches/release_branch_0.4.6/po/de.po
===================================================================
--- branches/release_branch_0.4.6/po/de.po 2007-02-12 17:16:33 UTC (rev 1385)
+++ branches/release_branch_0.4.6/po/de.po 2007-02-12 21:53:43 UTC (rev 1386)
@@ -1,4 +1,3 @@
-# translation of de.po to German
# translation of de.po to
# translation of rkward.po to
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -7,15 +6,15 @@
# Stefan Rodiger <stefan_roediger at gmx.de>, 2006.
# Stefan Joerg Roediger <stefan_roediger at gmx.de>, 2006.
# SJR <stefan_roediger at gmx.de>, 2006, 2007.
-# Thomas Friedrichsmeier <tfry at users.sourceforge.net>, 2006.
+# Thomas Friedrichsmeier <tfry at users.sourceforge.net>, 2006, 2007.
msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-02-09 11:51+0100\n"
-"PO-Revision-Date: 2007-02-04 20:43+0100\n"
-"Last-Translator: SJR <stefan_roediger at gmx.de>\n"
-"Language-Team: German <rkward-devel at lists.sourceforge.net>\n"
+"PO-Revision-Date: 2007-02-12 17:46+0100\n"
+"Last-Translator: Thomas Friedrichsmeier <tfry at users.sourceforge.net>\n"
+"Language-Team: <de at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +23,7 @@
#: dataeditor/editformatdialog.cpp:44
msgid "Alignment"
-msgstr "Anordnung"
+msgstr "Ausrichtung"
#: dataeditor/editformatdialog.cpp:49
msgid "Default for type '%1'"
@@ -73,7 +72,7 @@
#: dataeditor/rkeditordataframepart.cpp:59
msgid "Pastes the clipboard contents to actual position"
-msgstr "Füge den Inhalt der Zwischenablage in die aktuelle Position ein"
+msgstr "Fügt den Inhalt der Zwischenablage in die aktuelle Position ein"
#: dataeditor/rkeditordataframepart.cpp:60
msgid ""
@@ -114,8 +113,8 @@
"index column is read only). To remove levels at the end of the list, just "
"set them to empty."
msgstr ""
-"Levels können nur aufeinander folgend Integer die mit 1 beginnen zugewiesen "
-"werden. Warnung: Wenn Sie ein Level entfernen können die Indizes anderer "
+"Levels können nur aufeinander folgende Ganzzahlen, beginnend mit 1, zugewiesen "
+"werden. Warnung: Wenn Sie ein Level entfernen, können sich die Indizes anderer "
"Level verändern und folglich die Werte der Faktoren verändern!"
#: dataeditor/editlabelsdialog.cpp:249
@@ -171,8 +170,7 @@
msgstr "Lösche diese Zeile (%1)"
#: agents/rksaveagent.cpp:60
-msgid ""
-"No filename given. Your data was NOT saved. Do you still want to proceed?"
+msgid "No filename given. Your data was NOT saved. Do you still want to proceed?"
msgstr ""
"Kein Dateiname angegeben. Ihre Daten wurden NICHT gespeichert. Möchten Sie "
"dennoch fortfahren?"
@@ -198,7 +196,7 @@
"Saving to file '%1' failed. Do you want to try saving to a different "
"filename?"
msgstr ""
-"Speichern zur Datei '%1' gescheitert. Wollen Sie versuchen die Datei unter "
+"Speichern in Datei '%1' gescheitert. Wollen Sie versuchen, die Datei unter "
"einem anderen Dateinamen zu speichern?"
#: agents/showedittextfileagent.cpp:59
@@ -208,8 +206,8 @@
"\n"
msgstr ""
" Aus diesem Grund wurde die Ausführung vorerst gestoppt. Drücken Sie den "
-"\"Erledigt\"-Button, oder um diesen Dialog zu schließen, sobald Sie denken "
-"das es sicher ist fortzufahren.\n"
+"\"Erledigt\"-Button, oder um diesen Dialog zu schließen, sobald Sie denken,"
+"dass es sicher ist, fortzufahren.\n"
"\n"
#: agents/showedittextfileagent.cpp:60
@@ -291,8 +289,8 @@
"Waiting for remaining R commands to finish. To quit immediately, press "
"Cancel (WARNING: This may result in loss of data)"
msgstr ""
-"Bitte warten bis noch laufende R-Kommandos beendet sind. Um jetzt zu beenden "
-"bitte Cancel wählen (Warnung: Das könnte zu Datenverlußt führen)"
+"Bitte warten, bis noch laufende R-Kommandos beendet sind. Um sofort zu beenden "
+"bitte Cancel wählen (Warnung: Das könnte zu Datenverlust führen)"
#: agents/rkquitagent.cpp:41
msgid "Waiting for R to finish"
@@ -326,8 +324,7 @@
msgstr "Objekt entfernen?"
#: core/rkmodificationtracker.cpp:62
-msgid ""
-"Do you really want to remove the object '%1'? There's no way to get it back."
+msgid "Do you really want to remove the object '%1'? There's no way to get it back."
msgstr ""
"Wollen Sie das Objekt '%1' wirklich entfernen? Es gibt keine Möglichkeit es "
"wieder herzustellen."
@@ -407,7 +404,7 @@
#: windows/rkcommandeditorwindowpart.cpp:57 rkconsole.cpp:680
msgid "&Function reference"
-msgstr "&Funktions Bezug"
+msgstr "&Funktions Referenz"
#: windows/rkhtmlwindow.cpp:146
msgid ""
@@ -496,16 +493,14 @@
msgstr "Unbenanntes GUI-Element"
#: windows/rkhtmlwindow.cpp:531
-#, fuzzy
msgid "Related functions and pages"
-msgstr "Ähnliche Funktionen und Seiten"
+msgstr "Verwandte Funktionen und Seiten"
#: windows/rkhtmlwindow.cpp:608
msgid "R Reference on '%1'"
msgstr "R Referenz bei '%1'"
#: windows/rkhtmlwindow.cpp:623
-#, fuzzy
msgid "BROKEN REFERENCE"
msgstr "DEFEKTE REFERENZ"
@@ -573,8 +568,7 @@
#: windows/rkcommandeditorwindow.cpp:128
msgid "The document \"%1\" has been modified. Close it anyway?"
-msgstr ""
-"Das Dokument \"%1\" wurde verändert. Soll es dennoch gespeichert werden?"
+msgstr "Das Dokument \"%1\" wurde verändert. Soll es dennoch gespeichert werden?"
#: windows/rkcommandeditorwindow.cpp:128
msgid "File not saved"
@@ -1067,12 +1061,11 @@
msgstr "Eigenschaften des Ausgabefensters"
#: settings/rksettingsmoduler.cpp:57
-#, fuzzy
msgid ""
"The following settings mostly affect R behavior in the console. It is "
"generally safe to keep these unchanged."
msgstr ""
-"Die folgenden Einstellung beeinflussen meistens das Verhalten von R in der "
+"Die folgenden Einstellung beeinflussen im Wesentlichen das Verhalten von R in der "
"Konsole. Diese sollten unverändert belassen werden."
#: settings/rksettingsmoduler.cpp:65
@@ -1267,8 +1260,7 @@
#: settings/rksettingsmodulewatch.cpp:147
msgid "Maximum number of paragraphs/lines to display in the Command Log"
-msgstr ""
-"Maximale Anzahl von Absätzen/Zeile die im Command Log angezeigt werden sollen"
+msgstr "Maximale Anzahl von Absätzen/Zeile die im Command Log angezeigt werden sollen"
#: settings/rksettings.cpp:63
msgid "Settings"
@@ -1320,8 +1312,7 @@
#: dialogs/rkloadlibsdialog.cpp:205
msgid "Please stand by while installing selected packages"
-msgstr ""
-"Bitte warten warten Sie während die gewählten Pakete installiert werden."
+msgstr "Bitte warten warten Sie während die gewählten Pakete installiert werden."
#: dialogs/rkloadlibsdialog.cpp:205
msgid "Installing packages"
@@ -1547,17 +1538,15 @@
msgstr "Illegaler Attributwert. Nur Dezimalzahlen sind erlaubt."
#: misc/xmlhelper.cpp:219
-#, fuzzy
msgid "Illegal attribute value. Allowed values are '%1' or '%2', only."
-msgstr "Illegaler Attributwert. Erlaubt sind nur Werte einer von '%1'."
+msgstr "Illegaler Attributwert. Erlaubt sind nur Werte die Werte '%1' und '%2'."
#: misc/xmlhelper.cpp:230
msgid "XML-parsing '%1' "
msgstr "XML-parsing '%1' "
#: misc/rkprogresscontrol.cpp:203
-msgid ""
-"<b>There have been errors and / or warnings! See below for a transcript</b>"
+msgid "<b>There have been errors and / or warnings! See below for a transcript</b>"
msgstr ""
"<b>Es gab Fehler und / oder Warnungen! Betrachten Sie das Transkript "
"unterhalb</b>"
@@ -1651,9 +1640,8 @@
msgstr "Objektname wohin gespeichert werden soll:"
#: misc/rksaveobjectchooser.cpp:83
-#, fuzzy
msgid "Overwrite? (The given object name already exists)"
-msgstr "Diese Objekt existiert bereits"
+msgstr "Überschreiben? (Das Objekt existiert bereits)"
#: misc/rksaveobjectchooser.cpp:87
msgid "Overwrite?"
@@ -1786,7 +1774,6 @@
msgstr "Kann Objekt '%1' nicht editieren"
#: rbackend/rinterface.cpp:337
-#, fuzzy
msgid ""
"The R-backend has indicated that in order to carry out the current task it "
"needs the package '%1', which is not currently installed. We will open the "
@@ -1795,7 +1782,7 @@
msgstr ""
"Das R-Backend fragt nach den Paket '%1'um die aktuelle Aufgabe "
"durchzuführen. Es wird das Paket-Management-Tool geöffnet. Von dort können "
-"Sie versuchen das benötigte Paket zu finden und zu installieren."
+"Sie versuchen, das benötigte Paket zu finden und zu installieren."
#: rbackend/rinterface.cpp:337
msgid "Require package '%1'"
@@ -2186,12 +2173,10 @@
msgstr "Unterbreche laufendes Kommando"
#: rkconsole.cpp:690
-#, fuzzy
msgid "Copy selection cleaned"
-msgstr "Kopierauswahl gereinigt"
+msgstr "Kopiere Auswahl bereinigt"
#: rkconsole.cpp:691
-#, fuzzy
msgid "Copy selection literally"
msgstr "Kopiere Auswahl wörtlich"
@@ -2375,7 +2360,7 @@
#: robjectbrowser.cpp:143
msgid "Rename object"
-msgstr "Benenn Objekt um"
+msgstr "Benenne Objekt um"
#: robjectbrowser.cpp:143
msgid "Enter the new name"
@@ -2398,7 +2383,7 @@
#: rc.cpp:3 rc.cpp:27
#, no-c-format
msgid "&Run"
-msgstr "&Los"
+msgstr "&Ausführen"
#. i18n: file rkwardui.rc line 5
#: rc.cpp:12
@@ -2436,6 +2421,3 @@
"Your emails"
msgstr "stefan_roediger at gmx.de"
-#~ msgid "Illegal attribute value. Allowed values are 'true' or 'false', only."
-#~ msgstr ""
-#~ "Illegaler Attributwert. Nur die Werte 'wahr' oder 'falsch' sind zulässig."
Modified: branches/release_branch_0.4.6/po/el.po
===================================================================
--- branches/release_branch_0.4.6/po/el.po 2007-02-12 17:16:33 UTC (rev 1385)
+++ branches/release_branch_0.4.6/po/el.po 2007-02-12 21:53:43 UTC (rev 1386)
@@ -8,7 +8,7 @@
"Project-Id-Version: el\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-02-09 11:51+0100\n"
-"PO-Revision-Date: 2007-02-04 23:53+0200\n"
+"PO-Revision-Date: 2007-02-09 22:21+0200\n"
"Last-Translator: Ilias Soumpasis <isoumpasis at gmail.com>\n"
"Language-Team: Ελληνικά <el at li.org>\n"
"MIME-Version: 1.0\n"
@@ -166,8 +166,7 @@
msgstr "Διαγραφή αυτής της σειράς (%1)"
#: agents/rksaveagent.cpp:60
-msgid ""
-"No filename given. Your data was NOT saved. Do you still want to proceed?"
+msgid "No filename given. Your data was NOT saved. Do you still want to proceed?"
msgstr ""
"Δεν δόθηκε όνομα αρχείου. Τα δεδομένα σας δεν αποθηκεύτηκαν. Θέλετε να "
"συνεχίσετε;"
@@ -323,8 +322,7 @@
msgstr "Αφαίρεση αντικειμένου;"
#: core/rkmodificationtracker.cpp:62
-msgid ""
-"Do you really want to remove the object '%1'? There's no way to get it back."
+msgid "Do you really want to remove the object '%1'? There's no way to get it back."
msgstr ""
"Θέλετε πραγματικά να διαγράψετε το αντικείμενο '%1'; Δεν θα υπάρχει τρόπος "
"να το ανακτήσετε."
@@ -677,13 +675,11 @@
#: windows/rkwindowcatcher.cpp:245
msgid "Specify the R object name, you want to save the graph to"
-msgstr ""
-"Επιλέξτε το όνομα του αντικειμένου R με το οποίο θέλετε να σώσετε το γράφημα"
+msgstr "Επιλέξτε το όνομα του αντικειμένου R με το οποίο θέλετε να σώσετε το γράφημα"
#: windows/rkwindowcatcher.cpp:256
msgid "Save contents of graphics device number %1 to object '%2'"
-msgstr ""
-"Αποθήκευση περιεχομένων της συσκευής γραφικών νούμερο %1 στο αντικείμενο '%2'"
+msgstr "Αποθήκευση περιεχομένων της συσκευής γραφικών νούμερο %1 στο αντικείμενο '%2'"
#: windows/rkwindowcatcher.cpp:265
msgid "Duplicate graphics device number %1"
@@ -1149,8 +1145,7 @@
#: settings/rksettingsmoduler.cpp:283
msgid "R Library locations (where libraries get installed to, locally)"
-msgstr ""
-"Τοποθεσίες βιβλιοθηκών R (εκεί όπου οι βιβλιοθήκες εγκαθιστώνται τοπικά)"
+msgstr "Τοποθεσίες βιβλιοθηκών R (εκεί όπου οι βιβλιοθήκες εγκαθιστώνται τοπικά)"
#: settings/rksettingsmoduler.cpp:288
msgid ""
@@ -1252,8 +1247,7 @@
#: settings/rksettingsmodulewatch.cpp:147
msgid "Maximum number of paragraphs/lines to display in the Command Log"
-msgstr ""
-"Μέγιστος αριθμός παραγράφων/γραμμών προβολής στο αρχείο καταγραφής εντολών"
+msgstr "Μέγιστος αριθμός παραγράφων/γραμμών προβολής στο αρχείο καταγραφής εντολών"
#: settings/rksettings.cpp:63
msgid "Settings"
@@ -1520,8 +1514,7 @@
#: misc/xmlhelper.cpp:171
msgid "Illegal attribute value. Allowed values are one of '%1', only."
-msgstr ""
-"Μη επιτρεπόμενη τιμής ιδιότητας. Επιτρεπόμενες τιμές είναι μόνο μία από '%1'."
+msgstr "Μη επιτρεπόμενη τιμής ιδιότητας. Επιτρεπόμενες τιμές είναι μόνο μία από '%1'."
#: misc/xmlhelper.cpp:185
msgid "Illegal attribute value. Only integer numbers are allowed."
@@ -1529,22 +1522,18 @@
#: misc/xmlhelper.cpp:201
msgid "Illegal attribute value. Only real numbers are allowed."
-msgstr ""
-"Μη επιτρεπόμενη τιμής ιδιότητας. Μόνο πραγματικοί αριθμοί επιτρέπονται."
+msgstr "Μη επιτρεπόμενη τιμής ιδιότητας. Μόνο πραγματικοί αριθμοί επιτρέπονται."
#: misc/xmlhelper.cpp:219
-#, fuzzy
msgid "Illegal attribute value. Allowed values are '%1' or '%2', only."
-msgstr ""
-"Μη επιτρεπόμενη τιμής ιδιότητας. Επιτρεπόμενες τιμές είναι μόνο μία από '%1'."
+msgstr "Μη επιτρεπόμενη τιμής ιδιότητας. Επιτρεπόμενες τιμές είναι μόνο η '%1'. ή '%2'."
#: misc/xmlhelper.cpp:230
msgid "XML-parsing '%1' "
msgstr "Ανάλυση XML '%1' "
#: misc/rkprogresscontrol.cpp:203
-msgid ""
-"<b>There have been errors and / or warnings! See below for a transcript</b>"
+msgid "<b>There have been errors and / or warnings! See below for a transcript</b>"
msgstr ""
"<b>Υπήρξαν σφάλματα ή / και προειδοποιήσεις! Δείτε παρακάτω για μια "
"περιγραφή</b>"
@@ -1638,9 +1627,8 @@
msgstr "Όνομα αντικειμένου στο οποίο θέλετε να αποθηκευτεί "
#: misc/rksaveobjectchooser.cpp:83
-#, fuzzy
msgid "Overwrite? (The given object name already exists)"
-msgstr "Το σύμβολο που δόθηκε ήδη υπάρχει"
+msgstr "Αντικατάσταση; (Το όνομα του αντικειμένου που δόθηκε ήδη υπάρχει)"
#: misc/rksaveobjectchooser.cpp:87
msgid "Overwrite?"
@@ -2119,8 +2107,7 @@
#: rkward.cpp:602 robjectbrowser.cpp:113 robjectbrowser.cpp:147
msgid "The name you specified was already in use or not valid. Renamed to %1"
-msgstr ""
-"Το όνομα που δώσατε ήδη υπάρχει ή δεν είναι έγκυρο. Μετονομάστηκε σε %1"
+msgstr "Το όνομα που δώσατε ήδη υπάρχει ή δεν είναι έγκυρο. Μετονομάστηκε σε %1"
#: rkward.cpp:602 robjectbrowser.cpp:113 robjectbrowser.cpp:147
msgid "Invalid Name"
@@ -2429,7 +2416,3 @@
"_: EMAIL OF TRANSLATORS\n"
"isoumpasis at gmail.com, isoumpasis at yahoo.gr"
-#~ msgid "Illegal attribute value. Allowed values are 'true' or 'false', only."
-#~ msgstr ""
-#~ "Μη επιτρεπόμενη τιμής ιδιότητας. Οι επιτρεπόμενες τιμές μπορεί να είναι "
-#~ "μόνο αληθές' ή 'ψευδές'."
Modified: branches/release_branch_0.4.6/po/fr.po
===================================================================
--- branches/release_branch_0.4.6/po/fr.po 2007-02-12 17:16:33 UTC (rev 1385)
+++ branches/release_branch_0.4.6/po/fr.po 2007-02-12 21:53:43 UTC (rev 1386)
@@ -1,3 +1,4 @@
+# translation of fr.po to français
# translation of fr.po to German
# translation of fr.po to
# This file is distributed under the same license as the RKWard package.
@@ -2,7 +3,7 @@
# Copyright (C) 2005 Thomas Friedrichsmeier.
-#
# Pierre Ecochard <ecoch at users.sourceforge.net>, 2005.
# Frederic Daniel Luc LEHOBEY <Frederic.Lehobey at free.fr>, 2006.
-# Jacolin Yves <yjacolin at free.fr>, 2006.
+# Jacolin Yves <yjacolin at free.fr>, 2006, 2007.
# SJR <stefan_roediger at gmx.de>, 2007.
+#
msgid ""
@@ -12,13 +13,13 @@
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-02-09 11:51+0100\n"
-"PO-Revision-Date: 2007-01-02 05:47+0100\n"
-"Last-Translator: SJR <stefan_roediger at gmx.de>\n"
-"Language-Team: German <rkward-devel at lists.sourceforge.net>\n"
+"PO-Revision-Date: 2007-02-10 14:42+0100\n"
+"Last-Translator: Jacolin Yves <yjacolin at free.fr>\n"
+"Language-Team: français <fr at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: KBabel 1.10.2\n"
#: dataeditor/editformatdialog.cpp:44
msgid "Alignment"
@@ -107,14 +108,13 @@
msgstr "Étiquette"
#: dataeditor/editlabelsdialog.cpp:225
-#, fuzzy
msgid ""
"Levels can be assigned only to consecutive integers starting with 1 (the "
"index column is read only). To remove levels at the end of the list, just "
"set them to empty."
msgstr ""
"Les niveaux (\"levels\") ne peuvent être associés qu'à des entiers "
-"consécutifs commeçant par 1. Attention : si vous supprimez un niveau, les "
+"consécutifs commençant par 1. Attention : si vous supprimez un niveau, les "
"indices des autres niveaux peuvent changer aussi, ce qui modifierait la "
"valeur de la variable !"
@@ -171,8 +171,7 @@
msgstr "Supprimer cette ligne (%1)"
#: agents/rksaveagent.cpp:60
-msgid ""
-"No filename given. Your data was NOT saved. Do you still want to proceed?"
+msgid "No filename given. Your data was NOT saved. Do you still want to proceed?"
msgstr ""
"Aucun nom de fichier n'a été fourni. Les données N'ont PAS été enregistrées. "
"Voulez vous poursuivre quand même ?"
@@ -290,11 +289,11 @@
msgid ""
"Waiting for remaining R commands to finish. To quit immediately, press "
"Cancel (WARNING: This may result in loss of data)"
-msgstr ""
+msgstr "En attente que des commandes R finissent. Pour quitter immédiatement, cliquez sur Cancel (Attention : cela peut entraîner une perte de donnée) "
#: agents/rkquitagent.cpp:41
msgid "Waiting for R to finish"
-msgstr ""
+msgstr "En attente que R se termine"
#: core/rkmodificationtracker.cpp:50
msgid ""
@@ -323,18 +322,14 @@
msgstr "Supprimer l'objet ?"
#: core/rkmodificationtracker.cpp:62
-msgid ""
-"Do you really want to remove the object '%1'? There's no way to get it back."
+msgid "Do you really want to remove the object '%1'? There's no way to get it back."
msgstr ""
"Voulez-vous vraiment supprimer l'objet '%1' ? Il n'y a aucun moyen de le "
"récupérer."
#: core/robject.cpp:119
-#, fuzzy
msgid "Full location:"
-msgstr ""
-"\n"
-"Chemin complet : "
+msgstr "Chemin complet : "
#: core/robject.cpp:121
msgid "Label:"
@@ -426,12 +421,10 @@
msgstr "Sorties"
#: windows/rkhtmlwindow.cpp:228
-#, fuzzy
msgid "&Flush Output"
-msgstr "Vider les sorties ?"
+msgstr "Purger les sorties ?"
#: windows/rkhtmlwindow.cpp:229
-#, fuzzy
msgid "&Refresh Output"
msgstr "&Rafraîchir"
@@ -444,12 +437,10 @@
msgstr "Sauvegarder la sortie en HTML"
#: windows/rkhtmlwindow.cpp:328
-#, fuzzy
msgid ""
"Do you really want to flush the output? It will not be possible to restore "
"it."
-msgstr ""
-"Voulez-vous vraiment vider les sorties ? Il sera impossible de les restaurer."
+msgstr "Voulez-vous vraiment vider les sorties ? Il ne sera pas possible de les restaurer."
#: windows/rkhtmlwindow.cpp:328
msgid "Flush output?"
@@ -475,43 +466,39 @@
#: windows/rkhtmlwindow.cpp:398
msgid "Page does not exist or is broken"
-msgstr ""
+msgstr "La page n'existe par ou a été déplacée"
#: windows/rkhtmlwindow.cpp:456
-#, fuzzy
msgid "No Title"
-msgstr "Titre"
+msgstr "Pas de titre"
#: windows/rkhtmlwindow.cpp:481
msgid "Summary"
-msgstr ""
+msgstr "Sommaire"
#: windows/rkhtmlwindow.cpp:487
-#, fuzzy
msgid "Usage"
-msgstr "Usage :"
+msgstr "Usage"
#: windows/rkhtmlwindow.cpp:503
-#, fuzzy
msgid "GUI settings"
msgstr "Configuration"
#: windows/rkhtmlwindow.cpp:511
msgid "Unnamed GUI element"
-msgstr ""
+msgstr "Élément d'interface sans nom"
#: windows/rkhtmlwindow.cpp:531
-#, fuzzy
msgid "Related functions and pages"
-msgstr "Greffons et correctifs"
+msgstr "Fonctions et pages liés"
#: windows/rkhtmlwindow.cpp:608
msgid "R Reference on '%1'"
-msgstr ""
+msgstr "Référence de R sur '%1'"
#: windows/rkhtmlwindow.cpp:623
msgid "BROKEN REFERENCE"
-msgstr ""
+msgstr "RÉFÉRENCE CASSÉE"
#: windows/rcontrolwindow.cpp:41
msgid "Configure R backend"
@@ -605,7 +592,6 @@
msgstr "Impossible d'ouvrir le fichier de commandes"
#: windows/rkworkplace.cpp:324
-#, fuzzy
msgid "Save Workplace layout"
msgstr "Enregistrer l'espace de travail"
@@ -626,10 +612,8 @@
msgstr "Erreur de syntaxe.\n"
#: windows/rkcommandlog.cpp:177
-#, fuzzy
msgid "An unspecified error occurred while running the command.\n"
-msgstr ""
-"Une erreur inconnue s'est produite pendant l'exécution de la commande.\n"
+msgstr "Une erreur inconnue s'est produite pendant l'exécution de la commande.\n"
#: windows/rkwindowcatcher.cpp:60
msgid ""
@@ -645,6 +629,9 @@
"devel at lists.sourceforge.net with details on your setup, so we can try to fix "
"this in future versions of RKWard."
msgstr ""
+"Vous avez crée un nouveau périphérique de fenêtre X11 dans R. Habituellement, RKWard essaie de détecter de telle fenêtre pour prendre leur contrôle, et y ajouter une barre de menu. Pour cette fois, Cependant, RKWard n'a pas pû détecter quelle fenêtre a été crée et ne peut donc pas l'utiliser.\n"
+"Si vous avez crée la fenêtre sur un écran ou affichage X11 différent. Vous pouvez considérer la modification des options (\"Affichage\"). "
+"Si vous pouvez voir la fenêtre X11 sur le même écran que ce message, alors RKWard doit être amélioré. S'il vous plait, veuillez nous contacter à rkward-deval at lists.sourceforge.net avec des détails de votre configuration, nous pourrons ainsi corriger cela dans une prochaine version de RKWard."
#: windows/rkwindowcatcher.cpp:60
msgid "Could not embed R X11 window"
@@ -680,7 +667,7 @@
#: windows/rkwindowcatcher.cpp:256
msgid "Save contents of graphics device number %1 to object '%2'"
-msgstr ""
+msgstr "Sauver le contenu du périphérique graphique n° %1 dans l'objet '%2'"
#: windows/rkwindowcatcher.cpp:265
msgid "Duplicate graphics device number %1"
@@ -688,7 +675,7 @@
#: windows/rkwindowcatcher.cpp:285
msgid "Draw area follows size of window"
-msgstr ""
+msgstr "La surface dessinée suit la taille de la fenêtre"
#: windows/rkwindowcatcher.cpp:287
msgid "Set fixed size 500x500"
@@ -704,7 +691,7 @@
#: windows/rkwindowcatcher.cpp:290
msgid "Set specified fixed size..."
-msgstr ""
+msgstr "Définir la taille spécifiée ..."
#: windows/rkwindowcatcher.cpp:292
msgid "Make active"
@@ -727,7 +714,6 @@
msgstr "Entrez une valeur :"
#: plugin/rkpluginbrowser.cpp:53
-#, fuzzy
msgid "Enter filename"
msgstr "Entrer un nouveau nom"
@@ -748,14 +734,12 @@
msgstr "Modèle personnalisé :"
#: plugin/rkformula.cpp:90
-#, fuzzy
msgid "Main effects"
msgstr "Effets principaux seulement"
#: plugin/rkformula.cpp:95
-#, fuzzy
msgid "Level"
-msgstr "Niveaux"
+msgstr "Niveau"
#: plugin/rkformula.cpp:96
msgid "Term"
@@ -766,20 +750,18 @@
msgstr "Définissez un model"
#: plugin/rkstandardcomponent.cpp:74
-#, fuzzy
msgid ""
"There has been an error while trying to parse the description of this plugin "
"('%1'). Please refer to stdout for details."
msgstr ""
"Une erreur est apparue lors du lancement de ce plugin ('%1'). Référez-vous "
-"au message en sortie pour plus de détails"
+"au message en sortie pour plus de détails."
#: plugin/rkstandardcomponent.cpp:74
msgid "Could not create plugin"
msgstr "Ne peut créer le plugin"
#: plugin/rkstandardcomponentgui.cpp:47
-#, fuzzy
msgid ""
"The R-backend has reported one or more error(s) while processing the plugin "
"'%1'.\n"
@@ -851,23 +833,23 @@
#: plugin/rkpreviewbox.cpp:47
msgid "Preview"
-msgstr ""
+msgstr "Prévisualiser"
#: plugin/rkpreviewbox.cpp:167
msgid "Preview disabled"
-msgstr ""
+msgstr "Prévisualisation désactivée"
#: plugin/rkpreviewbox.cpp:171
msgid "Preview up to date"
-msgstr ""
+msgstr "Prévisualisation à jour"
#: plugin/rkpreviewbox.cpp:173
msgid "Preview updating"
-msgstr ""
+msgstr "Prévisualisation en cours de mise à jour"
#: plugin/rkpreviewbox.cpp:176
msgid "Preview not (yet) possible"
-msgstr ""
+msgstr "Prévisualisation pas encore possible"
#: plugin/rkpluginsaveobject.cpp:41 rkward.cpp:234
msgid "my.data"
@@ -875,7 +857,7 @@
#: plugin/rkpluginsaveobject.cpp:41
msgid "Save to:"
-msgstr ""
+msgstr "Sauver dans :"
#: settings/rksettingsmoduleobjectbrowser.cpp:41
msgid "Which objects should be shown by default?"
@@ -902,9 +884,8 @@
msgstr "Affichage variable"
#: settings/rksettingsmoduleobjectbrowser.cpp:57
-#, fuzzy
msgid "Which columns should be shown by default?"
-msgstr "Quelles colonnes doivent être apparentes ?"
+msgstr "Quelles colonnes doivent être apparentées ?"
#: settings/rksettingsmoduleobjectbrowser.cpp:59
msgid "Label field"
@@ -954,24 +935,24 @@
#: settings/rksettingsmodulegeneral.cpp:65
msgid "Show RKWard Help on Startup"
-msgstr ""
+msgstr "Montrer l'aide de RKWard au démarrage"
#: settings/rksettingsmodulegeneral.cpp:72
msgid ""
"The workplace layout (i.e. which script-, data-, help-windows are open) may "
"be saved (and loaded) per R workspace, or independent of the R workspace. "
"Which do you prefer?"
-msgstr ""
+msgstr "La mise en page de l'espace de travail (c'est à dire quelle fenêtre de script, donnée, aide sont ouvertes) peut être sauvée (et chargée) dans l'espace de travail R, ou indépendamment de l'espace de travail de R. Lequel préférez vous ?"
#: settings/rksettingsmodulegeneral.cpp:81
msgid "Save/restore with R workspace, when saving/loading R workspace"
-msgstr ""
+msgstr "Sauver/Restaurer l'espace de travail de R, lors de la sauvegarde/chargement de l'espace de travail de R"
#: settings/rksettingsmodulegeneral.cpp:82
msgid ""
"Save/restore independent of R workspace (save at end of RKWard session, "
"restore at next start)"
-msgstr ""
+msgstr "Sauver/restaurer indépendamment de l'espace de travail de R (sauver à la fin de la session de RKWard et restaurer au prochain démarrage)"
#: settings/rksettingsmodulegeneral.cpp:83
msgid "Do not save/restore workplace layout"
@@ -1027,7 +1008,7 @@
#: settings/rksettingsmoduleplugins.cpp:124
msgid "Configuration change"
-msgstr ""
+msgstr "La configuration a changée"
#: settings/rksettingsmodulephp.cpp:38
msgid "Changes in this section take effect the next time you start a plugin"
@@ -1052,12 +1033,11 @@
msgstr "Options de la fenêtre de sortie"
#: settings/rksettingsmoduler.cpp:57
-#, fuzzy
msgid ""
"The following settings mostly affect R behavior in the console. It is "
"generally safe to keep these unchanged."
msgstr ""
-"Les paramètres suivant conditionnent les comportement de R en mode terminal. "
+"Les paramètres suivants conditionnent les comportement de R en mode terminal. "
"Il est bon en général de les laisser tels quels."
#: settings/rksettingsmoduler.cpp:65
@@ -1130,7 +1110,7 @@
#: settings/rksettingsmoduler.cpp:133
msgid "Command used to send files to printer"
-msgstr ""
+msgstr "Commande utilisée pour envoyer les fichiers à l'imprimante"
#: settings/rksettingsmoduler.cpp:162
msgid "R-Backend"
@@ -1198,11 +1178,11 @@
#: settings/rksettingsmoduleconsole.cpp:64
msgid "Run commands from script editor through console"
-msgstr ""
+msgstr "Lancer les commandes de l'éditeur de script à travers la console"
#: settings/rksettingsmoduleconsole.cpp:71
msgid "Command history is context sensitive by default"
-msgstr ""
+msgstr "La commande d'historique est sensible à la casse par défaut"
#: settings/rksettingsmoduleconsole.cpp:167
msgid "Console"
@@ -1245,7 +1225,6 @@
msgstr "Commandes de RKWard"
#: settings/rksettingsmodulewatch.cpp:143
-#, fuzzy
msgid "Synchronization commands"
msgstr "Commandes de synchronisation"
@@ -1304,9 +1283,8 @@
msgstr "Configuration des dépôts"
#: dialogs/rkloadlibsdialog.cpp:205
-#, fuzzy
msgid "Please stand by while installing selected packages"
-msgstr "Veuillez patienter pendant l'installation des paquets."
+msgstr "Veuillez patienter pendant l'installation des paquets"
#: dialogs/rkloadlibsdialog.cpp:205
msgid "Installing packages"
@@ -1360,7 +1338,6 @@
"qui suit pour plus de détails."
#: dialogs/rkloadlibsdialog.cpp:396
-#, fuzzy
msgid "Error while handling packages"
msgstr "Erreur lors du traitement des paquets"
@@ -1398,14 +1375,12 @@
msgstr "[Aucune mise à jour disponible]"
#: dialogs/rkloadlibsdialog.cpp:578
-#, fuzzy
msgid ""
"Please stand by while determining, which packages have an update available "
"online."
msgstr "Veuillez patienter pendant le téléchargement de la liste des paquets."
#: dialogs/rkloadlibsdialog.cpp:578 dialogs/rkloadlibsdialog.cpp:707
-#, fuzzy
msgid "Fetching list"
msgstr "Récupérer la liste"
@@ -1431,7 +1406,6 @@
msgstr "[Aucun paquet disponible]"
#: dialogs/rkloadlibsdialog.cpp:707
-#, fuzzy
msgid "Please stand by while downloading the list of available packages."
msgstr "Veuillez patienter pendant le téléchargement de la liste des paquets."
@@ -1484,18 +1458,16 @@
msgstr "Devenir administrateur (root)"
#: dialogs/rkimportdialog.cpp:36
-#, fuzzy
msgid "File format: "
msgstr "Format"
#: dialogs/rkimportdialog.cpp:45
msgid "No plugins defined for context '%1'"
-msgstr ""
+msgstr "Aucun module définie pour le contexte '%1'"
#: dialogs/rkimportdialog.cpp:50
-#, fuzzy
msgid "All Files"
-msgstr "*|Tous les fichiers"
+msgstr "Tous les fichiers"
#: misc/xmlhelper.cpp:61
msgid "Could not open file for reading"
@@ -1524,8 +1496,7 @@
#: misc/xmlhelper.cpp:171
msgid "Illegal attribute value. Allowed values are one of '%1', only."
-msgstr ""
-"Valeur d'attribut interdite. Les valeurs possibles sont seulement parmi '%1'."
+msgstr "Valeur d'attribut interdite. Les valeurs possibles sont seulement parmi '%1'."
#: misc/xmlhelper.cpp:185
msgid "Illegal attribute value. Only integer numbers are allowed."
@@ -1536,20 +1507,16 @@
msgstr "Valeur d'attribut interdite. Seuls les nombres réels sont possibles."
#: misc/xmlhelper.cpp:219
-#, fuzzy
msgid "Illegal attribute value. Allowed values are '%1' or '%2', only."
-msgstr ""
-"Valeur d'attribut interdite. Les valeurs possibles sont seulement parmi '%1'."
+msgstr "Valeur d'attribut interdite. Les valeurs possibles sont seulement parmi '%1'."
#: misc/xmlhelper.cpp:230
msgid "XML-parsing '%1' "
msgstr "Analyse du XML '%1' "
#: misc/rkprogresscontrol.cpp:203
-msgid ""
-"<b>There have been errors and / or warnings! See below for a transcript</b>"
-msgstr ""
-"<b>Il y a eut des erreurs et / ou des avertissements ! Lisez ce qui suit</b>"
+msgid "<b>There have been errors and / or warnings! See below for a transcript</b>"
+msgstr "<b>Il y a eut des erreurs et / ou des avertissements ! Lisez ce qui suit</b>"
#: misc/rkprogresscontrol.cpp:213
msgid "Show Output"
@@ -1560,9 +1527,8 @@
msgstr "Cachez les sorties"
#: misc/rkprogresscontrol.cpp:215
-#, fuzzy
msgid "Output:"
-msgstr "Sorties"
+msgstr "Sorties :"
#: misc/rkprogresscontrol.cpp:217
msgid "Show Errors / Warnings"
@@ -1573,18 +1539,16 @@
msgstr "Cacher les erreurs / avertissements"
#: misc/rkprogresscontrol.cpp:219
-#, fuzzy
msgid "Errors / Warnings:"
-msgstr "Erreur lors du démarrage de R"
+msgstr "Erreur lors du démarrage de R :"
#: misc/rkerrordialog.cpp:117
msgid "Syntax error"
msgstr "Erreur de syntaxe"
#: misc/rkerrordialog.cpp:119
-#, fuzzy
msgid "command incomplete"
-msgstr "Fichier de commandes"
+msgstr "Commande incomplete"
#: misc/multistringselector.cpp:58
msgid "Up"
@@ -1603,7 +1567,6 @@
msgstr "Classe"
#: misc/rkobjectlistview.cpp:61
-#, fuzzy
msgid "Show Objects"
msgstr "Montrer les objets cachés"
@@ -1612,9 +1575,8 @@
msgstr "Montrer les champs"
#: misc/rkobjectlistview.cpp:63
-#, fuzzy
msgid "Configure Defaults"
-msgstr "Configuration de la vue"
+msgstr "Configuration par défaut"
#: misc/rkobjectlistview.cpp:318
msgid "[Objects]"
@@ -1637,22 +1599,20 @@
msgstr "Fonctions"
#: misc/rkobjectlistview.cpp:419
-#, fuzzy
msgid "Hidden Objects"
-msgstr "Montrer les objets cachés"
+msgstr "Objets cachés"
#: misc/rksaveobjectchooser.cpp:39
-#, fuzzy
msgid "Object name to save to"
-msgstr "Nom de l'objet : "
+msgstr "Nom de l'objet à sauver dans "
#: misc/rksaveobjectchooser.cpp:83
msgid "Overwrite? (The given object name already exists)"
-msgstr ""
+msgstr "Écraser ? (le nom de l'objet existe déjà)"
#: misc/rksaveobjectchooser.cpp:87
msgid "Overwrite?"
-msgstr ""
+msgstr "Écraser ?"
#: scriptbackends/phpbackend.cpp:64
msgid ""
@@ -1686,20 +1646,19 @@
#: scriptbackends/phpbackend.cpp:243
msgid "## Prepare\n"
-msgstr ""
+msgstr "## Préparer\n"
#: scriptbackends/phpbackend.cpp:247
msgid "## Compute\n"
-msgstr ""
+msgstr "## Calculer\n"
#: scriptbackends/phpbackend.cpp:251
-#, fuzzy
msgid "## Print result\n"
-msgstr "Imprimer l'aide"
+msgstr "##Imprimer le résultat\n"
#: scriptbackends/phpbackend.cpp:255
msgid "## Clean up\n"
-msgstr ""
+msgstr "## Nettoyer\n"
#: scriptbackends/phpbackend.cpp:283
msgid ""
@@ -1755,7 +1714,6 @@
"Configuration des paramètres -> Journaux) et redémarrez RKWard.\n"
#: rbackend/rinterface.cpp:197
-#, fuzzy
msgid ""
"\t-An unspecified error occurred that is not yet handled by RKWard. Likely "
"RKWard will not function properly. Please check your setup.\n"
@@ -1772,14 +1730,13 @@
msgid ""
"The object '%1', could not be opened for editing. Either it does not exist, "
"or RKWard does not support editing this type of object, yet."
-msgstr ""
+msgstr "L'objet '%1' ne peut pas être ouvert pourédition. Soit il n'existe pas, soit RKWard ne supporte pas encore l'édition de ce type d'objet."
#: rbackend/rinterface.cpp:331
msgid "Cannot edit '%1'"
-msgstr ""
+msgstr "Ne peut éditer '%1'"
#: rbackend/rinterface.cpp:337
-#, fuzzy
msgid ""
"The R-backend has indicated that in order to carry out the current task it "
"needs the package '%1', which is not currently installed. We will open the "
@@ -1787,7 +1744,7 @@
"needed package."
msgstr ""
"Le moteur R a besoin du paquet '%1' pour continuer. Ce paquet n'est pas "
-"installé. L'outils de gestion des paquets va être ouvert, pour que vous "
+"installé. L'outil de gestion des paquets va être ouvert, pour que vous "
"puissiez installer le paquet manquant."
#: rbackend/rinterface.cpp:337
@@ -1871,18 +1828,15 @@
#: main.cpp:76
msgid "Mask for components to debug as a binary number (see debug.h)"
-msgstr ""
-"Masque en tant que nombre binaire (voir debug.h) des composants à tracer"
+msgstr "Masque en tant que nombre binaire (voir debug.h) des composants à tracer"
#: main.cpp:83
-#, fuzzy
msgid "Project leader / main developer"
-msgstr "Chef de projet"
+msgstr "Chef de projet/ Principal développeur"
#: main.cpp:84
-#, fuzzy
msgid "C++ coder since 0.2.9"
-msgstr "Développeur principal depuis la version 0.2.9"
+msgstr "Développeur C++ depuis la version 0.2.9"
#: main.cpp:86
msgid "Several helpful comments and discussions"
@@ -1898,7 +1852,7 @@
#: main.cpp:89
msgid "Several plugins"
-msgstr ""
+msgstr "Plusieurs modules"
#: main.cpp:90
msgid "A cool icon"
@@ -1909,7 +1863,6 @@
msgstr "Logo de RKWard, nombreuses suggestions, aide à la formulation"
#: main.cpp:92
-#, fuzzy
msgid "Many plugins, suggestions, marketing, translations"
msgstr "Des commentaires utiles et des discussions"
@@ -1918,25 +1871,22 @@
msgstr "Des commentaires utiles, des conseils et des correctifs"
#: main.cpp:94
-#, fuzzy
msgid "Translation, Suggestions, plugins"
msgstr "Des commentaires utiles et des discussions"
#: main.cpp:95
msgid "Many comments, useful suggestions, and bug reports"
-msgstr ""
-"De nombreux commentaires, des suggestions utiles, et des rapports de bug"
+msgstr "De nombreux commentaires, des suggestions utiles, et des rapports de bug"
#: main.cpp:96
msgid "Some patches"
-msgstr ""
+msgstr "Quelques patches"
#: main.cpp:97
msgid "Many more people on rkward-devel at lists.sourceforge.net"
msgstr "Bien d'autres personnes sur rkward-devel at lists.sourceforge.net"
#: main.cpp:97
-#, fuzzy
msgid "Sorry, if we forgot to list you. Please contact us to get added"
msgstr "Désolé, vous avez été oublié. Veuillez nous contacter pour être ajouté"
@@ -1992,13 +1942,12 @@
msgstr "Fichier script"
#: rkward.cpp:312
-#, fuzzy
msgid "Open R Script File"
-msgstr "Ouvrir un fichier..."
+msgstr "Ouvrir un fichier de Script R ..."
#: rkward.cpp:314
msgid "Import Data"
-msgstr ""
+msgstr "Importer des données"
#: rkward.cpp:317
msgid "Open Workspace"
@@ -2038,7 +1987,7 @@
#: rkward.cpp:342
msgid "Import data from a variety of file formats"
-msgstr ""
+msgstr "Importer des données de fichiers au format divers"
#: rkward.cpp:343
msgid "Opens an existing document"
@@ -2073,9 +2022,8 @@
msgstr "Recherche dans l'aide de R"
#: rkward.cpp:357
-#, fuzzy
msgid "Help on RKWard"
-msgstr "Aide sur R"
+msgstr "Aide sur RKWard"
#: rkward.cpp:363
msgid "Shows the R help index"
@@ -2086,9 +2034,8 @@
msgstr "Afficher/aggrandir la fenêtre de recherche de l'aide de R"
#: rkward.cpp:365
-#, fuzzy
msgid "Show help on RKWard"
-msgstr "Qu'attendre de RKWard"
+msgstr "Montrer l'aide sur RKWard"
#: rkward.cpp:396
msgid "starting R engine"
@@ -2099,7 +2046,6 @@
msgstr "Fermeture..."
#: rkward.cpp:520
-#, fuzzy
msgid ""
"Quitting RKWard: Do you want to save the workspace?\n"
"RKWard will remain open if you press Cancel"
@@ -2117,6 +2063,9 @@
"group_id=50231&atid=459007 or send email to rkward-devel at lists.sourceforge."
"net"
msgstr ""
+"S'il vous plaît soumettez votre rapport de bug ou de fonctionnalité à http://sourceforge.net/tracker/?"
+"group_id=50231&atid=459007 ou envoyez un mail à rkward-devel at lists.sourceforge."
+"net"
#: rkward.cpp:598
msgid "New dataset"
@@ -2128,8 +2077,7 @@
#: rkward.cpp:602 robjectbrowser.cpp:113 robjectbrowser.cpp:147
msgid "The name you specified was already in use or not valid. Renamed to %1"
-msgstr ""
-"Le nom que vous avez choisi est déjà utilisé ou est incorrect. Renommé en %1"
+msgstr "Le nom que vous avez choisi est déjà utilisé ou est incorrect. Renommé en %1"
#: rkward.cpp:602 robjectbrowser.cpp:113 robjectbrowser.cpp:147
msgid "Invalid Name"
@@ -2176,7 +2124,6 @@
msgstr "Terminal R"
#: rkconsole.cpp:471
-#, fuzzy
msgid "Syntax error\n"
msgstr "Erreur de syntaxe.\n"
@@ -2185,12 +2132,10 @@
msgstr "Interrompre l'exécution de la commande"
#: rkconsole.cpp:690
-#, fuzzy
msgid "Copy selection cleaned"
msgstr "Copier la sélection"
#: rkconsole.cpp:691
-#, fuzzy
msgid "Copy selection literally"
msgstr "Copier la sélection"
@@ -2200,17 +2145,15 @@
"However, the console is currently busy (either a command is running, or you "
"have started to enter text in the console). Do you want to bypass the "
"console this one time, or do you want to try again later?"
-msgstr ""
+msgstr "Vous avez configuré RKWard pour lancer les commandes du script par la console. Cependant, la console est occupée (soit une commande est en cours, ou vous avez commencé à entrer du texte dans la console). Voulez-vous court-circuiter la console pourcette fois ou voulez vous retenter plus tard ?"
#: rkconsole.cpp:712
-#, fuzzy
msgid "Console is busy"
-msgstr "Console"
+msgstr "Console occupée"
#: rkconsole.cpp:712
-#, fuzzy
msgid "Bypass console"
-msgstr "Terminal R"
+msgstr "Court-circuiter la console"
#: robjectviewer.cpp:43
msgid "Object name: "
@@ -2261,7 +2204,6 @@
msgstr " - En attente des résultats du processus R..."
#: robjectviewer.cpp:75
-#, fuzzy
msgid ""
"\n"
"Some errors occurred: "
@@ -2336,7 +2278,6 @@
msgstr "Objets dans l'espace de travail R"
#: robjectbrowser.cpp:60
-#, fuzzy
msgid "Search Help"
msgstr "Aide de R"
@@ -2353,14 +2294,12 @@
msgstr "Copier vers .GlobalEnv"
#: robjectbrowser.cpp:109
-#, fuzzy
msgid "Copy object"
-msgstr "Copier la sélection"
+msgstr "Copier l'objet"
#: robjectbrowser.cpp:109
-#, fuzzy
msgid "Enter the name to copy to"
-msgstr "Entrer un nouveau nom"
+msgstr "Entrer le nom à copier"
#: robjectbrowser.cpp:125
msgid ""
@@ -2391,7 +2330,6 @@
msgstr "Montrez tous les environements"
#: robjectbrowser.cpp:216
-#, fuzzy
msgid "Show Hidden Objects"
msgstr "Montrer les objets cachés"
@@ -2412,7 +2350,7 @@
#: rc.cpp:15
#, no-c-format
msgid "&Import"
-msgstr ""
+msgstr "&Importer"
#. i18n: file rkwardui.rc line 22
#: rc.cpp:18
@@ -2444,10 +2382,3 @@
"Frederic.Lehobey at free.fr\n"
"yjacolin at free.fr"
-#~ msgid "Illegal attribute value. Allowed values are 'true' or 'false', only."
-#~ msgstr ""
-#~ "Valeur d'attribut interdite. Seules les valeurs 'true' ou 'false' sont "
-#~ "possibles."
-
-#~ msgid "&Flush"
-#~ msgstr "&Vider"
Modified: branches/release_branch_0.4.6/rkward/core/rkvariable.cpp
===================================================================
--- branches/release_branch_0.4.6/rkward/core/rkvariable.cpp 2007-02-12 17:16:33 UTC (rev 1385)
+++ branches/release_branch_0.4.6/rkward/core/rkvariable.cpp 2007-02-12 21:53:43 UTC (rev 1386)
@@ -56,28 +56,22 @@
// if the variable is currently opened for editing, all values need to be rechecked / resynced
if (myData ()) {
bool internal_sync = myData ()->immediate_sync;
- setSyncing (false);
// quick and dirty approach! TODO: make more efficient
QStringList list;
for (int i=0; i < getLength (); ++i) {
list.append (getText (i));
}
- setDataType (new_type);
- if (new_type == RObject::DataCharacter) {
- if (myData ()->cell_strings == 0) {
- delete [] (myData ()->cell_doubles);
- myData ()->cell_doubles = 0;
- myData ()->cell_strings = new QString[getLength ()];
- }
- } else {
- if (myData ()->cell_doubles == 0) {
- delete [] (myData ()->cell_strings);
- myData ()->cell_strings = 0;
- myData ()->cell_doubles = new double[getLength ()];
- }
+ if (myData ()->changes) { // all pending changes are moot
+ delete myData ()->changes;
+ myData ()->changes = 0;
}
+ RKEditor *editor = myData ()->editor;
+ discardEditData ();
+ setDataType (new_type);
+ allocateEditData (editor);
+ setSyncing (false);
int i = 0;
for (QStringList::const_iterator it = list.constBegin (); it != list.constEnd (); ++it) {
setText (i, *it);
@@ -194,13 +188,14 @@
}
// virtual
-void RKVariable::allocateEditData () {
+void RKVariable::allocateEditData (RKEditor *editor) {
RK_TRACE (OBJECTS);
// this assert should stay even when more than one editor is allowed per object. After all, the edit-data should only ever be allocated once!
RK_ASSERT (!myData ());
data = new RKVarEditData;
+ myData ()->editor = editor;
myData ()->cell_strings = 0;
myData ()->cell_doubles = 0;
myData ()->cell_states = 0;
@@ -212,6 +207,7 @@
myData ()->previously_valid = true;
myData ()->invalid_fields.setAutoDelete (true);
myData ()->dirty = false;
+ myData ()->pending = false;
extendToLength (getLength ());
Modified: branches/release_branch_0.4.6/rkward/core/rkvariable.h
===================================================================
--- branches/release_branch_0.4.6/rkward/core/rkvariable.h 2007-02-12 17:16:33 UTC (rev 1385)
+++ branches/release_branch_0.4.6/rkward/core/rkvariable.h 2007-02-12 21:53:43 UTC (rev 1386)
@@ -168,7 +168,7 @@
QIntDict<QString> invalid_fields;
};
/** reimplemented from RObject */
- void allocateEditData ();
+ void allocateEditData (RKEditor *editor);
/** reimplemented from RObject */
void initializeEditDataToEmpty ();
/** reimplemented from RObject */
Modified: branches/release_branch_0.4.6/rkward/core/robject.cpp
===================================================================
--- branches/release_branch_0.4.6/rkward/core/robject.cpp 2007-02-12 17:16:33 UTC (rev 1385)
+++ branches/release_branch_0.4.6/rkward/core/robject.cpp 2007-02-12 21:53:43 UTC (rev 1386)
@@ -554,10 +554,9 @@
if (opened) {
if (!data) {
- allocateEditData ();
+ allocateEditData (editor);
updateDataFromR (0);
}
- data->editor = editor;
} else {
discardEditData ();
}
@@ -570,21 +569,21 @@
RK_ASSERT (!data);
if (!data) {
- allocateEditData ();
+ allocateEditData (editor);
initializeEditDataToEmpty ();
}
- data->editor = editor;
data->pending = true;
}
// virtual
-void RObject::allocateEditData () {
+void RObject::allocateEditData (RKEditor *editor) {
RK_TRACE (OBJECTS);
// this assert should stay even when more than one editor is allowed per object. After all, the edit-data should only ever be allocated once!
RK_ASSERT (!data);
data = new EditData;
+ data->editor = editor;
data->dirty = false;
data->pending = false;
}
Modified: branches/release_branch_0.4.6/rkward/core/robject.h
===================================================================
--- branches/release_branch_0.4.6/rkward/core/robject.h 2007-02-12 17:16:33 UTC (rev 1385)
+++ branches/release_branch_0.4.6/rkward/core/robject.h 2007-02-12 21:53:43 UTC (rev 1386)
@@ -240,7 +240,7 @@
/** see EditData. 0 if the object is not being edited. */
EditData *data;
/** see EditData. Allocates the data member. To be reimplemented in classes that need more information in the EditData struct */
- virtual void allocateEditData ();
+ virtual void allocateEditData (RKEditor *editor);
/** companion to allocateEditData (). Initializes the data to empty (NA). Default implementation does nothing. Reimplemented in derived classes. */
virtual void initializeEditDataToEmpty ();
/** see above */
Modified: branches/release_branch_0.4.6/rkward/dialogs/rkimportdialog.cpp
===================================================================
--- branches/release_branch_0.4.6/rkward/dialogs/rkimportdialog.cpp 2007-02-12 17:16:33 UTC (rev 1385)
+++ branches/release_branch_0.4.6/rkward/dialogs/rkimportdialog.cpp 2007-02-12 21:53:43 UTC (rev 1386)
@@ -60,7 +60,12 @@
QString filter = handle->getAttributeValue ("format");
QString label = handle->getAttributeLabel ("format");
- formats.append (filter + '|' + label + " (" + filter + ')');
+
+ QString elabel = label;
+ elabel.replace ('/', "\\/");
+ elabel.replace ('|', "\\|");
+ formats.append (filter + '|' + elabel + " (" + filter + ')');
+
format_labels.append (label);
filters.append (filter);
}
Modified: branches/release_branch_0.4.6/rkward/plugins/00saveload/import/import_csv.php
===================================================================
--- branches/release_branch_0.4.6/rkward/plugins/00saveload/import/import_csv.php 2007-02-12 17:16:33 UTC (rev 1385)
+++ branches/release_branch_0.4.6/rkward/plugins/00saveload/import/import_csv.php 2007-02-12 21:53:43 UTC (rev 1386)
@@ -1,9 +1,21 @@
<?
- function preprocess () {
- }
-
- function calculate () {
-getRK("name"); ?> <- read.table (file="<? getRK("file"); ?>", header=<? getRK("header"); ?>, sep=<? getRK("sep"); ?>, dec=<? getRK("dec") ?>, <? # doing row names (what a pity...)
+// internal helper function
+function quoteString ($string) {
+ return ('"' . strtr ($string, array ('"'=>'\\"')) . '"');
+}
+
+function preprocess () {
+}
+
+function calculate () {
+ $dec = getRK_val ("dec");
+ if ($dec == "other") $dec = quoteString (getRK_val ("custom_dec"));
+ $sep = getRK_val ("sep");
+ if ($sep == "other") $sep = quoteString (getRK_val ("custom_sep"));
+ $quote = getRK_val ("quote");
+ if ($quote == "other") $quote = quoteString (getRK_val ("custom_quote"));
+
+getRK("name"); ?> <- read.table (file="<? getRK("file"); ?>", header=<? getRK("header"); ?>, sep=<? echo ($sep); ?>, quote=<? echo ($quote); ?>, dec=<? echo ($dec); ?>, <? # doing row names (what a pity...)
if (getRK_val("rowname")!="NULL") {
echo( "row.names = ");
if (getRK_val("rowname")=="rowcol") echo (getRK("nomrow") . ",");
@@ -13,15 +25,15 @@
if (getRK_val("colname") == "custoCol") echo ( "col.names = " . getRK_val ("colnames") . ",");
# doing col class (what a pity...)
if (getRK_val("colclass") == "custoClass") echo( "colClasses = " . getRK_val ("custoClasses") . ",");
-#doing what is left?> na.strings = "<? getRK("na") ?>" , nrows = <? getRK("nrows") ; ?> , skip = <? getRK("skip") ; ?> , check.names = <? getRK("checkname") ; ?> , fill = <? getRK("fill") ; ?> , strip.white = <? getRK("stripwhite") ; ?>, blank.lines.skip = <? getRK("blanklinesskip") ; ?> ,comment.char = "<? getRK("commentchar") ; ?>" )
+#doing what is left?> na.strings = "<? getRK("na") ?>", nrows = <? getRK("nrows") ; ?>, skip = <? getRK("skip") ; ?>, check.names = <? getRK("checkname") ; ?>, fill = <? getRK("fill") ; ?>, strip.white = <? getRK("stripwhite") ; ?>, blank.lines.skip = <? getRK("blanklinesskip") ; ?>, comment.char=<? echo (quoteString (getRK_val("commentchar"))); ?><? getRK("allow_escapes"); ?><? getRK("flush"); ?><? getRK("strings_as_factors"); ?>)
<?
- }
-
- function printout () {
- // produce the output
- }
-
- function cleanup () {
- }
+}
+
+function printout () {
+// produce the output
+}
+
+function cleanup () {
+}
?>
Modified: branches/release_branch_0.4.6/rkward/plugins/00saveload/import/import_csv.rkh
===================================================================
--- branches/release_branch_0.4.6/rkward/plugins/00saveload/import/import_csv.rkh 2007-02-12 17:16:33 UTC (rev 1385)
+++ branches/release_branch_0.4.6/rkward/plugins/00saveload/import/import_csv.rkh 2007-02-12 21:53:43 UTC (rev 1386)
@@ -14,24 +14,33 @@
<setting id="name">The name of an R object to store the imported data in. If you chose an existing symbol name, you will be prompted, whether to overwrite this object.</setting>
<setting id="header">Whether the first row of the file contains should be interpreted as column names</setting>
<setting id="dec">Decimal character used in the imported file</setting>
+ <setting id="custom_dec">If you selected "other" above, specify the character, here.</setting>
<setting id="sep">The separator character used in the imported file</setting>
+ <setting id="custom_sep">If you selected "other" above, specify the character, here.</setting>
<caption id="tab_rows"/>
<setting id="rowname">How to determine row names? Either the rows can be numbered 1...n. Or you can specify a single column containing the row names (typically the first). Or you can provide a character vector of names.</setting>
<setting id="nomrow">See above. The column containing the row names, given either as a number, or as a column name (in the latter case, make sure to quote the name)</setting>
- <setting id="rownames">See above. A vector of column names (e.g. c ("row1", "row2", ... "rown"))</setting>
+ <setting id="rownames">See above. A vector of column names (e.g. c ("row1", "row2", ..., "rown"), but you can also specify the name of an R object containing the names to use)</setting>
<caption id="tab_columns"/>
<setting id="colname">Use default column names (possibly read from first row of file), or use specific names?</setting>
- <setting id="colnames">See above. Specify a character vector of column names (e.g. c ("col1", "col2", ... "coln"))</setting>
+ <setting id="colnames">See above. Specify a character vector of column names (e.g. c ("col1", "col2", ..., "coln"), but you can also specify the name of an R object containing the names to use)</setting>
+ <setting id="flush">Should additional columns (not specified above, and not within the first five rows of input) be skipped? See parameter flush in <link href="rkward://rhelp/read.table"/>.</setting>
<setting id="colclass">Should be class of each column be determined automatically, or specified?</setting>
- <setting id="custoClasses">See above. Specify a character vector with the names of the classes to use for each column</setting>
+ <setting id="custoClasses">See above. Specify a character vector with the names of the classes to use for each column.</setting>
+ <caption id="tab_strings"/>
+ <setting id="allow_escapes">Should a backslash ('\') followed by a character be treated as an escaped character? Otherwise the sequence is read literally.</setting>
+ <setting id="strings_as_factors">Should columns containing character data be converted to factors in R, or should they be read as character vectors?</setting>
+ <setting id="quote">String delimiter character(s) used in the file</setting>
+ <setting id="custom_quote">If you selected "other" above, you can specify which quoting character to use, here. Simply enter all character to use (without spaces or comma, e.g. "'@ to use ", ', and @ as string delimiters).</setting>
+
<caption id="tab_further_options"/>
<setting id="skip">This many rows will be skipped at the start of the file. Use, for instance, if the file contains a text header.</setting>
<setting id="nrows">Maximum number of rows to read (-1 to read all lines)</setting>
<setting id="na">How are missing values (NAs) written in the file to be imported?</setting>
- <setting id="commentchar">If you enter a single character, here, everything after that character in a line will be ignored. Leave blank to disable detection of comments</setting>
+ <setting id="commentchar">If you enter a single character, here, everything after that character in a line will be ignored. Leave blank to disable detection of comments.</setting>
<setting id="fill">If checked, and the rows have differing length, they will be padded with empty values in the imported data.</setting>
<setting id="checkname">Should column names be checked for validity?</setting>
<setting id="stripwhite">Should leading and trailing white space be removed from character fields?</setting>
Modified: branches/release_branch_0.4.6/rkward/plugins/00saveload/import/import_csv.xml
===================================================================
--- branches/release_branch_0.4.6/rkward/plugins/00saveload/import/import_csv.xml 2007-02-12 17:16:33 UTC (rev 1385)
+++ branches/release_branch_0.4.6/rkward/plugins/00saveload/import/import_csv.xml 2007-02-12 21:53:43 UTC (rev 1386)
@@ -6,9 +6,20 @@
<external id="filename" />
<connect governor="filename" client="file.selection"/>
-
<connect client="rowname.enabled" governor="isrow.state" />
+ <convert id="customsep" mode="equals" sources="sep.string" standard="other" />
+ <connect client="custom_sep.enabled" governor="customsep" />
+ <connect client="custom_sep.required" governor="custom_sep.enabled" />
+
+ <convert id="customdec" mode="equals" sources="dec.string" standard="other" />
+ <connect client="custom_dec.enabled" governor="customdec" />
+ <connect client="custom_dec.required" governor="custom_dec.enabled" />
+
+ <convert id="customquote" mode="equals" sources="quote.string" standard="other" />
+ <connect client="custom_quote.enabled" governor="customquote" />
+ <connect client="custom_quote.required" governor="custom_quote.enabled" />
+
<convert id="userow" mode="equals" sources="rowname.string" standard="rowcol" />
<convert id="customizerow" mode="equals" sources="rowname.string" standard="custoRow" />
<convert id="customizerow2" mode="and" sources="isrow.state;customizerow" standard="custoRow" />
@@ -24,23 +35,31 @@
<connect client="custoClasses.enabled" governor="customizeclasses" />
<connect client="custoClasses.required" governor="customizeclasses" />
</logic>
- <dialog label="Import CSV data" >
+ <dialog label="Import Text / CSV data" >
<tabbook>
<tab id="tab_general" label="General" >
<browser size="small" id="file" label="File name" />
<saveobject id="name" initial="my.csv.data" label="Object to save to"/>
<checkbox id="header" value="TRUE" value_unchecked="FALSE" checked="true" label="First row contains column names"/>
<row>
- <radio id="dec" label="Decimal point character" >
- <option value="'.'" label="'.'" />
- <option value="','" label="','" />
- </radio>
- <radio id="sep" label="Field separator character" >
- <option value="'\t'" label="Tab" />
- <option value="';'" label="';'" />
- <option value="','" label="','" />
- <option value="' '" label="Space" />
- </radio>
+ <column>
+ <radio id="dec" label="Decimal point character" >
+ <option value="'.'" label="'.'" />
+ <option value="','" label="','" />
+ <option value="other" label="Other (specify below)" />
+ </radio>
+ <input id="custom_dec" label="Specify decimal point character" />
+ </column>
+ <column>
+ <radio id="sep" label="Field separator character" >
+ <option value="'\t'" label="Tab" />
+ <option value="';'" label="';'" />
+ <option value="','" label="','" />
+ <option value="' '" label="Space" />
+ <option value="other" label="Other (specify below)" />
+ </radio>
+ <input id="custom_sep" label="Specify field separator character" />
+ </column>
</row>
</tab>
<tab id="tab_rows" label="Rows" >
@@ -54,16 +73,37 @@
<input id="rownames" label="Vector of row names (quoted)" />
</tab>
<tab id="tab_columns" label="Columns" >
- <radio id="colname" label="Column names" >
- <option value="" label="Default" />
- <option value="custoCol" label="Use a character vector" />
+ <frame label="Column names">
+ <radio id="colname" label="Column names" >
+ <option value="" label="Default" />
+ <option value="custoCol" label="Use a character vector" />
+ </radio>
+ <input id="colnames" label="Vector of column names (quoted)" />
+ </frame>
+ <checkbox id="flush" label="Skip any further fields" value=", flush=TRUE" value_unchecked="" />
+ <frame label="Column classes">
+ <radio id="colclass" label="Classes of columns" >
+ <option value="" label="Default" />
+ <option value="custoClass" label="Use a character vector" />
+ </radio>
+ <input id="custoClasses" label="Vector of column classes (quoted)" />
+ </frame>
+ </tab>
+ <tab id="tab_strings" label="Strings" >
+ <checkbox id="allow_escapes" label="Allow escaped characters" value=", allowEscapes=TRUE" value_unchecked="" />
+ <radio id="strings_as_factors" label="Convert character columns to factors" >
+ <option value=", stringsAsFactors=TRUE" label="Convert to factor" />
+ <option value="" label="Default" checked="true" />
+ <option value=", stringsAsFactors=FALSE" label="Do not convert" />
</radio>
- <input id="colnames" label="Vector of column names (quoted)" />
- <radio id="colclass" label="Classes of columns" >
- <option value="" label="Default" />
- <option value="custoClass" label="Use a character vector" />
+ <radio id="quote" label="String delimiter" >
+ <option value="'"'" label="" only" />
+ <option value="'\''" label="' only" />
+ <option value="'"\''" label="" and '" checked="true"/>
+ <option value="''" label="None / disabled" />
+ <option value="other" label="Other (specify below)" />
</radio>
- <input id="custoClasses" label="Vector of column classes (quoted)" />
+ <input id="custom_quote" label="Specify quoting character(s)" />
</tab>
<tab id="tab_further_options" label="Further Options" >
<row>
Modified: branches/release_branch_0.4.6/rkward/plugins/import_export.pluginmap
===================================================================
--- branches/release_branch_0.4.6/rkward/plugins/import_export.pluginmap 2007-02-12 17:16:33 UTC (rev 1385)
+++ branches/release_branch_0.4.6/rkward/plugins/import_export.pluginmap 2007-02-12 21:53:43 UTC (rev 1386)
@@ -13,8 +13,8 @@
<component type="standard" id="import_spss" file="00saveload/import/import_spss.xml" label="Import SPSS">
<attribute id="format" value="*.sav *.por" label="SPSS data files"/>
</component>
- <component type="standard" id="import_csv" file="00saveload/import/import_csv.xml" label="Import CSV data">
- <attribute id="format" value="*.txt *.csv" label="Comma Separated Values"/>
+ <component type="standard" id="import_csv" file="00saveload/import/import_csv.xml" label="Import Text / CSV data">
+ <attribute id="format" value="*.txt *.csv" label="Text / Comma Separated Values"/>
</component>
</components>
Modified: branches/release_branch_0.4.6/rkward/plugins/x11device/export.php
===================================================================
--- branches/release_branch_0.4.6/rkward/plugins/x11device/export.php 2007-02-12 17:16:33 UTC (rev 1385)
+++ branches/release_branch_0.4.6/rkward/plugins/x11device/export.php 2007-02-12 21:53:43 UTC (rev 1386)
@@ -11,17 +11,17 @@
$options = "";
if (!getRK_val ("autowidth")) $options .= ", width=" . getRK_val ("width");
if (!getRK_val ("autoheight")) $options .= ", height=" . getRK_val ("height");
- $options = ", res=" . getRK_val ("resolution");
- if (!getRK_val ("autopointsize")) $options = ", pointsize=" . getRK_val ("pointsize");
+ $options .= ", res=" . getRK_val ("resolution");
+ if (!getRK_val ("autopointsize")) $options .= ", pointsize=" . getRK_val ("pointsize");
?>
dev.set (<? getRK ("devnum"); ?>)
dev2bitmap ("<? getRK ("file"); ?>", type="<? echo ($type); ?>"<? echo ($options); ?>)
<?
}
-
+
function printout () {
}
-
+
function cleanup () {
?><?
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list