Updated the info text; added info window title translations

git-svn-id: https://svn.code.sf.net/p/xlogo4schools/svn/trunk@8 3b0d7934-f7ef-4143-9606-b51f2e2281fd

17 files changed, 45 insertions, 25 deletions

diff --git a/logo/src/langage.properties b/logo/src/langage.properties
index 9204e31..74208e2 100644
--- a/logo/src/langage.properties
+++ b/logo/src/langage.properties
@@ -434,4 +434,5 @@ us.export.msg=Choose a file to export:
 contest.number.of.files=Number of exercises:
 contest.number.of.bonus.files = Number of bonus exercises:
 ws.settings.syntax=Syntax Highlighting
-ws.settings.contest=Contest / Record Mode
\ No newline at end of file
+ws.settings.contest=Contest / Record Mode
+welcome.info.title=XLogo4Schools Info
\ No newline at end of file
diff --git a/logo/src/langage_ar_MA.properties b/logo/src/langage_ar_MA.properties
index 21a8477..4f018b4 100644
--- a/logo/src/langage_ar_MA.properties
+++ b/logo/src/langage_ar_MA.properties
@@ -434,4 +434,5 @@ us.export.msg=Choose a file to export:
 contest.number.of.files=Number of exercises:
 contest.number.of.bonus.files = Number of bonus exercises:
 ws.settings.syntax=Syntax Highlighting
-ws.settings.contest=Contest / Record Mode
\ No newline at end of file
+ws.settings.contest=Contest / Record Mode
+welcome.info.title=XLogo4Schools Info
\ No newline at end of file
diff --git a/logo/src/langage_as_ES.properties b/logo/src/langage_as_ES.properties
index 86552f7..901280b 100644
--- a/logo/src/langage_as_ES.properties
+++ b/logo/src/langage_as_ES.properties
@@ -434,4 +434,5 @@ us.export.msg=Choose a file to export:
 contest.number.of.files=Number of exercises:
 contest.number.of.bonus.files = Number of bonus exercises:
 ws.settings.syntax=Syntax Highlighting
-ws.settings.contest=Contest / Record Mode
\ No newline at end of file
+ws.settings.contest=Contest / Record Mode
+welcome.info.title=XLogo4Schools Info
\ No newline at end of file
diff --git a/logo/src/langage_ca_ES.properties b/logo/src/langage_ca_ES.properties
index 8e76ee9..d5cdae1 100644
--- a/logo/src/langage_ca_ES.properties
+++ b/logo/src/langage_ca_ES.properties
@@ -434,4 +434,5 @@ us.export.msg=Choose a file to export:
 contest.number.of.files=Number of exercises:
 contest.number.of.bonus.files = Number of bonus exercises:
 ws.settings.syntax=Syntax Highlighting
-ws.settings.contest=Contest / Record Mode
\ No newline at end of file
+ws.settings.contest=Contest / Record Mode
+welcome.info.title=XLogo4Schools Info
\ No newline at end of file
diff --git a/logo/src/langage_de_DE.properties b/logo/src/langage_de_DE.properties
index 5d6d875..c3fc643 100644
--- a/logo/src/langage_de_DE.properties
+++ b/logo/src/langage_de_DE.properties
@@ -434,4 +434,5 @@ us.export.msg=Choose a file to export:
 contest.number.of.files=Anzahl Aufgaben:
 contest.number.of.bonus.files =Anzahl Bonusaufgaben:
 ws.settings.syntax=Syntaxhervorhebung
-ws.settings.contest=Wettbewerb- / Aufzeichnungsmodus
\ No newline at end of file
+ws.settings.contest=Wettbewerb- / Aufzeichnungsmodus
+welcome.info.title=XLogo4Schools Info
\ No newline at end of file
diff --git a/logo/src/langage_el_GR.properties b/logo/src/langage_el_GR.properties
index 3ea4423..56c9da5 100644
--- a/logo/src/langage_el_GR.properties
+++ b/logo/src/langage_el_GR.properties
@@ -434,4 +434,5 @@ us.export.msg=Choose a file to export:
 contest.number.of.files=Number of exercises:
 contest.number.of.bonus.files = Number of bonus exercises:
 ws.settings.syntax=Syntax Highlighting
-ws.settings.contest=Contest / Record Mode
\ No newline at end of file
+ws.settings.contest=Contest / Record Mode
+welcome.info.title=XLogo4Schools Info
\ No newline at end of file
diff --git a/logo/src/langage_en_DE.properties b/logo/src/langage_en_DE.properties
index e547689..b6171c2 100644
--- a/logo/src/langage_en_DE.properties
+++ b/logo/src/langage_en_DE.properties
@@ -434,4 +434,5 @@ us.export.msg=W�hle eine Datei zum Exportieren:
 contest.number.of.files=Anzahl Aufgaben:
 contest.number.of.bonus.files =Anzahl Bonusaufgaben:
 ws.settings.syntax=Syntaxhervorhebung
