[rkward-cvs] SF.net SVN: rkward: [1178] branches/release_branch_0.4.5/rkward

tfry at users.sourceforge.net tfry at users.sourceforge.net
Sun Jan 21 16:08:30 UTC 2007


Revision: 1178
          http://svn.sourceforge.net/rkward/?rev=1178&view=rev
Author:   tfry
Date:     2007-01-21 08:08:30 -0800 (Sun, 21 Jan 2007)

Log Message:
-----------
Merge 1172, 1176, 1177 from trunk

Modified Paths:
--------------
    branches/release_branch_0.4.5/rkward/ChangeLog
    branches/release_branch_0.4.5/rkward/TODO
    branches/release_branch_0.4.5/rkward/po/ca.po
    branches/release_branch_0.4.5/rkward/rkward/rkward.cpp

Modified: branches/release_branch_0.4.5/rkward/ChangeLog
===================================================================
--- branches/release_branch_0.4.5/rkward/ChangeLog	2007-01-21 16:04:55 UTC (rev 1177)
+++ branches/release_branch_0.4.5/rkward/ChangeLog	2007-01-21 16:08:30 UTC (rev 1178)
@@ -2,6 +2,7 @@
 - TODO: message merge!
 - TODO: test auto-detection of pluginmap path!
 
+- change shortcuts for Open/Save Workspace to Ctrl+Shift+O/S to avoid clash with Open/Save Script File
 - remove "Configure Packages" option from Workspace menu, as it is also in Settings menu
 - fixed: non-local workspaces would not be loaded
 - fixed: specifying a workspace to load on the command line would only work for full urls

Modified: branches/release_branch_0.4.5/rkward/TODO
===================================================================
--- branches/release_branch_0.4.5/rkward/TODO	2007-01-21 16:04:55 UTC (rev 1177)
+++ branches/release_branch_0.4.5/rkward/TODO	2007-01-21 16:08:30 UTC (rev 1178)
@@ -167,6 +167,7 @@
 			- static members should be moved to the respective classes. Much cleaner!
 
 R plugins:
+	- create grid() plugin
 	- create a (simple) color option plugin (~ 30 colors) for embedding
 	- build SPSS import plugin
 	- use SVG device for graphics output

Modified: branches/release_branch_0.4.5/rkward/po/ca.po
===================================================================
--- branches/release_branch_0.4.5/rkward/po/ca.po	2007-01-21 16:04:55 UTC (rev 1177)
+++ branches/release_branch_0.4.5/rkward/po/ca.po	2007-01-21 16:08:30 UTC (rev 1178)
@@ -2,20 +2,21 @@
 # translation of ca_bak3.po to Catalan
 # translation of ca.po to Catalan
 # translation of rkward.po to Catalan
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 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
-# Griera <griera at gmail.com>, 2006.
+# Pep Roca <griera at gmail.com>, 2006.
 # Núria Asensio <nasensio.germanstrias at gencat.net>, 2006.
+# Pep Roca <griera at gmail.com>, 2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-01-08 23:54+0100\n"
-"PO-Revision-Date: 2006-12-13 15:05+0100\n"
-"Last-Translator: Griera <griera at gmail.com>\n"
-"Language-Team: Catalan <ca at li.org>\n"
+"PO-Revision-Date: 2007-01-19 16:10+0100\n"
+"Last-Translator: Pep Roca <griera 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"
 "Content-Transfer-Encoding: 8bit\n"
@@ -180,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ò?"
@@ -320,8 +320,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
@@ -432,14 +431,12 @@
 msgstr "Resultats"
 
 #: windows/rkhtmlwindow.cpp:206
-#, fuzzy
 msgid "&Flush Output"
-msgstr "Netejo els resultats?"
+msgstr "&Neteja els resultats"
 
 #: windows/rkhtmlwindow.cpp:207
-#, fuzzy
 msgid "&Refresh Output"
-msgstr "&Refresca"
+msgstr "&Actualitza els resultats"
 
 #: windows/rkhtmlwindow.cpp:209
 msgid "Print Output"
@@ -450,7 +447,6 @@
 msgstr "Desa els resultats com HTML"
 
 #: windows/rkhtmlwindow.cpp:306
