propagate from branch 'i2p.i2p' (head 96b4e09e85e0947d0b9df188f4861664073f07a6)

to branch 'i2p.i2p.zzz.jetty6' (head 4024ef4f6e6c5e4ca6a7803614dc769ca654ac5f)

installer/resources/i2prouter

@@ -461,10 +461,13 @@ fi
 
 
 gettext() {
-    "$WRAPPER_CMD" --translate "$1" "$WRAPPER_CONF" 2>/dev/null
-    if [ $? != 0 ] ; then
+    # TODO provide translations and call external gettext.
+    # For now, don't attempt to translate via the wrapper,
+    # it probably isn't supported in the community edition.
+    #"$WRAPPER_CMD" --translate "$1" "$WRAPPER_CONF" 2>/dev/null
+    #if [ $? != 0 ] ; then
         echo "$1"
-    fi
+    #fi
 }
 
 outputFile() {
@@ -1099,7 +1102,7 @@ graceful() {
             # Running so try to stop it.
             # This sends HUP. router.gracefulHUP must be set in router.config,
             # or else this will do the same as stop.
-            kill $pid
+            kill -HUP $pid
             if [ $? -ne 0 ]
             then
                 # An explanation for the failure should have been given