-ws.settings.contest=Wettbewerb- / Aufzeichnungsmodus
\ No newline at end of file
+ws.settings.contest=Wettbewerb- / Aufzeichnungsmodus
+welcome.info.title=XLogo4Schools Info
\ No newline at end of file
diff --git a/logo/src/langage_en_US.properties b/logo/src/langage_en_US.properties
index e5aa726..aa05593 100644
--- a/logo/src/langage_en_US.properties
+++ b/logo/src/langage_en_US.properties
@@ -434,4 +434,5 @@ us.export.msg=Choose a file to export:
 contest.number.of.files=Number of exercises:
 contest.number.of.bonus.files = Number of bonus exercises:
 ws.settings.syntax=Syntax Highlighting
-ws.settings.contest=Contest / Record Mode
\ No newline at end of file
+ws.settings.contest=Contest / Record Mode
+welcome.info.title=XLogo4Schools Info
\ No newline at end of file
diff --git a/logo/src/langage_eo_EO.properties b/logo/src/langage_eo_EO.properties
index 881d94c..9c9a8a6 100644
--- a/logo/src/langage_eo_EO.properties
+++ b/logo/src/langage_eo_EO.properties
@@ -434,4 +434,5 @@ us.export.msg=Choose a file to export:
 contest.number.of.files=Number of exercises:
 contest.number.of.bonus.files = Number of bonus exercises:
 ws.settings.syntax=Syntax Highlighting
-ws.settings.contest=Contest / Record Mode
\ No newline at end of file
+ws.settings.contest=Contest / Record Mode
+welcome.info.title=XLogo4Schools Info
\ No newline at end of file
diff --git a/logo/src/langage_es_ES.properties b/logo/src/langage_es_ES.properties
index c7b49a6..bee1cc9 100644
--- a/logo/src/langage_es_ES.properties
+++ b/logo/src/langage_es_ES.properties
@@ -434,4 +434,5 @@ us.export.msg=Choose a file to export:
 contest.number.of.files=Number of exercises:
 contest.number.of.bonus.files = Number of bonus exercises:
 ws.settings.syntax=Syntax Highlighting
-ws.settings.contest=Contest / Record Mode
\ No newline at end of file
+ws.settings.contest=Contest / Record Mode
+welcome.info.title=XLogo4Schools Info
\ No newline at end of file
diff --git a/logo/src/langage_fr_FR.properties b/logo/src/langage_fr_FR.properties
index 5939302..0ef66eb 100644
--- a/logo/src/langage_fr_FR.properties
+++ b/logo/src/langage_fr_FR.properties
@@ -434,4 +434,5 @@ us.export.msg=Choose a file to export:
 contest.number.of.files=Number of exercises:
 contest.number.of.bonus.files = Number of bonus exercises:
 ws.settings.syntax=Syntax Highlighting
-ws.settings.contest=Contest / Record Mode
\ No newline at end of file
+ws.settings.contest=Contest / Record Mode
+welcome.info.title=XLogo4Schools Info
\ No newline at end of file
diff --git a/logo/src/langage_gl_ES.properties b/logo/src/langage_gl_ES.properties
index 1f1a56e..7d6241e 100644
--- a/logo/src/langage_gl_ES.properties
+++ b/logo/src/langage_gl_ES.properties
@@ -434,4 +434,5 @@ us.export.msg=Choose a file to export:
 contest.number.of.files=Number of exercises:
 contest.number.of.bonus.files = Number of bonus exercises:
 ws.settings.syntax=Syntax Highlighting
-ws.settings.contest=Contest / Record Mode
\ No newline at end of file
+ws.settings.contest=Contest / Record Mode
+welcome.info.title=XLogo4Schools Info
\ No newline at end of file
diff --git a/logo/src/langage_hu_HU.properties b/logo/src/langage_hu_HU.properties
index 28e65bb..e5501ed 100644
--- a/logo/src/langage_hu_HU.properties
+++ b/logo/src/langage_hu_HU.properties
@@ -434,4 +434,5 @@ us.export.msg=Choose a file to export:
 contest.number.of.files=Number of exercises:
 contest.number.of.bonus.files = Number of bonus exercises:
 ws.settings.syntax=Syntax Highlighting