-#, fuzzy
 msgid ""
 "Do you really want to flush the output? It will not be possible to restore "
 "it."
@@ -480,43 +476,39 @@
 
 #: windows/rkhtmlwindow.cpp:376
 msgid "Page does not exist or is broken"
-msgstr ""
+msgstr "La pàgina no existeix o està malament"
 
 #: windows/rkhtmlwindow.cpp:434
-#, fuzzy
 msgid "No Title"
-msgstr "Títol"
+msgstr "No títol"
 
 #: windows/rkhtmlwindow.cpp:460 windows/rkhtmlwindow.cpp:463
 msgid "Summary"
-msgstr ""
+msgstr "Sumari"
 
 #: windows/rkhtmlwindow.cpp:469 windows/rkhtmlwindow.cpp:472
-#, fuzzy
 msgid "Usage"
-msgstr "Ús: "
+msgstr "Ús"
 
 #: windows/rkhtmlwindow.cpp:491 windows/rkhtmlwindow.cpp:515
-#, fuzzy
 msgid "GUI settings"
-msgstr "Arranjaments"
+msgstr "Arranjaments de la IGU"
 
 #: windows/rkhtmlwindow.cpp:499
 msgid "Unnamed GUI element"
 msgstr ""
 
 #: windows/rkhtmlwindow.cpp:523 windows/rkhtmlwindow.cpp:526
-#, fuzzy
 msgid "Related functions and pages"
-msgstr "Endollables i pedaços"
+msgstr "Funcions relacionades i pàgines"
 
 #: windows/rkhtmlwindow.cpp:602
 msgid "R Reference on '%1'"
-msgstr ""
+msgstr "Ajuda del R sobre '%1'"
 
 #: windows/rkhtmlwindow.cpp:617
 msgid "BROKEN REFERENCE"
-msgstr ""
+msgstr "REFERÈNCIA TRENCADA"
 
 #: windows/rcontrolwindow.cpp:41
 msgid "Configure R backend"
@@ -640,7 +632,6 @@
 msgstr "Error de sintaxi.\n"
 
 #: windows/rkcommandlog.cpp:177
-#, fuzzy
 msgid "An unspecified error occurred while running the command.\n"
 msgstr "S'ha produït un error desconegut mentre s'executava l'ordre.\n"
 
@@ -800,15 +791,14 @@
 "There has been an error while trying to parse the description of this plugin "
 "('%1'). Please refer to stdout for details."
 msgstr ""
-"S'ha produït un error a l'analitzar la descripció d'aquest endollable ('%"
-"1'). Per a més detalls, reviseu la sortida estàndard."
+"S'ha produït un error a l'analitzar la descripció d'aquest endollable "
+"('%1'). Per a més detalls, reviseu la sortida estàndard."
 
 #: plugin/rkstandardcomponent.cpp:70
 msgid "Could not create plugin"
 msgstr "No s'ha pogut crear l'endollable"
 
 #: plugin/rkstandardcomponentgui.cpp:47
-#, fuzzy
 msgid ""
 "The R-backend has reported one or more error(s) while processing the plugin "
 "'%1'.\n"
@@ -852,7 +842,7 @@
 "Click 'Submit' to run the command(s)."
 msgstr ""
 "En la part inferior podeu veure les ordres que corresponen a la configuració "
-"que heu fet. Feu clic sobre \"Envia\" per executar-les."
+"que heu fet. Feu clic sobre 'Envia' per executar-les."
 
 #: plugin/rkstandardcomponentgui.cpp:322 plugin/rkstandardcomponentgui.cpp:340
 msgid "Next >"
@@ -930,8 +920,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 (*)"
@@ -961,7 +950,7 @@
 
 #: settings/rksettingsmodulegeneral.cpp:65
 msgid "Show RKWard Help on Startup"
-msgstr ""
+msgstr "Mostra l'ajuda del RKWard al engegar"
 
 # workplace layout "#" R workspace
 #: settings/rksettingsmodulegeneral.cpp:72
@@ -1070,13 +1059,12 @@
 msgstr "Opcions de la finestra de resultats"
 
 #: 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 ""
-"Els aranjaments següents condicionen el comportament del R en mode consola. "
-"En general és adequat no modificar-los."
+"Els aranjaments següents en general afecten el comportament del R en mode "
+"consola. En general és adequat no modificar-los."
 
 #: settings/rksettingsmoduler.cpp:65
 msgid "Display warnings"
