diff --git a/debian/patches/0001-path-substitution.patch b/debian/patches/0001-path-substitution.patch
index 524244bf3..9d3da448c 100644
--- a/debian/patches/0001-path-substitution.patch
+++ b/debian/patches/0001-path-substitution.patch
@@ -144,8 +144,8 @@ Debian wrapper.config to try to prevent confusion.
  }
  
  showsetusermesg()  {
--    echo "`gettext \"Please edit $0 and set the variable RUN_AS_USER\"`."
-+    echo "`gettext "Please edit /etc/default/i2p and set the variable RUN_AS_USER"`."
+-    echo "`gettext 'Please edit i2prouter and set the variable RUN_AS_USER'`."
++    echo "`gettext 'Please edit /etc/default/i2p and set the variable RUN_AS_USER'`."
  }
  
  checkifstartingasroot() {
@@ -153,12 +153,12 @@ Debian wrapper.config to try to prevent confusion.
          echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
          showsetusermesg
          echo
--        echo "`gettext \"To run as root anyway, edit $0 and set ALLOW_ROOT=true.\"`"
-+        echo "`gettext \"To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true.\"`"
+-        echo "`gettext 'To run as root anyway, edit i2prouter and set ALLOW_ROOT=true.'`"
++        echo "`gettext 'To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true.'`"
          exit 1
      fi
  }
-@@ -1866,23 +1809,9 @@
+@@ -1866,24 +1809,9 @@
              status
              ;;
  
@@ -179,12 +179,13 @@ Debian wrapper.config to try to prevent confusion.
 -
 -        'remove' | 'uninstall')
 -            removedaemon
+-            ;;
 +        'install' | 'remove' | 'uninstall')
 +            echo "Use \"dpkg-reconfigure i2p\" to configure the initscript."
 +            exit 1
-             ;;
  
          'dump')
+             checkUser "" "$COMMAND"
 --- a/installer/resources/runplain.sh
 +++ b/installer/resources/runplain.sh
 @@ -11,8 +11,8 @@
@@ -329,8 +330,8 @@ Debian wrapper.config to try to prevent confusion.
  msgstr "Falls gestartet, fordere einen Java Thread dump an"
  
  #: ../i2prouter:1788
--msgid "Please edit $0 and set the variable RUN_AS_USER"
--msgstr "Bitte bearbeite $0 und setze die Variable RUN_AS_USER"
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+-msgstr "Bitte bearbeite i2prouter und setze die Variable RUN_AS_USER"
 +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
 +msgstr "Bitte bearbeite /etc/default/i2p und setze die Variable RUN_AS_USER"
  
@@ -339,10 +340,10 @@ Debian wrapper.config to try to prevent confusion.
  msgstr "I2P als root Benutzer auszuführen ist *nicht* empfehlenswert."
  
  #: ../i2prouter:1796
--msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
  msgstr ""
--"Um I2P trotzdem als root auszuführen bearbeite $0 und setze ALLOW_ROOT=true."
+-"Um I2P trotzdem als root auszuführen bearbeite i2prouter und setze ALLOW_ROOT=true."
 +"Um I2P trotzdem als root auszuführen bearbeite /etc/default/i2p und setze ALLOW_ROOT=true."
 --- a/installer/resources/locale/po/messages_en.po
 +++ b/installer/resources/locale/po/messages_en.po
@@ -350,7 +351,7 @@ Debian wrapper.config to try to prevent confusion.
  msgstr ""
  
  #: ../i2prouter:1788
--msgid "Please edit $0 and set the variable RUN_AS_USER"
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
  msgstr ""
  
@@ -359,7 +360,7 @@ Debian wrapper.config to try to prevent confusion.
  msgstr ""
  
  #: ../i2prouter:1796
--msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
  msgstr ""
 --- a/installer/resources/locale/po/messages_fr.po
@@ -368,7 +369,7 @@ Debian wrapper.config to try to prevent confusion.
  msgstr "Request a Java thread dump if running."
  
  #: ../i2prouter:1788
--msgid "Please edit $0 and set the variable RUN_AS_USER"
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 -msgstr "Veuillez éditer $0 et paramétrer la variable RUN_AS_USER"
 +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
 +msgstr "Veuillez éditer /etc/default/i2p et paramétrer la variable RUN_AS_USER"
