diff --git a/.lang/de.mo b/.lang/de.mo
new file mode 100644
index 000000000..d6a0ab385
Binary files /dev/null and b/.lang/de.mo differ
diff --git a/.lang/de.po b/.lang/de.po
new file mode 100644
index 000000000..c8720bfbe
--- /dev/null
+++ b/.lang/de.po
@@ -0,0 +1,99 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: gb.deg.unittest 3.9.90\n"
+"PO-Revision-Date: 2016-09-24 10:45 UTC\n"
+"Last-Translator: christof <christof@deganius.de>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: .project:1
+msgid "gb.deg.unittest"
+msgstr "-"
+
+#: .project:2
+msgid "A Gambas component for unittesting and test-driven programming. Forked and inspired from a quite old program: COMUnit (http://comunit.sourceforge.net) and mainly JUnit. Currently beta state.\n\nLicense GPL V3"
+msgstr "Eine Gambas Komponente für Unittesting und testgetriebene Programmierung. Geforkt und inspiriert von einem ziemlich alten Framework: ComUnit und JUnit.\n\n Lizenz GPL V3"
+
+#: FmRunner.class:89
+msgid "All Test Containers"
+msgstr "Alle Testcontainer"
+
+#: FmRunner.class:108
+msgid "All Test Cases"
+msgstr "Alle Tests"
+
+#: FmRunner.class:148
+msgid "Results"
+msgstr "Ergebnis"
+
+#: FmRunner.class:166
+msgid "Trace"
+msgstr "Ablauf"
+
+#: FmRunner.form:28
+msgid "Containers:"
+msgstr "Container:"
+
+#: FmRunner.form:39
+msgid "Tests:"
+msgstr "Tests:"
+
+#: FmRunner.form:63
+msgid "Run Tests (Ctrl-r)"
+msgstr "Starte Tests (Ctrl-r)"
+
+#: FmRunner.form:72
+msgid "Press <Esc> to close"
+msgstr "Beenden mit <Esc>"
+
+#: UnitTest.class:53
+msgid "--------------------------------- Test Result ----------------------------------"
+msgstr "-------------------------------- Testergebnis ----------------------------------"
+
+#: UnitTest.class:54
+msgid "Tests done"
+msgstr "Tests beendet"
+
+#: UnitTest.class:56
+msgid "--------------------------------------------------------------------------------"
+msgstr "-"
+
+#: UnitTest.class:59
+msgid "Error in:"
+msgstr "-"
+
+#: UnitTest.class:60
+msgid "Error:"
+msgstr "-"
+
+#: UnitTest.class:63
+msgid "No Errors"
+msgstr "Keine Errors"
+
+#: UnitTest.class:68
+msgid "Failure in:"
+msgstr "Fehlschlag in:"
+
+#: UnitTest.class:69
+msgid "Failure:"
+msgstr "Fehlschlag:"
+
+#: UnitTest.class:72
+msgid "No Failures"
+msgstr "Keine Fehlschläge"
+
+#: UnitTest.class:74
+msgid "---------------------------------  Test End  -----------------------------------"
+msgstr "--------------------------------- Ende Test  -----------------------------------"
+
+#: UnitTest.class:76
+msgid "Success!"
+msgstr "Erfolgreich!"
+
+#: UnitTest.class:78
+msgid "Not successful... :-("
+msgstr "Nicht erfolgreich ... :-("
+
diff --git a/.project b/.project
index 4e61726d0..25653c2e6 100644
--- a/.project
+++ b/.project
@@ -11,7 +11,8 @@ Component=gb.settings
 Description="A Gambas component for unittesting and test-driven programming. Forked and inspired from a quite old program: COMUnit (http://comunit.sourceforge.net) and mainly JUnit. Currently beta state.\n\nLicense GPL V3"
 Authors="Christof Thalhofer"
 TabSize=4
-Language=de
+Translate=1
+Language=en_US
 Type=Component
 ControlPublic=1
 ModulePublic=1
diff --git a/.settings b/.settings
index af35d99f7..15166a9ee 100644
--- a/.settings
+++ b/.settings
@@ -313,13 +313,13 @@ Path="gb.deg.unit.gambas"
 [OpenFile]
 File[1]=".src/TestRunner/FmRunner.form"
 File[2]=".src/TestRunner/FmTrace.form"
