added initial multiple langua support.

9 files changed, 507 insertions, 187 deletions

diff --git a/sources/prefs/VSDefaultPrefs.java b/sources/prefs/VSDefaultPrefs.java
index 2cc7e39..63a2127 100644
--- a/sources/prefs/VSDefaultPrefs.java
+++ b/sources/prefs/VSDefaultPrefs.java
@@ -28,8 +28,7 @@ import java.awt.event.KeyEvent;
 
 /**
  * The class VSDefaultPrefs, makes sure that the simulator has its default
- * configuration values. (Btw: This is the only class which is allowed to have
- * code lines which are longer than 80 chars!)
+ * configuration values.
  *
  * @author Paul C. Buetow
  */
@@ -72,113 +71,139 @@ public class VSDefaultPrefs extends VSSerializablePrefs {
      * Fill with default strings.
      */
     public void fillDefaultStrings() {
-        initString("lang.about", "About");
-        initString("lang.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 vs@paul.buetow.org schicken!");
-        initString("lang.activate", "aktivieren");
-        initString("lang.activated", "aktiviert");
-        initString("lang.actualize", "Aktualisieren");
-        initString("lang.all", "Alle");
-        initString("lang.antialiasing", "Anti-Aliasing");
-        initString("lang.cancel", "Abbrechen");
-        initString("lang.client", "Client");
-        initString("lang.clientrequest.start", "Clientanfrage starten");
-        initString("lang.close", "Schliessen");
-        initString("lang.colorchooser", "Farbauswahl");
-        initString("lang.colorchooser2", "Bitte Farbe auswählen");
-        initString("lang.copy", "Kopieren");
-        initString("lang.crashed", "Abgestürzt");
-        initString("lang.dat", "Simulation (.dat)");
-        initString("lang.deactivate", "deaktivieren");
-        initString("lang.deactivated", "deaktiviert");
-        initString("lang.default", "Defaults");
-        initString("lang.edit", "Editieren");
-        initString("lang.editor", "Editor");
-        initString("lang.event", "Ereignis");
-        initString("lang.event.add.global", "Globales Ereignis einfügen");
-        initString("lang.event.add.local", "Lokales Ereignis einfügen");
-        initString("lang.event.add.time", "bei");
-        initString("lang.events", "Ereignisse");
-        initString("lang.events.process", "Prozessereignisse");
-        initString("lang.file", "Datei");
-        initString("lang.filter", "Filter");
-        initString("lang.loging.active", "Logging");
-        initString("lang.loging.clear", "Loggs löschen");
-        initString("lang.message", "Nachricht");
-        initString("lang.message.recv", "Nachricht erhalten");
-        initString("lang.message.sent", "Nachricht versendet");
-        initString("lang.mode.expert", "Expertenmodus");
-        initString("lang.name", "VS-Simulator 1.0");
-        initString("lang.ok", "OK");
-        initString("lang.open", "Öffnen");
-        initString("lang.pause", "Pausieren");
-        initString("lang.prefs", "Einstellungen");
-        initString("lang.prefs.color", "Farbeinstellungen");
-        initString("lang.prefs.diverse", "Diverse Einstellungen");
-        initString("lang.prefs.ext", "Erweiterte Einstellungen");
-        initString("lang.prefs.message", "Nachrichteneinstellungen");
-        initString("lang.prefs.message.defaults", "Nachrichteneinstellungen für neue Prozesse");
-        initString("lang.prefs.more", "Mehr Einstellungen");
-        initString("lang.prefs.process", "Prozesseinstellungen");
-        initString("lang.prefs.process", "Prozessstandardeinstellungen");
-        initString("lang.prefs.process.defaults", "Einstellungen für neue Prozesse");
-        initString("lang.prefs.process.ext", "Erweiterte Prozesseinstellungen");
-        initString("lang.prefs.protocols", "Protokolleinstellungen");
-        initString("lang.prefs.simulator", "Simulationseinstellungen");
-        initString("lang.process", "Prozess");
-        initString("lang.process.add.new", "Neuen Prozess hinzufügen");
-        initString("lang.process.crash", "Prozess abstürzen");
-        initString("lang.process.edit", "Prozess editieren");
-        initString("lang.process.id", "PID");
-        initString("lang.process.new", "Neuer Prozess");
-        initString("lang.process.not.selected", "Kein Prozess ausgewählt");
-        initString("lang.process.recover", "Prozess wiederbeleben");
-        initString("lang.process.remove", "Prozess entfernen");
-        initString("lang.process.selected", "Aktuell ausgewählter Prozess");
-        initString("lang.process.time.local", "Lokale Zeit");
-        initString("lang.processes.all", "Alle Prozesse");
-        initString("lang.protocol", "Protokoll");
-        initString("lang.protocol.client", "Clientseite");
-        initString("lang.protocol.editor", "Protokolleditor");
-        initString("lang.protocol.server", "Serverseite");
-        initString("lang.protocol.tasks.activation", "Client-/Serverprotokoll Aktivierung");
-        initString("lang.protocol.tasks.client", "Client Task-Manager (Clientanfragen)");
-        initString("lang.protocols", "Protokolle");
-        initString("lang.quit", "Beenden");
-        initString("lang.recovered", "Wiederbelebt");
-        initString("lang.remove", "Entfernen");
-        initString("lang.replay", "Wiederholen");
-        initString("lang.reset", "Reset");
-        initString("lang.save", "Speichern");
-        initString("lang.saveas", "Speichern unter");
-        initString("lang.server", "Server");
-        initString("lang.serverrequest.start", "Serveranfrage starten");
-        initString("lang.simulator", "Simulator");
-        initString("lang.simulator.close", "Simulation schliessen");
-        initString("lang.simulator.finished", "Simulation beendet");
-        initString("lang.simulator.new", "Neue Simulation");
-        initString("lang.simulator.paused", "Simulation pausiert");
-        initString("lang.simulator.resetted", "Simulation zurückgesetzt");
-        initString("lang.simulator.started", "Simulation gestartet");
-        initString("lang.start", "Starten");
-        initString("lang.stop", "Stoppen");
-        initString("lang.takeover", "Übernehmen");
-        initString("lang.task", "Aufgabe");
-        initString("lang.task.manager", "Ereigniseditor");
-        initString("lang.tasks.fullfilled", "Abgelaufene Aufgaben");
-        initString("lang.tasks.global", "Globale Aufgaben");
-        initString("lang.tasks.local", "Lokale Aufgaben");
-        initString("lang.time", "Zeit");
-        initString("lang.time.lamport", "Lamportzeit");
-        initString("lang.time.vector", "Vektorzeit");
-        initString("lang.timed.global", "Globale Ereignisse");
-        initString("lang.timed.local", "Lokale Ereignisse");
-        initString("lang.type", "Typ");
-        initString("lang.value", "Wert");
-        initString("lang.variable", "Variable");
-        initString("lang.variables", "Variablen");
-        initString("lang.variables.global", "Globale Variablen");
-        initString("lang.window.close", "Fenster schliessen");
-        initString("lang.window.new", "Neues Fenster");
+        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@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");
+
+        /* 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");
     }
 
     /**
@@ -186,10 +211,10 @@ public class VSDefaultPrefs extends VSSerializablePrefs {
      */
     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");
+        initInteger("sim.process.num", 3, "Number of processes", 1, 6);
+        initInteger("message.prob.outage", 0, "Message lost prob.", 0, 100, "%");
+        initInteger("process.prob.crash", 0, "Process crash prob.", 0, 100, "%");
+        initInteger("sim.seconds", 15, "Simulation duration", 5, 120, "s");
 
         /* Internal prefs */
         initInteger("keyevent.about", KeyEvent.VK_A, null, 0, 100);
@@ -215,12 +240,12 @@ public class VSDefaultPrefs extends VSSerializablePrefs {
         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");
+        initInteger("div.window.prefs.xsize", 400, "Configuration window X-Axis", 550, 3200, "px");
+        initInteger("div.window.prefs.ysize", 400, "Configuration window Y-Axis", 640, 2400, "px");
+        initInteger("div.window.logsize", 300, "Log window Y-Axis", 100, 1000, "px");
+        initInteger("div.window.splitsize", 320, "Toolbar X-Axis", 100, 1000, "px");
+        initInteger("div.window.xsize", 1024, "Main window X-Axis", 750, 3200, "px");
+        initInteger("div.window.ysize", 768, "Main window Y-Axis", 600, 2400, "px");
     }
 
     /**
@@ -228,8 +253,8 @@ public class VSDefaultPrefs extends VSSerializablePrefs {
      */
     public void fillDefaultFloats() {
         /* Simulator prefs */
-        initFloat("process.clock.variance", 0, "Uhrabweichung");
-        initFloat("sim.clock.speed", 0.5f, "Abspielgeschwindigkeit der Simulation");
+        initFloat("process.clock.variance", 0, "Clock variance");
+        initFloat("sim.clock.speed", 0.5f, "Simulation play speed");
     }
 
     /**
@@ -237,8 +262,8 @@ public class VSDefaultPrefs extends VSSerializablePrefs {
      */
     public void fillDefaultLongs() {
         /* Simulator prefs */
-        initLong("message.sendingtime.min", 500, "Minimale Übertragungszeit", "ms");
-        initLong("message.sendingtime.max", 2000, "Maximale Übertragungszeit", "ms");
+        initLong("message.sendingtime.min", 500, "Max transmission time", "ms");
+        initLong("message.sendingtime.max", 2000, "Min transmission time", "ms");
     }
 
     /**
@@ -264,13 +289,13 @@ public class VSDefaultPrefs extends VSSerializablePrefs {
      * 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");
+        initBoolean("sim.mode.expert", false, "Expert mode");
+        initBoolean("sim.message.own.recv", false, "Processes receive own messages");
+        initBoolean("sim.message.prob.mean", true, "Use mean value of message lost prob.");
+        initBoolean("sim.message.sendingtime.mean", true, "Use mean value of transmission times");
+        initBoolean("sim.messages.relevant", true, "Only show relevant messages");
+        initBoolean("sim.periodic", false, "Repeat simulation periodically");
+        initBoolean("sim.update.lamporttime.all", false, "Lamport timestamps affect all events");
+        initBoolean("sim.update.vectortime.all", false, "Vector timestamps affect all events");
     }
 }
diff --git a/sources/prefs/VSDefaultPrefsDE.java b/sources/prefs/VSDefaultPrefsDE.java
new file mode 100644
index 0000000..9f65153
--- /dev/null
+++ b/sources/prefs/VSDefaultPrefsDE.java
@@ -0,0 +1,275 @@
+/*
+ * Copyright (c) 2008 Paul C. Buetow, vs@dev.buetow.org
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * All icons of the icons/ folder are 	under a Creative Commons
+ * Attribution-Noncommercial-Share Alike License a CC-by-nc-sa.
+ *
+ * The icon's homepage is http://code.google.com/p/ultimate-gnome/
+ */
+
+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 {
+    /** The serial version uid */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 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 vs@paul.buetow.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 f5e68f3..31e1f22 100644
--- a/sources/prefs/VSPrefs.java
+++ b/sources/prefs/VSPrefs.java
@@ -36,6 +36,9 @@ import serialize.*;
  * @author Paul C. Buetow
  */
 public class VSPrefs {
+    /** Check if we want to overwrite description strings */
+    //private boolean useDefaultStrings = false;
+
     /** The Constant BOOLEAN_PREFIX. */
     public static final String BOOLEAN_PREFIX = "Boolean: ";
 
@@ -826,6 +829,14 @@ public class VSPrefs {
         initUnit(LONG_PREFIX + key, unit);
     }
 
+    /**
+     * Deletes the long.
+     *
+     * @param key the key
+     */
+    public synchronized void deleteLong(String key) {
+        longPrefs.remove(key);
+    }
 
     /**
      * Sets the long.
@@ -1187,4 +1198,13 @@ public class VSPrefs {
 
         return allKeys;
     }
+
+    /**
+     * Not overwrite description string defaults
+     */
+    /*
+        public void useDefaultStrings(boolean value) {
+    	useDefaultStrings = value;
+        }
+    */
 }
diff --git a/sources/prefs/editors/VSAbstractBetterEditor.java b/sources/prefs/editors/VSAbstractBetterEditor.java
index 9df7f78..556b14a 100644
--- a/sources/prefs/editors/VSAbstractBetterEditor.java
+++ b/sources/prefs/editors/VSAbstractBetterEditor.java
@@ -28,7 +28,6 @@ import java.awt.event.*;
 import javax.swing.*;
 
 import prefs.*;
-//import utils.*;
 
 /**
  * The class VSAbstractBetterEditor, is an improved VSAbstractEditor.
@@ -43,7 +42,6 @@ public abstract class VSAbstractBetterEditor extends VSAbstractEditor {
     private Container contentPane;
 
     /** The info area. */
-    //private VSInfoArea infoArea;
 
     /** The title. */
     private String title;
@@ -90,13 +88,10 @@ public abstract class VSAbstractBetterEditor extends VSAbstractEditor {
         JPanel panel  = new JPanel();
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
 
-        //infoArea = new VSInfoArea();
         JPanel editPanel = getEditPanel();
         JPanel buttonPanel = getButtonPanel();
 
-        //JScrollPane scrollPane = new JScrollPane(editPanel);
         panel.add(editPanel);
-        //panel.add(infoArea);
         panel.add(buttonPanel);
 
         return panel;
@@ -128,13 +123,4 @@ public abstract class VSAbstractBetterEditor extends VSAbstractEditor {
         /* More action in the super class!!! */
         super.actionPerformed(e);
     }
-
-    /**
-     * Gets the info area.
-     *
-     * @return the info area
-     */
-    //protected VSInfoArea getInfoArea() {
-    //   return infoArea;
-    //}
 }
diff --git a/sources/prefs/editors/VSAbstractEditor.java b/sources/prefs/editors/VSAbstractEditor.java
index 8f03ba4..6118c7e 100644
--- a/sources/prefs/editors/VSAbstractEditor.java
+++ b/sources/prefs/editors/VSAbstractEditor.java
@@ -249,7 +249,7 @@ public abstract class VSAbstractEditor implements ActionListener {
         boolean expertMode = prefs.getBoolean("sim.mode.expert");
 
         for (String elem : set) {
-            if (!elem.startsWith("lang.") && !elem.startsWith("keyevent.")) {
+            if (!elem.startsWith("lang.en.") && !elem.startsWith("keyevent.")) {
                 if (expertMode)
                     filtered.add(elem);
                 else if (!elem.startsWith("col.") && (!elem.startsWith("div.")))
@@ -271,7 +271,7 @@ public abstract class VSAbstractEditor implements ActionListener {
         addToButtonPanelFront(buttonPanel);
 
         JButton resetButton = new JButton(
-            prefs.getString("lang.reset"));
+            prefs.getString("lang.en.reset"));
         resetButton.setMnemonic(prefs.getInteger("keyevent.reset"));
         resetButton.addActionListener(this);
         buttonPanel.add(resetButton);
@@ -339,7 +339,9 @@ public abstract class VSAbstractEditor implements ActionListener {
      */
     protected VS3Tupel<String,Component,JComboBox> createIntegerComponent(
         String fullKey, String key, VSPrefs prefsToEdit) {
-        String descr = prefsToEdit.getDescription(fullKey);
+        String descr = prefs.getDescription(fullKey);
+        if (descr == null)
+            descr = prefsToEdit.getDescription(fullKey);
         String label = descr == null ? fullKey : descr;
         Integer integer = prefsToEdit.getInteger(key);
         Integer initialSelection[] = { integer };
@@ -381,7 +383,9 @@ public abstract class VSAbstractEditor implements ActionListener {
      */
     protected VS3Tupel<String,Component,JTextField> createVectorComponent(
         String fullKey, String key, VSPrefs prefsToEdit) {
-        String descr = prefsToEdit.getDescription(fullKey);
+        String descr = prefs.getDescription(fullKey);
+        if (descr == null)
+            descr = prefsToEdit.getDescription(fullKey);
         String label = descr == null ? fullKey : descr;
 
         Vector<Integer> vec = prefsToEdit.getVector(key);
@@ -402,8 +406,10 @@ public abstract class VSAbstractEditor implements ActionListener {
      */
     protected VS3Tupel<String,Component,JCheckBox> createBooleanComponent(
         String fullKey, String key, VSPrefs prefsToEdit) {
-        final String activated = prefs.getString("lang.activated");
-        String descr = prefsToEdit.getDescription(fullKey);
+        final String activated = prefs.getString("lang.en.activated");
+        String descr = prefs.getDescription(fullKey);
+        if (descr == null)
+            descr = prefsToEdit.getDescription(fullKey);
         String label = descr == null ? fullKey : descr;
         JCheckBox valField = new JCheckBox(activated,
                                            prefsToEdit.getBoolean(key));
@@ -424,7 +430,9 @@ public abstract class VSAbstractEditor implements ActionListener {
      */
     protected VS3Tupel<String,Component,JTextField> createLongComponent(
         String fullKey, String key, VSPrefs prefsToEdit) {
-        String descr = prefsToEdit.getDescription(fullKey);
+        String descr = prefs.getDescription(fullKey);
+        if (descr == null)
+            descr = prefsToEdit.getDescription(fullKey);
         String label = descr == null ? fullKey : descr;
         JTextField valField = new JTextField(VALUE_FIELD_COLS);
         valField.addKeyListener(new java.awt.event.KeyAdapter() {
@@ -451,7 +459,9 @@ public abstract class VSAbstractEditor implements ActionListener {
      */
     protected VS3Tupel<String,Component,JTextField> createFloatComponent(
         String fullKey, String key, VSPrefs prefsToEdit) {
-        String descr = prefsToEdit.getDescription(fullKey);
+        String descr = prefs.getDescription(fullKey);
+        if (descr == null)
+            descr = prefsToEdit.getDescription(fullKey);
         String label = descr == null ? fullKey : descr;
         JTextField valField = new JTextField(VALUE_FIELD_COLS);
         valField.addKeyListener(new java.awt.event.KeyAdapter() {
@@ -478,7 +488,9 @@ public abstract class VSAbstractEditor implements ActionListener {
      */
     protected VS3Tupel<String,Component,JTextField> createColorComponent(
         String fullKey, String key, final VSPrefs prefsToEdit) {
-        String descr = prefsToEdit.getDescription(fullKey);
+        String descr = prefs.getDescription(fullKey);
+        if (descr == null)
+            descr = prefsToEdit.getDescription(fullKey);
         String label = descr == null ? fullKey : descr;
         final JTextField valField = new JTextField(VALUE_FIELD_COLS);
         Color color = prefsToEdit.getColor(key);
@@ -492,9 +504,9 @@ public abstract class VSAbstractEditor implements ActionListener {
             public void mouseClicked(MouseEvent e) {
                 JFrame parentFrame = getFrame();
                 JFrame frame = new VSFrame(
-                    prefs.getString("lang.name") + " - " +
+                    prefs.getString("lang.en.name") + " - " +
                     prefs.getString(
-                        "lang.colorchooser"),parentFrame);
+                        "lang.en.colorchooser"),parentFrame);
                 frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 
                 JComponent colorChooserPane = new VSColorChooser(prefs,
@@ -522,7 +534,9 @@ public abstract class VSAbstractEditor implements ActionListener {
      */
     protected VS3Tupel<String,Component,JTextField> createStringComponent(
         String fullKey, String key, VSPrefs prefsToEdit) {
-        String descr = prefsToEdit.getDescription(fullKey);
+        String descr = prefs.getDescription(fullKey);
+        if (descr == null)
+            descr = prefsToEdit.getDescription(fullKey);
         String label = descr == null ? fullKey : descr;
         JTextField valField = new JTextField(VALUE_FIELD_COLS);
         valField.addKeyListener(new java.awt.event.KeyAdapter() {
@@ -630,7 +644,7 @@ public abstract class VSAbstractEditor implements ActionListener {
             if (key.startsWith("sim.")) {
                 if (!flag) {
                     flag = true;
-                    addSeparator(prefs.getString("lang.prefs.simulator"));
+                    addSeparator(prefs.getString("lang.en.prefs.simulator"));
                 }
                 addVariable(labels.get(fullKey), components.get(fullKey),
                             prefsToEdit);
@@ -644,10 +658,10 @@ public abstract class VSAbstractEditor implements ActionListener {
                 if (!flag) {
                     flag = true;
                     if (this instanceof VSProcessEditor)
-                        addSeparator(prefs.getString("lang.prefs.process"));
+                        addSeparator(prefs.getString("lang.en.prefs.process"));
                     else
                         addSeparator(prefs.getString(
-                                         "lang.prefs.process.defaults"));
+                                         "lang.en.prefs.process.defaults"));
                 }
                 addVariable(labels.get(fullKey), components.get(fullKey),
                             prefsToEdit);
@@ -662,10 +676,10 @@ public abstract class VSAbstractEditor implements ActionListener {
                     flag = true;
                     if (this instanceof VSProcessEditor)
                         addSeparator(prefs.getString(
-                                         "lang.prefs.message"));
+                                         "lang.en.prefs.message"));
                     else
                         addSeparator(prefs.getString(
-                                         "lang.prefs.message.defaults"));
+                                         "lang.en.prefs.message.defaults"));
                 }
                 addVariable(labels.get(fullKey), components.get(fullKey),
                             prefsToEdit);
@@ -678,7 +692,7 @@ public abstract class VSAbstractEditor implements ActionListener {
             if (key.startsWith("col.")) {
                 if (!flag) {
                     flag = true;
-                    addSeparator(prefs.getString("lang.prefs.color"));
+                    addSeparator(prefs.getString("lang.en.prefs.color"));
                 }
                 addVariable(labels.get(fullKey), components.get(fullKey),
                             prefsToEdit);
@@ -691,7 +705,7 @@ public abstract class VSAbstractEditor implements ActionListener {
             if (key.startsWith("div.")) {
                 if (!flag) {
                     flag = true;
-                    addSeparator(prefs.getString("lang.prefs.diverse"));
+                    addSeparator(prefs.getString("lang.en.prefs.diverse"));
                 }
                 addVariable(labels.get(fullKey), components.get(fullKey),
                             prefsToEdit);
@@ -1010,10 +1024,10 @@ public abstract class VSAbstractEditor implements ActionListener {
     public void actionPerformed(ActionEvent e) {
         String actionCommand = e.getActionCommand();
 
-        if (actionCommand.equals(prefs.getString("lang.takeover"))) {
+        if (actionCommand.equals(prefs.getString("lang.en.takeover"))) {
             savePrefs();
 
-        } else if (actionCommand.equals(prefs.getString("lang.reset"))) {
+        } else if (actionCommand.equals(prefs.getString("lang.en.reset"))) {
             resetPrefs();
         }
     }
diff --git a/sources/prefs/editors/VSColorChooser.java b/sources/prefs/editors/VSColorChooser.java
index 96aaf53..619bc17 100644
--- a/sources/prefs/editors/VSColorChooser.java
+++ b/sources/prefs/editors/VSColorChooser.java
@@ -62,7 +62,7 @@ public class VSColorChooser extends JPanel implements ChangeListener {
         colorChooser.setColor(color);
         colorChooser.getSelectionModel().addChangeListener(this);
         colorChooser.setBorder(BorderFactory.createTitledBorder(
-                                   prefs.getString("lang.colorchooser2")));
+                                   prefs.getString("lang.en.colorchooser2")));
         add(colorChooser, BorderLayout.CENTER);
     }
 
diff --git a/sources/prefs/editors/VSEditorFrame.java b/sources/prefs/editors/VSEditorFrame.java
index 332c8a5..855bf0a 100644
--- a/sources/prefs/editors/VSEditorFrame.java
+++ b/sources/prefs/editors/VSEditorFrame.java
@@ -82,13 +82,13 @@ public class VSEditorFrame extends VSFrame implements ActionListener {
      */
     private void fillButtonPanel(JPanel buttonPanel) {
         JButton okButton = new JButton(
-            prefs.getString("lang.ok"));
+            prefs.getString("lang.en.ok"));
         okButton.setMnemonic(prefs.getInteger("keyevent.ok"));
         okButton.addActionListener(this);
         buttonPanel.add(okButton, 0);
 
         JButton cancelButton = new JButton(
-            prefs.getString("lang.cancel"));
+            prefs.getString("lang.en.cancel"));
         cancelButton.setMnemonic(prefs.getInteger("keyevent.cancel"));
         cancelButton.addActionListener(this);
         buttonPanel.add(cancelButton, 1);
@@ -102,11 +102,11 @@ public class VSEditorFrame extends VSFrame implements ActionListener {
     public void actionPerformed(ActionEvent e) {
         String actionCommand = e.getActionCommand();
 
-        if (actionCommand.equals(prefs.getString("lang.ok"))) {
+        if (actionCommand.equals(prefs.getString("lang.en.ok"))) {
             editor.actionPerformed(e);
             dispose();
 
-        } else if (actionCommand.equals(prefs.getString("lang.cancel"))) {
+        } else if (actionCommand.equals(prefs.getString("lang.en.cancel"))) {
             editor.actionPerformed(e);
             dispose();
 
diff --git a/sources/prefs/editors/VSProcessEditor.java b/sources/prefs/editors/VSProcessEditor.java
index ae2a61f..eaacc7b 100644
--- a/sources/prefs/editors/VSProcessEditor.java
+++ b/sources/prefs/editors/VSProcessEditor.java
@@ -54,8 +54,8 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
      * @param process the process
      */
     public VSProcessEditor(VSPrefs prefs, VSInternalProcess process) {
-        super(prefs, process, prefs.getString("lang.name") + " - " +
-              prefs.getString("lang.prefs.process"));;
+        super(prefs, process, prefs.getString("lang.en.name") + " - " +
+              prefs.getString("lang.en.prefs.process"));;
         this.process = process;
         disposeFrameWithParentIfExists();
         makeProtocolVariablesEditable();
@@ -67,7 +67,7 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
      */
     protected void addToButtonPanelFront(JPanel buttonPanel) {
         JButton takeoverButton = new JButton(
-            prefs.getString("lang.takeover"));
+            prefs.getString("lang.en.takeover"));
         takeoverButton.setMnemonic(prefs.getInteger("keyevent.takeover"));
         takeoverButton.addActionListener(this);
         buttonPanel.add(takeoverButton);
@@ -80,9 +80,9 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
         ArrayList<String> editableProtocolsClassnames =
             VSRegisteredEvents.getEditableProtocolsClassnames();
 
-        //String protocolString = " " + prefs.getString("lang.protocol");
-        String clientString = " " + prefs.getString("lang.client");
-        String serverString = " " + prefs.getString("lang.server");
+        //String protocolString = " " + prefs.getString("lang.en.protocol");
+        String clientString = " " + prefs.getString("lang.en.client");
+        String serverString = " " + prefs.getString("lang.en.server");
 
         for (String protocolClassname : editableProtocolsClassnames) {
             String protocolShortname =
@@ -116,11 +116,11 @@ public class VSProcessEditor extends VSAbstractBetterEditor {
     public void actionPerformed(ActionEvent e) {
         String actionCommand = e.getActionCommand();
 
-        if (actionCommand.equals(prefs.getString("lang.ok"))) {
+        if (actionCommand.equals(prefs.getString("lang.en.ok"))) {
             savePrefs();
             process.updateFromPrefs();
 
-        } else if (actionCommand.equals(prefs.getString("lang.takeover"))) {
+        } else if (actionCommand.equals(prefs.getString("lang.en.takeover"))) {
             savePrefs();
             process.updateFromPrefs();
 
diff --git a/sources/prefs/editors/VSSimulatorEditor.java b/sources/prefs/editors/VSSimulatorEditor.java
index d900692..edd9cd5 100644
--- a/sources/prefs/editors/VSSimulatorEditor.java
+++ b/sources/prefs/editors/VSSimulatorEditor.java
@@ -68,8 +68,8 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
      */
     public VSSimulatorEditor(VSPrefs prefs, VSSimulatorFrame simulatorFrame,
                              VSSimulator simulator) {
-        super(prefs, prefs, prefs.getString("lang.name")
-              + " - " + prefs.getString("lang.prefs"));
+        super(prefs, prefs, prefs.getString("lang.en.name")
+              + " - " + prefs.getString("lang.en.prefs"));
         this.dontStartNewSimulator = true;//simulator != null;
         this.simulatorFrame = simulatorFrame;
         this.simulator = simulator;
@@ -83,8 +83,8 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
      */
     public VSSimulatorEditor(VSPrefs prefs, VSSimulatorFrame simulatorFrame,
                              boolean openedNewWindow) {
-        super(prefs, prefs, prefs.getString("lang.name")
-              + " - " + prefs.getString("lang.prefs"));
+        super(prefs, prefs, prefs.getString("lang.en.name")
+              + " - " + prefs.getString("lang.en.prefs"));
         this.simulatorFrame = simulatorFrame;
         this.openedNewWindow = openedNewWindow;
     }
@@ -97,7 +97,7 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
         if (TAKEOVER_BUTTON) {
             TAKEOVER_BUTTON = false;
             JButton takeoverButton = new JButton(
-                prefs.getString("lang.takeover"));
+                prefs.getString("lang.en.takeover"));
             takeoverButton.setMnemonic(prefs.getInteger("keyevent.takeover"));
             takeoverButton.addActionListener(this);
             buttonPanel.add(takeoverButton);
@@ -111,7 +111,7 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
     public void actionPerformed(ActionEvent e) {
         String actionCommand = e.getActionCommand();
 
-        if (actionCommand.equals(prefs.getString("lang.takeover"))) {
+        if (actionCommand.equals(prefs.getString("lang.en.takeover"))) {
             savePrefs();
 
             if (simulator != null) {
@@ -120,11 +120,11 @@ public class VSSimulatorEditor extends VSAbstractBetterEditor {
                 simulator.updateFromPrefs();
             }
 
-        } else if (actionCommand.equals(prefs.getString("lang.cancel"))) {
+        } else if (actionCommand.equals(prefs.getString("lang.en.cancel"))) {
             if (!dontStartNewSimulator && openedNewWindow)
                 simulatorFrame.dispose();
 
-        } else if (actionCommand.equals(prefs.getString("lang.ok"))) {
+        } else if (actionCommand.equals(prefs.getString("lang.en.ok"))) {
             savePrefs();
             if (expertModeChanged()) {
                 if (simulator != null)