diff -r 86616203414f -r d0edf588bbda data/dictionary.xml
--- a/data/dictionary.xml	Fri Aug 16 12:44:48 2013 +0200
+++ b/data/dictionary.xml	Fri Aug 16 13:32:45 2013 +0200
@@ -1338,7 +1338,32 @@
 	</concept>
 	<concept>
 		<term abbreviation="" completeForm="Java" language="en"/>
-		<explanation language="en"><text></text></explanation>
+		<explanation language="en">
+			<text>
+				an object-oriented programming language designed by James Gosling at Sun Microsystems;
+				Java source code is compiled into byte code (.class files) which can be executed in JVM on many architectures and operating systems;
+				Java is completely free software, there is OpenJDK and standard library distributed under GNU GPL license;
+				there is also GNU Classpath – an independent and free software implementation of the standard library;
+				Java is popular and well established enterprise-grade software platform
+			</text>
+		</explanation>
+		<tag>computer</tag>
+		<tag>java</tag>
+	</concept>
+	<concept>
+		<term abbreviation="JVM" completeForm="Java virtual machine" language="en"/>
+		<explanation language="en">
+			<text>
+				a runtime environment for running Java byte code;
+				there is lot of programming languages that can be compiled into the bytecode and executed in JVM e.g.
+					Clojure (a Lisp dialect),
+					Scala (OOP and functional language),
+					Groovy (a scripting language),
+					Jython (an implementation of Python),
+					JRuby
+					or Rhino (JavaScript)
+			</text>
+		</explanation>
 		<tag>computer</tag>
 		<tag>java</tag>
 	</concept>