[rkward-cvs] SF.net SVN: rkward: [1390] branches/release_branch_0.4.6

tfry at users.sourceforge.net tfry at users.sourceforge.net
Wed Feb 14 17:22:20 UTC 2007


Revision: 1390
          http://svn.sourceforge.net/rkward/?rev=1390&view=rev
Author:   tfry
Date:     2007-02-14 09:22:19 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
Merge 1387, 1388, 1389 from trunk

Modified Paths:
--------------
    branches/release_branch_0.4.6/ChangeLog
    branches/release_branch_0.4.6/po/ca.po
    branches/release_branch_0.4.6/rkward/plugins/x11device/export.xml
    branches/release_branch_0.4.6/rkward/rkward.sh.template

Modified: branches/release_branch_0.4.6/ChangeLog
===================================================================
--- branches/release_branch_0.4.6/ChangeLog	2007-02-14 17:10:49 UTC (rev 1389)
+++ branches/release_branch_0.4.6/ChangeLog	2007-02-14 17:22:19 UTC (rev 1390)
@@ -1,4 +1,5 @@
 --- Version 0.4.6 - Feb-15-2007
+- make sure any LC_ALL environment setting will not be applied by SCIM plugin (if installed on the system)
 - 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

Modified: branches/release_branch_0.4.6/po/ca.po
===================================================================
--- branches/release_branch_0.4.6/po/ca.po	2007-02-14 17:10:49 UTC (rev 1389)
+++ branches/release_branch_0.4.6/po/ca.po	2007-02-14 17:22:19 UTC (rev 1390)
@@ -5,17 +5,17 @@
 # Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 # This file is put in the public domain.
 # 28-11-2006: v 1.00
-# Pep Roca <griera at gmail.com>, 2006.
+# griera at gmail.com, 2006.
 # Núria Asensio <nasensio.germanstrias at gencat.net>, 2006.
-# Pep Roca <griera at gmail.com>, 2007.
+# Pep Roca <pep.roca at gmail.com>, 2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-02-09 11:51+0100\n"
-"PO-Revision-Date: 2007-01-19 16:10+0100\n"
-"Last-Translator: Pep Roca <griera at gmail.com>\n"
+"PO-Revision-Date: 2007-02-13 22:48+0100\n"
+"Last-Translator: Pep Roca <pep.roca at gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca at kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -181,8 +181,7 @@
 msgstr "Esborra aquesta fila (%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 ""
 "No heu proporcionat cap nom de fitxer. Les dades NO s'han desat. Voleu "
 "continuar malgrat això?"
@@ -299,10 +298,12 @@
 "Waiting for remaining R commands to finish. To quit immediately, press "
 "Cancel (WARNING: This may result in loss of data)"
 msgstr ""
+"S'està esperant que finalitzin les ordres restants. Per sortir immediatament, "
+"prémer Cancel·lar (AVÍS: Això pot provocar pèrdua de dades)"
 
 #: agents/rkquitagent.cpp:41
 msgid "Waiting for R to finish"
-msgstr ""
+msgstr "S'està esperant que R finalitzi"
 
 #: core/rkmodificationtracker.cpp:50
 msgid ""
@@ -331,8 +332,7 @@
 msgstr "Elimino l'objecte?"
 
 #: 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 "Realment voleu eliminar l'objecte '%1'? No podrà recuperar-se mai més."
 
 #: core/robject.cpp:119
@@ -508,7 +508,7 @@
 
 #: windows/rkhtmlwindow.cpp:511
 msgid "Unnamed GUI element"
-msgstr ""
+msgstr "Element de la IGU sense nom"
 
 #: windows/rkhtmlwindow.cpp:531
 msgid "Related functions and pages"
@@ -684,6 +684,7 @@
 
 # ??? Per revisar
 #: windows/rkwindowcatcher.cpp:198
+#, fuzzy
 msgid "Specify fixed size"
 msgstr "Especifiqueu la mida fixa"
 
@@ -705,6 +706,7 @@
 
 # ??? Per revisar
 #: windows/rkwindowcatcher.cpp:245
+#, fuzzy
 msgid "Specify the R object name, you want to save the graph to"
 msgstr "Especifiqueu el nom de l'objecte R on voleu desar el gràfic"
 
@@ -886,23 +888,27 @@
 
 #: plugin/rkpreviewbox.cpp:47
 msgid "Preview"
-msgstr ""
+msgstr "Previsualització"
 
 #: plugin/rkpreviewbox.cpp:167
 msgid "Preview disabled"
