diff --git a/src/com/gpl/rpg/atcontentstudio/ui/AboutEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/AboutEditor.java
index fef267c..35ce9f1 100644
--- a/src/com/gpl/rpg/atcontentstudio/ui/AboutEditor.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/AboutEditor.java
@@ -51,6 +51,7 @@ public class AboutEditor extends Editor {
 			"<br/>" +
 			"Contributors: <br/>" +
 			"Quentin Delvallet<br/>" +
+			"Žižkin<br/>" +
 			"<br/>" +
 			"This project uses the following libraries:<br/>" +
 			"<a href=\"http://code.google.com/p/json-simple/\">JSON.simple</a> by Yidong Fang & Chris Nokleberg.<br/>" +
diff --git a/src/com/gpl/rpg/atcontentstudio/ui/WorkspaceSettingsEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/WorkspaceSettingsEditor.java
index 0172366..95c7ce5 100644
--- a/src/com/gpl/rpg/atcontentstudio/ui/WorkspaceSettingsEditor.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/WorkspaceSettingsEditor.java
@@ -182,12 +182,19 @@ public class WorkspaceSettingsEditor extends JDialog {
 		useInternetBox.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				translatorLanguagesBox.setEnabled(useInternetBox.isSelected());
+				translatorLanguagesBox.setEnabled(useInternetBox.isSelected() && translatorModeBox.isSelected());
 				translatorModeBox.setEnabled(useInternetBox.isSelected());
 				checkUpdatesBox.setEnabled(useInternetBox.isSelected());
 			}
 		});
 		
+		translatorModeBox.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				translatorLanguagesBox.setEnabled(translatorModeBox.isSelected());
+			}
+		});
+		
 		
 		return pane;
 	}
diff --git a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java
index 52fbe53..80658a6 100644
--- a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/dialoguetree/DialogueGraphView.java
@@ -49,11 +49,13 @@ import prefuse.visual.expression.InGroupPredicate;
 
 import com.gpl.rpg.atcontentstudio.ATContentStudio;
 import com.gpl.rpg.atcontentstudio.model.GameDataElement;
+import com.gpl.rpg.atcontentstudio.model.Workspace;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Dialogue;
 import com.gpl.rpg.atcontentstudio.model.gamedata.NPC;
 import com.gpl.rpg.atcontentstudio.model.gamedata.Requirement;
 import com.gpl.rpg.atcontentstudio.ui.DefaultIcons;
 import com.gpl.rpg.atcontentstudio.ui.gamedataeditors.DialogueEditor;
+import com.gpl.rpg.atcontentstudio.utils.WeblateIntegration;
 import com.jidesoft.swing.JideBoxLayout;
 
 public class DialogueGraphView extends Display {
@@ -77,6 +79,7 @@ public class DialogueGraphView extends Display {
 	private Dialogue dialogue;
 	private Image npcIcon;
 	private Graph graph;
+	private Boolean translatorMode;
 
 	private Map<Dialogue, Node> cells = new HashMap<Dialogue, Node>();
 
@@ -88,6 +91,7 @@ public class DialogueGraphView extends Display {
 		} else {
 			npcIcon = DefaultIcons.getNPCIcon();
 		}
+		translatorMode = Workspace.activeWorkspace.settings.useInternet.getCurrentValue() && Workspace.activeWorkspace.settings.translatorLanguage.getCurrentValue() != null;
 		loadGraph();
 
 		 // add visual data groups
@@ -188,7 +192,7 @@ public class DialogueGraphView extends Display {
 			}
 			Node dNode = graph.addNode();
 			cells.put(dialogue, dNode);
-			dNode.setString(LABEL, dialogue.message != null ? dialogue.message : "[Selector]");
+			dNode.setString(LABEL, dialogue.message == null ? "[Selector]" : translatorMode ? dialogue.message + "\n---\n" + WeblateIntegration.getTranslationUnit(dialogue.message).translatedText : dialogue.message);
 			dNode.set(ICON, npcIcon);
 			dNode.set(TARGET, dialogue);
 			if (dialogue.replies != null) {
@@ -210,7 +214,7 @@ public class DialogueGraphView extends Display {
 		if (r.text != null && !r.text.equals(Dialogue.Reply.GO_NEXT_TEXT)) {
 			//Normal reply...
 			rNode = graph.addNode();
-			rNode.setString(LABEL, r.text);
+			rNode.setString(LABEL, translatorMode ? r.text + "\n---\n" + WeblateIntegration.getTranslationUnit(r.text).translatedText : r.text);
 			rNode.set(ICON, DefaultIcons.getHeroIcon());
 			rNode.set(TARGET, d);
 			rNode.set(REPLY, r);