reformatted with astyleds-sim

29 files changed, 334 insertions, 608 deletions

diff --git a/sources/core/VSAbstractProcess.java b/sources/core/VSAbstractProcess.java
index 83ff99d..78e7844 100644
--- a/sources/core/VSAbstractProcess.java
+++ b/sources/core/VSAbstractProcess.java
@@ -225,7 +225,7 @@ public abstract class VSAbstractProcess extends VSSerializablePrefs {
 
         /* Make additional process settings editable through GUI */
         initLong("process.localtime", localTime,
-                 prefs.getString("lang.en.process.time.local"), "ms");
+                 prefs.getString("lang.process.time.local"), "ms");
 
         createRandomCrashTask_();
     }
@@ -585,19 +585,19 @@ public abstract class VSAbstractProcess extends VSSerializablePrefs {
      */
     public synchronized String toString() {
         StringBuffer buffer = new StringBuffer();
-        buffer.append(prefs.getString("lang.en.process.id"));
+        buffer.append(prefs.getString("lang.process.id"));
         buffer.append(": ");
         buffer.append(getProcessID());
         buffer.append("; ");
-        buffer.append(prefs.getString("lang.en.process.time.local"));
+        buffer.append(prefs.getString("lang.process.time.local"));
         buffer.append(": ");
         buffer.append(VSTools.getTimeString(getTime()));
         buffer.append("; ");
-        buffer.append(prefs.getString("lang.en.time.lamport"));
+        buffer.append(prefs.getString("lang.time.lamport"));
         buffer.append(": ");
         buffer.append(lamportTime);
         buffer.append("; ");
-        buffer.append(prefs.getString("lang.en.time.vector"));
+        buffer.append(prefs.getString("lang.time.vector"));
         buffer.append(": ");
         buffer.append(vectorTime);
         return buffer.toString();
diff --git a/sources/core/VSInternalProcess.java b/sources/core/VSInternalProcess.java
index c2166b9..81cc3fd 100644
--- a/sources/core/VSInternalProcess.java
+++ b/sources/core/VSInternalProcess.java
@@ -313,7 +313,7 @@ public class VSInternalProcess extends VSAbstractProcess {
      */
     public synchronized void sendMessage(VSMessage message) {
         StringBuffer buffer = new StringBuffer();
-        buffer.append(prefs.getString("lang.en.message.sent"));
+        buffer.append(prefs.getString("lang.message.sent"));
         buffer.append("; ");
         buffer.append(message.toStringFull());
         log(buffer.toString());
diff --git a/sources/core/VSMessage.java b/sources/core/VSMessage.java
index 28e1b84..a7b48e6 100644
--- a/sources/core/VSMessage.java
+++ b/sources/core/VSMessage.java
@@ -151,7 +151,7 @@ public class VSMessage extends VSPrefs {
         buffer.append("ID: ");
         buffer.append(messageID);
         buffer.append("; ");
-        buffer.append(prefs.getString("lang.en.protocol"));
+        buffer.append(prefs.getString("lang.protocol"));
         buffer.append(": ");
         buffer.append(VSRegisteredEvents.getShortnameByClassname(
                           getProtocolClassname()));
diff --git a/sources/core/VSTask.java b/sources/core/VSTask.java
index 3e06a7f..54d7ff1 100644
--- a/sources/core/VSTask.java
+++ b/sources/core/VSTask.java
@@ -340,7 +340,7 @@ public class VSTask implements Comparable<Object>, VSSerializable {
     public String toString() {
         StringBuffer buffer = new StringBuffer();
 
-        buffer.append(prefs.getString("lang.en.task"));
+        buffer.append(prefs.getString("lang.task"));
         buffer.append(" ");
         buffer.append(getTaskTime());
         buffer.append(event.toString());
diff --git a/sources/core/VSTaskManager.java b/sources/core/VSTaskManager.java
index f2ad734..6aa10d0 100644
--- a/sources/core/VSTaskManager.java
+++ b/sources/core/VSTaskManager.java
@@ -439,9 +439,9 @@ public class VSTaskManager implements VSSerializable {
     public synchronized String toString() {
         StringBuffer buffer = new StringBuffer();
 
-        buffer.append(prefs.getString("lang.en.task.manager"));
+        buffer.append(prefs.getString("lang.task.manager"));
         buffer.append(" (");
-        buffer.append(prefs.getString("lang.en.tasks.fullfilled"));
+        buffer.append(prefs.getString("lang.tasks.fullfilled"));
         buffer.append(": ");
 
         for (VSTask task : fullfilledProgrammedTasks) {
@@ -449,7 +449,7 @@ public class VSTaskManager implements VSSerializable {
             buffer.append("; ");
         }
 
-        buffer.append(prefs.getString("lang.en.tasks.global"));
+        buffer.append(prefs.getString("lang.tasks.global"));
         buffer.append(": ");
 
         for (VSTask task : globalTasks) {
@@ -457,7 +457,7 @@ public class VSTaskManager implements VSSerializable {
             buffer.append("; ");
         }
 
-        buffer.append(prefs.getString("lang.en.tasks.local"));
+        buffer.append(prefs.getString("lang.tasks.local"));
         buffer.append(": ");
 
         ArrayList<VSInternalProcess> processes =
diff --git a/sources/events/VSAbstractEvent.java b/sources/events/VSAbstractEvent.java
index f61f76f..0f8c324 100644
--- a/sources/events/VSAbstractEvent.java
+++ b/sources/events/VSAbstractEvent.java
@@ -228,7 +228,7 @@ abstract public class VSAbstractEvent extends VSSerializablePrefs {
         int id = ((Integer) objectInputStream.readObject()).intValue();
         String savedEventShortname = (String) objectInputStream.readObject();
         this.eventClassname = (String) objectInputStream.readObject();
-	this.eventShortname = createShortname(savedEventShortname);
+        this.eventShortname = createShortname(savedEventShortname);
 
         if (VSSerialize.DEBUG)
             System.out.println(eventClassname);
diff --git a/sources/events/VSRegisteredEvents.java b/sources/events/VSRegisteredEvents.java
index 57c28c7..6d50ae5 100644
--- a/sources/events/VSRegisteredEvents.java
+++ b/sources/events/VSRegisteredEvents.java
@@ -320,9 +320,9 @@ public final class VSRegisteredEvents {
      */
     private static void registerEvent(String eventClassname) {
         String eventName =
-            prefs.getString("lang.en." + eventClassname);
+            prefs.getString("lang." + eventClassname);
         String eventShortname =
-            prefs.getString("lang.en." + eventClassname + ".short");
+            prefs.getString("lang." + eventClassname + ".short");
         registerEvent(eventClassname, eventName, eventShortname);
     }
 
diff --git a/sources/events/implementations/VSProcessCrashEvent.java b/sources/events/implementations/VSProcessCrashEvent.java
index d9d4df1..a68e8a1 100644
--- a/sources/events/implementations/VSProcessCrashEvent.java
+++ b/sources/events/implementations/VSProcessCrashEvent.java
@@ -10,7 +10,7 @@ import simulator.VSMain;
  * @author Paul C. Buetow
  */
 public class VSProcessCrashEvent extends VSAbstractEvent
-            implements VSCopyableEvent {
+    implements VSCopyableEvent {
     /* (non-Javadoc)
      * @see events.VSCopyableEvent#initCopy(events.VSAbstractEvent)
      */
@@ -28,7 +28,7 @@ public class VSProcessCrashEvent extends VSAbstractEvent
      * @see events.VSAbstractEvent#createShortname()()
      */
     protected String createShortname(String savedShortname) {
-	return VSMain.prefs.getString("lang.en.process.crash");
+        return VSMain.prefs.getString("lang.process.crash");
     }
 
     /* (non-Javadoc)
@@ -37,7 +37,7 @@ public class VSProcessCrashEvent extends VSAbstractEvent
     public void onStart() {
         if (!process.isCrashed()) {
             process.isCrashed(true);
-            log(prefs.getString("lang.en.crashed"));
+            log(prefs.getString("lang.crashed"));
         }
     }
 }
diff --git a/sources/events/implementations/VSProcessRecoverEvent.java b/sources/events/implementations/VSProcessRecoverEvent.java
index fc47bbd..2aa5758 100644
--- a/sources/events/implementations/VSProcessRecoverEvent.java
+++ b/sources/events/implementations/VSProcessRecoverEvent.java
@@ -11,7 +11,7 @@ import simulator.VSMain;
  * @author Paul C. Buetow
  */
 public class VSProcessRecoverEvent extends VSAbstractEvent
-            implements VSCopyableEvent {
+    implements VSCopyableEvent {
     /* (non-Javadoc)
      * @see events.VSCopyableEvent#initCopy(events.VSAbstractEvent)
      */
@@ -29,7 +29,7 @@ public class VSProcessRecoverEvent extends VSAbstractEvent
      * @see events.VSAbstractEvent#createShortname()()
      */
     protected String createShortname(String savedShortname) {
-	return VSMain.prefs.getString("lang.en.process.recover");
+        return VSMain.prefs.getString("lang.process.recover");
     }
 
     /* (non-Javadoc)
@@ -38,7 +38,7 @@ public class VSProcessRecoverEvent extends VSAbstractEvent
     public void onStart() {
         if (process.isCrashed()) {
             process.isCrashed(false);
-            log(prefs.getString("lang.en.recovered"));
+            log(prefs.getString("lang.recovered"));
         }
     }
 }
diff --git a/sources/events/internal/VSAbstractInternalEvent.java b/sources/events/internal/VSAbstractInternalEvent.java
index e8e2d13..33e3763 100644
--- a/sources/events/internal/VSAbstractInternalEvent.java
+++ b/sources/events/internal/VSAbstractInternalEvent.java
@@ -18,7 +18,7 @@ abstract public class VSAbstractInternalEvent extends VSAbstractEvent {
      * @see events.VSAbstractEvent#createShortname()()
      */
     protected String createShortname(String savedShortname) {
-	    return savedShortname;
+        return savedShortname;
     }
 
     /* (non-Javadoc)
diff --git a/sources/events/internal/VSMessageReceiveEvent.java b/sources/events/internal/VSMessageReceiveEvent.java
index 323a6d8..51ae926 100644
--- a/sources/events/internal/VSMessageReceiveEvent.java
+++ b/sources/events/internal/VSMessageReceiveEvent.java
@@ -11,7 +11,7 @@ import serialize.VSNotSerializable;
  * @author Paul C. Buetow
  */
 public class VSMessageReceiveEvent extends VSAbstractInternalEvent
-            implements VSNotSerializable {
+    implements VSNotSerializable {
 
     /** The message. */
     private VSMessage message;
@@ -53,7 +53,7 @@ public class VSMessageReceiveEvent extends VSAbstractInternalEvent
         process.updateVectorTime(message.getVectorTime());
 
         StringBuffer buffer = new StringBuffer();
-        buffer.append(prefs.getString("lang.en.message.recv"));
+        buffer.append(prefs.getString("lang.message.recv"));
         buffer.append("; ");
         buffer.append(message);;
         log(buffer.toString());
diff --git a/sources/events/internal/VSProtocolEvent.java b/sources/events/internal/VSProtocolEvent.java
index c39b639..de630e3 100644
--- a/sources/events/internal/VSProtocolEvent.java
+++ b/sources/events/internal/VSProtocolEvent.java
@@ -21,7 +21,7 @@ import serialize.VSSerialize;
  * @author Paul C. Buetow
  */
 public class VSProtocolEvent extends VSAbstractInternalEvent
-            implements VSCopyableEvent {
+    implements VSCopyableEvent {
     /** The protocol classname. */
     private String protocolClassname;
 
@@ -116,13 +116,13 @@ public class VSProtocolEvent extends VSAbstractInternalEvent
 
         buffer.append(" ");
         buffer.append(isClientProtocol
-                      ? prefs.getString("lang.en.client")
-                      : prefs.getString("lang.en.server"));
+                      ? prefs.getString("lang.client")
+                      : prefs.getString("lang.server"));
 
         buffer.append(" ");
         buffer.append(isProtocolActivation
-                      ? prefs.getString("lang.en.activated")
-                      : prefs.getString("lang.en.deactivated"));
+                      ? prefs.getString("lang.activated")
+                      : prefs.getString("langactivated"));
 
         log(buffer.toString());
     }
diff --git a/sources/events/internal/VSProtocolScheduleEvent.java b/sources/events/internal/VSProtocolScheduleEvent.java
index 9c708ad..c940212 100644
--- a/sources/events/internal/VSProtocolScheduleEvent.java
+++ b/sources/events/internal/VSProtocolScheduleEvent.java
@@ -16,7 +16,7 @@ import serialize.VSSerialize;
  * @author Paul C. Buetow
  */
 public class VSProtocolScheduleEvent extends VSAbstractInternalEvent
-            implements VSNotSerializable {
+    implements VSNotSerializable {
     /** The event is a server protocol schedule. */
     private boolean isServerSchedule; /* true = server, false = client */
 
diff --git a/sources/prefs/VSDefaultPrefs.java b/sources/prefs/VSDefaultPrefs.java
index cfa579c..aa41143 100644
--- a/sources/prefs/VSDefaultPrefs.java
+++ b/sources/prefs/VSDefaultPrefs.java
@@ -45,139 +45,139 @@ public class VSDefaultPrefs extends VSSerializablePrefs {
      * Fill with default strings.
      */
     public void fillDefaultStrings() {
-        initString("lang.en.about", "About");
-        initString("lang.en.about.info", "This program used to be the diploma thesis of Paul C. Buetow. Please contact vs-sim@dev.buetow.org, if you find any errors!");
-        initString("lang.en.activate", "activate");
-        initString("lang.en.activated", "activated");
-        initString("lang.en.actualize", "Activation");
-        initString("lang.en.all", "All");
-        initString("lang.en.antialiasing", "Anti-Aliasing");
-        initString("lang.en.cancel", "Abort");
-        initString("lang.en.client", "Client");
-        initString("lang.en.clientrequest.start", "Start client request");
-        initString("lang.en.close", "Close");
-        initString("lang.en.colorchooser", "Color chooser");
-        initString("lang.en.colorchooser2", "Please select color");
-        initString("lang.en.copy", "Copy");
-        initString("lang.en.crashed", "Crashed");
-        initString("lang.en.dat", "Simulation (.dat)");
-        initString("lang.en.deactivate", "deactivate");
-        initString("lang.en.deactivated", "deactivated");
-        initString("lang.en.default", "Defaults");
-        initString("lang.en.edit", "Edit");
-        initString("lang.en.editor", "Editor");
-        initString("lang.en.event", "Event");
-        initString("lang.en.event.add.global", "Insert global event");
-        initString("lang.en.event.add.local", "Insert local event");
-        initString("lang.en.event.add.time", "at");
-        initString("lang.en.events", "Events");
-        initString("lang.en.events.process", "Process events");
-        initString("lang.en.file", "File");
-        initString("lang.en.filter", "Filter");
-        initString("lang.en.loging.active", "Logging");
-        initString("lang.en.loging.clear", "Delete logs");
-        initString("lang.en.message", "Message");
-        initString("lang.en.message.recv", "Message received");
-        initString("lang.en.message.sent", "Message sent");
-        initString("lang.en.mode.expert", "Expert mode");
-        initString("lang.en.name", "VS-Simulator 1.1");
-        initString("lang.en.ok", "OK");
-        initString("lang.en.open", "Open");
-        initString("lang.en.pause", "Paus");
-        initString("lang.en.prefs", "Preferences");
-        initString("lang.en.prefs.color", "Color preferences");
-        initString("lang.en.prefs.diverse", "Diverse preferences");
-        initString("lang.en.prefs.ext", "Extended preferences");
-        initString("lang.en.prefs.message", "Message preferences");
-        initString("lang.en.prefs.message.defaults", "Message prefs. for new processes");
-        initString("lang.en.prefs.more", "More preferences");
-        initString("lang.en.prefs.process", "Process preferences");
-        initString("lang.en.prefs.process", "Standard process preferences");
-        initString("lang.en.prefs.process.defaults", "Preferences for new processes");
-        initString("lang.en.prefs.process.ext", "Extended process preferences");
-        initString("lang.en.prefs.protocols", "Protocol preferences");
-        initString("lang.en.prefs.simulator", "Simulator preferences");
-        initString("lang.en.process", "Process");
-        initString("lang.en.process.add.new", "Insert new process");
-        initString("lang.en.process.crash", "Crash process");
-        initString("lang.en.process.edit", "Edit process");
-        initString("lang.en.process.id", "PID");
-        initString("lang.en.process.new", "New process");
-        initString("lang.en.process.not.selected", "No process selected");
-        initString("lang.en.process.recover", "Recover process");
-        initString("lang.en.process.remove", "Remove process");
-        initString("lang.en.process.selected", "Selected process");
-        initString("lang.en.process.time.local", "Local time");
-        initString("lang.en.processes.all", "All processes");
-        initString("lang.en.protocol", "Protocol");
-        initString("lang.en.protocol.client", "Client side");
-        initString("lang.en.protocol.editor", "Protocol editor");
-        initString("lang.en.protocol.server", "Server side");
-        initString("lang.en.protocol.tasks.activation", "Client-/Server protocol activation");
-        initString("lang.en.protocol.tasks.client", "Client Task-Manager (Client request)");
-        initString("lang.en.protocols", "Protocols");
-        initString("lang.en.quit", "Quit");
-        initString("lang.en.recovered", "Recovered");
-        initString("lang.en.remove", "Remove");
-        initString("lang.en.replay", "Repeat");
-        initString("lang.en.reset", "Reset");
-        initString("lang.en.save", "Save");
-        initString("lang.en.saveas", "Save as");
-        initString("lang.en.server", "Server");
-        initString("lang.en.serverrequest.start", "Start server request");
-        initString("lang.en.simulator", "Simulator");
-        initString("lang.en.simulator.close", "Close simulation");
-        initString("lang.en.simulator.finished", "Simulation closed");
-        initString("lang.en.simulator.new", "New simulation");
-        initString("lang.en.simulator.paused", "Simulation paused");
-        initString("lang.en.simulator.resetted", "Simulation resetted");
-        initString("lang.en.simulator.started", "Simulation started");
-        initString("lang.en.start", "Start");
-        initString("lang.en.stop", "Stop");
-        initString("lang.en.takeover", "Take over");
-        initString("lang.en.task", "Task");
-        initString("lang.en.task.manager", "Event editor");
-        initString("lang.en.tasks.fullfilled", "Fullfilled tasks");
-        initString("lang.en.tasks.global", "GLobal tasks");
-        initString("lang.en.tasks.local", "Local tasks");
-        initString("lang.en.time", "Time");
-        initString("lang.en.time.lamport", "Lamport time");
-        initString("lang.en.time.vector", "Vector time");
-        initString("lang.en.timed.global", "Global events");
-        initString("lang.en.timed.local", "Local events");
-        initString("lang.en.type", "Type");
-        initString("lang.en.value", "Value");
-        initString("lang.en.variable", "Variable");
-        initString("lang.en.variables", "Variables");
-        initString("lang.en.variables.global", "Global variables");
-        initString("lang.en.window.close", "Close window");
-        initString("lang.en.window.new", "New window");
+        initString("lang.about", "About");
+        initString("lang.about.info", "This program used to be the diploma thesis of Paul C. Buetow. Please contact vs-sim@dev.buetow.org, if you find any errors!");
+        initString("lang.activate", "activate");
+        initString("lang.activated", "activated");
+        initString("lang.actualize", "Activation");
+        initString("lang.all", "All");
+        initString("lang.antialiasing", "Anti-Aliasing");
+        initString("lang.cancel", "Abort");
+        initString("lang.client", "Client");
+        initString("lang.clientrequest.start", "Start client request");
+        initString("lang.close", "Close");
+        initString("lang.colorchooser", "Color chooser");
+        initString("lang.colorchooser2", "Please select color");
+        initString("lang.copy", "Copy");
+        initString("lang.crashed", "Crashed");
+        initString("lang.dat", "Simulation (.dat)");
+        initString("langactivate", "deactivate");
+        initString("langactivated", "deactivated");
+        initString("lang.default", "Defaults");
+        initString("lang.edit", "Edit");
+        initString("lang.editor", "Editor");
+        initString("lang.event", "Event");
+        initString("lang.event.add.global", "Insert global event");
+        initString("lang.event.add.local", "Insert local event");
+        initString("lang.event.add.time", "at");
+        initString("lang.events", "Events");
+        initString("lang.events.process", "Process events");
+        initString("lang.file", "File");
+        initString("lang.filter", "Filter");
+        initString("lang.loging.active", "Logging");
+        initString("lang.loging.clear", "Delete logs");
+        initString("lang.message", "Message");
+        initString("lang.message.recv", "Message received");
+        initString("lang.message.sent", "Message sent");
+        initString("lang.mode.expert", "Expert mode");
+        initString("lang.name", "VS-Simulator 1.1");
+        initString("lang.ok", "OK");
+        initString("lang.open", "Open");
+        initString("lang.pause", "Pause");
+        initString("lang.prefs", "Preferences");
+        initString("lang.prefs.color", "Color preferences");
+        initString("lang.prefs.diverse", "Diverse preferences");
+        initString("lang.prefs.ext", "Extended preferences");
+        initString("lang.prefs.message", "Message preferences");
+        initString("lang.prefs.message.defaults", "Message prefs. for new processes");
+        initString("lang.prefs.more", "More preferences");
+        initString("lang.prefs.process", "Process preferences");
+        initString("lang.prefs.process", "Standard process preferences");
+        initString("lang.prefs.process.defaults", "Preferences for new processes");
+        initString("lang.prefs.process.ext", "Extended process preferences");
+        initString("lang.prefs.protocols", "Protocol preferences");
+        initString("lang.prefs.simulator", "Simulator preferences");
+        initString("lang.process", "Process");
+        initString("lang.process.add.new", "Insert new process");
+        initString("lang.process.crash", "Crash process");
+        initString("lang.process.edit", "Edit process");
+        initString("lang.process.id", "PID");
+        initString("lang.process.new", "New process");
+        initString("lang.process.not.selected", "No process selected");
+        initString("lang.process.recover", "Recover process");
+        initString("lang.process.remove", "Remove process");
+        initString("lang.process.selected", "Selected process");
+        initString("lang.process.time.local", "Local time");
+        initString("lang.processes.all", "All processes");
+        initString("lang.protocol", "Protocol");
+        initString("lang.protocol.client", "Client side");
+        initString("lang.protocol.editor", "Protocol editor");
+        initString("lang.protocol.server", "Server side");
+        initString("lang.protocol.tasks.activation", "Client-/Server protocol activation");
+        initString("lang.protocol.tasks.client", "Client Task-Manager (Client request)");
+        initString("lang.protocols", "Protocols");
+        initString("lang.quit", "Quit");
+        initString("lang.recovered", "Recovered");
+        initString("lang.remove", "Remove");
+        initString("lang.replay", "Repeat");
+        initString("lang.reset", "Reset");
+        initString("lang.save", "Save");
+        initString("lang.saveas", "Save as");
+        initString("lang.server", "Server");
+        initString("lang.serverrequest.start", "Start server request");
+        initString("lang.simulator", "Simulator");
+        initString("lang.simulator.close", "Close simulation");
+        initString("lang.simulator.finished", "Simulation closed");
+        initString("lang.simulator.new", "New simulation");
+        initString("lang.simulator.paused", "Simulation paused");
+        initString("lang.simulator.resetted", "Simulation resetted");
+        initString("lang.simulator.started", "Simulation started");
+        initString("lang.start", "Start");
+        initString("lang.stop", "Stop");
+        initString("lang.takeover", "Take over");
+        initString("lang.task", "Task");
+        initString("lang.task.manager", "Event editor");
+        initString("lang.tasks.fullfilled", "Fullfilled tasks");
+        initString("lang.tasks.global", "GLobal tasks");
+        initString("lang.tasks.local", "Local tasks");
+        initString("lang.time", "Time");
+        initString("lang.time.lamport", "Lamport time");
+        initString("lang.time.vector", "Vector time");
+        initString("lang.timed.global", "Global events");
+        initString("lang.timed.local", "Local events");
+        initString("lang.type", "Type");
+        initString("lang.value", "Value");
+        initString("lang.variable", "Variable");
+        initString("lang.variables", "Variables");
+        initString("lang.variables.global", "Global variables");
+        initString("lang.window.close", "Close window");
+        initString("lang.window.new", "New window");
 
         /* Protocol names */
-        initString("lang.en.events.implementations.VSProcessCrashEvent", "Process Crash Event");
-        initString("lang.en.events.implementations.VSProcessCrashEvent.short", "Process Crash");
-        initString("lang.en.events.implementations.VSProcessRecoverEvent", "Process Recover Event");
-        initString("lang.en.events.implementations.VSProcessRecoverEvent.short", "Process Recover");
-        initString("lang.en.protocols.implementations.VSBasicMulticastProtocol", "Basic Multicast Protocol");
-        initString("lang.en.protocols.implementations.VSBasicMulticastProtocol.short", "Basic Multicast");
-        initString("lang.en.protocols.implementations.VSBerkelyTimeProtocol", "Berkley algorithm for internal sync.");
-        initString("lang.en.protocols.implementations.VSBerkelyTimeProtocol.short", "Berkley Protocol");
-        initString("lang.en.protocols.implementations.VSBroadcastProtocol", "Broadcast Protocol");
-        initString("lang.en.protocols.implementations.VSBroadcastProtocol.short", "Broadcast");
-        initString("lang.en.protocols.implementations.VSDummyProtocol", "Example/Dummy Protocol");
-        initString("lang.en.protocols.implementations.VSDummyProtocol.short", "Example/Dummy");
-        initString("lang.en.protocols.implementations.VSExternalTimeSyncProtocol", "Christians method for external sync.");
-        initString("lang.en.protocols.implementations.VSExternalTimeSyncProtocol.short", "Christians");
-        initString("lang.en.protocols.implementations.VSInternalTimeSyncProtocol", "Internal Synchronization Protocol");
-        initString("lang.en.protocols.implementations.VSInternalTimeSyncProtocol.short", "Internal sync.");
-        initString("lang.en.protocols.implementations.VSOnePhaseCommitProtocol", "One-Phase Commit Protocol");
-        initString("lang.en.protocols.implementations.VSOnePhaseCommitProtocol.short", "1-Phase Commit");
-        initString("lang.en.protocols.implementations.VSPingPongProtocol", "Ping-Pong Protocol");
-        initString("lang.en.protocols.implementations.VSPingPongProtocol.short", "Ping-Pong");
-        initString("lang.en.protocols.implementations.VSReliableMulticastProtocol", "Reliable Multicast Protocol");
-        initString("lang.en.protocols.implementations.VSReliableMulticastProtocol.short", "Reliable Multicast");
-        initString("lang.en.protocols.implementations.VSTwoPhaseCommitProtocol", "Two-Phase Commit");
-        initString("lang.en.protocols.implementations.VSTwoPhaseCommitProtocol.short", "2-Phase Commit");
+        initString("lang.events.implementations.VSProcessCrashEvent", "Process Crash Event");
+        initString("lang.events.implementations.VSProcessCrashEvent.short", "Process Crash");
+        initString("lang.events.implementations.VSProcessRecoverEvent", "Process Recover Event");
+        initString("lang.events.implementations.VSProcessRecoverEvent.short", "Process Recover");
+        initString("lang.protocols.implementations.VSBasicMulticastProtocol", "Basic Multicast Protocol");
+        initString("lang.protocols.implementations.VSBasicMulticastProtocol.short", "Basic Multicast");
+        initString("lang.protocols.implementations.VSBerkelyTimeProtocol", "Berkley algorithm for internal sync.");
+        initString("lang.protocols.implementations.VSBerkelyTimeProtocol.short", "Berkley Protocol");
+        initString("lang.protocols.implementations.VSBroadcastProtocol", "Broadcast Protocol");
+        initString("lang.protocols.implementations.VSBroadcastProtocol.short", "Broadcast");
+        initString("lang.protocols.implementations.VSDummyProtocol", "Example/Dummy Protocol");
+        initString("lang.protocols.implementations.VSDummyProtocol.short", "Example/Dummy");
+        initString("lang.protocols.implementations.VSExternalTimeSyncProtocol", "Christians method for external sync.");
+        initString("lang.protocols.implementations.VSExternalTimeSyncProtocol.short", "Christians");
+        initString("lang.protocols.implementations.VSInternalTimeSyncProtocol", "Internal Synchronization Protocol");
+        initString("lang.protocols.implementations.VSInternalTimeSyncProtocol.short", "Internal sync.");
+        initString("lang.protocols.implementations.VSOnePhaseCommitProtocol", "One-Phase Commit Protocol");
+        initString("lang.protocols.implementations.VSOnePhaseCommitProtocol.short", "1-Phase Commit");
+        initString("lang.protocols.implementations.VSPingPongProtocol", "Ping-Pong Protocol");
+        initString("lang.protocols.implementations.VSPingPongProtocol.short", "Ping-Pong");
+        initString("lang.protocols.implementations.VSReliableMulticastProtocol", "Reliable Multicast Protocol");
+        initString("lang.protocols.implementations.VSReliableMulticastProtocol.short", "Reliable Multicast");
+        initString("lang.protocols.implementations.VSTwoPhaseCommitProtocol", "Two-Phase Commit");
+        initString("lang.protocols.implementations.VSTwoPhaseCommitProtocol.short", "2-Phase Commit");
     }
 
     /**
diff --git a/sources/prefs/VSDefaultPrefsDE.java b/sources/prefs/VSDefaultPrefsDE.java
deleted file mode 100644
index fb2eacb..0000000
--- a/sources/prefs/VSDefaultPrefsDE.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package prefs;
-
-import java.awt.Color;
-import java.awt.event.KeyEvent;
-
-/**
- * The class VSDefaultPrefsDE, makes sure that the simulator has its default
- * configuration values.
- *
- * @author Paul C. Buetow
- */
-public class VSDefaultPrefsDE extends VSSerializablePrefs {
-    /**
-     * Inits a prefs object with default values.
-     *
-     * @return the lang.process.removeprefs
-     */
-    public static VSPrefs init() {
-        VSDefaultPrefsDE prefs = new VSDefaultPrefsDE();
-        prefs.fillWithDefaults();
-        return prefs;
-    }
-
-    /**
-     * Fill everything with ts defaults.
-     */
-    public void fillWithDefaults() {
-        super.clear();
-        addWithDefaults();
-    }
-
-    /**
-     * Adds default values if not existent.
-     */
-    public void addWithDefaults() {
-        fillDefaultBooleans();
-        fillDefaultColors();
-        fillDefaultFloats();
-        fillDefaultIntegers();
-        fillDefaultLongs();
-        fillDefaultStrings();
-    }
-
-    /**
-     * Fill with default strings.
-     */
-    public void fillDefaultStrings() {
-        initString("lang.de.about", "About");
-        initString("lang.de.about.info", "Dieses Programm wurde von Paul Bütow im Rahmen der Diplomarbeit \"Objektorientierte Entwicklung eines GUI-basierten Tools für die ereignisbasierte Simulator verteilter Systeme\" bei Prof. Dr.-Ing. Oßmann als 1. Prüfer sowie Betreuer und Prof. Dr. rer. nat. Fassbender als 2. Prüfer erstellt. Bei Fehlern bitte eine kurze Mail mit Fehlerbeschreibung an paul at buetow punkt org schicken!");
-        initString("lang.de.activate", "aktivieren");
-        initString("lang.de.activated", "aktiviert");
-        initString("lang.de.actualize", "Aktualisieren");
-        initString("lang.de.all", "Alle");
-        initString("lang.de.antialiasing", "Anti-Aliasing");
-        initString("lang.de.cancel", "Abbrechen");
-        initString("lang.de.client", "Client");
-        initString("lang.de.clientrequest.start", "Clientanfrage starten");
-        initString("lang.de.close", "Schliessen");
-        initString("lang.de.colorchooser", "Farbauswahl");
-        initString("lang.de.colorchooser2", "Bitte Farbe auswählen");
-        initString("lang.de.copy", "Kopieren");
-        initString("lang.de.crashed", "Abgestürzt");
-        initString("lang.de.dat", "Simulation (.dat)");
-        initString("lang.de.deactivate", "deaktivieren");
-        initString("lang.de.deactivated", "deaktiviert");
-        initString("lang.de.default", "Defaults");
-        initString("lang.de.edit", "Editieren");
-        initString("lang.de.editor", "Editor");
-        initString("lang.de.event", "Ereignis");
-        initString("lang.de.event.add.global", "Globales Ereignis einfügen");
-        initString("lang.de.event.add.local", "Lokales Ereignis einfügen");
-        initString("lang.de.event.add.time", "bei");
-        initString("lang.de.events", "Ereignisse");
-        initString("lang.de.events.process", "Prozessereignisse");
-        initString("lang.de.file", "Datei");
-        initString("lang.de.filter", "Filter");
-        initString("lang.de.loging.active", "Logging");
-        initString("lang.de.loging.clear", "Loggs löschen");
-        initString("lang.de.message", "Nachricht");
-        initString("lang.de.message.recv", "Nachricht erhalten");
-        initString("lang.de.message.sent", "Nachricht versendet");
-        initString("lang.de.mode.expert", "Expertenmodus");
-        initString("lang.de.name", "VS-Simulator 1.0");
-        initString("lang.de.ok", "OK");
-        initString("lang.de.open", "Öffnen");
-        initString("lang.de.pause", "Pausieren");
-        initString("lang.de.prefs", "Einstellungen");
-        initString("lang.de.prefs.color", "Farbeinstellungen");
-        initString("lang.de.prefs.diverse", "Diverse Einstellungen");
-        initString("lang.de.prefs.ext", "Erweiterte Einstellungen");
-        initString("lang.de.prefs.message", "Nachrichteneinstellungen");
-        initString("lang.de.prefs.message.defaults", "Nachrichteneinstellungen für neue Prozesse");
-        initString("lang.de.prefs.more", "Mehr Einstellungen");
-        initString("lang.de.prefs.process", "Prozesseinstellungen");
-        initString("lang.de.prefs.process", "Prozessstandardeinstellungen");
-        initString("lang.de.prefs.process.defaults", "Einstellungen für neue Prozesse");
-        initString("lang.de.prefs.process.ext", "Erweiterte Prozesseinstellungen");
-        initString("lang.de.prefs.protocols", "Protokolleinstellungen");
-        initString("lang.de.prefs.simulator", "Simulationseinstellungen");
-        initString("lang.de.process", "Prozess");
-        initString("lang.de.process.add.new", "Neuen Prozess hinzufügen");
-        initString("lang.de.process.crash", "Prozess abstürzen");
-        initString("lang.de.process.edit", "Prozess editieren");
-        initString("lang.de.process.id", "PID");
-        initString("lang.de.process.new", "Neuer Prozess");
-        initString("lang.de.process.not.selected", "Kein Prozess ausgewählt");
-        initString("lang.de.process.recover", "Prozess wiederbeleben");
-        initString("lang.de.process.remove", "Prozess entfernen");
-        initString("lang.de.process.selected", "Aktuell ausgewählter Prozess");
-        initString("lang.de.process.time.local", "Lokale Zeit");
-        initString("lang.de.processes.all", "Alle Prozesse");
-        initString("lang.de.protocol", "Protokoll");
-        initString("lang.de.protocol.client", "Clientseite");
-        initString("lang.de.protocol.editor", "Protokolleditor");
-        initString("lang.de.protocol.server", "Serverseite");
-        initString("lang.de.protocol.tasks.activation", "Client-/Serverprotokoll Aktivierung");
-        initString("lang.de.protocol.tasks.client", "Client Task-Manager (Clientanfragen)");
-        initString("lang.de.protocols", "Protokolle");
-        initString("lang.de.quit", "Beenden");
-        initString("lang.de.recovered", "Wiederbelebt");
-        initString("lang.de.remove", "Entfernen");
-        initString("lang.de.replay", "Wiederholen");
-        initString("lang.de.reset", "Reset");
-        initString("lang.de.save", "Speichern");
-        initString("lang.de.saveas", "Speichern unter");
-        initString("lang.de.server", "Server");
-        initString("lang.de.serverrequest.start", "Serveranfrage starten");
-        initString("lang.de.simulator", "Simulator");
-        initString("lang.de.simulator.close", "Simulation schliessen");
-        initString("lang.de.simulator.finished", "Simulation beendet");
-        initString("lang.de.simulator.new", "Neue Simulation");
-        initString("lang.de.simulator.paused", "Simulation pausiert");
-        initString("lang.de.simulator.resetted", "Simulation zurückgesetzt");
-        initString("lang.de.simulator.started", "Simulation gestartet");
-        initString("lang.de.start", "Starten");
-        initString("lang.de.stop", "Stoppen");
-        initString("lang.de.takeover", "Übernehmen");
-        initString("lang.de.task", "Aufgabe");
-        initString("lang.de.task.manager", "Ereigniseditor");
-        initString("lang.de.tasks.fullfilled", "Abgelaufene Aufgaben");
-        initString("lang.de.tasks.global", "Globale Aufgaben");
-        initString("lang.de.tasks.local", "Lokale Aufgaben");
-        initString("lang.de.time", "Zeit");
-        initString("lang.de.time.lamport", "Lamportzeit");
-        initString("lang.de.time.vector", "Vektorzeit");
-        initString("lang.de.timed.global", "Globale Ereignisse");
-        initString("lang.de.timed.local", "Lokale Ereignisse");
-        initString("lang.de.type", "Typ");
-        initString("lang.de.value", "Wert");
-        initString("lang.de.variable", "Variable");
-        initString("lang.de.variables", "Variablen");
-        initString("lang.de.variables.global", "Globale Variablen");
-        initString("lang.de.window.close", "Fenster schliessen");
-        initString("lang.de.window.new", "Neues Fenster");
-    }
-
-    /**
-     * Fill with default integers.
-     */
-    public void fillDefaultIntegers() {
-        /* Simulator prefs */
-        initInteger("sim.process.num", 3, "Anzahl der Prozesse", 1, 6);
-        initInteger("message.prob.outage", 0, "Nachrichtenverlustw'keit", 0, 100, "%");
-        initInteger("process.prob.crash", 0, "Prozessausfallw'keit", 0, 100, "%");
-        initInteger("sim.seconds", 15, "Dauer der Simulation", 5, 120, "s");
-
-        /* Internal prefs */
-        initInteger("keyevent.about", KeyEvent.VK_A, null, 0, 100);
-        initInteger("keyevent.cancel", KeyEvent.VK_A, null, 0, 100);
-        initInteger("keyevent.close", KeyEvent.VK_C, null, 0, 100);
-        initInteger("keyevent.default", KeyEvent.VK_F, null, 0, 100);
-        initInteger("keyevent.edit", KeyEvent.VK_E, null, 0, 100);
-        initInteger("keyevent.file", KeyEvent.VK_D, null, 0, 100);
-        initInteger("keyevent.new", KeyEvent.VK_N, null, 0, 100);
-        initInteger("keyevent.actualize", KeyEvent.VK_A, null, 0, 100);
-        initInteger("keyevent.takeover", KeyEvent.VK_B, null, 0, 100);
-        initInteger("keyevent.ok", KeyEvent.VK_O, null, 0, 100);
-        initInteger("keyevent.open", KeyEvent.VK_O, null, 0, 100);
-        initInteger("keyevent.pause", KeyEvent.VK_P, null, 0, 100);
-        initInteger("keyevent.prefs", KeyEvent.VK_P, null, 0, 100);
-        initInteger("keyevent.prefs.ext", KeyEvent.VK_E, null, 0, 100);
-        initInteger("keyevent.quit", KeyEvent.VK_B, null, 0, 100);
-        initInteger("keyevent.replay", KeyEvent.VK_W, null, 0, 100);
-        initInteger("keyevent.reset", KeyEvent.VK_R, null, 0, 100);
-        initInteger("keyevent.save", KeyEvent.VK_S, null, 0, 100);
-        initInteger("keyevent.saveas", KeyEvent.VK_V, null, 0, 100);
-        initInteger("keyevent.simulator", KeyEvent.VK_S, null, 0, 100);
-        initInteger("keyevent.start", KeyEvent.VK_S, null, 0, 100);
-        initInteger("keyevent.stop", KeyEvent.VK_P, null, 0, 100);
-
-        initInteger("div.window.prefs.xsize", 400, "Einstellungsfenster X-Achse", 550, 3200, "px");
-        initInteger("div.window.prefs.ysize", 400, "Einstellungsfenster Y-Achse", 640, 2400, "px");
-        initInteger("div.window.logsize", 300, "Loggfenster Y-Achse", 100, 1000, "px");
-        initInteger("div.window.splitsize", 320, "Toolbar X-Achse", 100, 1000, "px");
-        initInteger("div.window.xsize", 1024, "Hauptfenster X-Achse", 750, 3200, "px");
-        initInteger("div.window.ysize", 768, "Hauptfenster Y-Achse", 600, 2400, "px");
-    }
-
-    /**
-     * Fill with default floats.
-     */
-    public void fillDefaultFloats() {
-        /* Simulator prefs */
-        initFloat("process.clock.variance", 0, "Uhrabweichung");
-        initFloat("sim.clock.speed", 0.5f, "Abspielgeschwindigkeit der Simulation");
-    }
-
-    /**
-     * Fill default longs.
-     */
-    public void fillDefaultLongs() {
-        /* Simulator prefs */
-        initLong("message.sendingtime.min", 500, "Minimale Übertragungszeit", "ms");
-        initLong("message.sendingtime.max", 2000, "Maximale Übertragungszeit", "ms");
-    }
-
-    /**
-     * Fill with default colors.
-     */
-    public void fillDefaultColors() {
-        /* Internal prefs */
-        initColor("col.background", new Color(0xFF, 0xFF, 0xFF));
-        initColor("col.process.default", new Color(0x00, 0x00, 0x00));
-        initColor("col.process.running", new Color(0x0D, 0xD8, 0x09));
-        initColor("col.process.crashed", new Color(0xff, 0x00, 0x00));
-        initColor("col.process.highlight", new Color(0xff, 0xA5, 0x00));
-        initColor("col.process.line", new Color(0x00, 0x00, 0x00));
-        initColor("col.process.secondline", new Color(0xAA, 0xAA, 0xAA));
-        initColor("col.process.sepline", new Color(0xff, 0x00, 0x00));
-        initColor("col.process.stopped", new Color(0x00, 0x00, 0x00));
-        initColor("col.message.arrived", new Color(0x00, 0x85, 0xD2));
-        initColor("col.message.sending", new Color(0x0D, 0xD8, 0x09));
-        initColor("col.message.lost", new Color(0xFF, 0x00, 0x00));
-    }
-
-    /**
-     * Fill with default booleans.
-     */
-    public void fillDefaultBooleans() {
-        initBoolean("sim.mode.expert", false, "Expertenmodus aktivieren");
-        initBoolean("sim.message.own.recv", false, "Prozesse empfangen eigene Nachrichten");
-        initBoolean("sim.message.prob.mean", true, "Mittelwerte der Nachrichtverlustw'k. bilden");
-        initBoolean("sim.message.sendingtime.mean", true, "Mittelwerte der Übertragungszeiten bilden");
-        initBoolean("sim.messages.relevant", true, "Nur relevante Nachrichten anzeigen");
-        initBoolean("sim.periodic", false, "Simulation periodisch wiederholen");
-        initBoolean("sim.update.lamporttime.all", false, "Lamportzeiten betreffen alle Ereignisse");
-        initBoolean("sim.update.vectortime.all", false, "Vektorzeiten betreffen alle Ereignisse");
-    }
-}
diff --git a/sources/prefs/VSPrefs.java b/sources/prefs/VSPrefs.java
index ea128df..9209e55 100644
--- a/sources/prefs/VSPrefs.java
+++ b/sources/prefs/VSPrefs.java
@@ -210,8 +210,7 @@ public class VSPrefs {
         Object val = objectPrefs.get(key);
 
         if (val == null) {
-            System.err.println("Fatal: No such object config value \""
-                               + key + "\"");
+            System.err.println("Fatal: No such object config value \"" + key + "\"");
             System.exit(1);
         }
 
@@ -531,8 +530,7 @@ public class VSPrefs {
         Integer val = integerPrefs.get(key);
 
         if (val == null) {
-            System.err.println("Fatal: No such integer config value \""
-                               + key + "\"");
+            System.err.println("Fatal: No such integer config value \"" + key + "\"");
             System.exit(1);
         }
 
@@ -665,8 +663,7 @@ public class VSPrefs {
         Vector<Integer> val = vectorPrefs.get(key);
 
         if (val == null) {
-            System.err.println("Fatal: No such integer config value \""
-                               + key + "\"");
+            System.err.println("Fatal: No such integer config value \"" + key + "\"");
             System.exit(1);
         }
 
@@ -752,8 +749,7 @@ public class VSPrefs {
         Long val = longPrefs.get(key);
 
         if (val == null) {
-            System.err.println("Fatal: No such long config value \""
-                               + key + "\"");
+            System.err.println("Fatal: No such long config value \"" + key + "\"");
             System.exit(1);
         }
 
@@ -848,8 +844,8 @@ public class VSPrefs {
         String val = stringPrefs.get(key);
 
         if (val == null) {
-            System.err.println("Fatal: No such string config value \""
-                               + key + "\"");
+            // TODO: Redirect all string keys with prefix "lang" to static lang map.
+            System.err.println("Fatal: No such string config value \"" + key + "\"");
             System.exit(1);
         }
 
@@ -936,26 +932,16 @@ public class VSPrefs {
         /** For later backwards compatibility, to add more stuff */
         objectInputStream.readObject();
 
-        booleanPrefs = (HashMap<String,Boolean>)
-                       objectInputStream.readObject();
-        colorPrefs = (HashMap<String,Color>)
-                     objectInputStream.readObject();
-        descriptionPrefs = (HashMap<String,String>)
-                           objectInputStream.readObject();
-        floatPrefs = (HashMap<String,Float>)
-                     objectInputStream.readObject();
-        integerPrefs = (HashMap<String,Integer>)
-                       objectInputStream.readObject();
-        longPrefs = (HashMap<String,Long>)
-                    objectInputStream.readObject();
-        stringPrefs = (HashMap<String,String>)
-                      objectInputStream.readObject();
-        units = (HashMap<String,String>)
-                objectInputStream.readObject();
-        vectorPrefs = (HashMap<String,Vector<Integer>>)
-                      objectInputStream.readObject();
-        restrictions = (HashMap<String,VSPrefsRestriction>)
-                       objectInputStream.readObject();
+        booleanPrefs = (HashMap<String,Boolean>) objectInputStream.readObject();
+        colorPrefs = (HashMap<String,Color>) objectInputStream.readObject();
+        descriptionPrefs = (HashMap<String,String>) objectInputStream.readObject();
+        floatPrefs = (HashMap<String,Float>) objectInputStream.readObject();
+        integerPrefs = (HashMap<String,Integer>) objectInputStream.readObject();
+        longPrefs = (HashMap<String,Long>) objectInputStream.readObject();
+        stringPrefs = (HashMap<String,String>) objectInputStream.readObject();
+        units = (HashMap<String,String>) objectInputStream.readObject();
+        vectorPrefs = (HashMap<String,Vector<Integer>>) objectInputStream.readObject();
+        restrictions = (HashMap<String,VSPrefsRestriction>) objectInputStream.readObject();
 
         /** For later backwards compatibility, to add more stuff */
         objectInputStream.readObject();
diff --git a/sources/prefs/editors/VSAbstractEditor.java b/sources/prefs/editors/VSAbstractEditor.java
index e849a50..266b62c 100644
--- a/sources/prefs/editors/VSAbstractEditor.java
+++ b/sources/prefs/editors/VSAbstractEditor.java
@@ -244,7 +244,7 @@ public abstract class VSAbstractEditor implements ActionListener {
         boolean expertMode = prefs.getBoolean("sim.mode.expert");
 
         for (String elem : set) {
-            if (!elem.startsWith("lang.en.") && !elem.startsWith("keyevent.")) {
+            if (!elem.startsWith("lang.") && !elem.startsWith("keyevent.")) {
                 if (expertMode)
                     filtered.add(elem);
                 else if (!elem.startsWith("col.") && (!elem.startsWith("div.")))
@@ -266,7 +266,7 @@ public abstract class VSAbstractEditor implements ActionListener {
         addToButtonPanelFront(buttonPanel);
 
         JButton resetButton = new JButton(
-            prefs.getString("lang.en.reset"));
+            prefs.getString("lang.reset"));
         resetButton.setMnemonic(prefs.getInteger("keyevent.reset"));
         resetButton.addActionListener(this);
         buttonPanel.add(resetButton);
@@ -401,7 +401,7 @@ public abstract class VSAbstractEditor implements ActionListener {
      */
     protected VS3Tupel<String,Component,JCheckBox> createBooleanComponent(
         String fullKey, String key, VSPrefs prefsToEdit) {
-        final String activated = prefs.getString("lang.en.activated");
+        final String activated = prefs.getString("lang.activated");
         String descr = prefs.getDescription(fullKey);
         if (descr == null)
             descr = prefsToEdit.getDescription(fullKey);
@@ -499,9 +499,9 @@ public abstract class VSAbstractEditor implements ActionListener {
             public void mouseClicked(MouseEvent e) {
                 JFrame parentFrame = getFrame();
                 JFrame frame = new VSFrame(
-                    prefs.getString("lang.en.name") + " - " +
+                    prefs.getString("lang.name") + " - " +
                     prefs.getString(
-                        "lang.en.colorchooser"),parentFrame);
+                        "lang.colorchooser"),parentFrame);
                 frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 
                 JComponent colorChooserPane = new VSColorChooser(prefs,
@@ -639,7 +639,7 @@ public abstract class VSAbstractEditor implements ActionListener {
             if (key.startsWith("sim.")) {
                 if (!flag) {
                     flag = true;
-                    addSeparator(prefs.getString("lang.en.prefs.simulator"));
+                    addSeparator(prefs.getString("lang.prefs.simulator"));
                 }
                 addVariable(labels.get(fullKey), components.get(fullKey),
                             prefsToEdit);
@@ -653,10 +653,10 @@ public abstract class VSAbstractEditor implements ActionListener {
                 if (!flag) {
                     flag = true;
                     if (this instanceof VSProcessEditor)
-                        addSeparator(prefs.getString("lang.en.prefs.process"));
+                        addSeparator(prefs.getString("lang.prefs.process"));
                     else
                         addSeparator(prefs.getString(
-                                         "lang.en.prefs.process.defaults"));
+                                         "lang.prefs.process.defaults"));
                 }
                 addVariable(labels.get(fullKey), components.get(fullKey),
                             prefsToEdit);
@@ -671,10 +671,10 @@ public abstract class VSAbstractEditor implements ActionListener {
                     flag = true;
                     if (this instanceof VSProcessEditor)
                         addSeparator(prefs.getString(
-                                         "lang.en.prefs.message"));
+                                         "lang.prefs.message"));
                     else
                         addSeparator(prefs.getString(
-                                         "lang.en.prefs.message.defaults"));
+                                         "lang.prefs.message.defaults"));
                 }
                 addVariable(labels.get(fullKey), components.get(fullKey),
                             prefsToEdit);
@@ -687,7 +687,7 @@ public abstract class VSAbstractEditor implements ActionListener {
             if (key.startsWith("col.")) {
                 if (!flag) {
                     flag = true;
-                    addSeparator(prefs.getString("lang.en.prefs.color"));
+                    addSeparator(prefs.getString("lang.prefs.color"));
                 }
                 addVariable(labels.get(fullKey), components.get(fullKey),
                             prefsToEdit);
@@ -700,7 +700,7 @@ public abstract class VSAbstractEditor implements ActionListener {
             if (key.startsWith("div.")) {
                 if (!flag) {
                     flag = true;
-                    addSeparator(prefs.getString("lang.en.prefs.diverse"));
+                    addSeparator(prefs.getString("lang.prefs.diverse"));
                 }
                 addVariable(labels.get(fullKey), components.get(fullKey),
                             prefsToEdit);
@@ -1019,10 +1019,10 @@ public abstract class VSAbstractEditor implements ActionListener {
     public void actionPerformed(ActionEvent e) {
         String actionCommand = e.getActionCommand();
 
-        if (actionCommand.equals(prefs.getString("lang.en.takeover"))) {
+        if (actionCommand.equals(prefs.getString("lang.takeover"))) {
             savePrefs();
 
-        } else if (actionCommand.equals(prefs.getString("lang.en.reset"))) {
+        } else if (actionCommand.equals(prefs.getString("lang.reset"))) {
             resetPrefs();
         }
     }
diff --git a/sources/prefs/editors/VSColorChooser.java b/sources/prefs/editors/VSColorChooser.java
index 4f53fb4..ac67ace 100644
--- a/sources/prefs/editors/VSColorChooser.java
+++ b/sources/prefs/editors/VSColorChooser.java
@@ -45,7 +45,7 @@ public class VSColorChooser extends JPanel implements ChangeListener {
         colorChooser.setColor(color);
         colorChooser.getSelectionModel().addChangeListener(this);
         colorChooser.setBorder(BorderFactory.createTitledBorder(
-                                   prefs.getString("lang.en.colorchooser2")));
+                                   prefs.getString("lang.colorchooser2")));
         add(colorChooser, BorderLayout.CENTER);
     }
 
diff --git a/sources/prefs/editors/VSEditorFrame.java b/sources/prefs/editors/VSEditorFrame.java
index 650a619..e418801 100644
--- a/sources/prefs/editors/VSEditorFrame.java
+++ b/sources/prefs/editors/VSEditorFrame.java
@@ -63,13 +63,13 @@ public class VSEditorFrame extends VSFrame implements ActionListener {
      */
     private void fillButtonPanel(JPanel buttonPanel) {
         JButton okButton = new JButton(
-            prefs.getString("lang.en.ok"));
+            prefs.getString("lang.ok"));
         okButton.setMnemonic(prefs.getInteger("keyevent.ok"));
         okButton.addActionListener(this);
         buttonPanel.add(okButton, 0);
 
         JButton cancelButton = new JButton(
-            prefs.getString("lang.en.cancel"));
+            prefs.getString("lang.cancel"));
         cancelButton.setMnemonic(prefs.getInteger("keyevent.cancel"));
         cancelButton.addActionListener(this);
         buttonPanel.add(cancelButton, 1);
@@ -83,11 +83,11 @@ public class VSEditorFrame extends VSFrame implements ActionListener {
     public void actionPerformed(ActionEvent e) {
         String actionCommand = e.getActionCommand();
 
-        if (actionCommand.equals(prefs.getString("lang.en.ok"))) {
+        if (actionCommand.equals(prefs.getString("lang.ok"))) {
             editor.actionPerformed(e);
             dispose();
 
-        } else if (actionCommand.equals(prefs.getString("lang.en.cancel"))) {
+        } else if (actionCommand.equals(prefs.getString("lang.cancel"))) {
             editor.actionPerformed(e);
             dispose();
 
diff --git a/sources/prefs/editors/VSEditorTable.java b/sources/prefs/editors/VSEditorTable.java
index 30ae30c..7be0dbf 100644
--- a/sources/prefs/editors/VSEditorTable.java
+++ b/sources/prefs/editors/VSEditorTable.java
@@ -105,7 +105,7 @@ public class VSEditorTable extends JTable {
      * The class VSEditorTableModel, it is the model of a VSEditorTable.
      */
     private class VSEditorTableModel extends AbstractTableModel
-                implements TableCellRenderer {
+        implements TableCellRenderer {
         /** The serial version uid */
         private static final long serialVersionUID = 1L;
 
@@ -213,7 +213,7 @@ public class VSEditorTable extends JTable {
      * The class VSTableCellEditor, is the editor of the VSEditorTable
      */
     private class VSTableCellEditor extends AbstractCellEditor
-                implements TableCellEditor  {
+        implements TableCellEditor  {
         /** The serial version uid */
         private static final long serialVersionUID = 1L;
 
diff --git a/sources/prefs/editors/VSProcessEditor.java b/sources/prefs/editors/VSProcessEditor.java
index 8035085..105152e 100644
--- a/sources/prefs/editors/VSProcessEditor.java
+++ b/sources/prefs/editors/VSProcessEditor.java
@@ -30,8 +30,8 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
      * @param process the process
      */
     public VSProcessEditor(VSPrefs prefs, VSInternalProcess process) {
-        super(prefs, process, prefs.getString("lang.en.name") + " - " +
-              prefs.getString("lang.en.prefs.process"));;
+        super(prefs, process, prefs.getString("lang.name") + " - " +
+              prefs.getString("lang.prefs.process"));;
         this.process = process;
         disposeFrameWithParentIfExists();
         makeProtocolVariablesEditable();
@@ -43,7 +43,7 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
      */
     protected void addToButtonPanelFront(JPanel buttonPanel) {
         JButton takeoverButton = new JButton(
-            prefs.getString("lang.en.takeover"));
+            prefs.getString("lang.takeover"));
         takeoverButton.setMnemonic(prefs.getInteger("keyevent.takeover"));
         takeoverButton.addActionListener(this);
         buttonPanel.add(takeoverButton);
@@ -56,9 +56,9 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
         ArrayList<String> editableProtocolsClassnames =
             VSRegisteredEvents.getEditableProtocolsClassnames();
 
-        //String protocolString = " " + prefs.getString("lang.en.protocol");
-        String clientString = " " + prefs.getString("lang.en.client");
-        String serverString = " " + prefs.getString("lang.en.server");
+        //String protocolString = " " + prefs.getString("lang.protocol");
+        String clientString = " " + prefs.getString("lang.client");
+        String serverString = " " + prefs.getString("lang.server");
 
         for (String protocolClassname : editableProtocolsClassnames) {
             String protocolShortname =
@@ -92,11 +92,11 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
     public void actionPerformed(ActionEvent e) {
         String actionCommand = e.getActionCommand();
 
-        if (actionCommand.equals(prefs.getString("lang.en.ok"))) {
+        if (actionCommand.equals(prefs.getString("lang.ok"))) {
             savePrefs();
             process.updateFromPrefs();
 
-        } else if (actionCommand.equals(prefs.getString("lang.en.takeover"))) {
+        } else if (actionCommand.equals(prefs.getString("lang.takeover"))) {
             savePrefs();
             process.updateFromPrefs();
 
diff --git a/sources/prefs/editors/VSSimulatorEditor.java b/sources/prefs/editors/VSSimulatorEditor.java
index 53eea0a..9ee0e58 100644
--- a/sources/prefs/editors/VSSimulatorEditor.java
+++ b/sources/prefs/editors/VSSimulatorEditor.java
@@ -45,8 +45,8 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
      */
     public VSSimulatorEditor(VSPrefs prefs, VSSimulatorFrame simulatorFrame,
                              VSSimulator simulator) {
-        super(prefs, prefs, prefs.getString("lang.en.name")
-              + " - " + prefs.getString("lang.en.prefs"));
+        super(prefs, prefs, prefs.getString("lang.name")
+              + " - " + prefs.getString("lang.prefs"));
         this.dontStartNewSimulator = true;//simulator != null;
         this.simulatorFrame = simulatorFrame;
         this.simulator = simulator;
@@ -60,8 +60,8 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
      */
     public VSSimulatorEditor(VSPrefs prefs, VSSimulatorFrame simulatorFrame,
                              boolean openedNewWindow) {
-        super(prefs, prefs, prefs.getString("lang.en.name")
-              + " - " + prefs.getString("lang.en.prefs"));
+        super(prefs, prefs, prefs.getString("lang.name")
+              + " - " + prefs.getString("lang.prefs"));
         this.simulatorFrame = simulatorFrame;
         this.openedNewWindow = openedNewWindow;
     }
@@ -74,7 +74,7 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
         if (TAKEOVER_BUTTON) {
             TAKEOVER_BUTTON = false;
             JButton takeoverButton = new JButton(
-                prefs.getString("lang.en.takeover"));
+                prefs.getString("lang.takeover"));
             takeoverButton.setMnemonic(prefs.getInteger("keyevent.takeover"));
             takeoverButton.addActionListener(this);
             buttonPanel.add(takeoverButton);
@@ -88,7 +88,7 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
     public void actionPerformed(ActionEvent e) {
         String actionCommand = e.getActionCommand();
 
-        if (actionCommand.equals(prefs.getString("lang.en.takeover"))) {
+        if (actionCommand.equals(prefs.getString("lang.takeover"))) {
             savePrefs();
 
             if (simulator != null) {
@@ -97,11 +97,11 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
                 simulator.updateFromPrefs();
             }
 
-        } else if (actionCommand.equals(prefs.getString("lang.en.cancel"))) {
+        } else if (actionCommand.equals(prefs.getString("lang.cancel"))) {
             if (!dontStartNewSimulator && openedNewWindow)
                 simulatorFrame.dispose();
 
-        } else if (actionCommand.equals(prefs.getString("lang.en.ok"))) {
+        } else if (actionCommand.equals(prefs.getString("lang.ok"))) {
             savePrefs();
             if (expertModeChanged()) {
                 if (simulator != null)
diff --git a/sources/protocols/VSAbstractProtocol.java b/sources/protocols/VSAbstractProtocol.java
index 0317d07..70d7595 100644
--- a/sources/protocols/VSAbstractProtocol.java
+++ b/sources/protocols/VSAbstractProtocol.java
@@ -385,7 +385,7 @@ abstract public class VSAbstractProtocol extends VSAbstractEvent {
      * @see events.VSAbstractEvent#createShortname()()
      */
     protected String createShortname(String savedShortname) {
-	return savedShortname;
+        return savedShortname;
     }
 
     /* (non-Javadoc)
@@ -397,15 +397,15 @@ abstract public class VSAbstractProtocol extends VSAbstractEvent {
 
         StringBuffer buffer = new StringBuffer();
 
-        buffer.append(prefs.getString("lang.en.protocol"));
+        buffer.append(prefs.getString("lang.protocol"));
         buffer.append(": ");
         buffer.append(getShortname());
         buffer.append(" ");
 
         if (currentContextIsServer)
-            buffer.append(prefs.getString("lang.en.server"));
+            buffer.append(prefs.getString("lang.server"));
         else
-            buffer.append(prefs.getString("lang.en.client"));
+            buffer.append(prefs.getString("lang.client"));
 
         return buffer.toString();
     }
diff --git a/sources/protocols/implementations/VSOnePhaseCommitProtocol.java b/sources/protocols/implementations/VSOnePhaseCommitProtocol.java
index bd3d843..d6d6c43 100644
--- a/sources/protocols/implementations/VSOnePhaseCommitProtocol.java
+++ b/sources/protocols/implementations/VSOnePhaseCommitProtocol.java
@@ -33,6 +33,7 @@ public class VSOnePhaseCommitProtocol extends VSAbstractProtocol {
         vec.add(1);
         vec.add(3);
 
+        // TODO: Translate
         initVector("pids", vec, "PIDs beteiligter Prozesse");
         initLong("timeout", 2500, "Zeit bis erneute Anfrage", "ms");
     }
@@ -101,7 +102,6 @@ public class VSOnePhaseCommitProtocol extends VSAbstractProtocol {
         onServerStart();
     }
 
-
     /* Client variables, coordinator */
     private ArrayList<Integer> pids;
 
diff --git a/sources/serialize/VSSerialize.java b/sources/serialize/VSSerialize.java
index f479a2c..a6d3580 100644
--- a/sources/serialize/VSSerialize.java
+++ b/sources/serialize/VSSerialize.java
@@ -27,7 +27,7 @@ public final class VSSerialize {
     public static final boolean DEBUG = true;
 
     /** The last filename used for saveing/opening*/
-    public static String LAST_FILENAME = null;
+    public static volatile String LAST_FILENAME = null;
 
     /** For temp object storage */
     private static HashMap<String,Object> objects;
@@ -110,8 +110,7 @@ public final class VSSerialize {
         Object object = objects.get(key + ":" + num);
 
         if (object == null) {
-            System.err.println("No such deserialization helper key "
-                               + key + ":" + num);
+            System.err.println("No such deserialization helper key " + key + ":" + num);
             System.exit(1);
         }
 
@@ -156,8 +155,7 @@ public final class VSSerialize {
             ObjectOutputStream objectOutputStream =
                 new ObjectOutputStream(fileOutputStream);
 
-            VSSerializablePrefs prefs = (VSSerializablePrefs)
-                                        simulator.getPrefs();
+            VSSerializablePrefs prefs = (VSSerializablePrefs) simulator.getPrefs();
             prefs.serialize(this, objectOutputStream);
             simulator.serialize(this, objectOutputStream);
 
@@ -178,9 +176,8 @@ public final class VSSerialize {
         VSPrefs prefs = simulator.getPrefs();
         VSSimulatorFrame simulatorFrame = simulator.getSimulatorFrame();
 
-        String saveText = prefs.getString("lang.en.save");
-        JFileChooser fileChooser = new JFileChooser(
-            new File(".").getPath());
+        String saveText = prefs.getString("lang.save");
+        JFileChooser fileChooser = new JFileChooser(new File(".").getPath());
         fileChooser.setMultiSelectionEnabled(false);
         fileChooser.addChoosableFileFilter(createFileFilter(prefs));
         fileChooser.setApproveButtonText(saveText);
@@ -208,14 +205,11 @@ public final class VSSerialize {
         LAST_FILENAME = filename;
 
         try {
-            FileInputStream fileInputStream =
-                new FileInputStream(filename);
-            ObjectInputStream objectInputStream =
-                new ObjectInputStream(fileInputStream);
+            FileInputStream fileInputStream = new FileInputStream(filename);
+            ObjectInputStream objectInputStream = new ObjectInputStream(fileInputStream);
 
             VSDefaultPrefs prefs = new VSDefaultPrefs();
             prefs.deserialize(this, objectInputStream);
-            //prefs.useDefaultStrings(true);
             prefs.addWithDefaults();
 
             this.setObject("prefs", prefs);
@@ -225,7 +219,7 @@ public final class VSSerialize {
             simulator.deserialize(this, objectInputStream);
 
         } catch (Exception e) {
-            //e.printStackTrace();
+            e.printStackTrace();
 
         } finally {
             //objectInputStream.close();
@@ -244,7 +238,7 @@ public final class VSSerialize {
     public VSSimulator openSimulator(VSSimulatorFrame simulatorFrame) {
         VSPrefs prefs = simulatorFrame.getPrefs();
 
-        String openText = prefs.getString("lang.en.open");
+        String openText = prefs.getString("lang.open");
         JFileChooser fileChooser = new JFileChooser(
             new File(".").getPath());
         fileChooser.setMultiSelectionEnabled(false);
@@ -276,7 +270,7 @@ public final class VSSerialize {
             }
 
             public String getDescription() {
-                return prefs.getString("lang.en.dat");
+                return prefs.getString("lang.dat");
             }
         };
     }
diff --git a/sources/simulator/VSSimulator.java b/sources/simulator/VSSimulator.java
index 691fb15..4965a71 100644
--- a/sources/simulator/VSSimulator.java
+++ b/sources/simulator/VSSimulator.java
@@ -175,7 +175,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
      * the task manager's JTable.
      */
     private class VSTaskManagerTableModel extends AbstractTableModel
-                implements MouseListener {
+        implements MouseListener {
         /** the serial version uid */
         private static final long serialVersionUID = 1l;
 
@@ -218,9 +218,9 @@ public class VSSimulator extends JPanel implements VSSerializable {
             tasks = new ArrayList<VSTask>();
             set(process, localTask, ONE_PROCESS);
             columnNames = new String[3];
-            columnNames[0]= prefs.getString("lang.en.time") + " (ms)";
-            columnNames[1] = prefs.getString("lang.en.process.id");
-            columnNames[2] = prefs.getString("lang.en.event");
+            columnNames[0]= prefs.getString("lang.time") + " (ms)";
+            columnNames[1] = prefs.getString("lang.process.id");
+            columnNames[2] = prefs.getString("lang.event");
             numColumns = 3;
         }
 
@@ -410,23 +410,23 @@ public class VSSimulator extends JPanel implements VSSerializable {
                         String command = ae.getActionCommand();
                         int rows[] = source.getSelectedRows();
 
-                        if (command.equals(prefs.getString("lang.en.remove"))) {
+                        if (command.equals(prefs.getString("lang.remove"))) {
                             for (int i = rows.length - 1; i >= 0; --i)
                                 removeTaskAtRow(rows[i]);
 
                         } else if (command.equals(
-                        prefs.getString("lang.en.copy"))) {
+                                       prefs.getString("lang.copy"))) {
                             copyTasksAtRows(rows);
                         }
                     }
                 };
 
                 JPopupMenu popup = new JPopupMenu();
-                JMenuItem item = new JMenuItem(prefs.getString("lang.en.remove"));
+                JMenuItem item = new JMenuItem(prefs.getString("lang.remove"));
                 item.addActionListener(actionListener);
                 popup.add(item);
 
-                item = new JMenuItem(prefs.getString("lang.en.copy"));
+                item = new JMenuItem(prefs.getString("lang.copy"));
                 item.addActionListener(actionListener);
                 popup.add(item);
 
@@ -464,7 +464,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
      * the task manager's JTable editor
      */
     private class VSTaskManagerCellEditor extends AbstractCellEditor
-                implements TableCellEditor {
+        implements TableCellEditor {
         /** the serial version uid */
         private static final long serialVersionUID = 1L;
 
@@ -607,7 +607,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
         if (this.loging == null)
             this.loging = new VSLogging();
 
-        loging.log(prefs.getString("lang.en.simulator.new"));
+        loging.log(prefs.getString("lang.simulator.new"));
 
         fillContentPane();
         updateFromPrefs();
@@ -688,7 +688,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
 
         toolsPanel.setLayout(new BoxLayout(toolsPanel, BoxLayout.X_AXIS));
         JCheckBox expertActiveCheckBox =
-            new JCheckBox(prefs.getString("lang.en.mode.expert"));
+            new JCheckBox(prefs.getString("lang.mode.expert"));
 
         expertActiveCheckBox.setSelected(expertMode);
         expertActiveCheckBox.addChangeListener(new ChangeListener() {
@@ -708,7 +708,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
 
         if (expertMode) {
             lamportActiveCheckBox = new JCheckBox(
-                prefs.getString("lang.en.time.lamport"));
+                prefs.getString("lang.time.lamport"));
             lamportActiveCheckBox.setSelected(false);
             lamportActiveCheckBox.addChangeListener(new ChangeListener() {
                 public void stateChanged(ChangeEvent ce) {
@@ -724,7 +724,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
             toolsPanel.add(lamportActiveCheckBox);
 
             vectorTimeActiveCheckBox = new JCheckBox(
-                prefs.getString("lang.en.time.vector"));
+                prefs.getString("lang.time.vector"));
             vectorTimeActiveCheckBox.setSelected(false);
             vectorTimeActiveCheckBox.addChangeListener(new ChangeListener() {
                 public void stateChanged(ChangeEvent ce) {
@@ -740,7 +740,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
             toolsPanel.add(vectorTimeActiveCheckBox);
 
             JCheckBox antiAliasing = new JCheckBox(
-                prefs.getString("lang.en.antialiasing"));
+                prefs.getString("lang.antialiasing"));
             antiAliasing.setSelected(false);
             antiAliasing.addChangeListener(new ChangeListener() {
                 public void stateChanged(ChangeEvent ce) {
@@ -755,7 +755,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
         }
 
         JCheckBox logingActiveCheckBox = new JCheckBox(
-            prefs.getString("lang.en.loging.active"));
+            prefs.getString("lang.loging.active"));
         logingActiveCheckBox.setSelected(true);
         logingActiveCheckBox.addChangeListener(new ChangeListener() {
             public void stateChanged(ChangeEvent ce) {
@@ -769,7 +769,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
 
         if (expertMode) {
             filterActiveCheckBox = new JCheckBox(
-                prefs.getString("lang.en.filter"));
+                prefs.getString("lang.filter"));
             filterActiveCheckBox.setSelected(false);
             filterActiveCheckBox.addChangeListener(new ChangeListener() {
                 public void stateChanged(ChangeEvent ce) {
@@ -799,12 +799,12 @@ public class VSSimulator extends JPanel implements VSSerializable {
             toolsPanel.add(filterTextField);
 
             JButton clearButton = new JButton(
-                prefs.getString("lang.en.loging.clear"));
+                prefs.getString("lang.loging.clear"));
             clearButton.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent ae) {
                     String command = ae.getActionCommand();
                     if (command.equals(
-                    prefs.getString("lang.en.loging.clear"))) {
+                                prefs.getString("lang.loging.clear"))) {
                         loging.clear();
                     }
                 }
@@ -831,7 +831,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
 
         lastSelectedProcessNum = 0;
         int numProcesses = simulatorVisualization.getNumProcesses();
-        String processString = prefs.getString("lang.en.process");
+        String processString = prefs.getString("lang.process");
 
         for (int i = 0; i < numProcesses; ++i) {
             int pid = simulatorVisualization.getProcess(i).getProcessID();
@@ -840,9 +840,9 @@ public class VSSimulator extends JPanel implements VSSerializable {
             globalPIDComboBox.addItem("PID: " + pid);
         }
 
-        processesComboBox.addItem(prefs.getString("lang.en.processes.all"));
-        localPIDComboBox.addItem(prefs.getString("lang.en.all"));
-        globalPIDComboBox.addItem(prefs.getString("lang.en.all"));
+        processesComboBox.addItem(prefs.getString("lang.processes.all"));
+        localPIDComboBox.addItem(prefs.getString("lang.all"));
+        globalPIDComboBox.addItem(prefs.getString("lang.all"));
 
         tabbedPane = new JTabbedPane(JTabbedPane.TOP,
                                      JTabbedPane.WRAP_TAB_LAYOUT);
@@ -856,10 +856,10 @@ public class VSSimulator extends JPanel implements VSSerializable {
         splitPane1.setOneTouchExpandable(true);
 
         if (expertMode)
-            tabbedPane.addTab(prefs.getString("lang.en.events"), splitPane1);
+            tabbedPane.addTab(prefs.getString("lang.events"), splitPane1);
 
         else
-            tabbedPane.addTab(prefs.getString("lang.en.events"), localPanel);
+            tabbedPane.addTab(prefs.getString("lang.events"), localPanel);
 
         processesComboBox.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent ae) {
@@ -898,7 +898,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
             }
         });
 
-        tabbedPane.add(prefs.getString("lang.en.variables"), null);
+        tabbedPane.add(prefs.getString("lang.variables"), null);
 
         editPanel.add(processesComboBox);
         editPanel.add(tabbedPane);
@@ -934,9 +934,9 @@ public class VSSimulator extends JPanel implements VSSerializable {
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
 
         if (localTasks)
-            panel.add(createLabelPanel(prefs.getString("lang.en.timed.local")));
+            panel.add(createLabelPanel(prefs.getString("lang.timed.local")));
         else
-            panel.add(createLabelPanel(prefs.getString("lang.en.timed.global")));
+            panel.add(createLabelPanel(prefs.getString("lang.timed.global")));
 
         JScrollPane scrollPane = new JScrollPane(createTaskTable(localTasks));
         panel.add(scrollPane);
@@ -1027,7 +1027,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
         }
 
         final JComboBox<String> comboBox = new JComboBox<>();
-        JButton takeoverButton = new JButton(prefs.getString("lang.en.takeover"));
+        JButton takeoverButton = new JButton(prefs.getString("lang.takeover"));
         takeoverButton.setMnemonic(prefs.getInteger("keyevent.takeover"));
         takeoverButton.addActionListener(new ActionListener() {
             private boolean isRed;
@@ -1090,7 +1090,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
                     taskManager.addTask(task, VSTaskManager.PROGRAMMED);
 
                     if (selectedProcess == null ||
-                    process.equals(selectedProcess)) {
+                            process.equals(selectedProcess)) {
                         if (localTasks)
                             taskManagerLocalModel.addTask(task);
                         else
@@ -1111,7 +1111,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
             VSRegisteredEvents.getNonProtocolClassnames();
 
         comboBox.setMaximumRowCount(20);
-        String menuText = prefs.getString("lang.en.events.process");
+        String menuText = prefs.getString("lang.events.process");
         comboBox.addItem("----- " + menuText + " -----");
 
         if (createTaskFlag)
@@ -1126,13 +1126,13 @@ public class VSSimulator extends JPanel implements VSSerializable {
                 createTasks.add(new VSCreateTask(menuText, eventClassname));
         }
 
-        String activate = prefs.getString("lang.en.activate");
-        String client = prefs.getString("lang.en.client");
-        String clientRequest = prefs.getString("lang.en.clientrequest.start");
-        String deactivate = prefs.getString("lang.en.deactivate");
-        String server = prefs.getString("lang.en.server");
-        String serverRequest = prefs.getString("lang.en.serverrequest.start");
-        String protocol = prefs.getString("lang.en.protocol");
+        String activate = prefs.getString("lang.activate");
+        String client = prefs.getString("lang.client");
+        String clientRequest = prefs.getString("lang.clientrequest.start");
+        String deactivate = prefs.getString("langactivate");
+        String server = prefs.getString("lang.server");
+        String serverRequest = prefs.getString("lang.serverrequest.start");
+        String protocol = prefs.getString("lang.protocol");
 
         String protocolEventClassname = "events.internal.VSProtocolEvent";
         eventClassnames = VSRegisteredEvents.getProtocolClassnames();
@@ -1316,7 +1316,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
      */
     private void updateProcessesComboBox() {
         int numProcesses = simulatorVisualization.getNumProcesses();
-        String processString = prefs.getString("lang.en.process");
+        String processString = prefs.getString("lang.process");
 
         for (int i = 0; i < numProcesses; ++i) {
             int processID = simulatorVisualization.getProcess(i).getProcessID();
@@ -1414,7 +1414,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
      */
     public synchronized void addProcessAtIndex(int index) {
         int processID = simulatorVisualization.getProcess(index).getProcessID();
-        String processString = prefs.getString("lang.en.process");
+        String processString = prefs.getString("lang.process");
 
         localTextFields.add(index, "0000");
         globalTextFields.add(index, "0000");
@@ -1437,7 +1437,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
 
         if (expertMode) {
             tabbedPane.remove(localPanel);
-            tabbedPane.insertTab(prefs.getString("lang.en.events"), null,
+            tabbedPane.insertTab(prefs.getString("lang.events"), null,
                                  splitPane1, null, 0);
             splitPane1.setTopComponent(localPanel);
             //splitPane1.setDividerLocation((int) (getPaintSize()/2) - 20);
@@ -1447,7 +1447,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
 
         } else {
             tabbedPane.remove(splitPane1);
-            tabbedPane.insertTab(prefs.getString("lang.en.events"), null,
+            tabbedPane.insertTab(prefs.getString("lang.events"), null,
                                  localPanel, null, 0);
 
             /* addPanel */
diff --git a/sources/simulator/VSSimulatorFrame.java b/sources/simulator/VSSimulatorFrame.java
index 61ba324..3cf4e91 100644
--- a/sources/simulator/VSSimulatorFrame.java
+++ b/sources/simulator/VSSimulatorFrame.java
@@ -109,7 +109,7 @@ public class VSSimulatorFrame extends VSFrame {
      * @param relativeTo the component to open the window relative to
      */
     public VSSimulatorFrame(VSPrefs prefs, Component relativeTo) {
-        super(prefs.getString("lang.en.name"), relativeTo);
+        super(prefs.getString("lang.name"), relativeTo);
         this.prefs = prefs;
         this.simulators = new Vector<VSSimulator>();
 
@@ -126,11 +126,11 @@ public class VSSimulatorFrame extends VSFrame {
                                  getDescription();
 
                 if (sourceText.equals(
-                finalPrefs.getString("lang.en.simulator.close"))) {
+                            finalPrefs.getString("lang.simulator.close"))) {
                     removeCurrentSimulator();
 
                 } else if (sourceText.equals(
-                finalPrefs.getString("lang.en.simulator.new"))) {
+                               finalPrefs.getString("lang.simulator.new"))) {
                     VSPrefs newPrefs = VSDefaultPrefs.init();
                     VSSimulatorEditor simulatorEditor =
                         new VSSimulatorEditor(newPrefs, VSSimulatorFrame.this,
@@ -139,21 +139,21 @@ public class VSSimulatorFrame extends VSFrame {
                                       simulatorEditor);
 
                 } else if (sourceText.equals(
-                finalPrefs.getString("lang.en.window.new"))) {
+                               finalPrefs.getString("lang.window.new"))) {
                     new VSMain(VSDefaultPrefs.init(),
                                VSSimulatorFrame.this);
 
                 } else if (sourceText.equals(
-                finalPrefs.getString("lang.en.window.close"))) {
+                               finalPrefs.getString("lang.window.close"))) {
                     dispose();
 
                 } else if (sourceText.equals(
-                finalPrefs.getString("lang.en.open"))) {
+                               finalPrefs.getString("lang.open"))) {
                     VSSerialize serialize = new VSSerialize();
                     serialize.openSimulator(VSSimulatorFrame.this);
 
                 } else if (sourceText.equals(
-                finalPrefs.getString("lang.en.save"))) {
+                               finalPrefs.getString("lang.save"))) {
                     VSSimulatorVisualization simulatorVisualization =
                         currentSimulator.getSimulatorCanvas();
                     boolean flag = !simulatorVisualization.isPaused()
@@ -170,7 +170,7 @@ public class VSSimulatorFrame extends VSFrame {
                         startCurrentSimulator();
 
                 } else if (sourceText.equals(
-                finalPrefs.getString("lang.en.saveas"))) {
+                               finalPrefs.getString("lang.saveas"))) {
                     VSSimulatorVisualization simulatorVisualization =
                         currentSimulator.getSimulatorCanvas();
                     boolean flag = !simulatorVisualization.isPaused()
@@ -186,27 +186,27 @@ public class VSSimulatorFrame extends VSFrame {
                         startCurrentSimulator();
 
                 } else if (sourceText.equals(
-                finalPrefs.getString("lang.en.about"))) {
+                               finalPrefs.getString("lang.about"))) {
                     new VSAboutFrame(finalPrefs, VSSimulatorFrame.this);
 
                 } else if (sourceText.equals(
-                finalPrefs.getString("lang.en.quit"))) {
+                               finalPrefs.getString("lang.quit"))) {
                     System.exit(0);
 
                 } else if (sourceText.equals(
-                finalPrefs.getString("lang.en.start"))) {
+                               finalPrefs.getString("lang.start"))) {
                     startCurrentSimulator();
 
                 } else if (sourceText.equals(
-                finalPrefs.getString("lang.en.pause"))) {
+                               finalPrefs.getString("lang.pause"))) {
                     pauseCurrentSimulator();
 
                 } else if (sourceText.equals(
-                finalPrefs.getString("lang.en.reset"))) {
+                               finalPrefs.getString("lang.reset"))) {
                     resetCurrentSimulator();
 
                 } else if (sourceText.equals(
-                finalPrefs.getString("lang.en.replay"))) {
+                               finalPrefs.getString("lang.replay"))) {
                     VSMenuItemStates menuItemState =
                         currentSimulator.getMenuItemStates();
                     menuItemState.setStart(false);
@@ -249,11 +249,11 @@ public class VSSimulatorFrame extends VSFrame {
      */
     private JMenuBar createMenuBar() {
         /* File menu */
-        menuFile = new JMenu(prefs.getString("lang.en.file"));
+        menuFile = new JMenu(prefs.getString("lang.file"));
         menuFile.setMnemonic(prefs.getInteger("keyevent.file"));
         JMenuItem menuItem;
 
-        menuItem = new JMenuItem(prefs.getString("lang.en.simulator.new"));
+        menuItem = new JMenuItem(prefs.getString("lang.simulator.new"));
         menuItem.setAccelerator(KeyStroke.getKeyStroke(
                                     prefs.getInteger("keyevent.new"),
                                     ActionEvent.ALT_MASK));
@@ -261,7 +261,7 @@ public class VSSimulatorFrame extends VSFrame {
         menuFile.add(menuItem);
 
         closeItem = new JMenuItem(
-            prefs.getString("lang.en.simulator.close"));
+            prefs.getString("lang.simulator.close"));
         closeItem.setAccelerator(KeyStroke.getKeyStroke(
                                      prefs.getInteger("keyevent.close"),
                                      ActionEvent.ALT_MASK));
@@ -270,31 +270,31 @@ public class VSSimulatorFrame extends VSFrame {
 
         menuFile.addSeparator();
 
-        menuItem = new JMenuItem(prefs.getString("lang.en.window.new"));
+        menuItem = new JMenuItem(prefs.getString("lang.window.new"));
         menuItem.addActionListener(actionListener);
         menuFile.add(menuItem);
 
-        menuItem = new JMenuItem(prefs.getString("lang.en.window.close"));
+        menuItem = new JMenuItem(prefs.getString("lang.window.close"));
         menuItem.addActionListener(actionListener);
         menuFile.add(menuItem);
 
         menuFile.addSeparator();
 
-        menuItem = new JMenuItem(prefs.getString("lang.en.open"));
+        menuItem = new JMenuItem(prefs.getString("lang.open"));
         menuItem.setAccelerator(KeyStroke.getKeyStroke(
                                     prefs.getInteger("keyevent.open"),
                                     ActionEvent.ALT_MASK));
         menuItem.addActionListener(actionListener);
         menuFile.add(menuItem);
 
-        saveItem = new JMenuItem(prefs.getString("lang.en.save"));
+        saveItem = new JMenuItem(prefs.getString("lang.save"));
         saveItem.setAccelerator(KeyStroke.getKeyStroke(
                                     prefs.getInteger("keyevent.save"),
                                     ActionEvent.ALT_MASK));
         saveItem.addActionListener(actionListener);
         menuFile.add(saveItem);
 
-        saveAsItem = new JMenuItem(prefs.getString("lang.en.saveas"));
+        saveAsItem = new JMenuItem(prefs.getString("lang.saveas"));
         saveAsItem.setAccelerator(KeyStroke.getKeyStroke(
                                       prefs.getInteger("keyevent.saveas"),
                                       ActionEvent.ALT_MASK));
@@ -303,27 +303,27 @@ public class VSSimulatorFrame extends VSFrame {
 
         menuFile.addSeparator();
 
-        menuItem = new JMenuItem(prefs.getString("lang.en.about"));
+        menuItem = new JMenuItem(prefs.getString("lang.about"));
         menuItem.addActionListener(actionListener);
         menuFile.add(menuItem);
 
-        menuItem = new JMenuItem(prefs.getString("lang.en.quit"));
+        menuItem = new JMenuItem(prefs.getString("lang.quit"));
         menuItem.addActionListener(actionListener);
         menuFile.add(menuItem);
 
         /* Edit menu */
         menuEdit = new JMenu(
-            prefs.getString("lang.en.edit"));
+            prefs.getString("lang.edit"));
         menuEdit.setMnemonic(prefs.getInteger("keyevent.edit"));
         updateEditMenu();
 
         /* Simulator menu */
         toolBar = new JToolBar();
         menuSimulator = new JMenu(
-            prefs.getString("lang.en.simulator"));
+            prefs.getString("lang.simulator"));
         menuSimulator.setMnemonic(prefs.getInteger("keyevent.simulator"));
 
-        resetItem = new JMenuItem(prefs.getString("lang.en.reset"));
+        resetItem = new JMenuItem(prefs.getString("lang.reset"));
         resetItem.setAccelerator(KeyStroke.getKeyStroke(
                                      prefs.getInteger("keyevent.reset"),
                                      ActionEvent.ALT_MASK));
@@ -331,12 +331,12 @@ public class VSSimulatorFrame extends VSFrame {
         resetItem.setEnabled(false);
         menuSimulator.add(resetItem);
         resetButton = new JButton(getImageIcon("reset.png",
-                                               prefs.getString("lang.en.reset")));
+                                               prefs.getString("lang.reset")));
         resetButton.addActionListener(actionListener);
         toolBar.add(resetButton);
 
         replayItem = new JMenuItem(
-            prefs.getString("lang.en.replay"));
+            prefs.getString("lang.replay"));
         replayItem.setAccelerator(KeyStroke.getKeyStroke(
                                       prefs.getInteger("keyevent.replay"),
                                       ActionEvent.ALT_MASK));
@@ -344,11 +344,11 @@ public class VSSimulatorFrame extends VSFrame {
         replayItem.setEnabled(false);
         menuSimulator.add(replayItem);
         replayButton = new JButton(
-            getImageIcon("replay.png", prefs.getString("lang.en.replay")));
+            getImageIcon("replay.png", prefs.getString("lang.replay")));
         replayButton.addActionListener(actionListener);
         toolBar.add(replayButton);
 
-        pauseItem = new JMenuItem(prefs.getString("lang.en.pause"));
+        pauseItem = new JMenuItem(prefs.getString("lang.pause"));
         pauseItem.setAccelerator(KeyStroke.getKeyStroke(
                                      prefs.getInteger("keyevent.pause"),
                                      ActionEvent.ALT_MASK));
@@ -356,18 +356,18 @@ public class VSSimulatorFrame extends VSFrame {
         menuSimulator.add(pauseItem);
         pauseItem.setEnabled(false);
         pauseButton = new JButton(getImageIcon("pause.png",
-                                               prefs.getString("lang.en.pause")));
+                                               prefs.getString("lang.pause")));
         pauseButton.addActionListener(actionListener);
         toolBar.add(pauseButton);
 
-        startItem = new JMenuItem(prefs.getString("lang.en.start"));
+        startItem = new JMenuItem(prefs.getString("lang.start"));
         startItem.setAccelerator(KeyStroke.getKeyStroke(
                                      prefs.getInteger("keyevent.start"),
                                      ActionEvent.ALT_MASK));
         startItem.addActionListener(actionListener);
         menuSimulator.add(startItem);
         startButton = new JButton(getImageIcon("start.png",
-                                               prefs.getString("lang.en.start")));
+                                               prefs.getString("lang.start")));
         startButton.addActionListener(actionListener);
         toolBar.add(startButton);
 
@@ -416,7 +416,7 @@ public class VSSimulatorFrame extends VSFrame {
         menuEdit.removeAll();
 
         JMenuItem globalPrefsItem = new JMenuItem(
-            prefs.getString("lang.en.prefs"));
+            prefs.getString("lang.prefs"));
 
         globalPrefsItem.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent ae) {
@@ -435,7 +435,7 @@ public class VSSimulatorFrame extends VSFrame {
         if (currentSimulator == null)
             return;
 
-        String processString = prefs.getString("lang.en.process");
+        String processString = prefs.getString("lang.process");
         ArrayList<VSInternalProcess> arr =
             currentSimulator.getSimulatorCanvas().getProcessesArray();
 
@@ -501,7 +501,7 @@ public class VSSimulatorFrame extends VSFrame {
         simulator.setMaximumSize(new Dimension(0, 0));
 
         simulators.add(simulator);
-        tabbedPane.addTab(prefs.getString("lang.en.simulator")
+        tabbedPane.addTab(prefs.getString("lang.simulator")
                           + " " + simulator.getSimulatorNum(), simulator);
         tabbedPane.setSelectedComponent(simulator);
 
diff --git a/sources/simulator/VSSimulatorVisualization.java b/sources/simulator/VSSimulatorVisualization.java
index 5c28eaf..2dc4a64 100644
--- a/sources/simulator/VSSimulatorVisualization.java
+++ b/sources/simulator/VSSimulatorVisualization.java
@@ -48,7 +48,7 @@ import serialize.VSSerialize;
  * @author Paul C. Buetow
  */
 public class VSSimulatorVisualization extends Canvas
-            implements Runnable, VSSerializable {
+    implements Runnable, VSSerializable {
 
     /** The serial version uid */
     private static final long serialVersionUID = 1L;
@@ -236,9 +236,6 @@ public class VSSimulatorVisualization extends Canvas
      * @author Paul C. Buetow
      */
     public class VSMessageLine {
-        /** The serial version uid */
-        private static final long serialVersionUID = 1L;
-
         /** The receiver process. */
         private VSInternalProcess receiverProcess;
 
@@ -311,7 +308,7 @@ public class VSSimulatorVisualization extends Canvas
          * @param task the task
          */
         public VSMessageLine(VSInternalProcess receiverProcess, long sendTime,
-                             long recvTime, long outageTime, int senderNum ,
+                             long recvTime, long outageTime, int senderNum,
                              int receiverNum, VSTask task) {
             this.receiverProcess = receiverProcess;
             this.sendTime = sendTime;
@@ -501,7 +498,6 @@ public class VSSimulatorVisualization extends Canvas
             this.processes = new ArrayList<VSInternalProcess>();
 
             numProcesses = prefs.getInteger("sim.process.num");
-
             for (int i = 0; i < numProcesses; ++i)
                 processes.add(createProcess(i));
         }
@@ -520,11 +516,11 @@ public class VSSimulatorVisualization extends Canvas
                         public void actionPerformed(ActionEvent ae) {
                             String command = ae.getActionCommand();
                             if (command.equals(
-                            finalPrefs.getString("lang.en.process.edit"))) {
+                                        finalPrefs.getString("lang.process.edit"))) {
                                 editProcess(process);
 
                             } else if (command.equals(
-                            finalPrefs.getString("lang.en.process.crash"))) {
+                                           finalPrefs.getString("lang.process.crash"))) {
                                 VSAbstractEvent event =
                                     new VSProcessCrashEvent();
 
@@ -534,7 +530,7 @@ public class VSSimulatorVisualization extends Canvas
                                                         VSTask.GLOBAL));
 
                             } else if (command.equals(
-                            finalPrefs.getString("lang.en.process.recover"))) {
+                                           finalPrefs.getString("lang.process.recover"))) {
                                 VSAbstractEvent event =
                                     new VSProcessRecoverEvent();
 
@@ -544,11 +540,11 @@ public class VSSimulatorVisualization extends Canvas
                                                         VSTask.GLOBAL));
 
                             } else if (command.equals(
-                            finalPrefs.getString("lang.en.process.remove"))) {
+                                           finalPrefs.getString("lang.process.remove"))) {
                                 removeProcess(process);
 
                             } else if (command.equals(
-                            finalPrefs.getString("lang.en.process.add.new"))) {
+                                           finalPrefs.getString("lang.process.add.new"))) {
                                 addProcess();
                             }
                         }
@@ -559,18 +555,18 @@ public class VSSimulatorVisualization extends Canvas
 
                     if (process != null)
                         item = new JMenuItem(
-                            finalPrefs.getString("lang.en.process.selected") +
+                            finalPrefs.getString("lang.process.selected") +
                             ": " + process.getProcessID());
                     else
                         item = new JMenuItem(
-                            finalPrefs.getString("lang.en.process.not.selected"));
+                            finalPrefs.getString("lang.process.not.selected"));
 
                     item.setEnabled(false);
                     popup.add(item);
                     popup.addSeparator();
 
                     item = new JMenuItem(
-                        finalPrefs.getString("lang.en.process.edit"));
+                        finalPrefs.getString("lang.process.edit"));
                     if (process == null)
                         item.setEnabled(false);
                     else
@@ -578,7 +574,7 @@ public class VSSimulatorVisualization extends Canvas
                     popup.add(item);
 
                     item = new JMenuItem(
-                        finalPrefs.getString("lang.en.process.crash"));
+                        finalPrefs.getString("lang.process.crash"));
 
                     if (process == null || process.isCrashed() || isPaused ||
                             time == 0 || hasFinished)
@@ -588,7 +584,7 @@ public class VSSimulatorVisualization extends Canvas
                     popup.add(item);
 
                     item = new JMenuItem(
-                        finalPrefs.getString("lang.en.process.recover"));
+                        finalPrefs.getString("lang.process.recover"));
 
                     if (process == null || !process.isCrashed() || isPaused ||
                             time == 0 || hasFinished)
@@ -598,7 +594,7 @@ public class VSSimulatorVisualization extends Canvas
                     popup.add(item);
 
                     item = new JMenuItem(
-                        finalPrefs.getString("lang.en.process.remove"));
+                        finalPrefs.getString("lang.process.remove"));
 
                     if (process == null)
                         item.setEnabled(false);
@@ -610,11 +606,11 @@ public class VSSimulatorVisualization extends Canvas
 
                     final long xPosTime = getXPositionTime(me.getX());
                     String timeString = finalPrefs.getString(
-                                            "lang.en.event.add.time") +
+                                            "lang.event.add.time") +
                                         " " + xPosTime + "ms";
 
                     JMenu subMenu = new JMenu(
-                        finalPrefs.getString("lang.en.event.add.local")
+                        finalPrefs.getString("lang.event.add.local")
                         + " " + timeString);
 
                     ArrayList<VSCreateTask> createTasks =
@@ -651,7 +647,7 @@ public class VSSimulatorVisualization extends Canvas
                     popup.add(subMenu);
 
                     subMenu = new JMenu(
-                        finalPrefs.getString("lang.en.event.add.global")
+                        finalPrefs.getString("lang.event.add.global")
                         + " " + timeString);
                     if (process == null) {
                         subMenu.setEnabled(false);
@@ -687,7 +683,7 @@ public class VSSimulatorVisualization extends Canvas
                     popup.addSeparator();
 
                     item = new JMenuItem(
-                        finalPrefs.getString("lang.en.process.add.new"));
+                        finalPrefs.getString("lang.process.add.new"));
 
                     item.addActionListener(actionListener);
                     popup.add(item);
@@ -1298,7 +1294,7 @@ public class VSSimulatorVisualization extends Canvas
      * Starts/plays the simulator.
      */
     public void play() {
-        loging.log(prefs.getString("lang.en.simulator.started"));
+        loging.log(prefs.getString("lang.simulator.started"));
         final long currentTime = System.currentTimeMillis();
 
         synchronized (processes) {
@@ -1336,7 +1332,7 @@ public class VSSimulatorVisualization extends Canvas
 
         simulator.finish();
         hasFinished = true;
-        loging.log(prefs.getString("lang.en.simulator.finished"));
+        loging.log(prefs.getString("lang.simulator.finished"));
         paint();
 
         if (prefs.getBoolean("sim.periodic")) {
@@ -1357,7 +1353,7 @@ public class VSSimulatorVisualization extends Canvas
         }
 
         pauseTime = System.currentTimeMillis();
-        loging.log(prefs.getString("lang.en.simulator.paused"));
+        loging.log(prefs.getString("lang.simulator.paused"));
         paint();
     }
 
@@ -1366,7 +1362,7 @@ public class VSSimulatorVisualization extends Canvas
      */
     public void reset() {
         if (!isResetted) {
-            loging.log(prefs.getString("lang.en.simulator.resetted"));
+            loging.log(prefs.getString("lang.simulator.resetted"));
 
             isResetted = true;
             isPaused = false;
@@ -1676,7 +1672,7 @@ public class VSSimulatorVisualization extends Canvas
     private VSInternalProcess createProcess(int processNum) {
         VSInternalProcess process =
             new VSInternalProcess(prefs, processNum, this, loging);
-        loging.log(prefs.getString("lang.en.process.new") + "; " + process);
+        loging.log(prefs.getString("lang.process.new") + "; " + process);
         return process;
     }
 
@@ -1784,7 +1780,6 @@ public class VSSimulatorVisualization extends Canvas
      * @see serialize.VSSerializable#deserialize(serialize.VSSerialize,
      *	java.io.ObjectInputStream)
      */
-    @SuppressWarnings("unchecked")
     public synchronized void deserialize(VSSerialize serialize,
                                          ObjectInputStream objectInputStream)
     throws IOException, ClassNotFoundException {
diff --git a/sources/utils/VSAboutFrame.java b/sources/utils/VSAboutFrame.java
index ef64ffa..e07289f 100644
--- a/sources/utils/VSAboutFrame.java
+++ b/sources/utils/VSAboutFrame.java
@@ -31,8 +31,8 @@ public class VSAboutFrame extends VSFrame {
      * @param relativeTo the component to open the about window relative to
      */
     public VSAboutFrame(VSPrefs prefs, Component relativeTo) {
-        super(prefs.getString("lang.en.name") + " - "
-              + prefs.getString("lang.en.about"), relativeTo);
+        super(prefs.getString("lang.name") + " - "
+              + prefs.getString("lang.about"), relativeTo);
         this.prefs = prefs;
 
         disposeWithParent();
@@ -51,7 +51,7 @@ public class VSAboutFrame extends VSFrame {
         Container contentPane = getContentPane();
 
         VSInfoArea infoArea = new VSInfoArea(
-            prefs.getString("lang.en.about.info"));
+            prefs.getString("lang.about.info"));
         JPanel buttonPane = createButtonPanel();
         JScrollPane scrollPane = new JScrollPane(infoArea);
 
@@ -71,12 +71,12 @@ public class VSAboutFrame extends VSFrame {
         buttonPane.setBackground(Color.WHITE);
 
         JButton closeButton = new JButton(
-            prefs.getString("lang.en.close"));
+            prefs.getString("lang.close"));
         closeButton.setMnemonic(prefs.getInteger("keyevent.close"));
         closeButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
                 String actionCommand = e.getActionCommand();
-                if (actionCommand.equals(prefs.getString("lang.en.close")))
+                if (actionCommand.equals(prefs.getString("lang.close")))
                     dispose();
             }
         });