@@ -378,7 +379,7 @@ Debian wrapper.config to try to prevent confusion.
  msgstr "Faire fonctionner I2P en tant qu'utilisateur root n'est *pas* recommandé."
  
  #: ../i2prouter:1796
--msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 -msgstr "Pour exécuter en tant que root de toute façon, éditer $0 et mettre ALLOW_ROOT=true."
 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
 +msgstr "Pour exécuter en tant que root de toute façon, éditer /etc/default/i2p et mettre ALLOW_ROOT=true."
@@ -388,7 +389,7 @@ Debian wrapper.config to try to prevent confusion.
  msgstr ""
  
  #: ../i2prouter:1780
--msgid "Please edit $0 and set the variable RUN_AS_USER"
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
  msgstr ""
  
@@ -397,7 +398,7 @@ Debian wrapper.config to try to prevent confusion.
  msgstr ""
  
  #: ../i2prouter:1788
--msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
  msgstr ""
 --- a/installer/resources/locale/po/messages_ru.po
@@ -406,7 +407,7 @@ Debian wrapper.config to try to prevent confusion.
  msgstr ""
  
  #: ../i2prouter:1780
--msgid "Please edit $0 and set the variable RUN_AS_USER"
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
  msgstr ""
  
@@ -415,6 +416,26 @@ Debian wrapper.config to try to prevent confusion.
  msgstr ""
  
  #: ../i2prouter:1788
--msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
  msgstr ""
