summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/core/VSTaskManager.java2
-rw-r--r--src/main/java/prefs/VSDefaultPrefs.java14
-rw-r--r--src/main/java/simulator/VSMain.java2
-rw-r--r--src/main/java/simulator/VSSimulator.java6
4 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/core/VSTaskManager.java b/src/main/java/core/VSTaskManager.java
index 6aa10d0..bd95a4e 100644
--- a/src/main/java/core/VSTaskManager.java
+++ b/src/main/java/core/VSTaskManager.java
@@ -441,7 +441,7 @@ public class VSTaskManager implements VSSerializable {
buffer.append(prefs.getString("lang.task.manager"));
buffer.append(" (");
- buffer.append(prefs.getString("lang.tasks.fullfilled"));
+ buffer.append(prefs.getString("lang.tasks.fulfilled"));
buffer.append(": ");
for (VSTask task : fullfilledProgrammedTasks) {
diff --git a/src/main/java/prefs/VSDefaultPrefs.java b/src/main/java/prefs/VSDefaultPrefs.java
index bc57098..9a5d966 100644
--- a/src/main/java/prefs/VSDefaultPrefs.java
+++ b/src/main/java/prefs/VSDefaultPrefs.java
@@ -68,15 +68,15 @@ public class VSDefaultPrefs extends VSSerializablePrefs {
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.global", "Add global event");
+ initString("lang.event.add.local", "Add 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.logging.active", "Logging");
+ initString("lang.logging.clear", "Clear logs");
initString("lang.message", "Message");
initString("lang.message.recv", "Message received");
initString("lang.message.sent", "Message sent");
@@ -99,7 +99,7 @@ public class VSDefaultPrefs extends VSSerializablePrefs {
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.add.new", "Add new process");
initString("lang.process.crash", "Crash process");
initString("lang.process.edit", "Edit process");
initString("lang.process.id", "PID");
@@ -138,8 +138,8 @@ public class VSDefaultPrefs extends VSSerializablePrefs {
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.fulfilled", "Fulfilled tasks");
+ initString("lang.tasks.global", "Global tasks");
initString("lang.tasks.local", "Local tasks");
initString("lang.time", "Time");
initString("lang.time.lamport", "Lamport time");
diff --git a/src/main/java/simulator/VSMain.java b/src/main/java/simulator/VSMain.java
index 34a21b7..46077ec 100644
--- a/src/main/java/simulator/VSMain.java
+++ b/src/main/java/simulator/VSMain.java
@@ -61,7 +61,7 @@ public class VSMain {
UIManager.getCrossPlatformLookAndFeelClassName());
} catch (Exception e) { }
- Locale.setDefault(Locale.GERMAN);
+ Locale.setDefault(Locale.ENGLISH);
javax.swing.JPopupMenu.setDefaultLightWeightPopupEnabled(false);
VSPrefs prefs = VSDefaultPrefs.init();
VSRegisteredEvents.init(prefs);
diff --git a/src/main/java/simulator/VSSimulator.java b/src/main/java/simulator/VSSimulator.java
index 4965a71..4515357 100644
--- a/src/main/java/simulator/VSSimulator.java
+++ b/src/main/java/simulator/VSSimulator.java
@@ -755,7 +755,7 @@ public class VSSimulator extends JPanel implements VSSerializable {
}
JCheckBox logingActiveCheckBox = new JCheckBox(
- prefs.getString("lang.loging.active"));
+ prefs.getString("lang.logging.active"));
logingActiveCheckBox.setSelected(true);
logingActiveCheckBox.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.loging.clear"));
+ prefs.getString("lang.logging.clear"));
clearButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent ae) {
String command = ae.getActionCommand();
if (command.equals(
- prefs.getString("lang.loging.clear"))) {
+ prefs.getString("lang.logging.clear"))) {
loging.clear();
}
}