-ws.settings.contest=Contest / Record Mode
\ No newline at end of file
+ws.settings.contest=Contest / Record Mode
+welcome.info.title=XLogo4Schools Info
\ No newline at end of file
diff --git a/logo/src/langage_it_IT.properties b/logo/src/langage_it_IT.properties
index df5729c..1c4aa74 100644
--- a/logo/src/langage_it_IT.properties
+++ b/logo/src/langage_it_IT.properties
@@ -434,4 +434,5 @@ us.export.msg=Choose a file to export:
 contest.number.of.files=Number of exercises:
 contest.number.of.bonus.files = Number of bonus exercises:
 ws.settings.syntax=Syntax Highlighting
-ws.settings.contest=Contest / Record Mode
\ No newline at end of file
+ws.settings.contest=Contest / Record Mode
+welcome.info.title=XLogo4Schools Info
\ No newline at end of file
diff --git a/logo/src/langage_pt_BR.properties b/logo/src/langage_pt_BR.properties
index d791c4d..5a88820 100644
--- a/logo/src/langage_pt_BR.properties
+++ b/logo/src/langage_pt_BR.properties
@@ -434,4 +434,5 @@ us.export.msg=Choose a file to export:
 contest.number.of.files=Number of exercises:
 contest.number.of.bonus.files = Number of bonus exercises:
 ws.settings.syntax=Syntax Highlighting
-ws.settings.contest=Contest / Record Mode
\ No newline at end of file
+ws.settings.contest=Contest / Record Mode
+welcome.info.title=XLogo4Schools Info
\ No newline at end of file
diff --git a/logo/src/xlogo/gpl/x4s_info.html b/logo/src/xlogo/gpl/x4s_info.html
index 699fd50..be553dd 100644
--- a/logo/src/xlogo/gpl/x4s_info.html
+++ b/logo/src/xlogo/gpl/x4s_info.html
@@ -1,16 +1,16 @@
 <html>

 	<head>

-		<title>HTML Online Editor Sample</title>

+		<title>XLogo4Schools</title>

 	</head>

 	<body>

 		<h2>

 			XLogo4Schools</h2>

+			Version 0.9.03beta-2014-11-03

 		<p>

 			XLogo4Schools is a modified, extended and reengineered version of Lo&#239;c Le Coq&#39;s XLogo. It is the result of a six month Bachelor&#39;s thesis conducted by Marko &#381;ivkovi&#263; at ETHZ, D-INFK department from March 2013 until September 2013.</p>

 		<p>

-			I want to thank <a href="http://www.ite.ethz.ch/people/host/jhromkov">Prof. Juraj Hromkovi&#269;</a> for giving me the opportunity to dive into the world of Logo and for letting me do the reengineering of XLogo for my Bachelor&#39;s Thesis. Very special thanks go to <a href="http://www.ite.ethz.ch/people/fachdidaktik/serafing/curriculum">Giovanni Serafini</a> who acted as an excellent adviser and mentor during this project. I also want to thank <a href="http://www.inf.ethz.ch/personal/gebauerh/">Dr. Heidi Gebauer</a>, <a href="http://www.ite.ethz.ch/people/postdocs/ivanak">Dr. Ivana Kosirova</a>, <a href="http://www.ite.ethz.ch/people/researchassistants/lkeller">Lucia Keller</a>,&nbsp; and <a href="http://www.ite.ethz.ch/people/researchassistants/steffenb">Bj&ouml;rn Steffen</a> from Prof. Hromkovi&#269;&#39;s chair for their intensive contributions during the requirements analysis phase. I enjoyed the many talks and discussions and appreciated every new idea from you. And finally I want to thank the other Logo tutors, Lukas H&auml;fliger, Samuel Bryner,&nbsp; Alexander Viand, Petra Hromkovi&#269;ova, Stefan Dietiker, and Christine Zeller, who contributed in numerous inspiring talks during the many Logo projects.</p>

-		<h3>

-			What was reengineered?</h3>

+			I want to thank <a href="http://www.ite.ethz.ch/people/host/jhromkov" target="_blank">Prof. Juraj Hromkovi&#269;</a> for giving me the opportunity to dive into the world of Logo and for letting me do the reengineering of XLogo for my Bachelor&#39;s Thesis. Very special thanks go to <a href="http://www.ite.ethz.ch/people/fachdidaktik/serafing/curriculum" target="_blank">Giovanni Serafini</a> who acted as an excellent adviser and mentor during this project. I also want to thank <a href="http://www.inf.ethz.ch/personal/gebauerh/" target="_blank">Dr. Heidi Gebauer</a>, <a href="http://www.ite.ethz.ch/people/postdocs/ivanak" target="_blank">Dr. Ivana Kosirova</a>, <a href="http://www.ite.ethz.ch/people/researchassistants/lkeller" target="_blank">Lucia Keller</a>,&nbsp; and <a href="http://www.ite.ethz.ch/people/researchassistants/steffenb" target="_blank">Bj&ouml;rn Steffen</a> from Prof. Hromkovi&#269;&#39;s chair for their intensive contributions during the requirements analysis phase. I enjoyed the many talks and discussions and appreciated every new idea from you. And finally I want to thank the other Logo tutors, Lukas H&auml;fliger, Samuel Bryner,&nbsp; Alexander Viand, Petra Hromkovi&#269;ova, Stefan Dietiker, and Christine Zeller, who contributed in numerous inspiring talks during the many Logo projects.</p>

