4 files changed, 12 insertions, 0 deletions

diff --git a/de-de/elixir-de.html.markdown b/de-de/elixir-de.html.markdown
index ecd74dcb..f77f9b0c 100644
--- a/de-de/elixir-de.html.markdown
+++ b/de-de/elixir-de.html.markdown
@@ -5,6 +5,7 @@ contributors:
 translators:

     - ["Gregor Große-Bölting", "http://www.ideen-und-soehne.de"]

 filename: learnelixir-de.ex

++lang: de-de

 ---

 

 Elixir ist eine moderne, funktionale Sprache für die Erlang VM. Sie ist voll 

diff --git a/es-es/csharp-es.html.markdown b/es-es/csharp-es.html.markdown
index 7d1a1201..ef26d8ce 100644
--- a/es-es/csharp-es.html.markdown
+++ b/es-es/csharp-es.html.markdown
@@ -6,6 +6,7 @@ contributors:
 translators:
     - ["Olfran Jiménez", "https://twitter.com/neslux"]	
 filename: LearnCSharp-es.cs
+lang: es-es
 ---
 
 C# es un lenguaje orientado a objetos elegante y de tipado seguro que
diff --git a/java.html.markdown b/java.html.markdown
index a2fc3630..0dec51d1 100644
--- a/java.html.markdown
+++ b/java.html.markdown
@@ -3,6 +3,7 @@
 language: java
 contributors:
     - ["Jake Prather", "http://github.com/JakeHP"]
+    - ["Madison Dickson", "http://github.com/mix3d"]
 filename: LearnJava.java
 
 ---
@@ -245,6 +246,13 @@ public class LearnJava {
                     break;
         }
         System.out.println("Switch Case Result: " + monthString);
+        
+        // Conditional Shorthand
+        // You can use the '?' operator for quick assignments or logic forks.
+        // Reads as "If (statement) is true, use <first value>, otherwise, use <second value>"
+        int foo = 5
+        String bar = (foo < 10) ? "A" : "B";
+        System.out.println(bar); // Prints A, because the statement is true
 
 
         ///////////////////////////////////////
diff --git a/javascript.html.markdown b/javascript.html.markdown
index bc2a973a..2f742574 100644
--- a/javascript.html.markdown
+++ b/javascript.html.markdown
@@ -219,6 +219,8 @@ function myFunction(){
     // this code will be called in 5 seconds' time
 }
 setTimeout(myFunction, 5000);
+// Note: setTimeout isn't part of the JS language, but is provided by browsers
+// and Node.js.
 
 // Function objects don't even have to be declared with a name - you can write
 // an anonymous function definition directly into the arguments of another.