+--- a/installer/resources/locale/po/messages_sv.po
++++ b/installer/resources/locale/po/messages_sv.po
+@@ -187,13 +187,13 @@
+ msgstr "Fråga efter en Java thread dump vid drift."
+ 
+ #: ../i2prouter:1780
+-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+-msgstr "Var god ändra i2prouter och sätt variabeln RUN_AS_USER"
++msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
++msgstr "Var god ändra /etc/default/i2p och sätt variabeln RUN_AS_USER"
+ 
+ #: ../i2prouter:1785
+ msgid "Running I2P as the root user is *not* recommended."
+ msgstr "Att köra I2P som användare root är *inte* rekommenderat."
+ 
+ #: ../i2prouter:1788
+-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
+-msgstr "För att köra som root iallafall, ändra i2prouter och sätt ALLOW_ROOT=true"
++msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
++msgstr "För att köra som root iallafall, ändra /etc/default/i2p och sätt ALLOW_ROOT=true"
diff --git a/installer/resources/i2prouter b/installer/resources/i2prouter
index d5b545067..34ad1c099 100644
--- a/installer/resources/i2prouter
+++ b/installer/resources/i2prouter
@@ -1793,7 +1793,7 @@ showUsage() {
 }
 
 showsetusermesg()  {
-    echo "`gettext \"Please edit $0 and set the variable RUN_AS_USER\"`."
+    echo "`gettext 'Please edit i2prouter and set the variable RUN_AS_USER'`."
 }
 
 checkifstartingasroot() {
@@ -1801,7 +1801,7 @@ checkifstartingasroot() {
         echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
         showsetusermesg
         echo
-        echo "`gettext \"To run as root anyway, edit $0 and set ALLOW_ROOT=true.\"`"
+        echo "`gettext 'To run as root anyway, edit i2prouter and set ALLOW_ROOT=true.'`"
         exit 1
     fi
 }
diff --git a/installer/resources/locale/po/messages_de.po b/installer/resources/locale/po/messages_de.po
index f41a9e7b9..ea493e540 100644
--- a/installer/resources/locale/po/messages_de.po
+++ b/installer/resources/locale/po/messages_de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-02 17:24+0000\n"
+"POT-Creation-Date: 2013-05-15 22:00+0000\n"
 "PO-Revision-Date: 2013-05-08 14:19+0000\n"
 "Last-Translator: zeroflag <zeroflag@i2pmail.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/I2P/language/"
@@ -21,184 +21,185 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../i2prouter:203
+#: ../i2prouter:195
 msgid "Failed to load the wrapper"
 msgstr "Wrapper konnte nicht geladen werden."
 
-#: ../i2prouter:908 ../i2prouter:935 ../i2prouter:1009 ../i2prouter:1037
-#: ../i2prouter:1061
+#: ../i2prouter:900 ../i2prouter:927 ../i2prouter:1001 ../i2prouter:1029
+#: ../i2prouter:1053
 #, sh-format
 msgid "$APP_LONG_NAME is already running."
 msgstr "$APP_LONG_NAME läuft bereits."
 
-#: ../i2prouter:919
+#: ../i2prouter:911
 #, sh-format
 msgid "Running $APP_LONG_NAME"
 msgstr "Führe $APP_LONG_NAME aus"
 
-#: ../i2prouter:942
+#: ../i2prouter:934
 #, sh-format
 msgid "Waiting for $APP_LONG_NAME"
 msgstr "Warte auf $APP_LONG_NAME"
 
-#: ../i2prouter:989
+#: ../i2prouter:981
 #, sh-format
 msgid "WARNING: $APP_LONG_NAME may have failed to start."
 msgstr "WARNUNG: Das Starten von $APP_LONG_NAME könnte fehlgeschlagen sein"
 
-#: ../i2prouter:1003 ../i2prouter:1031 ../i2prouter:1240 ../i2prouter:1529
+#: ../i2prouter:995 ../i2prouter:1023 ../i2prouter:1232 ../i2prouter:1521
 msgid "Must be root to perform this action."
 msgstr "Nur root kann diese Aktion durchführen."
 
-#: ../i2prouter:1047
+#: ../i2prouter:1039
 #, sh-format
 msgid "Starting $APP_LONG_NAME"
 msgstr "Starte $APP_LONG_NAME"
 
-#: ../i2prouter:1072
+#: ../i2prouter:1064
 #, sh-format
 msgid "Stopping $APP_LONG_NAME"
 msgstr "Stoppe $APP_LONG_NAME"
 
-#: ../i2prouter:1076 ../i2prouter:1144 ../i2prouter:1697
+#: ../i2prouter:1068 ../i2prouter:1136 ../i2prouter:1689
 #, sh-format
 msgid "$APP_LONG_NAME was not running."
 msgstr "$APP_LONG_NAME wurde nicht ausgeführt."
 
-#: ../i2prouter:1089 ../i2prouter:1097 ../i2prouter:1159 ../i2prouter:1167
+#: ../i2prouter:1081 ../i2prouter:1089 ../i2prouter:1151 ../i2prouter:1159
 #, sh-format
 msgid "Unable to stop $APP_LONG_NAME."
 msgstr "Konnte $APP_LONG_NAME nicht beenden."
 
-#: ../i2prouter:1115
+#: ../i2prouter:1107
 #, sh-format
 msgid "Waiting for $APP_LONG_NAME to exit"
 msgstr "Warte auf die Beendigung von $APP_LONG_NAME."
 
-#: ../i2prouter:1129
+#: ../i2prouter:1121
 #, sh-format
 msgid "Failed to stop $APP_LONG_NAME."
 msgstr "Beenden von $APP_LONG_NAME fehlgeschlagen."
 
-#: ../i2prouter:1132
+#: ../i2prouter:1124
 #, sh-format
 msgid "Stopped $APP_LONG_NAME."
 msgstr "$APP_LONG_NAME wurde beendet."
 
-#: ../i2prouter:1140
+#: ../i2prouter:1132
 #, sh-format
 msgid "Stopping $APP_LONG_NAME gracefully"
 msgstr "Beende $APP_LONG_NAME ordnungsgemäß."
 
-#: ../i2prouter:1186
+#: ../i2prouter:1178
 #, sh-format
 msgid "$APP_LONG_NAME is not running."
 msgstr "$APP_LONG_NAME wird nicht ausgeführt."
 
-#: ../i2prouter:1191
+#: ../i2prouter:1183
 #, sh-format
 msgid "$APP_LONG_NAME is running: PID:$pid"
 msgstr "$APP_LONG_NAME wird ausgeführt: PID:$pid"
 
-#: ../i2prouter:1194
+#: ../i2prouter:1186
 #, sh-format
 msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS"
 msgstr ""
 "$APP_LONG_NAME wird ausgeführt: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS"
 
-#: ../i2prouter:1247 ../i2prouter:1259 ../i2prouter:1278 ../i2prouter:1295
-#: ../i2prouter:1362 ../i2prouter:1382 ../i2prouter:1396 ../i2prouter:1410
-#: ../i2prouter:1438 ../i2prouter:1476 ../i2prouter:1511
+#: ../i2prouter:1239 ../i2prouter:1251 ../i2prouter:1270 ../i2prouter:1287
+#: ../i2prouter:1354 ../i2prouter:1374 ../i2prouter:1388 ../i2prouter:1402
+#: ../i2prouter:1430 ../i2prouter:1468 ../i2prouter:1503
 #, sh-format
 msgid "The $APP_LONG_NAME daemon is already installed."
 msgstr "Der $APP_LONG_NAME Dämon ist bereits installiert."
 
-#: ../i2prouter:1250 ../i2prouter:1265 ../i2prouter:1367 ../i2prouter:1399
-#: ../i2prouter:1413 ../i2prouter:1427 ../i2prouter:1441 ../i2prouter:1479
-#: ../i2prouter:1514
+#: ../i2prouter:1242 ../i2prouter:1257 ../i2prouter:1359 ../i2prouter:1391
+#: ../i2prouter:1405 ../i2prouter:1419 ../i2prouter:1433 ../i2prouter:1471
+#: ../i2prouter:1506
 #, sh-format
 msgid "Installing the $APP_LONG_NAME daemon"
 msgstr "Installiere den $APP_LONG_NAME Dämon"
 
-#: ../i2prouter:1521
+#: ../i2prouter:1513
 #, sh-format
 msgid "Install not currently supported for $DIST_OS"
 msgstr "Die Installation für $DIST_OS wird momentan nicht unterstützt"
 
-#: ../i2prouter:1537 ../i2prouter:1550 ../i2prouter:1564 ../i2prouter:1573
-#: ../i2prouter:1583 ../i2prouter:1607 ../i2prouter:1620 ../i2prouter:1632
-#: ../i2prouter:1650 ../i2prouter:1663 ../i2prouter:1677
+#: ../i2prouter:1529 ../i2prouter:1542 ../i2prouter:1556 ../i2prouter:1565
+#: ../i2prouter:1575 ../i2prouter:1599 ../i2prouter:1612 ../i2prouter:1624
+#: ../i2prouter:1642 ../i2prouter:1655 ../i2prouter:1669
 #, sh-format
 msgid "Removing $APP_LONG_NAME daemon"
 msgstr "Entferne $APP_LONG_NAME Dämon"
 
-#: ../i2prouter:1543 ../i2prouter:1558 ../i2prouter:1567 ../i2prouter:1577
-#: ../i2prouter:1588 ../i2prouter:1601 ../i2prouter:1613 ../i2prouter:1626
-#: ../i2prouter:1644 ../i2prouter:1657 ../i2prouter:1671 ../i2prouter:1682
+#: ../i2prouter:1535 ../i2prouter:1550 ../i2prouter:1559 ../i2prouter:1569
+#: ../i2prouter:1580 ../i2prouter:1593 ../i2prouter:1605 ../i2prouter:1618
+#: ../i2prouter:1636 ../i2prouter:1649 ../i2prouter:1663 ../i2prouter:1674
 #, sh-format
 msgid "The $APP_LONG_NAME daemon is not currently installed."
 msgstr "Der $APP_LONG_NAME Dämon ist momentan nicht installiert."
 
-#: ../i2prouter:1686
+#: ../i2prouter:1678
 #, sh-format
 msgid "Remove not currently supported for $DIST_OS"
 msgstr "Entfernen wird momentan unter $DIST_OS nicht unterstützt."
 
-#: ../i2prouter:1773
+#: ../i2prouter:1765
 msgid "Commands:"
 msgstr "Befehle:"
 
-#: ../i2prouter:1774
+#: ../i2prouter:1766
 msgid "Launch in the current console."
 msgstr "Start in dieser Konsole."
 
-#: ../i2prouter:1775
+#: ../i2prouter:1767
 msgid "Start in the background as a daemon process."
 msgstr "Im Hintergrund als Dämon starten."
 
-#: ../i2prouter:1776
+#: ../i2prouter:1768
 msgid "Stop if running as a daemon or in another console."
 msgstr ""
 "Beende den Router, falls er als Dämon oder in einer anderen Konsole "
 "ausgeführt wird."
 
-#: ../i2prouter:1777
+#: ../i2prouter:1769
 msgid "Stop gracefully, may take up to 11 minutes."
 msgstr "Ordnungsgemäßes Beenden kann bis zu 11 Minuten dauern."
 
-#: ../i2prouter:1778
+#: ../i2prouter:1770
 msgid "Stop if running and then start."
 msgstr ""
 "Beende den Router, falls er ausgeführt wird und dann starte ihn erneut."
 
-#: ../i2prouter:1779
+#: ../i2prouter:1771
 msgid "Restart only if already running."
 msgstr "Starte den Router neu, falls er momentan ausgeführt wird."
 
-#: ../i2prouter:1780
+#: ../i2prouter:1772
 msgid "Query the current status."
 msgstr "Aktuellen Status abfragen."
 
-#: ../i2prouter:1781
+#: ../i2prouter:1773
 msgid "Install to start automatically when system boots."
 msgstr "Installiere für automatischen Start wenn das System hochfährt."
 
-#: ../i2prouter:1782
+#: ../i2prouter:1774
 msgid "Uninstall."
 msgstr "Deinstallieren."
 
-#: ../i2prouter:1783
+#: ../i2prouter:1775
 msgid "Request a Java thread dump if running."
 msgstr "Falls gestartet, fordere einen Java Thread dump an"
 
-#: ../i2prouter:1801
+#: ../i2prouter:1788
+msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+msgstr "Bitte bearbeite i2prouter und setze die Variable RUN_AS_USER"
+
+#: ../i2prouter:1793
 msgid "Running I2P as the root user is *not* recommended."
 msgstr "I2P als root Benutzer auszuführen ist *nicht* empfehlenswert."
 
-#~ msgid "Please edit $0 and set the variable RUN_AS_USER"
-#~ msgstr "Bitte bearbeite $0 und setze die Variable RUN_AS_USER"
-
-#~ msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
-#~ msgstr ""
-#~ "Um I2P trotzdem als root auszuführen bearbeite $0 und setze "
-#~ "ALLOW_ROOT=true."
+#: ../i2prouter:1796
+msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
+msgstr ""
+"Um I2P trotzdem als root auszuführen bearbeite i2prouter und setze ALLOW_ROOT=true."
diff --git a/installer/resources/locale/po/messages_en.po b/installer/resources/locale/po/messages_en.po
index 97b912362..f5707d7ff 100644
--- a/installer/resources/locale/po/messages_en.po
+++ b/installer/resources/locale/po/messages_en.po
@@ -185,7 +185,7 @@ msgid "Request a Java thread dump if running."
 msgstr ""
 
 #: ../i2prouter:1788
-msgid "Please edit $0 and set the variable RUN_AS_USER"
+msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 msgstr ""
 
 #: ../i2prouter:1793
@@ -193,5 +193,5 @@ msgid "Running I2P as the root user is *not* recommended."
 msgstr ""
 
 #: ../i2prouter:1796
-msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 msgstr ""
diff --git a/installer/resources/locale/po/messages_fr.po b/installer/resources/locale/po/messages_fr.po
index cba18009a..4ff2af12f 100644
--- a/installer/resources/locale/po/messages_fr.po
+++ b/installer/resources/locale/po/messages_fr.po
@@ -2,201 +2,197 @@
 # Copyright (C) 2012 The I2P Project
 # This file is distributed under the same license as the routerconsole package.
 # To contribute translations, see http://www.i2p2.de/newdevelopers
-#
+# 
 # Translators:
 # Boxoa590, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-02 17:24+0000\n"
+"Report-Msgid-Bugs-To: https://trac.i2p2.de/\n"
+"POT-Creation-Date: 2013-05-15 21:58+0000\n"
 "PO-Revision-Date: 2013-05-29 21:25+0000\n"
 "Last-Translator: Boxoa590\n"
-"Language-Team: French (http://www.transifex.com/projects/p/I2P/language/"
-"fr/)\n"
-"Language: fr\n"
+"Language-Team: French (http://www.transifex.com/projects/p/I2P/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../i2prouter:203
+#: ../i2prouter:195
 msgid "Failed to load the wrapper"
 msgstr "Echec de chargement du wrapper"
 
-#: ../i2prouter:908 ../i2prouter:935 ../i2prouter:1009 ../i2prouter:1037
-#: ../i2prouter:1061
+#: ../i2prouter:900 ../i2prouter:927 ../i2prouter:1001 ../i2prouter:1029
+#: ../i2prouter:1053
 #, sh-format
 msgid "$APP_LONG_NAME is already running."
 msgstr "$APP_LONG_NAME fonctionne déjà."
 
-#: ../i2prouter:919
+#: ../i2prouter:911
 #, sh-format
 msgid "Running $APP_LONG_NAME"
 msgstr "Lancement de $APP_LONG_NAME"
 
-#: ../i2prouter:942
+#: ../i2prouter:934
 #, sh-format
 msgid "Waiting for $APP_LONG_NAME"
 msgstr "Attente de $APP_LONG_NAME"
 
-#: ../i2prouter:989
+#: ../i2prouter:981
 #, sh-format
 msgid "WARNING: $APP_LONG_NAME may have failed to start."
 msgstr "AVERTISSEMENT : $APP_LONG_NAME peut avoir échoué à démarrer."
 
-#: ../i2prouter:1003 ../i2prouter:1031 ../i2prouter:1240 ../i2prouter:1529
+#: ../i2prouter:995 ../i2prouter:1023 ../i2prouter:1232 ../i2prouter:1521
 msgid "Must be root to perform this action."
 msgstr "Vous devez être root pour accomplir cette action."
 
-#: ../i2prouter:1047
+#: ../i2prouter:1039
 #, sh-format
 msgid "Starting $APP_LONG_NAME"
 msgstr "Démarrage de $APP_LONG_NAME"
 
-#: ../i2prouter:1072
+#: ../i2prouter:1064
 #, sh-format
 msgid "Stopping $APP_LONG_NAME"
 msgstr "Arrêt de $APP_LONG_NAME"
 
-#: ../i2prouter:1076 ../i2prouter:1144 ../i2prouter:1697
+#: ../i2prouter:1068 ../i2prouter:1136 ../i2prouter:1689
 #, sh-format
 msgid "$APP_LONG_NAME was not running."
 msgstr "$APP_LONG_NAME ne fonctionnait pas."
 
-#: ../i2prouter:1089 ../i2prouter:1097 ../i2prouter:1159 ../i2prouter:1167
+#: ../i2prouter:1081 ../i2prouter:1089 ../i2prouter:1151 ../i2prouter:1159
 #, sh-format
 msgid "Unable to stop $APP_LONG_NAME."
 msgstr "Incapable de stopper $APP_LONG_NAME."
 
-#: ../i2prouter:1115
+#: ../i2prouter:1107
 #, sh-format
 msgid "Waiting for $APP_LONG_NAME to exit"
 msgstr "En attente que $APP_LONG_NAME existe"
 
-#: ../i2prouter:1129
+#: ../i2prouter:1121
 #, sh-format
 msgid "Failed to stop $APP_LONG_NAME."
 msgstr "Echec à stopper $APP_LONG_NAME."
 
-#: ../i2prouter:1132
+#: ../i2prouter:1124
 #, sh-format
 msgid "Stopped $APP_LONG_NAME."
 msgstr "Stoppé $APP_LONG_NAME."
 
-#: ../i2prouter:1140
+#: ../i2prouter:1132
 #, sh-format
 msgid "Stopping $APP_LONG_NAME gracefully"
 msgstr "Arrête $APP_LONG_NAME gracieusement"
 
-#: ../i2prouter:1186
+#: ../i2prouter:1178
 #, sh-format
 msgid "$APP_LONG_NAME is not running."
 msgstr "$APP_LONG_NAME ne tourne pas."
 
-#: ../i2prouter:1191
+#: ../i2prouter:1183
 #, sh-format
 msgid "$APP_LONG_NAME is running: PID:$pid"
 msgstr "$APP_LONG_NAME fait tourner: PID:$pid"
 
-#: ../i2prouter:1194
+#: ../i2prouter:1186
 #, sh-format
 msgid "$APP_LONG_NAME is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS"
-msgstr ""
-"$APP_LONG_NAME fait tourner: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS"
+msgstr "$APP_LONG_NAME fait tourner: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS"
 
-#: ../i2prouter:1247 ../i2prouter:1259 ../i2prouter:1278 ../i2prouter:1295
-#: ../i2prouter:1362 ../i2prouter:1382 ../i2prouter:1396 ../i2prouter:1410
-#: ../i2prouter:1438 ../i2prouter:1476 ../i2prouter:1511
+#: ../i2prouter:1239 ../i2prouter:1251 ../i2prouter:1270 ../i2prouter:1287
+#: ../i2prouter:1354 ../i2prouter:1374 ../i2prouter:1388 ../i2prouter:1402
+#: ../i2prouter:1430 ../i2prouter:1468 ../i2prouter:1503
 #, sh-format
 msgid "The $APP_LONG_NAME daemon is already installed."
 msgstr "Le démon de $APP_LONG_NAME est déjà installé."
 
-#: ../i2prouter:1250 ../i2prouter:1265 ../i2prouter:1367 ../i2prouter:1399
-#: ../i2prouter:1413 ../i2prouter:1427 ../i2prouter:1441 ../i2prouter:1479
-#: ../i2prouter:1514
+#: ../i2prouter:1242 ../i2prouter:1257 ../i2prouter:1359 ../i2prouter:1391
+#: ../i2prouter:1405 ../i2prouter:1419 ../i2prouter:1433 ../i2prouter:1471
+#: ../i2prouter:1506
 #, sh-format
 msgid "Installing the $APP_LONG_NAME daemon"
 msgstr "Installing le démon de $APP_LONG_NAME"
 
-#: ../i2prouter:1521
+#: ../i2prouter:1513
 #, sh-format
 msgid "Install not currently supported for $DIST_OS"
 msgstr "Installation actuellement pas prise en charge pour $DIST_OS"
 
-#: ../i2prouter:1537 ../i2prouter:1550 ../i2prouter:1564 ../i2prouter:1573
-#: ../i2prouter:1583 ../i2prouter:1607 ../i2prouter:1620 ../i2prouter:1632
-#: ../i2prouter:1650 ../i2prouter:1663 ../i2prouter:1677
+#: ../i2prouter:1529 ../i2prouter:1542 ../i2prouter:1556 ../i2prouter:1565
+#: ../i2prouter:1575 ../i2prouter:1599 ../i2prouter:1612 ../i2prouter:1624
+#: ../i2prouter:1642 ../i2prouter:1655 ../i2prouter:1669
 #, sh-format
 msgid "Removing $APP_LONG_NAME daemon"
 msgstr "Supprime le démon $APP_LONG_NAME"
 
-#: ../i2prouter:1543 ../i2prouter:1558 ../i2prouter:1567 ../i2prouter:1577
-#: ../i2prouter:1588 ../i2prouter:1601 ../i2prouter:1613 ../i2prouter:1626
-#: ../i2prouter:1644 ../i2prouter:1657 ../i2prouter:1671 ../i2prouter:1682
+#: ../i2prouter:1535 ../i2prouter:1550 ../i2prouter:1559 ../i2prouter:1569
+#: ../i2prouter:1580 ../i2prouter:1593 ../i2prouter:1605 ../i2prouter:1618
+#: ../i2prouter:1636 ../i2prouter:1649 ../i2prouter:1663 ../i2prouter:1674
 #, sh-format
 msgid "The $APP_LONG_NAME daemon is not currently installed."
 msgstr "Le démon $APP_LONG_NAME n'est actuellement pas installé."
 
-#: ../i2prouter:1686
+#: ../i2prouter:1678
 #, sh-format
 msgid "Remove not currently supported for $DIST_OS"
 msgstr "Suppression actuellement pas prise en charge pour $DIST_OS"
 
-#: ../i2prouter:1773
+#: ../i2prouter:1765
 msgid "Commands:"
 msgstr "Commandes :"
 
-#: ../i2prouter:1774
+#: ../i2prouter:1766
 msgid "Launch in the current console."
 msgstr "Lancer dans la console actuelle."
 
-#: ../i2prouter:1775
+#: ../i2prouter:1767
 msgid "Start in the background as a daemon process."
 msgstr "Démarre en tâche de fond comme un processus démon."
 
-#: ../i2prouter:1776
+#: ../i2prouter:1768
 msgid "Stop if running as a daemon or in another console."
 msgstr "Stopper s'il fonctionne comme un démon ou dans une autre console."
 
-#: ../i2prouter:1777
+#: ../i2prouter:1769
 msgid "Stop gracefully, may take up to 11 minutes."
 msgstr "Stopper gracieusement, peut prendre jusqu'à 11 minutes."
 
-#: ../i2prouter:1778
+#: ../i2prouter:1770
 msgid "Stop if running and then start."
 msgstr "Stopper si il marche et ensuite démarrer."
 
-#: ../i2prouter:1779
+#: ../i2prouter:1771
 msgid "Restart only if already running."
 msgstr "Redémarrer seulement si il est déjà en cours d'exécution."
 
-#: ../i2prouter:1780
+#: ../i2prouter:1772
 msgid "Query the current status."
 msgstr "Interroger l'état actuel."
 
-#: ../i2prouter:1781
+#: ../i2prouter:1773
 msgid "Install to start automatically when system boots."
-msgstr ""
-"Installer pour lancer automatiquement quand le système système démarre."
+msgstr "Installer pour lancer automatiquement quand le système système démarre."
 
-#: ../i2prouter:1782
+#: ../i2prouter:1774
 msgid "Uninstall."
 msgstr "Désinstalle."
 
-#: ../i2prouter:1783
+#: ../i2prouter:1775
 msgid "Request a Java thread dump if running."
 msgstr "Request a Java thread dump if running."
 
-#: ../i2prouter:1801
+#: ../i2prouter:1788
+msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+msgstr "Veuillez éditer $0 et paramétrer la variable RUN_AS_USER"
+
+#: ../i2prouter:1793
 msgid "Running I2P as the root user is *not* recommended."
-msgstr ""
-"Faire fonctionner I2P en tant qu'utilisateur root n'est *pas* recommandé."
+msgstr "Faire fonctionner I2P en tant qu'utilisateur root n'est *pas* recommandé."
 
-#~ msgid "Please edit $0 and set the variable RUN_AS_USER"
-#~ msgstr "Veuillez éditer $0 et paramétrer la variable RUN_AS_USER"
-
-#~ msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
-#~ msgstr ""
-#~ "Pour exécuter en tant que root de toute façon, éditer $0 et mettre "
-#~ "ALLOW_ROOT=true."
+#: ../i2prouter:1796
+msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
+msgstr "Pour exécuter en tant que root de toute façon, éditer $0 et mettre ALLOW_ROOT=true."
diff --git a/installer/resources/locale/po/messages_it.po b/installer/resources/locale/po/messages_it.po
index b3b1eea93..e309b3dca 100644
--- a/installer/resources/locale/po/messages_it.po
+++ b/installer/resources/locale/po/messages_it.po
@@ -187,7 +187,7 @@ msgid "Request a Java thread dump if running."
 msgstr ""
 
 #: ../i2prouter:1780
-msgid "Please edit $0 and set the variable RUN_AS_USER"
+msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 msgstr ""
 
 #: ../i2prouter:1785
@@ -195,5 +195,5 @@ msgid "Running I2P as the root user is *not* recommended."
 msgstr ""
 
 #: ../i2prouter:1788
-msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 msgstr ""
diff --git a/installer/resources/locale/po/messages_ru.po b/installer/resources/locale/po/messages_ru.po
index 1fe035426..b0f43136f 100644
--- a/installer/resources/locale/po/messages_ru.po
+++ b/installer/resources/locale/po/messages_ru.po
@@ -188,7 +188,7 @@ msgid "Request a Java thread dump if running."
 msgstr ""
 
 #: ../i2prouter:1780
-msgid "Please edit $0 and set the variable RUN_AS_USER"
+msgid "Please edit i2prouter and set the variable RUN_AS_USER"
 msgstr ""
 
 #: ../i2prouter:1785
@@ -196,5 +196,5 @@ msgid "Running I2P as the root user is *not* recommended."
 msgstr ""
 
 #: ../i2prouter:1788
-msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
+msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
 msgstr ""
diff --git a/installer/resources/locale/po/messages_sv.po b/installer/resources/locale/po/messages_sv.po
index 8c89bb310..11d7a311f 100644
--- a/installer/resources/locale/po/messages_sv.po
+++ b/installer/resources/locale/po/messages_sv.po
@@ -187,13 +187,13 @@ msgid "Request a Java thread dump if running."
 msgstr "Fråga efter en Java thread dump vid drift."
 
 #: ../i2prouter:1780
-msgid "Please edit $0 and set the variable RUN_AS_USER"
-msgstr "Var god ändra $0 och sätt variabeln RUN_AS_USER"
+msgid "Please edit i2prouter and set the variable RUN_AS_USER"
+msgstr "Var god ändra i2prouter och sätt variabeln RUN_AS_USER"
 
 #: ../i2prouter:1785
 msgid "Running I2P as the root user is *not* recommended."
 msgstr "Att köra I2P som användare root är *inte* rekommenderat."
 
 #: ../i2prouter:1788
-msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
-msgstr "För att köra som root iallafall, ändra $0 och sätt ALLOW_ROOT=true"
+msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
+msgstr "För att köra som root iallafall, ändra i2prouter och sätt ALLOW_ROOT=true"