-msgstr ""
+msgstr "Previsualització deshabilitat"
 
 #: plugin/rkpreviewbox.cpp:171
+# ??? Per revisar
+#, fuzzy
 msgid "Preview up to date"
-msgstr ""
+msgstr "Previsualitza la darrera versió"
 
 #: plugin/rkpreviewbox.cpp:173
 msgid "Preview updating"
-msgstr ""
+msgstr "S'està actualitzant la previsualització"
 
 #: plugin/rkpreviewbox.cpp:176
+# ??? Per revisar
+#, fuzzy
 msgid "Preview not (yet) possible"
-msgstr ""
+msgstr "Encara no és possible la previsualització"
 
 #: plugin/rkpluginsaveobject.cpp:41 rkward.cpp:234
 msgid "my.data"
@@ -910,7 +916,7 @@
 
 #: plugin/rkpluginsaveobject.cpp:41
 msgid "Save to:"
-msgstr ""
+msgstr "Desar com:"
 
 #: settings/rksettingsmoduleobjectbrowser.cpp:41
 msgid "Which objects should be shown by default?"
@@ -960,8 +966,7 @@
 # Recull de termes de Softcatalà: settings - m pl paràmetres
 #: settings/rksettingsmodulegeneral.cpp:47
 msgid "Settings marked with (*) do not take effect until you restart RKWard"
-msgstr ""
-"Els arranjaments marcats amb un (*) només s'aplicaran si reengegueu RKWard"
+msgstr "Els arranjaments marcats amb un (*) només s'aplicaran si reengegueu RKWard"
 
 #: settings/rksettingsmodulegeneral.cpp:51
 msgid "Directory where the logfiles should be kept (*)"
@@ -1201,11 +1206,11 @@
 
 #: settings/rksettingsmoduler.cpp:283
 msgid "R Library locations  (where libraries get installed to, locally)"
-msgstr ""
-"Ubicació de les biblioteques R (on localment s'instal·len les biblioteques)"
+msgstr "Ubicació de les biblioteques R (on localment s'instal·len les biblioteques)"
 
 # ??? Per revisar
 #: settings/rksettingsmoduler.cpp:288
+#, fuzzy
 msgid ""
 "Note: The startup defaults will always be used in addition to the locations "
 "you specify in this list"
@@ -1258,8 +1263,10 @@
 msgstr "Executar les ordres del editor de seqüències a través de la consola"
 
 #: settings/rksettingsmoduleconsole.cpp:71
+#, fuzzy
+# ??? Per revisar
 msgid "Command history is context sensitive by default"
-msgstr ""
+msgstr "El historial d'ordres és, per omissió, sensible al context"
 
 #: settings/rksettingsmoduleconsole.cpp:167
 msgid "Console"
@@ -1547,18 +1554,16 @@
 msgstr "Convertir-se en root"
 
 #: dialogs/rkimportdialog.cpp:36
-#, fuzzy
 msgid "File format: "
-msgstr "Format"
+msgstr "Format de fitxer:"
 
 #: dialogs/rkimportdialog.cpp:45
 msgid "No plugins defined for context '%1'"
-msgstr ""
+msgstr "No existeixen endollables definits pel context '%1'"
 
 #: dialogs/rkimportdialog.cpp:50
-#, fuzzy
 msgid "All Files"
-msgstr "*|Tots els fitxers"
+msgstr "Tots els fitxers"
 
 #: misc/xmlhelper.cpp:61
 msgid "Could not open file for reading"
@@ -1587,8 +1592,7 @@
 # fr.po: Valeur d'attribut interdite. Les valeurs possibles sont seulement parmi '%1'.
 #: misc/xmlhelper.cpp:171
 msgid "Illegal attribute value. Allowed values are one of '%1', only."
-msgstr ""
-"El valor de l'atribut està prohibit. Només es permet un dels valors de '%1'."
+msgstr "El valor de l'atribut està prohibit. Només es permet un dels valors de '%1'."
 
 #: misc/xmlhelper.cpp:185
 msgid "Illegal attribute value. Only integer numbers are allowed."
@@ -1600,18 +1604,15 @@
 
 # fr.po: Valeur d'attribut interdite. Les valeurs possibles sont seulement parmi '%1'.
 #: misc/xmlhelper.cpp:219
-#, fuzzy
 msgid "Illegal attribute value. Allowed values are '%1' or '%2', only."