+		<h3>What was reengineered?</h3>

 		<p>

 			The new main features introduced are</p>

 		<ul>

@@ -27,16 +27,21 @@
 			<li>

 				A simple workspace management system. Workspaces consist of multiple projects or users. Certain settings apply to the whole workspace, others are per user or project.</li>

 		</ul>

-		<p>

-			What was changed?</p>

+		<h3>What was changed?</h3>

 		<ul>

 			<li>

-				The <strong>user interface</strong> has completely changed. I reduced the complexity of customizability to the minimum. Very necessary settings can be defined by the teachers, but not by the children. There is a simple password mechanism to hide these settings. The main window now includes everything that is needed. A command line, the drawing area, the history panel, and the list of files to the left. There is also a procedue search, that lets one more easily find the desired procedures amongst the files. The editor is now integrated in the same window. When a file is opened, the editor is shown instead of the drawing area and the command line. All the options menus and preferences have been removed. The turtle speed and the turtle icon can be changed in the main window directly. I removed these border-images that were used by XLogo, instead providing a larger view onto the drawing area.</li>

+				The <strong>user interface</strong> has completely changed. The complexity of customizability is reduced to the minimum. Very necessary settings can be defined by the teachers, but not by the children. There is a simple password mechanism to hide these settings. The main window now includes everything that is needed. A command line, the drawing area, the history panel, and the list of files to the left. There is also a procedue search, that lets one more easily find the desired procedures amongst the files. The editor is now integrated in the same window. When a file is opened, the editor is shown instead of the drawing area and the command line. All the options menus and preferences have been removed. The turtle speed and the turtle icon can be changed in the main window directly. The border-images that were used by XLogo were removed, instead providing a larger view onto the drawing area.</li>

 			<li>

-				The core of the application, the interpreter and drawing engine are left almost untouched. Things that I had to alter a lot have become replaced by loosely coupled components that can work independently of each other. The communication between different parts of the application is now event driven instead of static variables and similar anti-patterns.</li>

+				The core of the application, the interpreter and drawing engine are left almost untouched. Things that had to be altered a lot have become replaced by loosely coupled components that can work independently of each other. The communication between different parts of the application is now event driven instead of static variables and similar anti-patterns.</li>

 			<li>

 				The Graphics are much smoother due to another rendering configuration.</li>

 			<li>

 				Measured on a Sierpinski Triangle of depth 9, XLogo4Schools is around 25% faster than XLogo (16s vs. 21s on my machine). It is even faster, when many procedures are added to the workspace. XLogo used a stack to manage its procedures which took O(N) string comparisons to find a procedure. Interestingly, the designated stack operations push and pop are not really used. For the same purpose, XLogo4Schools uses now a HashMap that usually works in O(1).</li>

-		</ul></body>

+		</ul>

+		

+		<h3>Where can I find an XLogo language reference and documentation?</h3>

+		In most cases, XLogo4Schools is very similar to XLogo. Therefore you can use the <a href="http://downloads.tuxfamily.org/xlogo/downloads-en/manual-html-en/manual-en.html" target="_blank">XLogo language reference and documentation</a> found.

+		Currently, there is no <a href="https://sourceforge.net/p/xlogo4schools/wiki/Home/" target="_blank">XLogo4Schools documentation</a>, but it is planned. Thank you for your patience.

+		

+		</body>

 </html>
\ No newline at end of file
diff --git a/logo/src/xlogo/gui/welcome/WelcomeScreen.java b/logo/src/xlogo/gui/welcome/WelcomeScreen.java
index 1e11f25..3a67e2d 100644
--- a/logo/src/xlogo/gui/welcome/WelcomeScreen.java
+++ b/logo/src/xlogo/gui/welcome/WelcomeScreen.java
@@ -464,7 +464,7 @@ public class WelcomeScreen extends X4SFrame {
 
 	private void showInfo()
 	{
-		JFrame frame = new JFrame(translate("menu.help.licence"));
+		JFrame frame = new JFrame(translate("welcome.info.title"));
 		frame.setIconImage(Toolkit.getDefaultToolkit().createImage(WebPage.class.getResource("Icon_x4s.png")));
 		frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 		frame.setSize(500, 500);