rkward-cvs

[Thomas F. <tho...@ru...>]

Git commit 67cbb201be9a6bcee825ffd797aa133e2db16742 by Thomas Friedrichsmeier.
Committed on 06/01/2015 at 20:25.
Pushed by tfry into branch 'master'.

Add i18n to import_export plugins (.js files; messages not yet extracted), and adjust tests.

M  +3    -3    rkward/plugins/00saveload/import/convert_encoding.js
M  +2    -2    rkward/plugins/00saveload/import/import_csv.js
M  +3    -3    rkward/plugins/00saveload/import/import_spss.js
M  +3    -3    rkward/plugins/00saveload/import/import_stata.js
M  +9    -6    rkward/plugins/00saveload/import/import_xls.js
M  +1    -1    rkward/plugins/00saveload/import/load_data.js
M  +1    -1    rkward/plugins/00saveload/import/source.js
M  +3    -8    rkward/plugins/00saveload/save/save.js
M  +1    -1    rkward/plugins/00saveload/save/skeleton/code.js
M  +1    -1    rkward/plugins/00saveload/save/write.js
M  +1    -1    rkward/plugins/00saveload/save/write_table.js
M  +2    -2    tests/import_export_plugins/import_csv.rkcommands.R
M  +2    -2    tests/import_export_plugins/import_csv.rkout
M  +1    -2    tests/import_export_plugins/import_spss.messages.txt
M  +2    -2    tests/import_export_plugins/import_spss.rkcommands.R
M  +2    -2    tests/import_export_plugins/import_spss.rkout
M  +2    -2    tests/import_export_plugins/import_stata.rkcommands.R
M  +2    -2    tests/import_export_plugins/import_stata.rkout
M  +2    -2    tests/import_export_plugins/load_r_object.rkcommands.R
M  +1    -1    tests/import_export_plugins/load_r_object.rkout
M  +2    -2    tests/import_export_plugins/load_source.rkcommands.R
M  +2    -2    tests/import_export_plugins/load_source.rkout
M  +2    -2    tests/import_export_plugins/package_skeleton.rkcommands.R
M  +1    -1    tests/import_export_plugins/package_skeleton.rkout
M  +4    -4    tests/import_export_plugins/save_r_object.rkcommands.R
M  +4    -4    tests/import_export_plugins/save_r_object.rkout
M  +2    -2    tests/import_export_plugins/write_csv.rkcommands.R
M  +2    -2    tests/import_export_plugins/write_table.rkcommands.R
M  +1    -1    tests/import_export_plugins/write_table.rkout
M  +2    -2    tests/import_export_plugins/write_vector_matrix.rkcommands.R
M  +1    -1    tests/import_export_plugins/write_vector_matrix.rkout

http://commits.kde.org/rkward/67cbb201be9a6bcee825ffd797aa133e2db16742