-File[3]=".src/TestRunner/FmRunner.class:18.261"
+File[3]=".src/TestRunner/FmRunner.class:18.233"
 File[4]=".src/TestRunner/FmTrace.class:40.64"
-Active=5
+Active=7
 Count=17
 File[5]=".src/TesteStartRunner.module:13.8"
 File[6]=".src/TestMyself/_TestErrorsAndFailures.class:6.7"
-File[7]=".src/TestRunner/UnitTest.class:72.116"
+File[7]=".src/TestRunner/UnitTest.class:0.47"
 File[8]=".src/TestSuite/TestSuite.class:8.44"
 File[9]=".src/TestSuite/ITestCase.class:0.0"
 File[10]=".src/TestSuite/TestCase.class:17.54"
diff --git a/.src/TestRunner/FmRunner.class b/.src/TestRunner/FmRunner.class
index d889d803b..2aa0ee10e 100644
--- a/.src/TestRunner/FmRunner.class
+++ b/.src/TestRunner/FmRunner.class
@@ -86,7 +86,7 @@ Sub FillCboContainers()
     Dim ContainerNames As New String[]
     ' ------------------------------------------------- CboContainers
     With ContainerNames
-        .Add("All Test Containers")
+        .Add(("All Test Containers"))
         .Insert(UnitTest.GetAllTestContainerNames($DoSelftest))
     End With
 
@@ -105,7 +105,7 @@ Sub FillCboTests(Optional TestContainerName As String)
     Dim C As ATestContainer
     Dim i As Integer
 
-    TestNames.Add("All Test Cases")
+    TestNames.Add(("All Test Cases"))
 
     If Not TestContainerName Then
         'all Tests
@@ -145,7 +145,7 @@ Sub FillTabs()
         .Count = 1
         .Arrangement = Arrange.Fill
         .Index = 0
-        .Text = "Results"
+        .Text = ("Results")
         .Show()
     End With
 
@@ -163,7 +163,7 @@ Sub FillTabs()
         .Count = 2
         .Arrangement = Arrange.Fill
         .Index = 1
-        .Text = "Trace"
+        .Text = ("Trace")
     End With
 
     $FmTrace.Reparent(TabPanel1)
diff --git a/.src/TestRunner/UnitTest.class b/.src/TestRunner/UnitTest.class
index 8c407b0dc..c42da1100 100644
--- a/.src/TestRunner/UnitTest.class
+++ b/.src/TestRunner/UnitTest.class
@@ -50,31 +50,32 @@ Public Sub _PrintResult(Res As TestResult)
     Errs = Res.Errors
     Fails = Res.Failures
 
-    Print "----------------------- Test Results ----------------------- "
-    Print " " & res.CountRunnedTests & " Tests done"
-    Print "------------------------------------------------------------ "
+    Print ("--------------------------------- Test Result ----------------------------------")
+    Print " " & res.CountRunnedTests & " " & ("Tests done")
+    '80 Zeichen
+    Print ("--------------------------------------------------------------------------------")
     If Errs.Count > 0 Then
         For Each Err In Errs.Items
-            Print " Error in:";; Err.Source
-            Print " Error:";; Err.Description
+            Print " " & ("Error in:");; Err.Source
+            Print " " & ("Error:");; Err.Description
         Next
     Else
-        Print " No Errors"
+        Print " " & ("No Errors")
     Endif
     Print "\n"
     If Fails.Count > 0 Then
         For Each Fail In Fails.Items
-            Print " Failure in:";; Fail.Source
-            Print " Failure:";; Fail.Description
+            Print " " & ("Failure in:");; Fail.Source
+            Print " " & ("Failure:");; Fail.Description
         Next
     Else
-        Print " No Failures"
+        Print " " & ("No Failures")
     Endif
-    Print "------------------------- Test End -------------------------"
+    Print ("---------------------------------  Test End  -----------------------------------")
     If res.WasSuccessful = True Then
-        Print " Success!"
+        Print " " & ("Success!")
     Else
-        Print " Not successful"
+        Print " " & ("Not successful... :-(")
     Endif
 
 End