@@ -1172,8 +1160,7 @@
 
 #: 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
@@ -1226,7 +1213,7 @@
 
 #: settings/rksettingsmoduleconsole.cpp:63
 msgid "Run commands from script editor through console"
-msgstr ""
+msgstr "Executar les ordres del editor de seqüències a través de la consola"
 
 #: settings/rksettingsmoduleconsole.cpp:148
 msgid "Console"
@@ -1274,7 +1261,6 @@
 msgstr "Ordres de l'aplicació"
 
 #: settings/rksettingsmodulewatch.cpp:143
-#, fuzzy
 msgid "Synchronization commands"
 msgstr "Ordres de sincronització"
 
@@ -1532,7 +1518,7 @@
 
 #: misc/xmlhelper.cpp:98
 msgid "Expected exactly one element '%1' but found %2"
-msgstr "S'esperava exactament un element '%1', però s'ha trobat '%2'"
+msgstr "S'esperava exactament un element '%1', però s'ha trobat %2"
 
 #: misc/xmlhelper.cpp:153
 msgid "'%1'-attribute not given. Assuming '%2'"
@@ -1541,8 +1527,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."
@@ -1554,16 +1539,14 @@
 
 #: misc/xmlhelper.cpp:219
 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'."
+msgstr "El valor de l'atribut està prohibit. Només es permet 'verdader o 'fals'."
 
 #: misc/xmlhelper.cpp:230
 msgid "XML-parsing '%1' "
 msgstr "S'està analitzant el XML '%1' "
 
 #: misc/rkprogresscontrol.cpp:202
-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>"
@@ -1697,20 +1680,19 @@
 
 #: scriptbackends/phpbackend.cpp:243
 msgid "## Prepare\n"
-msgstr ""
+msgstr "## Prepara\n"
 
 #: scriptbackends/phpbackend.cpp:247
 msgid "## Compute\n"
-msgstr ""
+msgstr "## Calcula\n"
 
 #: scriptbackends/phpbackend.cpp:251
-#, fuzzy
 msgid "## Print result\n"
-msgstr "Imprimeix l'ajuda"
+msgstr "## Imprimeix els resultats\n"
 
 #: scriptbackends/phpbackend.cpp:255
 msgid "## Clean up\n"
-msgstr ""
+msgstr "## Neteja\n"
 
 #: scriptbackends/phpbackend.cpp:291
 msgid ""
@@ -1767,14 +1749,13 @@
 # fr.po: \t- Une erreur non spécifiée qui n'est pas encore gérée par RKWard s'est produite. RKWard ne va probablement pas fonctionner correctement. Veuillez vérifier votre installation.\n
 # es.po: "\t- Ha ocurrido un error no especificado que aún no está gestionado por RKWard. Posiblemente RKWard no funcione correctamente. Por favor, compruebe su configuración.\n
 #: rbackend/rinterface.cpp:184
-#, 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"
 msgstr ""
 "\t-S'ha produït un error desconegut que encara no està gestionat per el "
 "RKWard. Segurament el RKWard no funcionarà adequadament. Si us plau, reviseu "
-"la vostra configuració / instal·lació.\n"
+"la vostra configuració.\n"
 
 #: rbackend/rinterface.cpp:186
 msgid "Error starting R"
@@ -1794,7 +1775,6 @@
 
 # fr.po: 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 puissiez installer le paquet manquant.
 #: rbackend/rinterface.cpp:325
-#, 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 "
@@ -1887,8 +1867,7 @@
 # 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
 msgid "Project leader"
@@ -2029,7 +2008,7 @@
 
 #: rkward.cpp:318
 msgid "Show &Output"
-msgstr "Mostra els &resultats"
+msgstr "Mostra els &Resultats"
 
 #: rkward.cpp:319
 msgid "Configure RKWard"
@@ -2073,9 +2052,8 @@
 msgstr "Cerca ajuda del R"
 
 #: rkward.cpp:337
-#, fuzzy
 msgid "Help on RKWard"
-msgstr "Ajuda sobre el R"
+msgstr "Ajuda sobre el RKWard"
 
 #: rkward.cpp:344
 msgid "Shows the R help index"
