diff --git a/locale/messages_en.po b/locale/messages_en.po
index 1993f2862..d84bf7f69 100644
--- a/locale/messages_en.po
+++ b/locale/messages_en.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: itoopie\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-12 18:44+0000\n"
+"POT-Creation-Date: 2015-01-19 12:53+0000\n"
 "PO-Revision-Date: 2010-07-25 14:09+0100\n"
 "Last-Translator: hottuna <dev@robertfoss.se>\n"
 "Language-Team: hottuna <dev@robertfoss.se>\n"
@@ -88,7 +88,7 @@ msgid "Are you sure that you trust the new certificate?"
 msgstr ""
 
 #: src/net/i2p/itoopie/gui/CertificateGUI.java:106
-msgid "Is that you final answer?"
+msgid "Is that your final answer?"
 msgstr ""
 
 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:46
@@ -232,12 +232,12 @@ msgid "Restart needed for new settings."
 msgstr ""
 
 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:408
-msgid "Restarting I2P node.. "
+msgid "Restarting I2P node"
 msgstr ""
 
 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:410
 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:412
-msgid "Restart failed: "
+msgid "Restart failed"
 msgstr ""
 
 #: src/net/i2p/itoopie/gui/Main.java:85
diff --git a/locale/messages_sv.po b/locale/messages_sv.po
index a5aeb46cd..9888df638 100644
--- a/locale/messages_sv.po
+++ b/locale/messages_sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: itoopie\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-12 18:44+0000\n"
+"POT-Creation-Date: 2015-01-19 12:53+0000\n"
 "PO-Revision-Date: 2010-07-25 14:09+0100\n"
 "Last-Translator: hottuna <dev@robertfoss.se>\n"
 "Language-Team: hottuna <dev@robertfoss.se>\n"
@@ -38,6 +38,7 @@ msgid "New remote host detected"
 msgstr "Ny fjärrvärd upptäckt"
 
 #: src/net/i2p/itoopie/gui/CertificateGUI.java:31
+#, fuzzy, java-format
 msgid ""
 "Would you like permanently trust the certificate from the remote host {0}?"
 msgstr "Vill du permanent lite på certifikatet från fjärrvärden "
@@ -87,7 +88,7 @@ msgid "Are you sure that you trust the new certificate?"
 msgstr "Är du säker på att du vill lite på det nya certifkatet?"
 
 #: src/net/i2p/itoopie/gui/CertificateGUI.java:106
-msgid "Is that you final answer?"
+msgid "Is that your final answer?"
 msgstr "Är det ditt slutgiltiga svar?"
 
 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:46
@@ -243,13 +244,13 @@ msgid "Restart needed for new settings."
 msgstr "Omstart krävs för nya inställningar."
 
 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:408
-msgid "Restarting I2P node.. "
-msgstr "Startar om I2P nod.."
+msgid "Restarting I2P node"
+msgstr "Startar om I2P nod"
 
 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:410
 #: src/net/i2p/itoopie/gui/ConfigurationTab.java:412
-msgid "Restart failed: "
-msgstr "Omstart misslyckades: "
+msgid "Restart failed"
+msgstr "Omstart misslyckades"
 
 #: src/net/i2p/itoopie/gui/Main.java:85
 msgid "Overview"
diff --git a/src/net/i2p/itoopie/gui/CertificateGUI.java b/src/net/i2p/itoopie/gui/CertificateGUI.java
index a4785d2b0..2ed76d9ab 100644
--- a/src/net/i2p/itoopie/gui/CertificateGUI.java
+++ b/src/net/i2p/itoopie/gui/CertificateGUI.java
@@ -103,7 +103,7 @@ public class CertificateGUI {
 			n = JOptionPane.showConfirmDialog(
 				    frame,
 				    Transl._("Are you sure that you trust the new certificate?"),
-				    Transl._("Is that you final answer?"),
+				    Transl._("Is that your final answer?"),
 				    JOptionPane.YES_NO_OPTION,
 				    JOptionPane.ERROR_MESSAGE);
 			if (n == JOptionPane.YES_OPTION){
diff --git a/src/net/i2p/itoopie/gui/ConfigurationTab.java b/src/net/i2p/itoopie/gui/ConfigurationTab.java
index 8a52af028..c740f7119 100644
--- a/src/net/i2p/itoopie/gui/ConfigurationTab.java
+++ b/src/net/i2p/itoopie/gui/ConfigurationTab.java
@@ -405,11 +405,11 @@ public class ConfigurationTab extends TabLogoPanel {
 						HashMap<ROUTER_MANAGER, String> hm = new HashMap<ROUTER_MANAGER,String>();
 						hm.put(ROUTER_MANAGER.RESTART, null);
 						SetRouterManager.execute(hm);
-						StatusHandler.setStatus(Transl._("Restarting I2P node.. "));
+						StatusHandler.setStatus(Transl._("Restarting I2P node"));
 					} catch (InvalidPasswordException e) {
-						StatusHandler.setStatus(Transl._("Restart failed: ") + DEFAULT_STATUS.INVALID_PASSWORD);
+						StatusHandler.setStatus(Transl._("Restart failed") + ": " + DEFAULT_STATUS.INVALID_PASSWORD);
 					} catch (JSONRPC2SessionException e) {
-						StatusHandler.setStatus(Transl._("Restart failed: ") + DEFAULT_STATUS.NOT_CONNECTED);
+						StatusHandler.setStatus(Transl._("Restart failed") + ": " + DEFAULT_STATUS.NOT_CONNECTED);
 					}
 				}
 				break;