-msgstr ""
-"El valor de l'atribut està prohibit. Només es permet un dels valors de '%1'."
+msgstr "El valor de l'atribut està prohibit. Només es permeten els valors '%1' o '%2'."
 
 #: misc/xmlhelper.cpp:230
 msgid "XML-parsing '%1' "
 msgstr "S'està analitzant el 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>S'han produït errors i / o avisos! Una transcripció dels missatges es "
 "mostra aquí sota</b>"
@@ -1706,9 +1707,8 @@
 msgstr "Introduïu el nom de l'objecte"
 
 #: misc/rksaveobjectchooser.cpp:83
-#, fuzzy
 msgid "Overwrite? (The given object name already exists)"
-msgstr "El símbol proporcionat ja existeix"
+msgstr "Sobreescric? (El nom del objecte ja existeix)"
 
 #: misc/rksaveobjectchooser.cpp:87
 msgid "Overwrite?"
@@ -1933,18 +1933,16 @@
 # es.po: Máscara para los componentes a depurar como números binarios (mirar en debug. "h)"
 #: main.cpp:76
 msgid "Mask for components to debug as a binary number (see debug.h)"
-msgstr ""
-"Màscara per als components a depurar com a nombre binaris (mireu en depura.h)"
+msgstr "Màscara per als components a depurar com a nombre binaris (mireu en depura.h)"
 
 #: main.cpp:83
-#, fuzzy
 msgid "Project leader / main developer"
-msgstr "Líder del projecte"
+msgstr "Líder del projecte / desenvolupador principal"
 
 #: main.cpp:84
-#, fuzzy
+# Softcatalà: coder: codificador
 msgid "C++ coder since 0.2.9"
-msgstr "Programador del nucli des de 0.2.9"
+msgstr "Codificador C++ des de 0.2.9"
 
 #: main.cpp:86
 msgid "Several helpful comments and discussions"
@@ -1960,7 +1958,7 @@
 
 #: main.cpp:89
 msgid "Several plugins"
-msgstr ""
+msgstr "Alguns endollables"
 
 #: main.cpp:90
 msgid "A cool icon"
@@ -1971,18 +1969,16 @@
 msgstr "El logotip de RKWard, molts suggeriments, ajudes en la redacció"
 
 #: main.cpp:92
-#, fuzzy
 msgid "Many plugins, suggestions, marketing, translations"
-msgstr "Alguns endollables, suggeriments i màrqueting"
+msgstr "Molts endollables, suggeriments, màrqueting, traduccions"
 
 #: main.cpp:93
 msgid "Several valuable comments, hints and patches"
 msgstr "Alguns valuosos commentaris, consells i pedaços"
 
 #: main.cpp:94
-#, fuzzy
 msgid "Translation, Suggestions, plugins"
-msgstr "Alguns endollables, suggeriments i màrqueting"
+msgstr "Traduccions, suggeriments, endollables"
 
 #: main.cpp:95
 msgid "Many comments, useful suggestions, and bug reports"
@@ -1990,7 +1986,7 @@
 
 #: main.cpp:96
 msgid "Some patches"
-msgstr ""
+msgstr "Alguns pedaços"
 
 #: main.cpp:97
 msgid "Many more people on rkward-devel at lists.sourceforge.net"
@@ -2021,10 +2017,9 @@
 msgid "What to expect of RKWard"
 msgstr "Què podeu esperar de RKWard?"
 
-# ??? Per revisar
 #: rkward.cpp:196
 msgid "Existing objects in your workspace."
-msgstr "Objectes en el seu espai de treball."
+msgstr "Hi han objectes en l'espai de treball."
 
 #: rkward.cpp:204
 msgid "Pending Jobs"
@@ -2063,7 +2058,7 @@
 
 #: rkward.cpp:314
 msgid "Import Data"
-msgstr ""
+msgstr "Importar dades"
 
 #: rkward.cpp:317
 msgid "Open Workspace"
@@ -2103,7 +2098,7 @@
 
 #: rkward.cpp:342
 msgid "Import data from a variety of file formats"
-msgstr ""
+msgstr "Importar dades des d'una varietat de formats"
 
 #: rkward.cpp:343
 msgid "Opens an existing document"
@@ -2253,8 +2248,10 @@
 msgstr "Interromp l'execució de l'ordre"
 
 #: rkconsole.cpp:690
+# Thomas Friedrichsmeier:
+# Console action: Copy the selection, but remove any leading "> " or "+ " on the copied lines, so it is easier to re-use commands from the console.
 msgid "Copy selection cleaned"