@@ -2086,9 +2064,8 @@
 msgstr "Mostra / alça la finestra per cercar l'ajuda de R"
 
 #: rkward.cpp:346
-#, fuzzy
 msgid "Show help on RKWard"
-msgstr "Què podeu esperar de RKWard?"
+msgstr "Mostra l'ajuda del RKWard"
 
 #: rkward.cpp:377
 msgid "starting R engine"
@@ -2180,9 +2157,8 @@
 msgstr "Consola R"
 
 #: rkconsole.cpp:425
-#, fuzzy
 msgid "Syntax error\n"
-msgstr "Error de sintaxi.\n"
+msgstr "Error de sintaxi\n"
 
 # fr.po: Interrompre l'exécution de la commande
 #: rkconsole.cpp:637
@@ -2190,14 +2166,12 @@
 msgstr "Interromp l'execució de l'ordre"
 
 #: rkconsole.cpp:643
-#, fuzzy
 msgid "Copy selection cleaned"
-msgstr "Copia la selecció"
+msgstr ""
 
 #: rkconsole.cpp:644
-#, fuzzy
 msgid "Copy selection literally"
-msgstr "Copia la selecció"
+msgstr "Copia la selecció literalment"
 
 #: rkconsole.cpp:665
 msgid ""
@@ -2206,16 +2180,18 @@
 "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 ""
+"Ha configurat executar les seqüències d'ordres a través de la consola. "
+"Tanmateix, la consola ara està ocupada (o s'està executant una ordre o heu "
+"començat a escriure-hi text a la consola). Voleu evitar la consola ara, o ho "
+"voleu intentar de nou més tard?"
 
 #: rkconsole.cpp:665
-#, fuzzy
 msgid "Console is busy"
-msgstr "Consola"
+msgstr "La consola és ocupada"
 
 #: rkconsole.cpp:665
-#, fuzzy
 msgid "Bypass console"
-msgstr "Consola R"
+msgstr "Evita la consola"
 
 #: robjectviewer.cpp:43
 msgid "Object name: "
@@ -2268,7 +2244,6 @@
 msgstr " - S'està a l'espera dels resultats del procés R..."
 
 #: robjectviewer.cpp:75
-#, fuzzy
 msgid ""
 "\n"
 "Some errors occurred: "
@@ -2428,7 +2403,7 @@
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
-msgstr "Griera"
+msgstr "Pep Roca"
 
 #: _translatorinfo.cpp:3
 msgid ""
@@ -2436,5 +2411,3 @@
 "Your emails"
 msgstr "griera at gmail.com"
 
-#~ msgid "&Flush"
-#~ msgstr "&Neteja"

Modified: branches/release_branch_0.4.5/rkward/rkward/rkward.cpp
===================================================================
--- branches/release_branch_0.4.5/rkward/rkward/rkward.cpp	2007-01-21 16:04:55 UTC (rev 1177)
+++ branches/release_branch_0.4.5/rkward/rkward/rkward.cpp	2007-01-21 16:08:30 UTC (rev 1178)
@@ -299,9 +299,11 @@
 	
 	fileOpenWorkspace = KStdAction::open(this, SLOT(slotFileOpenWorkspace()), actionCollection(), "file_openx");
 	fileOpenWorkspace->setText (i18n ("Open Workspace"));
+	fileOpenWorkspace->setShortcut (KShortcut ("Ctrl+Shift+O"));
 	fileOpenRecentWorkspace = KStdAction::openRecent(this, SLOT(slotFileOpenRecentWorkspace(const KURL&)), actionCollection(), "file_open_recentx");
 	fileSaveWorkspace = KStdAction::save(this, SLOT(slotFileSaveWorkspace()), actionCollection(), "file_savex");
 	fileSaveWorkspace->setText (i18n ("Save Workspace"));
+	fileSaveWorkspace->setShortcut (KShortcut ("Ctrl+Shift+S"));
 	fileSaveWorkspaceAs = KStdAction::saveAs(this, SLOT(slotFileSaveWorkspaceAs()), actionCollection(), "file_save_asx");
 	fileSaveWorkspaceAs->setText (i18n ("Save Workspace As"));
 


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