diff --git a/rkward/plugins/00saveload/import/convert_encoding.js b/rkward/plugins/00saveload/import/convert_encoding.js
index 09376ee..20fdc0a 100644
--- a/rkward/plugins/00saveload/import/convert_encoding.js
+++ b/rkward/plugins/00saveload/import/convert_encoding.js
@@ -1,7 +1,7 @@
 function makeEncodingPreprocessCode () {
 	if (!getValue ("do_locale_conversion")) return;
 	echo ('\n');
-	echo ('# helper function to convert all strings to the current encoding\n');
+	comment ('helper function to convert all strings to the current encoding');
 	echo ('iconv.recursive <- function (x, from) {\n');
 	echo ('	attribs <- attributes (x);\n');
 	echo ('	if (is.character (x)) {\n');
@@ -9,7 +9,7 @@ function makeEncodingPreprocessCode () {
 	echo ('	} else if (is.list (x)) {\n');
 	echo ('		x <- lapply (x, function (sub) iconv.recursive (sub, from))\n');
 	echo ('	}\n');
-	echo ('	# convert factor levels and all other attributes\n');
+	comment ('convert factor levels and all other attributes', '\t');
 	echo ('	attributes (x) <- lapply (attribs, function (sub) iconv.recursive (sub, from))\n');
 	echo ('	x\n');
 	echo ('}\n');
@@ -23,6 +23,6 @@ function makeEncodingCall (varname) {
 		from_locale = getValue ("user_encoding");
 	}
 	echo ('\n');
-	echo ('# convert all strings to the current encoding\n');
+	comment ('convert all strings to the current encoding');
 	echo (varname + ' <- iconv.recursive (' + varname + ', from="' + from_locale + '")\n');
 }
\ No newline at end of file
diff --git a/rkward/plugins/00saveload/import/import_csv.js b/rkward/plugins/00saveload/import/import_csv.js
index 160af54..3b1a3b3 100644
--- a/rkward/plugins/00saveload/import/import_csv.js
+++ b/rkward/plugins/00saveload/import/import_csv.js
@@ -29,7 +29,7 @@ function calculate () {
 	//doing what is left
 	echo (' na.strings = "' + getValue("na") + '", nrows = ' + getValue("nrows") + ', skip = ' + getValue("skip") + ', check.names = ' + getValue("checkname") + ', strip.white = ' + getValue("stripwhite") + ', blank.lines.skip = ' + getValue("blanklinesskip") + getValue("allow_escapes") + getValue("flush") + getValue("strings_as_factors") + ')\n');
 	echo ('\n');
-	echo ('# copy from the local environment to globalenv()\n');
+	comment ('copy from the local environment to globalenv()');
 	echo ('.GlobalEnv$' + getValue("name") + ' <- imported\n');
 	if (getValue ("doedit")) {
 		echo ('\n');
@@ -38,6 +38,6 @@ function calculate () {
 }
 
 function printout () {
-	makeHeaderCode ("Import text / csv data", new Array("File" ,  getValue ("file"), "Import as", getValue ("name")));
+	new Header (i18n ("Import text / csv data")).addFromUI ("file").addFromUI ("name").print ();
 }
 
diff --git a/rkward/plugins/00saveload/import/import_spss.js b/rkward/plugins/00saveload/import/import_spss.js
index 5dba0aa..2c5b8ae 100644
--- a/rkward/plugins/00saveload/import/import_spss.js
+++ b/rkward/plugins/00saveload/import/import_spss.js
@@ -27,7 +27,7 @@ function calculate () {
 	makeEncodingCall ('data');
 	if (getValue ("convert_var_labels")) {
 		echo ('\n');
-		echo ('# set variable labels for use in RKWard\n');
+		comment ('set variable labels for use in RKWard');
 		echo ('labels <- attr (data, "variable.labels");\n');
 		echo ('if (!is.null (labels)) {\n');
 		echo ('	for (i in 1:length (labels)) {\n');
@@ -39,13 +39,13 @@ function calculate () {
 		echo ('}\n');
 	}
 	echo ('\n');
-	echo ('.GlobalEnv$' + object + ' <- data		# assign to globalenv()\n');
+	echo ('.GlobalEnv$' + object + ' <- data		'); comment ('assign to globalenv()');
 	if (getValue ("doedit") && data_frame) {
 		echo ('rk.edit (.GlobalEnv$' + object + ')\n');
 	}
 }
 
 function printout () {
-	makeHeaderCode ("Import SPSS data", new Array("File",  getValue ("file"), "Import as", getValue ("saveto")));
+	new Header (i18n ("Import SPSS data")).addFromUI ("file").addFromUI ("saveto").print ();
 }
 
diff --git a/rkward/plugins/00saveload/import/import_stata.js b/rkward/plugins/00saveload/import/import_stata.js
index 5bdb3a5..ae85ffe 100644
--- a/rkward/plugins/00saveload/import/import_stata.js
+++ b/rkward/plugins/00saveload/import/import_stata.js
@@ -37,7 +37,7 @@ function calculate () {
 	echo ('data <- read.dta ("' + getValue ("file") + '"' + options + ')\n');
 	makeEncodingCall ('data');
 	echo ('\n');
-	echo ('# set variable labels for use in RKWard\n');
+	comment ('set variable labels for use in RKWard');
 	echo ('labels <- attr (data, "var.labels")\n');
 	echo ('if (!is.null (labels)) {\n');
 	echo ('        for (i in 1:length (labels)) {\n');
@@ -48,13 +48,13 @@ function calculate () {
 	echo ('        }\n');
 	echo ('}\n');
 	echo ('\n');
-	echo ('.GlobalEnv$' + object + ' <- data		# assign to globalenv()\n');
+	echo ('.GlobalEnv$' + object + ' <- data		'); comment ('assign to globalenv()');
 	if (getValue ("doedit") ) {
 		echo ('rk.edit (.GlobalEnv$' + object + ')\n');
 	}
 }
 
 function printout () {
-	makeHeaderCode ("Import Stata File", new Array("File", getValue ("file"), "Imported to", getValue ("saveto")));
+	new Header (i18n ("Import Stata File")).addFromUI ("file").addFromUI ("saveto").print ();
 }
 
diff --git a/rkward/plugins/00saveload/import/import_xls.js b/rkward/plugins/00saveload/import/import_xls.js
index ffcfa11..a44ebbe 100644
--- a/rkward/plugins/00saveload/import/import_xls.js
+++ b/rkward/plugins/00saveload/import/import_xls.js
@@ -20,17 +20,20 @@ function calculate () {
 	echo ('data <- read.xls ("' + getValue ("file") + '", sheet="' + sheet + '"' + options + ', ');
 	echo (' nrows=' + getValue ("nrows") + ', skip=' + getValue ("skip") + ', na.string="'+ getValue ("na") +'"' + getValue("strings_as_factors") + 
 	      ', check.names = ' + getValue("checkname") + ', strip.white = ' + getValue("stripwhite") + ')\n');
-	echo ('.GlobalEnv$' + object + ' <- data		# assign to globalenv()\n');
+	echo ('.GlobalEnv$' + object + ' <- data		'); comment ('assign to globalenv()');
 	if (getValue ("doedit") ) {
 		echo ('rk.edit (.GlobalEnv$' + object + ')\n');
 	}
 }
 
 function printout () {
-	makeHeaderCode ("Import Microsoft EXCEL sheet", new Array("File", getValue ("file"), "Imported to", getValue ("saveto"), 
-								  "Imported Sheet", getValue ("sheetname"), "First row as header", getValue ("header"), 
-								  "Max number of rows to skip (-1 for no limit)", getValue ("skip"),
-								  "Number of lines to read (-1 for no limit)", getValue ("nrows"),
-								  "Character for missing values", getValue ("na")));
+	new Header (i18n ("Import Microsoft EXCEL sheet"))
+		.addFromUI ("file")
+		.addFromUI ("saveto")
+		.addFromUI ("sheetname")
+		.addFromUI ("header")
+		.addFromUI ("skip")
+		.addFromUI ("nrows")
+		.addFromUI ("na").print ();
 }
 
diff --git a/rkward/plugins/00saveload/import/load_data.js b/rkward/plugins/00saveload/import/load_data.js
index 3b40678..a3c9477 100644
--- a/rkward/plugins/00saveload/import/load_data.js
+++ b/rkward/plugins/00saveload/import/load_data.js
@@ -17,7 +17,7 @@ function calculate () {
 }
 
 function printout () {
-	makeHeaderCode ("Load data", new Array("File",  getValue ("file"), "Import to environment",  envir));
+	new Header (i18n ("Load data")).addFromUI ("file").add (i18n ("Import to environment"), envir).print ();
 }
 
 
diff --git a/rkward/plugins/00saveload/import/source.js b/rkward/plugins/00saveload/import/source.js
index 4a642a2..092f8af 100644
--- a/rkward/plugins/00saveload/import/source.js
+++ b/rkward/plugins/00saveload/import/source.js
@@ -19,7 +19,7 @@ function calculate () {
 }
 
 function printout () {
-	makeHeaderCode ("Source R file", new Array("File", getValue ("file")));
+	new Header (i18n ("Source R file")).addFromUI ("file").print ();
 }
 
 
diff --git a/rkward/plugins/00saveload/save/save.js b/rkward/plugins/00saveload/save/save.js
index 56d4790..64d60f3 100644
--- a/rkward/plugins/00saveload/save/save.js
+++ b/rkward/plugins/00saveload/save/save.js
@@ -1,9 +1,5 @@
-// globals
-var data;
-var file;
-
 function calculate(){
-	file = getValue("file");
+	var file = getValue("file");
 	// read in variables from dialog
 	var ascii = getValue("ascii");
 	var compress = getValue("compress");
@@ -11,7 +7,7 @@ function calculate(){
 	var xzextreme = getValue("xzextreme");
 
 	// the R code to be evaluated
-	data = getValue("data").split("\n").join(", ");
+	var data = getValue("data").split("\n").join(", ");
 	echo("save(" + data);
 	if(file) {
 		echo(",\n\tfile=\"" + file + "\"");
@@ -30,7 +26,6 @@ function calculate(){
 }
 
 function printout(){
-	// printout the results
-	makeHeaderCode ("Save R objects", new Array("File", file, "Variables", data));
+	new Header (i18n ("Save R objects")).addFromUI ("file").addFromUI ("data").print ();
 }
 
diff --git a/rkward/plugins/00saveload/save/skeleton/code.js b/rkward/plugins/00saveload/save/skeleton/code.js
index 208edd8..5b048a5 100644
--- a/rkward/plugins/00saveload/save/skeleton/code.js
+++ b/rkward/plugins/00saveload/save/skeleton/code.js
@@ -5,6 +5,6 @@ function calculate () {
 }
 
 function printout () {
-	makeHeaderCode ("Create package skeleton", new Array("Name", getValue ("name"), "Directory", getValue ("path")));
+	new Header (i18n ("Create package skeleton")).addFromUI ("name").addFromUI ("path").print ();
 }
 
diff --git a/rkward/plugins/00saveload/save/write.js b/rkward/plugins/00saveload/save/write.js
index 60db98f..10847c1 100644
--- a/rkward/plugins/00saveload/save/write.js
+++ b/rkward/plugins/00saveload/save/write.js
@@ -8,6 +8,6 @@ function calculate () {
 }
 
 function printout () {
-	makeHeaderCode ("Write Variables", new Array("File", getValue ("file"), "Data",  getValue ("data")));
+	new Header (i18n ("Write Variables")).addFromUI ("file").addFromUI ("data").print ();
 }
 
diff --git a/rkward/plugins/00saveload/save/write_table.js b/rkward/plugins/00saveload/save/write_table.js
index 5c7dda4..e109973 100644
--- a/rkward/plugins/00saveload/save/write_table.js
+++ b/rkward/plugins/00saveload/save/write_table.js
@@ -7,6 +7,6 @@ function calculate () {
 }
 
 function printout () {
-	makeHeaderCode ("Write as table", new Array("File", getValue ("file"), "Data",  getValue ("data")));
+	new Header (i18n ("Write as table")).addFromUI ("file").addFromUI ("data").print ();
 }
 
diff --git a/tests/import_export_plugins/import_csv.rkcommands.R b/tests/import_export_plugins/import_csv.rkcommands.R
index 5f644dc..f0e42cb 100644
--- a/tests/import_export_plugins/import_csv.rkcommands.R
+++ b/tests/import_export_plugins/import_csv.rkcommands.R
@@ -5,6 +5,6 @@ imported <- read.csv (file="women.csv", row.names=1,  na.strings = "NA", nrows =
 # copy from the local environment to globalenv()
 .GlobalEnv$women <- imported
 ## Print result
-rk.header("Import text / csv data", parameters=list("File", "women.csv",
-	"Import as", "women"))
+rk.header ("Import text / csv data", parameters=list("File name"="women.csv",
+	"Object to save to"="women"))
 })
diff --git a/tests/import_export_plugins/import_csv.rkout b/tests/import_export_plugins/import_csv.rkout
index e475a62..fbefe8d 100644
--- a/tests/import_export_plugins/import_csv.rkout
+++ b/tests/import_export_plugins/import_csv.rkout
@@ -1,6 +1,6 @@
 <h1>Import text / csv data</h1>
 <h2>Parameters</h2>
-<ul><li>File: women.csv</li>
-<li>Import as: women</li>
+<ul><li>File name: women.csv</li>
+<li>Object to save to: women</li>
 </ul>
 DATE<br />
diff --git a/tests/import_export_plugins/import_spss.messages.txt b/tests/import_export_plugins/import_spss.messages.txt
index a590d52..c0a0975 100644
--- a/tests/import_export_plugins/import_spss.messages.txt
+++ b/tests/import_export_plugins/import_spss.messages.txt
@@ -1,3 +1,2 @@
-Warning message:
-In read.spss("import_export_plugins_testfile.sav", to.data.frame = TRUE,  :
+Warning in read.spss("import_export_plugins_testfile.sav", to.data.frame = TRUE,  :
   import_export_plugins_testfile.sav: position 1: Variable name character 4 is lowercase letter �
diff --git a/tests/import_export_plugins/import_spss.rkcommands.R b/tests/import_export_plugins/import_spss.rkcommands.R
index dffa75d..520d57f 100644
--- a/tests/import_export_plugins/import_spss.rkcommands.R
+++ b/tests/import_export_plugins/import_spss.rkcommands.R
@@ -17,6 +17,6 @@ if (!is.null (labels)) {
 
 .GlobalEnv$my.spss.data <- data		# assign to globalenv()
 ## Print result
-rk.header("Import SPSS data", parameters=list("File", "import_export_plugins_testfile.sav",
-	"Import as", "my.spss.data"))
+rk.header ("Import SPSS data", parameters=list("File name"="import_export_plugins_testfile.sav",
+	"Object to save to"="my.spss.data"))
 })
diff --git a/tests/import_export_plugins/import_spss.rkout b/tests/import_export_plugins/import_spss.rkout
index 2724a7b..8d42faf 100644
--- a/tests/import_export_plugins/import_spss.rkout
+++ b/tests/import_export_plugins/import_spss.rkout
@@ -1,7 +1,7 @@
 <h1>Import SPSS data</h1>
 <h2>Parameters</h2>
-<ul><li>File: import_export_plugins_testfile.sav</li>
-<li>Import as: my.spss.data</li>
+<ul><li>File name: import_export_plugins_testfile.sav</li>
+<li>Object to save to: my.spss.data</li>
 </ul>
 DATE<br />
 
diff --git a/tests/import_export_plugins/import_stata.rkcommands.R b/tests/import_export_plugins/import_stata.rkcommands.R
index 1b0b680..d122765 100644
--- a/tests/import_export_plugins/import_stata.rkcommands.R
+++ b/tests/import_export_plugins/import_stata.rkcommands.R
@@ -33,6 +33,6 @@ if (!is.null (labels)) {
 
 .GlobalEnv$my.stata.data <- data		# assign to globalenv()
 ## Print result
-rk.header("Import Stata File", parameters=list("File", "import_export_plugins_testfile.dta",
-	"Imported to", "my.stata.data"))
+rk.header ("Import Stata File", parameters=list("File name"="import_export_plugins_testfile.dta",
+	"Object to save to"="my.stata.data"))
 })
diff --git a/tests/import_export_plugins/import_stata.rkout b/tests/import_export_plugins/import_stata.rkout
index 1aa2c3a..814ce12 100644
--- a/tests/import_export_plugins/import_stata.rkout
+++ b/tests/import_export_plugins/import_stata.rkout
@@ -1,7 +1,7 @@
 <h1>Import Stata File</h1>
 <h2>Parameters</h2>
-<ul><li>File: import_export_plugins_testfile.dta</li>
-<li>Imported to: my.stata.data</li>
+<ul><li>File name: import_export_plugins_testfile.dta</li>
+<li>Object to save to: my.stata.data</li>
 </ul>
 DATE<br />
 
diff --git a/tests/import_export_plugins/load_r_object.rkcommands.R b/tests/import_export_plugins/load_r_object.rkcommands.R
index 071a358..617cf5a 100644
--- a/tests/import_export_plugins/load_r_object.rkcommands.R
+++ b/tests/import_export_plugins/load_r_object.rkcommands.R
@@ -2,6 +2,6 @@ local({
 ## Compute
 load (file="women.RData", envir=globalenv())
 ## Print result
-rk.header("Load data", parameters=list("File", "women.RData",
-	"Import to environment", "globalenv()"))
+rk.header ("Load data", parameters=list("R data file to load"="women.RData",
+	"Import to environment"="globalenv()"))
 })
diff --git a/tests/import_export_plugins/load_r_object.rkout b/tests/import_export_plugins/load_r_object.rkout
index dd0035c..c44a620 100644
--- a/tests/import_export_plugins/load_r_object.rkout
+++ b/tests/import_export_plugins/load_r_object.rkout
@@ -1,6 +1,6 @@
 <h1>Load data</h1>
 <h2>Parameters</h2>
-<ul><li>File: women.RData</li>
+<ul><li>R data file to load: women.RData</li>
 <li>Import to environment: globalenv()</li>
 </ul>
 DATE<br />
diff --git a/tests/import_export_plugins/load_source.rkcommands.R b/tests/import_export_plugins/load_source.rkcommands.R
index 8a20ade..2bb4ad4 100644
--- a/tests/import_export_plugins/load_source.rkcommands.R
+++ b/tests/import_export_plugins/load_source.rkcommands.R
@@ -2,11 +2,11 @@ local({
 ## Compute
 source (file="source.R", local=TRUE, verbose=FALSE, print.eval=FALSE, chdir=FALSE)
 ## Print result
-rk.header("Source R file", parameters=list("File", "source.R"))
+rk.header ("Source R file", parameters=list("File name"="source.R"))
 })
 local({
 ## Compute
 source (file="source.R", local=FALSE, echo=TRUE, max.deparse.length=150, verbose=FALSE, print.eval=FALSE, chdir=FALSE)
 ## Print result
-rk.header("Source R file", parameters=list("File", "source.R"))
+rk.header ("Source R file", parameters=list("File name"="source.R"))
 })
diff --git a/tests/import_export_plugins/load_source.rkout b/tests/import_export_plugins/load_source.rkout
index 12a74a6..f07106c 100644
--- a/tests/import_export_plugins/load_source.rkout
+++ b/tests/import_export_plugins/load_source.rkout
@@ -1,6 +1,6 @@
 <h1>Source R file</h1>
 <h2>Parameters</h2>
-<ul><li>File: source.R</li>
+<ul><li>File name: source.R</li>
 </ul>
 DATE<br />
 <h2>Messages, warnings, or errors:</h2>
@@ -8,7 +8,7 @@ DATE<br />
 </pre>
 <h1>Source R file</h1>
 <h2>Parameters</h2>
-<ul><li>File: source.R</li>
+<ul><li>File name: source.R</li>
 </ul>
 DATE<br />
 <h2>Messages, warnings, or errors:</h2>
diff --git a/tests/import_export_plugins/package_skeleton.rkcommands.R b/tests/import_export_plugins/package_skeleton.rkcommands.R
index 68b4b52..1ee3bd4 100644
--- a/tests/import_export_plugins/package_skeleton.rkcommands.R
+++ b/tests/import_export_plugins/package_skeleton.rkcommands.R
@@ -2,6 +2,6 @@ local({
 ## Compute
 package.skeleton(name="anRpackage", list=c('skel.func1','skel.func2'), path=".", force= TRUE)
 ## Print result
-rk.header("Create package skeleton", parameters=list("Name", "anRpackage",
-	"Directory", "."))
+rk.header ("Create package skeleton", parameters=list("Package name"="anRpackage",
+	"Directory"="."))
 })
diff --git a/tests/import_export_plugins/package_skeleton.rkout b/tests/import_export_plugins/package_skeleton.rkout
index ce09a54..79bc7fc 100644
--- a/tests/import_export_plugins/package_skeleton.rkout
+++ b/tests/import_export_plugins/package_skeleton.rkout
@@ -1,6 +1,6 @@
 <h1>Create package skeleton</h1>
 <h2>Parameters</h2>
-<ul><li>Name: anRpackage</li>
+<ul><li>Package name: anRpackage</li>
 <li>Directory: .</li>
 </ul>
 DATE<br />
diff --git a/tests/import_export_plugins/save_r_object.rkcommands.R b/tests/import_export_plugins/save_r_object.rkcommands.R
index 1ac0fa7..a06b9f7 100644
--- a/tests/import_export_plugins/save_r_object.rkcommands.R
+++ b/tests/import_export_plugins/save_r_object.rkcommands.R
@@ -7,8 +7,8 @@ save(testx,
 	compression_level=6)
 
 ## Print result
-rk.header("Save R objects", parameters=list("File", "x.RData",
-	"Variables", "testx"))
+rk.header ("Save R objects", parameters=list("File name"="x.RData",
+	"Object"="testx"))
 })
 local({
 ## Compute
@@ -18,6 +18,6 @@ save(testy,
 	compression_level=-9)
 
 ## Print result
-rk.header("Save R objects", parameters=list("File", "y.RData",
-	"Variables", "testy"))
+rk.header ("Save R objects", parameters=list("File name"="y.RData",
+	"Object"="testy"))
 })
diff --git a/tests/import_export_plugins/save_r_object.rkout b/tests/import_export_plugins/save_r_object.rkout
index 6879230..602f6b0 100644
--- a/tests/import_export_plugins/save_r_object.rkout
+++ b/tests/import_export_plugins/save_r_object.rkout
@@ -1,12 +1,12 @@
 <h1>Save R objects</h1>
 <h2>Parameters</h2>
-<ul><li>File: x.RData</li>
-<li>Variables: testx</li>
+<ul><li>File name: x.RData</li>
+<li>Object: testx</li>
 </ul>
 DATE<br />
 <h1>Save R objects</h1>
 <h2>Parameters</h2>
-<ul><li>File: y.RData</li>
-<li>Variables: testy</li>
+<ul><li>File name: y.RData</li>
+<li>Object: testy</li>
 </ul>
 DATE<br />
diff --git a/tests/import_export_plugins/write_csv.rkcommands.R b/tests/import_export_plugins/write_csv.rkcommands.R
index a6c4d11..8284149 100644
--- a/tests/import_export_plugins/write_csv.rkcommands.R
+++ b/tests/import_export_plugins/write_csv.rkcommands.R
@@ -1,5 +1,5 @@
 local({
-## Berechne
+## Compute
 
 	# some options can't be changed with write.csv() and are set to these values:
 	# append=FALSE, sep=",", dec=".", col.names=NA, qmethod="double"
@@ -9,7 +9,7 @@ local({
 		fileEncoding=""
 	)
 
-## Drucke Ergebnisse
+## Print result
 rk.header ("Export Table / CSV files", parameters=list("File"="data",
 	"Data"="women"))
 })
diff --git a/tests/import_export_plugins/write_table.rkcommands.R b/tests/import_export_plugins/write_table.rkcommands.R
index 610437d..516a7e9 100644
--- a/tests/import_export_plugins/write_table.rkcommands.R
+++ b/tests/import_export_plugins/write_table.rkcommands.R
@@ -2,6 +2,6 @@ local({
 ## Compute
 write.table ( x =  women , file =  "data" , append =  FALSE  ,quote = TRUE ,  sep = '\t' , eol = "\n" , na = "NA" ,  dec = '.' , row.names =  FALSE ,  col.names =  TRUE , qmethod=  'escape' ) 
 ## Print result
-rk.header("Write as table", parameters=list("File", "data",
-	"Data", "women"))
+rk.header ("Write as table", parameters=list("Name of the file"="data",
+	"Data"="women"))
 })
diff --git a/tests/import_export_plugins/write_table.rkout b/tests/import_export_plugins/write_table.rkout
index b973e8f..1344a60 100644
--- a/tests/import_export_plugins/write_table.rkout
+++ b/tests/import_export_plugins/write_table.rkout
@@ -1,6 +1,6 @@
 <h1>Write as table</h1>
 <h2>Parameters</h2>
-<ul><li>File: data</li>
+<ul><li>Name of the file: data</li>
 <li>Data: women</li>
 </ul>
 DATE<br />
diff --git a/tests/import_export_plugins/write_vector_matrix.rkcommands.R b/tests/import_export_plugins/write_vector_matrix.rkcommands.R
index ea3bea1..a1234bd 100644
--- a/tests/import_export_plugins/write_vector_matrix.rkcommands.R
+++ b/tests/import_export_plugins/write_vector_matrix.rkcommands.R
@@ -2,6 +2,6 @@ local({
 ## Compute
 write (x=testx, file="data", ncolumns=2, append=FALSE, sep=",")
 ## Print result
-rk.header("Write Variables", parameters=list("File", "data",
-	"Data", "testx"))
+rk.header ("Write Variables", parameters=list("File name"="data",
+	"Data"="testx"))
 })
diff --git a/tests/import_export_plugins/write_vector_matrix.rkout b/tests/import_export_plugins/write_vector_matrix.rkout
index 5c59ca2..fd15e2b 100644
--- a/tests/import_export_plugins/write_vector_matrix.rkout
+++ b/tests/import_export_plugins/write_vector_matrix.rkout
@@ -1,6 +1,6 @@
 <h1>Write Variables</h1>
 <h2>Parameters</h2>
-<ul><li>File: data</li>
+<ul><li>File name: data</li>
 <li>Data: testx</li>
 </ul>
 DATE<br />