-msgstr ""
+msgstr "Còpia la selecció de forma neta"
 
 #: rkconsole.cpp:691
 msgid "Copy selection literally"
@@ -2450,8 +2447,9 @@
 msgstr "Entreu el nou nom"
 
 #: robjectbrowser.cpp:204
+# Thomas Friedrichsmeier: While "Non-Functions" really is the most precise description, "Data" would probably be close enough. Another option might be to translate as "Other", since "Functions" and "Non-Functions" are shown side-by-side in the Workspace browser.
 msgid "Non-Functions"
-msgstr ""
+msgstr "Dades i altres"
 
 #: robjectbrowser.cpp:212
 msgid "Show All Environments"
@@ -2478,7 +2476,7 @@
 #: rc.cpp:15
 #, no-c-format
 msgid "&Import"
-msgstr ""
+msgstr "&Importar"
 
 #. i18n: file rkwardui.rc line 22
 #: rc.cpp:18
@@ -2502,8 +2500,5 @@
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
-msgstr "griera at gmail.com"
+msgstr "pep.roca at gmail.com"
 
-#~ msgid "Illegal attribute value. Allowed values are 'true' or 'false', only."
-#~ msgstr ""
-#~ "El valor de l'atribut està prohibit. Només es permet 'verdader o 'fals'."

Modified: branches/release_branch_0.4.6/rkward/plugins/x11device/export.xml
===================================================================
--- branches/release_branch_0.4.6/rkward/plugins/x11device/export.xml	2007-02-14 17:10:49 UTC (rev 1389)
+++ branches/release_branch_0.4.6/rkward/plugins/x11device/export.xml	2007-02-14 17:22:19 UTC (rev 1390)
@@ -39,21 +39,21 @@
 					<row>
 						<column>
 							<checkbox id="autowidth" value="1" value_unchecked="0" checked="true" label="Automatic Width"/>
-							<spinbox id="width" label="Width in inches" min="0" initial="6"  default_precision="0"/>
+							<spinbox id="width" label="Width in inches" min="0" initial="6" default_precision="1"/>
 						</column>
 						<column>
 							<checkbox id="autoheight" value="1" value_unchecked="0" checked="true" label="Automatic Height"/>
-							<spinbox id="height" label="Height in inches" min="0" initial="6"  default_precision="0"/>
+							<spinbox id="height" label="Height in inches" min="0" initial="6" default_precision="1" />
 						</column>
 					</row>
 				</frame>
 				<frame>
 					<checkbox id="autopointsize" value="1" value_unchecked="0" checked="true" label="Automatic Font size"/>
-					<spinbox id="pointsize" label="Point size" min="0" initial="12" default_precision="0"/>
+					<spinbox id="pointsize" label="Point size" min="0" initial="12"  default_precision="1"/>
 				</frame>
 				<frame>
 					<text>Resolution is only meaningful for bitmap formats</text>
-					<spinbox id="resolution" label="Resolution (dpi)" min="0" initial="72" default_precision="0"/>
+					<spinbox id="resolution" label="Resolution (dpi)" min="0" initial="72" default_precision="1"/>
 				</frame>
 			</tab>
 		</tabbook>

Modified: branches/release_branch_0.4.6/rkward/rkward.sh.template
===================================================================
--- branches/release_branch_0.4.6/rkward/rkward.sh.template	2007-02-14 17:10:49 UTC (rev 1389)
+++ branches/release_branch_0.4.6/rkward/rkward.sh.template	2007-02-14 17:22:19 UTC (rev 1390)
@@ -19,8 +19,19 @@
   error "R binary ('${R_binary}') not found. Most likely your installation of R has moved to a new location. Please rebuild rkward."
 fi
 
-## Apparently on some systems an embedded R gets outsmarted somehow, and LC_NUMERIC is set to some dangerous value for the whole app (likely via some Qt stuff)
+## Apparently on some systems an embedded R gets outsmarted somehow, and LC_NUMERIC is set to some dangerous value for the whole app (via SCIM)
 ## To prevent this, set it here, explicitely. R does not work with wrong settings of LC_NUMERIC.
+
+## First, however, need to unset LC_ALL, if set. Instead we set LANG, so the default will be the same, where not overridden
+if [ -z "$LC_ALL" ]; then
+  :
+else
+  export LANG="$LC_ALL"
+  unset LC_ALL
+  echo "Warning: unsetting LC_ALL"
+fi
+
+## set LC_NUMERIC to "C"
 export LC_NUMERIC="C"
 
 ## Start rkward. Running through R CMD to set all the relevant R enviroment variables


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