zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

merge of '11dcbebf6657486cbeae1d8bfe43ede3f4a5b314'

Browse Source 
and '8e065cf86f719138e323815c38f249ed56941327'
This commit is contained in:
zzz
2017-07-31 20:51:17 +00:00
parent 80c55c150f 8beb75be50
commit 9d1097b467
1 changed files with 139 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

257
debian/patches/0001-path-substitution.patch vendored
View File

@@ -14,6 +14,8 @@ Debian wrapper.config to try to prevent confusion.
installer/resources/wrapper.config | 70 ++++++------------------------ installer/resources/wrapper.config | 70 ++++++------------------------
4 files changed, 24 insertions(+), 134 deletions(-) 4 files changed, 24 insertions(+), 134 deletions(-)
Index: b/installer/resources/eepget
===================================================================
--- a/installer/resources/eepget --- a/installer/resources/eepget
+++ b/installer/resources/eepget +++ b/installer/resources/eepget
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
@@ -22,6 +24,8 @@ Debian wrapper.config to try to prevent confusion.
-java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@" -java -cp "$I2P/lib/i2p.jar" net.i2p.util.EepGet "$@"
+I2P="/usr/share/i2p" +I2P="/usr/share/i2p"
+java -cp "$I2P/lib/i2p.jar:/usr/share/java/gnu-getopt.jar" net.i2p.util.EepGet "$@" +java -cp "$I2P/lib/i2p.jar:/usr/share/java/gnu-getopt.jar" net.i2p.util.EepGet "$@"
Index: b/installer/resources/i2prouter
===================================================================
--- a/installer/resources/i2prouter --- a/installer/resources/i2prouter
+++ b/installer/resources/i2prouter +++ b/installer/resources/i2prouter
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
@@ -61,7 +65,7 @@ Debian wrapper.config to try to prevent confusion.
# PORTABLE installation: # PORTABLE installation:
# Use the following instead. # Use the following instead.
#I2PTEMP="%INSTALL_PATH" #I2PTEMP="%INSTALL_PATH"
@@ -69,8 +60,8 @@ @@ -69,8 +60,8 @@ fi
#RUN_AS_USER= #RUN_AS_USER=
# Wrapper # Wrapper
@@ -72,7 +76,7 @@ Debian wrapper.config to try to prevent confusion.
# Priority at which to run the wrapper. See "man nice" for valid priorities. # Priority at which to run the wrapper. See "man nice" for valid priorities.
# nice is only used if a priority is specified. # nice is only used if a priority is specified.
@@ -177,77 +168,8 @@ @@ -177,77 +168,8 @@ if [ ! -e "$WRAPPER_CONF" ]; then
exit 1 exit 1
fi fi
@@ -150,7 +154,7 @@ Debian wrapper.config to try to prevent confusion.
if [ -n "$FIXED_COMMAND" ] if [ -n "$FIXED_COMMAND" ]
then then
COMMAND="$FIXED_COMMAND" COMMAND="$FIXED_COMMAND"
@@ -1068,7 +982,6 @@ @@ -1068,7 +990,6 @@ startwait() {
if [ "X$pid" = "X" ] if [ "X$pid" = "X" ]
then then
eval echo " `gettext 'WARNING: $APP_LONG_NAME may have failed to start.'`" eval echo " `gettext 'WARNING: $APP_LONG_NAME may have failed to start.'`"
@@ -158,7 +162,7 @@ Debian wrapper.config to try to prevent confusion.
else else
eval echo ' running: PID:$pid' eval echo ' running: PID:$pid'
fi fi
@@ -1871,7 +1784,7 @@ @@ -1871,7 +1792,7 @@ showUsage() {
} }
showsetusermesg() { showsetusermesg() {
@@ -167,7 +171,7 @@ Debian wrapper.config to try to prevent confusion.
} }
checkifstartingasroot() { checkifstartingasroot() {
@@ -1879,7 +1792,7 @@ @@ -1879,7 +1800,7 @@ checkifstartingasroot() {
echo "`gettext 'Running I2P as the root user is *not* recommended.'`" echo "`gettext 'Running I2P as the root user is *not* recommended.'`"
showsetusermesg showsetusermesg
echo echo
@@ -176,7 +180,7 @@ Debian wrapper.config to try to prevent confusion.
exit 1 exit 1
fi fi
} }
@@ -1946,24 +1859,10 @@ @@ -1946,24 +1867,10 @@ docommand() {
status status
;; ;;
@@ -205,6 +209,8 @@ Debian wrapper.config to try to prevent confusion.
'dump') 'dump')
checkUser "" "$COMMAND" checkUser "" "$COMMAND"
Index: b/installer/resources/runplain.sh
===================================================================
--- a/installer/resources/runplain.sh --- a/installer/resources/runplain.sh
+++ b/installer/resources/runplain.sh +++ b/installer/resources/runplain.sh
@@ -11,8 +11,8 @@ @@ -11,8 +11,8 @@
@@ -218,6 +224,8 @@ Debian wrapper.config to try to prevent confusion.
# Having IPv6 enabled can cause problems with certain configurations. Changing the # Having IPv6 enabled can cause problems with certain configurations. Changing the
# next value to true may help. # next value to true may help.
Index: b/installer/resources/wrapper.config
===================================================================
--- a/installer/resources/wrapper.config --- a/installer/resources/wrapper.config
+++ b/installer/resources/wrapper.config +++ b/installer/resources/wrapper.config
@@ -8,22 +8,13 @@ @@ -8,22 +8,13 @@
@@ -245,7 +253,7 @@ Debian wrapper.config to try to prevent confusion.
# #
#******************************************************************** #********************************************************************
# Java Application # Java Application
@@ -60,13 +51,14 @@ @@ -60,13 +51,14 @@ wrapper.java.mainclass=org.tanukisoftwar
# classes, or all the classes of i2p.jar, are in a different directory). # classes, or all the classes of i2p.jar, are in a different directory).
# Be sure there are no other duplicate classes. # Be sure there are no other duplicate classes.
# #
@@ -265,7 +273,7 @@ Debian wrapper.config to try to prevent confusion.
# Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode. # Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
wrapper.java.additional.auto_bits=TRUE wrapper.java.additional.auto_bits=TRUE
@@ -74,7 +66,7 @@ @@ -74,7 +66,7 @@ wrapper.java.additional.auto_bits=TRUE
# Java Additional Parameters # Java Additional Parameters
# Numbers must be consecutive (except for stripquotes) # Numbers must be consecutive (except for stripquotes)
wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt wrapper.java.additional.1=-DloggerFilenameOverride=logs/log-router-@.txt
@@ -274,7 +282,7 @@ Debian wrapper.config to try to prevent confusion.
wrapper.java.additional.2.stripquotes=TRUE wrapper.java.additional.2.stripquotes=TRUE
# Prevent the JVM from exporting stats (and thereby causing hundreds of # Prevent the JVM from exporting stats (and thereby causing hundreds of
@@ -146,11 +138,7 @@ @@ -146,11 +138,7 @@ wrapper.console.loglevel=INFO
# You may wish to change this. # You may wish to change this.
# NOTE: On Linux/Mac this is overridden in the i2prouter script; changes here will have no effect. # NOTE: On Linux/Mac this is overridden in the i2prouter script; changes here will have no effect.
# System temp directory: # System temp directory:
@@ -287,7 +295,7 @@ Debian wrapper.config to try to prevent confusion.
# Format of output for the log file. # Format of output for the log file.
# The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread, # The format consists of the tokens 'L' for log level, 'P' for prefix, 'D' for thread,
@@ -220,11 +208,7 @@ @@ -220,11 +208,7 @@ wrapper.use_system_time=false
# Linux/Mac users, do not set here, see settings in the i2prouter script. # Linux/Mac users, do not set here, see settings in the i2prouter script.
# Directory must exist or the wrapper will fail to start. # Directory must exist or the wrapper will fail to start.
# System temp directory: # System temp directory:
@@ -300,7 +308,7 @@ Debian wrapper.config to try to prevent confusion.
# #
# From i2prouter: # From i2prouter:
# #
@@ -238,10 +222,7 @@ @@ -238,10 +222,7 @@ wrapper.use_system_time=false
# Linux/Mac users, do not set here, see settings in the i2prouter script. # Linux/Mac users, do not set here, see settings in the i2prouter script.
# Directory must exist or the wrapper will fail to start. # Directory must exist or the wrapper will fail to start.
# System temp directory: # System temp directory:
@@ -312,7 +320,7 @@ Debian wrapper.config to try to prevent confusion.
#******************************************************************** #********************************************************************
# Wrapper General Properties # Wrapper General Properties
@@ -259,32 +240,6 @@ @@ -259,32 +240,6 @@ wrapper.umask=0022
wrapper.java.umask=0022 wrapper.java.umask=0022
wrapper.logfile.umask=0077 wrapper.logfile.umask=0077
@@ -345,31 +353,33 @@ Debian wrapper.config to try to prevent confusion.
# http://wrapper.tanukisoftware.com/doc/english/prop-check-deadlock.html # http://wrapper.tanukisoftware.com/doc/english/prop-check-deadlock.html
# requires wrapper 3.5.0 or higher # requires wrapper 3.5.0 or higher
# interval is seconds # interval is seconds
Index: b/installer/resources/locale/po/messages_de.po
===================================================================
--- a/installer/resources/locale/po/messages_de.po --- a/installer/resources/locale/po/messages_de.po
+++ b/installer/resources/locale/po/messages_de.po +++ b/installer/resources/locale/po/messages_de.po
@@ -195,15 +195,15 @@ @@ -190,13 +190,13 @@ msgid "Request a Java thread dump if run
msgstr "Falls gestartet, fordere einen Java Thread dump an" msgstr "Falls gestartet, fordere einen Java Thread dump an"
#: ../i2prouter:1864 #: ../i2prouter:1874
-msgid "Please edit i2prouter and set the 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" -msgstr "Bitte bearbeite i2prouter und setze die Variable RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the 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" +msgstr "Bitte bearbeite /etc/default/i2p und setze die Variable RUN_AS_USER"
#: ../i2prouter:1869 #: ../i2prouter:1879
msgid "Running I2P as the root user is *not* recommended." msgid "Running I2P as the root user is *not* recommended."
msgstr "I2P als root Benutzer auszuführen ist *nicht* empfehlenswert." msgstr "I2P als root Benutzer auszuführen ist *nicht* empfehlenswert."
#: ../i2prouter:1872 #: ../i2prouter:1882
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -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."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr "" +msgstr "Um I2P trotzdem als root auszuführen bearbeite /etc/default/i2p und setze ALLOW_ROOT=true."
-"Um I2P trotzdem als root auszuführen bearbeite i2prouter und setze " Index: b/installer/resources/locale/po/messages_en.po
+"Um I2P trotzdem als root auszuführen bearbeite /etc/default/i2p und setze " ===================================================================
"ALLOW_ROOT=true."
--- a/installer/resources/locale/po/messages_en.po --- a/installer/resources/locale/po/messages_en.po
+++ b/installer/resources/locale/po/messages_en.po +++ b/installer/resources/locale/po/messages_en.po
@@ -185,7 +185,7 @@ @@ -185,7 +185,7 @@ msgid "Request a Java thread dump if run
msgstr "" msgstr ""
#: ../i2prouter:1874 #: ../i2prouter:1874
@@ -378,187 +388,194 @@ Debian wrapper.config to try to prevent confusion.
msgstr "" msgstr ""
#: ../i2prouter:1879 #: ../i2prouter:1879
@@ -193,5 +193,5 @@ @@ -193,5 +193,5 @@ msgid "Running I2P as the root user is *
msgstr "" msgstr ""
#: ../i2prouter:1882 #: ../i2prouter:1882
-msgid "To run as root anyway, edit i2prouter 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." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr "" msgstr ""
Index: b/installer/resources/locale/po/messages_it.po
===================================================================
--- a/installer/resources/locale/po/messages_it.po --- a/installer/resources/locale/po/messages_it.po
+++ b/installer/resources/locale/po/messages_it.po +++ b/installer/resources/locale/po/messages_it.po
@@ -187,7 +187,7 @@ @@ -189,13 +189,13 @@ msgid "Request a Java thread dump if run
msgstr "" msgstr "Richiedi un Java thread dump se è in esecuzione."
#: ../i2prouter:1864 #: ../i2prouter:1874
-msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "Modifica i2prouter e imposta la variabile RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
msgstr "" +msgstr "Modifica /etc/default/i2p e imposta la variabile RUN_AS_USER"
#: ../i2prouter:1869 #: ../i2prouter:1879
@@ -195,5 +195,5 @@ msgid "Running I2P as the root user is *not* recommended."
msgstr "" msgstr "Eseguire I2P come amministratore *non* è consigliato."
#: ../i2prouter:1872 #: ../i2prouter:1882
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
-msgstr "Per eseguirlo comunque come amministratore, modifica i2prouter e imposta ALLOW_ROOT=true."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr "" +msgstr "Per eseguirlo comunque come amministratore, modifica /etc/default/i2p e imposta ALLOW_ROOT=true."
Index: b/installer/resources/locale/po/messages_zh.po
===================================================================
--- a/installer/resources/locale/po/messages_zh.po --- a/installer/resources/locale/po/messages_zh.po
+++ b/installer/resources/locale/po/messages_zh.po +++ b/installer/resources/locale/po/messages_zh.po
@@ -187,13 +187,13 @@ @@ -186,13 +186,13 @@ msgid "Request a Java thread dump if run
msgstr "请求Java转储(如果在运行)。" msgstr "请求Java转储(如果在运行)。"
#: ../i2prouter:1864 #: ../i2prouter:1874
-msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "请编辑 i2prouter 设置 RUN_AS_USER 变量" -msgstr "请编辑 i2prouter 设置 RUN_AS_USER 变量"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+msgstr "请编辑 /etc/default/i2p 设置 RUN_AS_USER 变量" +msgstr "请编辑 /etc/default/i2p 设置 RUN_AS_USER 变量"
#: ../i2prouter:1869 #: ../i2prouter:1879
msgid "Running I2P as the root user is *not* recommended." msgid "Running I2P as the root user is *not* recommended."
msgstr "推荐 *不要* 以 root 身份运行 I2P 。" msgstr "推荐 *不要* 以 root 身份运行 I2P 。"
#: ../i2prouter:1872 #: ../i2prouter:1882
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
-msgstr "要以root运行，请编辑 i2prouter 并设置 ALLOW_ROOT=true。" -msgstr "要以root运行，请编辑 i2prouter 并设置 ALLOW_ROOT=true。"
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
+msgstr "要以root运行，请编辑 /etc/default/i2p 并设置 ALLOW_ROOT=true。" +msgstr "要以root运行，请编辑 /etc/default/i2p 并设置 ALLOW_ROOT=true。"
Index: b/installer/resources/locale/po/messages_tr.po
===================================================================
--- a/installer/resources/locale/po/messages_tr.po --- a/installer/resources/locale/po/messages_tr.po
+++ b/installer/resources/locale/po/messages_tr.po +++ b/installer/resources/locale/po/messages_tr.po
@@ -188,15 +188,15 @@ @@ -186,13 +186,13 @@ msgid "Request a Java thread dump if run
msgstr "Çalışıyorsa Java iş parçacığı dökümü isteyin." msgstr "Çalışıyorsa Java iş parçacığı dökümü isteyin."
#: ../i2prouter:1864 #: ../i2prouter:1874
-msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "i2prouter dosyasını düzenleyin ve RUN_AS_USER değişkenini ayarlayın" -msgstr "i2prouter dosyasını düzenleyin ve RUN_AS_USER değişkenini ayarlayın"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+msgstr "/etc/default/i2p dosyasını düzenleyin ve RUN_AS_USER değişkenini ayarlayın" +msgstr "/etc/default/i2p dosyasını düzenleyin ve RUN_AS_USER değişkenini ayarlayın"
#: ../i2prouter:1869 #: ../i2prouter:1879
msgid "Running I2P as the root user is *not* recommended." msgid "Running I2P as the root user is *not* recommended."
msgstr "I2P yazılımının root olarak çalıştırmanız *önerilmez*." msgstr "I2P yazılımının root olarak çalıştırmanız *önerilmez*."
#: ../i2prouter:1872 #: ../i2prouter:1882
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
-msgstr "Root olarak çalıştırmak için i2prouter dosyasını düzenleyin ve ALLOW_ROOT=true ayarını yapın."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr "" +msgstr "Root olarak çalıştırmak için /etc/default/i2p dosyasını düzenleyin ve ALLOW_ROOT=true ayarını yapın."
-"Root olarak çalıştırmak için i2prouter dosyasını düzenleyin ve " Index: b/installer/resources/locale/po/messages_es.po
+"Root olarak çalıştırmak için /etc/default/i2p dosyasını düzenleyin ve " ===================================================================
"ALLOW_ROOT=true ayarını yapın."
--- a/installer/resources/locale/po/messages_es.po --- a/installer/resources/locale/po/messages_es.po
+++ b/installer/resources/locale/po/messages_es.po +++ b/installer/resources/locale/po/messages_es.po
@@ -193,15 +193,15 @@ @@ -190,13 +190,13 @@ msgid "Request a Java thread dump if run
msgstr "Solicitar un volcado del hilo JAVA si se está ejecutando." msgstr "Solicitar un volcado del hilo JAVA si se está ejecutando."
#: ../i2prouter:1864 #: ../i2prouter:1874
-msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "Por favor edite i2prouter e introduzca la variable RUN_AS_USER" -msgstr "Por favor edite i2prouter e introduzca la variable RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+msgstr "Por favor edite /etc/default/i2p e introduzca la variable RUN_AS_USER" +msgstr "Por favor edite /etc/default/i2p e introduzca la variable RUN_AS_USER"
#: ../i2prouter:1869 #: ../i2prouter:1879
msgid "Running I2P as the root user is *not* recommended." msgid "Running I2P as the root user is *not* recommended."
msgstr "\"No\" se recomienda ejecutar I2P como root." msgstr "\"No\" se recomienda ejecutar I2P como root."
#: ../i2prouter:1872 #: ../i2prouter:1882
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
-msgstr "Para ejecutar como root de todos modos, edite i2prouter y ponga la variable ALLOW_ROOT=true."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr "" +msgstr "Para ejecutar como root de todos modos, edite /etc/default/i2p y ponga la variable ALLOW_ROOT=true."
-"Para ejecutar como root de todos modos, edite i2prouter y ponga la variable " Index: b/installer/resources/locale/po/messages_pt.po
+"Para ejecutar como root de todos modos, edite /etc/default/i2p y ponga la variable " ===================================================================
"ALLOW_ROOT=true."
--- a/installer/resources/locale/po/messages_pt.po --- a/installer/resources/locale/po/messages_pt.po
+++ b/installer/resources/locale/po/messages_pt.po +++ b/installer/resources/locale/po/messages_pt.po
@@ -189,15 +189,15 @@ @@ -190,13 +190,13 @@ msgid "Request a Java thread dump if run
msgstr "Requisitar o histórico Java se iniciado." msgstr "Requisitar o histórico Java se iniciado."
#: ../i2prouter:1864 #: ../i2prouter:1874
-msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "Favor editar o arquivo i2prouter e configurar a variável RUN_AS_USER" -msgstr "Por favor, edite i2prouter e defina a variável RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+msgstr "Favor editar o arquivo /etc/default/i2p e configurar a variável RUN_AS_USER" +msgstr "Por favor, edite /etc/default/i2p e defina a variável RUN_AS_USER"
#: ../i2prouter:1869 #: ../i2prouter:1879
msgid "Running I2P as the root user is *not* recommended." msgid "Running I2P as the root user is *not* recommended."
msgstr "Iniciar I2P como permissões root *não* é recomendado." msgstr "Iniciar I2P como permissões root *não* é recomendado."
#: ../i2prouter:1872 #: ../i2prouter:1882
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
-msgstr "Para continuar a executar como \"root\", edite i2prouter e defina ALLOW_ROOT=true."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr "" +msgstr "Para continuar a executar como \"root\", edite /etc/default/i2p e defina ALLOW_ROOT=true."
-"Para executar como root mesmo assim, editar o i2prouter e configurar a " Index: b/installer/resources/locale/po/messages_fr.po
+"Para executar como root mesmo assim, editar o /etc/default/i2p e configurar a " ===================================================================
"variável ALLOW_ROOT=true."
--- a/installer/resources/locale/po/messages_fr.po --- a/installer/resources/locale/po/messages_fr.po
+++ b/installer/resources/locale/po/messages_fr.po +++ b/installer/resources/locale/po/messages_fr.po
@@ -190,8 +190,8 @@ @@ -188,13 +188,13 @@ msgid "Request a Java thread dump if run
msgstr "Request a Java thread dump if running." msgstr "Demander un vidage des fils d'exécution de Java si elle est en cours d'exécution."
#: ../i2prouter:1864 #: ../i2prouter:1874
-msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "Veuillez éditer i2prouter et paramétrer la variable RUN_AS_USER" -msgstr "Veuillez modifier i2prouter et définir la variable RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the 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" +msgstr "Veuillez modifier /etc/default/i2p et définir la variable RUN_AS_USER"
#: ../i2prouter:1869 #: ../i2prouter:1879
msgid "Running I2P as the root user is *not* recommended." msgid "Running I2P as the root user is *not* recommended."
@@ -199,7 +199,7 @@ msgstr "Il n'est *pas* recommandé d'exécuter I2P en tant que root."
"Faire fonctionner I2P en tant qu'utilisateur root n'est *pas* recommandé."
#: ../i2prouter:1872 #: ../i2prouter:1882
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
-msgstr "Pour quand même exécuter en tant que root, modifier i2prouter et définir ALLOW_ROOT=true."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr "" +msgstr "Pour quand même exécuter en tant que root, modifier /etc/default/i2p et définir ALLOW_ROOT=true."
-"Pour exécuter en tant que root de toute façon, éditer i2prouter et mettre " Index: b/installer/resources/locale/po/messages_ru.po
+"Pour exécuter en tant que root de toute façon, éditer /etc/default/i2p et mettre " ===================================================================
"ALLOW_ROOT=true."
--- a/installer/resources/locale/po/messages_ru.po --- a/installer/resources/locale/po/messages_ru.po
+++ b/installer/resources/locale/po/messages_ru.po +++ b/installer/resources/locale/po/messages_ru.po
@@ -193,16 +193,16 @@ @@ -191,13 +191,13 @@ msgid "Request a Java thread dump if run
msgstr "Запросить дамп нитей Java, если запущено." msgstr "Запросить дамп нитей Java, если запущено."
#: ../i2prouter:1864 #: ../i2prouter:1874
-msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "Пожалуйста, отредактируйте i2prouter и установите переменную RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
msgstr "" +msgstr "Пожалуйста, отредактируйте /etc/default/i2p и установите переменную RUN_AS_USER"
-"Пожалуйста, отредактируйте i2prouter и установите переменную RUN_AS_USER"
+"Пожалуйста, отредактируйте /etc/default/i2p и установите переменную RUN_AS_USER"
#: ../i2prouter:1869 #: ../i2prouter:1879
msgid "Running I2P as the root user is *not* recommended." msgid "Running I2P as the root user is *not* recommended."
msgstr "Запускать I2P от имени root'а *НЕ* рекомендуется." msgstr "Запускать I2P от имени root'а *НЕ* рекомендуется."
#: ../i2prouter:1872 #: ../i2prouter:1882
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
-msgstr "Чтобы всё равно запустить под root'ом, отредактируйте i2prouter и установите ALLOW_ROOT=true."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr "" +msgstr "Чтобы всё равно запустить под root'ом, отредактируйте /etc/default/i2p и установите ALLOW_ROOT=true."
-"Чтобы всё равно запустить под root'ом, отредактируйте i2prouter и установите " Index: b/installer/resources/locale/po/messages_sv.po
+"Чтобы всё равно запустить под root'ом, отредактируйте /etc/default/i2p и установите " ===================================================================
"ALLOW_ROOT=true."
--- a/installer/resources/locale/po/messages_sv.po --- a/installer/resources/locale/po/messages_sv.po
+++ b/installer/resources/locale/po/messages_sv.po +++ b/installer/resources/locale/po/messages_sv.po
@@ -187,14 +187,14 @@ @@ -187,13 +187,13 @@ msgid "Request a Java thread dump if run
msgstr "Fråga efter en Java thread dump vid drift." -@msgstr "Fråga efter en Java thread dump vid drift."
#: ../i2prouter:1864 #: ../i2prouter:1874
-msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "Var god ändra i2prouter och set variabeln RUN_AS_USER" -msgstr "Var god ändra i2prouter och set variabeln RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+msgstr "Var god ändra /etc/default/i2p och set variabeln RUN_AS_USER" +msgstr "Var god ändra /etc/default/i2p och set variabeln RUN_AS_USER"
#: ../i2prouter:1869 #: ../i2prouter:1879
msgid "Running I2P as the root user is *not* recommended." msgid "Running I2P as the root user is *not* recommended."
msgstr "Att köra I2P som användare root är *inte* rekommenderat." msgstr "Att köra I2P som användare root är *inte* rekommenderat."
#: ../i2prouter:1872 #: ../i2prouter:1882
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
-msgstr "För att köra som root oavsett, ändra i2prouter och sätt ALLOW_ROOT=true"
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr "" +msgstr "För att köra som root oavsett, ändra /etc/default/i2p och sätt ALLOW_ROOT=true"
-"För att köra som root oavsett, ändra i2prouter och sätt ALLOW_ROOT=true" Index: b/installer/resources/locale/po/messages_ro.po
+"För att köra som root oavsett, ändra /etc/default/i2p och sätt ALLOW_ROOT=true" ===================================================================
--- a/installer/resources/locale/po/messages_ro.po --- a/installer/resources/locale/po/messages_ro.po
+++ b/installer/resources/locale/po/messages_ro.po +++ b/installer/resources/locale/po/messages_ro.po
@@ -187,13 +187,13 @@ @@ -186,13 +186,13 @@ msgid "Request a Java thread dump if run
msgstr "Solicită Java thread dump dacă rulează." msgstr "Solicită Java thread dump dacă rulează."
#: ../i2prouter:1874 #: ../i2prouter:1874
@@ -576,87 +593,91 @@ Debian wrapper.config to try to prevent confusion.
-msgstr "Pentru a rula ca root, oricum, editați i2prouter și setați ALLOW_ROOT=true." -msgstr "Pentru a rula ca root, oricum, editați i2prouter și setați ALLOW_ROOT=true."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
+msgstr "Pentru a rula ca root, oricum, editați /etc/default/i2p și setați ALLOW_ROOT=true." +msgstr "Pentru a rula ca root, oricum, editați /etc/default/i2p și setați ALLOW_ROOT=true."
Index: b/installer/resources/locale/po/messages_pt_BR.po
===================================================================
--- a/installer/resources/locale/po/messages_pt_BR.po --- a/installer/resources/locale/po/messages_pt_BR.po
+++ b/installer/resources/locale/po/messages_pt_BR.po +++ b/installer/resources/locale/po/messages_pt_BR.po
@@ -189,13 +189,13 @@ @@ -189,13 +189,13 @@ msgid "Request a Java thread dump if run
msgstr "Solicitar um despejo de thread se está sendo executado." msgstr "Solicitar um despejo de thread se está sendo executado."
#: ../i2prouter:1864 #: ../i2prouter:1874
-msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "Por favor, edite i2prouter e especifique a variável RUN_AS_USER" -msgstr "Por favor, edite i2prouter e especifique a variável RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+msgstr "Por favor, edite /etc/default/i2p e especifique a variável RUN_AS_USER" +msgstr "Por favor, edite /etc/default/i2p e especifique a variável RUN_AS_USER"
#: ../i2prouter:1869 #: ../i2prouter:1879
msgid "Running I2P as the root user is *not* recommended." msgid "Running I2P as the root user is *not* recommended."
msgstr "Executar o roteador I2P como usuário root *não* é recomendado." msgstr "Executar o roteador I2P como usuário root *não* é recomendado."
#: ../i2prouter:1872 #: ../i2prouter:1882
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
-msgstr "De qualquer forma, se quiser mesmo executar o roteador como root, edite i2prouter e ponha ALLOW_ROOT=true." -msgstr "De qualquer forma, se quiser mesmo executar o roteador como root, edite i2prouter e ponha ALLOW_ROOT=true."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
+msgstr "De qualquer forma, se quiser mesmo executar o roteador como root, edite /etc/default/i2p e ponha ALLOW_ROOT=true." +msgstr "De qualquer forma, se quiser mesmo executar o roteador como root, edite /etc/default/i2p e ponha ALLOW_ROOT=true."
Index: b/installer/resources/locale/po/messages_pl.po
===================================================================
--- a/installer/resources/locale/po/messages_pl.po --- a/installer/resources/locale/po/messages_pl.po
+++ b/installer/resources/locale/po/messages_pl.po +++ b/installer/resources/locale/po/messages_pl.po
@@ -191,13 +191,13 @@ @@ -186,13 +186,13 @@ msgid "Request a Java thread dump if run
msgstr "Zażądaj zrzutu wątków Java jeśli jest uruchomiona." msgstr "Zażądaj zrzutu wątków Java jeśli jest uruchomiona."
#: ../i2prouter:1864 #: ../i2prouter:1874
-msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "Proszę edytuj i2prouter i ustaw zmienną RUN_AS_USER" -msgstr "Proszę edytuj i2prouter i ustaw zmienną RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+msgstr "Proszę edytuj /etc/default/i2p i ustaw zmienną RUN_AS_USER" +msgstr "Proszę edytuj /etc/default/i2p i ustaw zmienną RUN_AS_USER"
#: ../i2prouter:1869 #: ../i2prouter:1879
msgid "Running I2P as the root user is *not* recommended." msgid "Running I2P as the root user is *not* recommended."
msgstr "Nie jest polecane uruchamianie I2P jako root." msgstr "Nie jest polecane uruchamianie I2P jako root."
#: ../i2prouter:1872 #: ../i2prouter:1882
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
-msgstr "Aby uruchomić jako root, edytuj i2prouter i ustaw ALLOW_ROOT=true." -msgstr "Aby uruchomić jako root, edytuj i2prouter i ustaw ALLOW_ROOT=true."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
+msgstr "Aby uruchomić jako root, edytuj /etc/default/i2p i ustaw ALLOW_ROOT=true." +msgstr "Aby uruchomić jako root, edytuj /etc/default/i2p i ustaw ALLOW_ROOT=true."
Index: b/installer/resources/locale/po/messages_ja.po
===================================================================
--- a/installer/resources/locale/po/messages_ja.po --- a/installer/resources/locale/po/messages_ja.po
+++ b/installer/resources/locale/po/messages_ja.po +++ b/installer/resources/locale/po/messages_ja.po
@@ -189,15 +189,15 @@ @@ -186,13 +186,13 @@ msgid "Request a Java thread dump if run
msgstr "起動中の場合、 Java スレッドダンプを要求" msgstr "起動中の場合、 Java スレッドダンプを要求"
#: ../i2prouter:1864 #: ../i2prouter:1874
-msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "i2prouter を編集して、変数 RUN_AS_USER を設定してください" -msgstr "i2prouter を編集して、変数 RUN_AS_USER を設定してください"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+msgstr "/etc/default/i2p を編集して、変数 RUN_AS_USER を設定してください" +msgstr "/etc/default/i2p を編集して、変数 RUN_AS_USER を設定してください"
#: ../i2prouter:1869 #: ../i2prouter:1879
msgid "Running I2P as the root user is *not* recommended." msgid "Running I2P as the root user is *not* recommended."
msgstr "root ユーザーとしての I2P の起動は推奨され*ません*。" msgstr "root ユーザーとしての I2P の起動は推奨され*ません*。"
#: ../i2prouter:1872 #: ../i2prouter:1882
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
-msgstr "とにかく root として起動し、 i2prouter を編集して、ALLOW_ROOT=true と設定する。"
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr "" +msgstr "とにかく root として起動し、 /etc/default/i2p を編集して、ALLOW_ROOT=true と設定する。"
-"とにかく root として起動し、 i2prouter を編集して、ALLOW_ROOT=true と設定す" Index: b/installer/resources/locale/po/messages_sk.po
+"とにかく root として起動し、 /etc/default/i2p を編集して、ALLOW_ROOT=true と設定す" ===================================================================
"る。"
--- a/installer/resources/locale/po/messages_sk.po --- a/installer/resources/locale/po/messages_sk.po
+++ b/installer/resources/locale/po/messages_sk.po +++ b/installer/resources/locale/po/messages_sk.po
@@ -189,15 +189,15 @@ @@ -187,13 +187,13 @@ msgid "Request a Java thread dump if run
msgstr "Vyžiadať zrušenie vlákna Javy, ak je spustený." msgstr "Vyžiadať zrušenie vlákna Javy, ak je spustený."
#: ../i2prouter:1864 #: ../i2prouter:1874
-msgid "Please edit i2prouter and set the variable RUN_AS_USER" -msgid "Please edit i2prouter and set the variable RUN_AS_USER"
-msgstr "Prosím upravte i2prouter a nastavte premennú RUN_AS_USER" -msgstr "Prosím upravte i2prouter a nastavte premennú RUN_AS_USER"
+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER" +msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
+msgstr "Prosím upravte /etc/default/i2p a nastavte premennú RUN_AS_USER" +msgstr "Prosím upravte /etc/default/i2p a nastavte premennú RUN_AS_USER"
#: ../i2prouter:1869 #: ../i2prouter:1879
msgid "Running I2P as the root user is *not* recommended." msgid "Running I2P as the root user is *not* recommended."
msgstr "Spúšťať I2P ako root *nie* je odporúčané." msgstr "Spúšťať I2P ako root *nie* je odporúčané."
#: ../i2prouter:1872 #: ../i2prouter:1882
-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true." -msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
-msgstr "Ak ho chcete spustiť ako root aj tak, upravte i2prouter a nastavte ALLOW_ROOT=true."
+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true." +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
msgstr "" +msgstr "Ak ho chcete spustiť ako root aj tak, upravte /etc/default/i2p a nastavte ALLOW_ROOT=true."
-"Ak ho chcete spustiť ako root aj tak, upravte i2prouter a nastavte "
+"Ak ho chcete spustiť ako root aj tak, upravte /etc/default/i2p a nastavte "
"ALLOW_ROOT=true."