Changeset 70bb81b for debian


Ignore:
Timestamp:
Jul 2, 2013 8:08:28 PM (7 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
b84bfd57, bcfc763
Parents:
58bb94a (diff), 7ebb26b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '3dbb3a0ff30032f71e1ef6dd6d90f3b8117f3cd1'

and 'ccdac8f0911b798c42e9079d47e07c0e7c652815'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • debian/patches/0001-path-substitution.patch

    r58bb94a r70bb81b  
    145145 
    146146 showsetusermesg()  {
    147 -    echo "`gettext \"Please edit $0 and set the variable RUN_AS_USER\"`."
    148 +    echo "`gettext "Please edit /etc/default/i2p and set the variable RUN_AS_USER"`."
     147-    echo "`gettext 'Please edit i2prouter and set the variable RUN_AS_USER'`."
     148+    echo "`gettext 'Please edit /etc/default/i2p and set the variable RUN_AS_USER'`."
    149149 }
    150150 
     
    154154         showsetusermesg
    155155         echo
    156 -        echo "`gettext \"To run as root anyway, edit $0 and set ALLOW_ROOT=true.\"`"
    157 +        echo "`gettext \"To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true.\"`"
     156-        echo "`gettext 'To run as root anyway, edit i2prouter and set ALLOW_ROOT=true.'`"
     157+        echo "`gettext 'To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true.'`"
    158158         exit 1
    159159     fi
    160160 }
    161 @@ -1866,23 +1809,9 @@
     161@@ -1866,24 +1809,9 @@
    162162             status
    163163             ;;
     
    180180-        'remove' | 'uninstall')
    181181-            removedaemon
     182-            ;;
    182183+        'install' | 'remove' | 'uninstall')
    183184+            echo "Use \"dpkg-reconfigure i2p\" to configure the initscript."
    184185+            exit 1
    185              ;;
    186186 
    187187         'dump')
     188             checkUser "" "$COMMAND"
    188189--- a/installer/resources/runplain.sh
    189190+++ b/installer/resources/runplain.sh
     
    330331 
    331332 #: ../i2prouter:1788
    332 -msgid "Please edit $0 and set the variable RUN_AS_USER"
    333 -msgstr "Bitte bearbeite $0 und setze die Variable RUN_AS_USER"
     333-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
     334-msgstr "Bitte bearbeite i2prouter und setze die Variable RUN_AS_USER"
    334335+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
    335336+msgstr "Bitte bearbeite /etc/default/i2p und setze die Variable RUN_AS_USER"
     
    340341 
    341342 #: ../i2prouter:1796
    342 -msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
    343 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
    344  msgstr ""
    345 -"Um I2P trotzdem als root auszuführen bearbeite $0 und setze ALLOW_ROOT=true."
     343-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
     344+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
     345 msgstr ""
     346-"Um I2P trotzdem als root auszuführen bearbeite i2prouter und setze ALLOW_ROOT=true."
    346347+"Um I2P trotzdem als root auszuführen bearbeite /etc/default/i2p und setze ALLOW_ROOT=true."
    347348--- a/installer/resources/locale/po/messages_en.po
     
    351352 
    352353 #: ../i2prouter:1788
    353 -msgid "Please edit $0 and set the variable RUN_AS_USER"
     354-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
    354355+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
    355356 msgstr ""
     
    360361 
    361362 #: ../i2prouter:1796
    362 -msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
     363-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
    363364+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
    364365 msgstr ""
     
    369370 
    370371 #: ../i2prouter:1788
    371 -msgid "Please edit $0 and set the variable RUN_AS_USER"
     372-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
    372373-msgstr "Veuillez éditer $0 et paramétrer la variable RUN_AS_USER"
    373374+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
     
    379380 
    380381 #: ../i2prouter:1796
    381 -msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
     382-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
    382383-msgstr "Pour exécuter en tant que root de toute façon, éditer $0 et mettre ALLOW_ROOT=true."
    383384+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
     
    389390 
    390391 #: ../i2prouter:1780
    391 -msgid "Please edit $0 and set the variable RUN_AS_USER"
     392-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
    392393+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
    393394 msgstr ""
     
    398399 
    399400 #: ../i2prouter:1788
    400 -msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
     401-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
    401402+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
    402403 msgstr ""
     
    407408 
    408409 #: ../i2prouter:1780
    409 -msgid "Please edit $0 and set the variable RUN_AS_USER"
     410-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
    410411+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
    411412 msgstr ""
     
    416417 
    417418 #: ../i2prouter:1788
    418 -msgid "To run as root anyway, edit $0 and set ALLOW_ROOT=true."
    419 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
    420  msgstr ""
     419-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
     420+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
     421 msgstr ""
     422--- a/installer/resources/locale/po/messages_sv.po
     423+++ b/installer/resources/locale/po/messages_sv.po
     424@@ -187,13 +187,13 @@
     425 msgstr "Fråga efter en Java thread dump vid drift."
     426 
     427 #: ../i2prouter:1780
     428-msgid "Please edit i2prouter and set the variable RUN_AS_USER"
     429-msgstr "Var god ändra i2prouter och sätt variabeln RUN_AS_USER"
     430+msgid "Please edit /etc/default/i2p and set the variable RUN_AS_USER"
     431+msgstr "Var god ändra /etc/default/i2p och sätt variabeln RUN_AS_USER"
     432 
     433 #: ../i2prouter:1785
     434 msgid "Running I2P as the root user is *not* recommended."
     435 msgstr "Att köra I2P som användare root är *inte* rekommenderat."
     436 
     437 #: ../i2prouter:1788
     438-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
     439-msgstr "För att köra som root iallafall, ändra i2prouter och sätt ALLOW_ROOT=true"
     440+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
     441+msgstr "För att köra som root iallafall, ändra /etc/default/i2p och sätt ALLOW_ROOT=true"
Note: See TracChangeset for help on using the changeset viewer.