Ignore:
Timestamp:
Jan 29, 2016 6:23:57 PM (5 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
28a2b82
Parents:
bccefb9 (diff), be97e84 (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 '01b0b5d0f5aae9882a6ada1fd1a9a7414adec7cb'

and 'ad6ebc8a0672f769ddc142886e0ce9e7fb344180'

File:
1 edited

Legend:

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

    rbccefb9 rf094bac  
    578578--- a/installer/resources/locale/po/messages_pt_BR.po
    579579+++ b/installer/resources/locale/po/messages_pt_BR.po
    580 @@ -190,15 +190,15 @@
     580@@ -189,13 +189,13 @@
    581581 msgstr "Solicitar um despejo de thread se está sendo executado."
    582582 
     
    593593 #: ../i2prouter:1872
    594594-msgid "To run as root anyway, edit i2prouter and set ALLOW_ROOT=true."
    595 +msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
    596  msgstr ""
    597  "De qualquer forma, se quiser mesmo executar o roteador como root, edite "
    598 -"i2prouter e ponha ALLOW_ROOT=true."
    599 +"/etc/default/i2p e ponha ALLOW_ROOT=true."
     595-msgstr "De qualquer forma, se quiser mesmo executar o roteador como root, edite i2prouter e ponha ALLOW_ROOT=true."
     596+msgid "To run as root anyway, edit /etc/default/i2p and set ALLOW_ROOT=true."
     597+msgstr "De qualquer forma, se quiser mesmo executar o roteador como root, edite /etc/default/i2p e ponha ALLOW_ROOT=true."
    600598--- a/installer/resources/locale/po/messages_pl.po
    601599+++ b/installer/resources/locale/po/messages_pl.po
Note: See TracChangeset for help on using the changeset viewer.