forked from I2P_Developers/i2p.i2p
merge of 'a4b347fba401e0a80981d93f36f07b5146665bec'
and 'c25ab2c347bca5e3c4157389ecb6f68c35ce5a6f'
This commit is contained in:
kytv
30
debian/changelog
vendored
30
debian/changelog
vendored
@ -1,10 +1,30 @@
|
||||
i2p (0.8.6-6~build9) UNRELEASED; urgency=low
|
||||
i2p (0.8.7-1) stable; urgency=low
|
||||
|
||||
* Ship own router.config with router.updatesDisabled=true to prevent
|
||||
upgrades to be performed by the router itself. Upgrades *must* take place
|
||||
via the package manager.
|
||||
* The "W00t! My debs are official!" release
|
||||
* New upstream release. See /usr/share/doc/i2p/changelog.gz for the details.
|
||||
* Drop from debian/patches: 0002-sync-countries, 0006-i2p-jetty,
|
||||
0007-eepget-redirections, 0008-config-news, 0009-jetty-snark-disable and
|
||||
re-work the existing patches.
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Fri, 27 May 2011 17:33:21 +0000
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sun, 26 Jun 2011 18:51:31 +0000
|
||||
|
||||
i2p (0.8.6-7) stable; urgency=low
|
||||
|
||||
* Fix bug in maintainer script that caused upgrade to fail on some systems.
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sun, 29 May 2011 15:53:04 +0000
|
||||
|
||||
i2p (0.8.6-6) stable; urgency=low
|
||||
|
||||
* Remove extraneous cruft from debian/rules from back when cpuid couldn't be
|
||||
built for i386
|
||||
* Ship our own router.config with router.updatesDisabled=true to prevent
|
||||
upgrades to be performed by the router itself. Per Debian policy, upgrades
|
||||
*must* take place via the package manager.
|
||||
* Backported eepget fix
|
||||
* Backported news fix
|
||||
|
||||
-- Kill Your TV <killyourtv@i2pmail.org> Sat, 28 May 2011 10:23:51 +0000
|
||||
|
||||
i2p (0.8.6-5) stable; urgency=low
|
||||
|
||||
|
||||
10
debian/patches/debian-version.patch
vendored
10
debian/patches/debian-version.patch
vendored
@ -2,11 +2,15 @@ Add debian package vesion to the EXTRA version field
|
||||
|
||||
--- a/router/java/src/net/i2p/router/RouterVersion.java
|
||||
+++ b/router/java/src/net/i2p/router/RouterVersion.java
|
||||
@@ -21,7 +21,7 @@
|
||||
public final static long BUILD = 0;
|
||||
@@ -18,10 +18,10 @@
|
||||
/** deprecated */
|
||||
public final static String ID = "Monotone";
|
||||
public final static String VERSION = CoreVersion.VERSION;
|
||||
- public final static long BUILD = 31;
|
||||
+ public final static long BUILD = 0;
|
||||
|
||||
/** for example "-test" */
|
||||
- public final static String EXTRA = "";
|
||||
- public final static String EXTRA = "-rc";
|
||||
+ public final static String EXTRA = "deb1";
|
||||
public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
|
||||
public static void main(String args[]) {
|
||||
|
||||
33
debian/po/de.po
vendored
33
debian/po/de.po
vendored
@ -1,12 +1,12 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
# German debconf translation
|
||||
# Copyright (C) 2011 The I2P Project
|
||||
# This file is distributed under the same license as the i2p package.
|
||||
# mixxy <m1xxy@mail.i2p>, 2011
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"Project-Id-Version: i2p 0.8.7-1\n"
|
||||
"Report-Msgid-Bugs-To: debian@mail.i2p\n"
|
||||
"POT-Creation-Date: 2011-06-16 17:09+0000\n"
|
||||
"PO-Revision-Date: 2011-06-24 12:42+0100\n"
|
||||
"Last-Translator: mixxy <m1xxy@mail.i2p>\n"
|
||||
@ -25,8 +25,12 @@ msgstr "Soll der I2P-Router beim Systemstart mitgestartet werden?"
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
#: ../i2p.templates:2001
|
||||
msgid "The I2P router can be run as a daemon that starts automatically when your computer boots up. This is the recommended configuration."
|
||||
msgstr "Der I2P-Router kann als Dämon laufen und beim Start des Betriebssystems mitgestartet werden. Diese Option wird empfohlen."
|
||||
msgid ""
|
||||
"The I2P router can be run as a daemon that starts automatically when your "
|
||||
"computer boots up. This is the recommended configuration."
|
||||
msgstr ""
|
||||
"Der I2P-Router kann als Dämon laufen und beim Start des Betriebssystems "
|
||||
"mitgestartet werden. Diese Option wird empfohlen."
|
||||
|
||||
#. Type: string
|
||||
#. Description
|
||||
@ -37,12 +41,19 @@ msgstr "Benutzer für den I2P-Dämon"
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../i2p.templates:3001
|
||||
msgid "By default I2P is configured to run under the account i2psvc when running as a daemon. To use an **existing** I2P profile you may enter a different account name here. For example, if your previous I2P installation is at /home/user/i2p, you may enter 'user' here."
|
||||
msgstr "Standardmäßig ist I2P so eingestellt, dass der zugehörige Benutzer im Dämonmodus i2psvc ist. Um ein bereits **vorhandenes** I2P-Profil zu benutzen, kannst du hiere einen anderen Benutzer angeben. Beispiel: Wenn deine alte I2P-Installation in /home/ich/i2p residiert, gib hier 'ich' ein."
|
||||
msgid ""
|
||||
"By default I2P is configured to run under the account i2psvc when running as "
|
||||
"a daemon. To use an **existing** I2P profile you may enter a different "
|
||||
"account name here. For example, if your previous I2P installation is at /"
|
||||
"home/user/i2p, you may enter 'user' here."
|
||||
msgstr ""
|
||||
"Standardmäßig ist I2P so eingestellt, dass der zugehörige Benutzer im "
|
||||
"Dämonmodus i2psvc ist. Um ein bereits **vorhandenes** I2P-Profil zu "
|
||||
"benutzen, kannst du hiere einen anderen Benutzer angeben. Beispiel: Wenn "
|
||||
"deine alte I2P-Installation in /home/ich/i2p residiert, gib hier 'ich' ein."
|
||||
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../i2p.templates:3001
|
||||
msgid "Very important: The account specified here *MUST* already exist."
|
||||
msgstr "WICHTIG; Der hier angegebene Benutzer *MUSS* bereits existieren!"
|
||||
|
||||
|
||||
34
debian/po/es.po
vendored
34
debian/po/es.po
vendored
@ -1,12 +1,12 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
# Spanish debconf translation
|
||||
# Copyright (C) 2011 The I2P Project
|
||||
# This file is distributed under the same license as the i2p package.
|
||||
# mixxy <m1xxy@mail.i2p>, 2011
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"Project-Id-Version: i2p 0.8.7\n"
|
||||
"Report-Msgid-Bugs-To: debian@mail.i2p\n"
|
||||
"POT-Creation-Date: 2011-06-16 17:09+0000\n"
|
||||
"PO-Revision-Date: 2011-06-24 12:33+0100\n"
|
||||
"Last-Translator: mixxy <m1xxy@mail.i2p>\n"
|
||||
@ -25,8 +25,12 @@ msgstr "Iniciar I2P automáticamente en el arranque?"
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
#: ../i2p.templates:2001
|
||||
msgid "The I2P router can be run as a daemon that starts automatically when your computer boots up. This is the recommended configuration."
|
||||
msgstr "El router I2P se puede ejecutar como demonio que inicia automaticamente al arrancar la computadora. Ésta es la opción recomendada."
|
||||
msgid ""
|
||||
"The I2P router can be run as a daemon that starts automatically when your "
|
||||
"computer boots up. This is the recommended configuration."
|
||||
msgstr ""
|
||||
"El router I2P se puede ejecutar como demonio que inicia automaticamente al "
|
||||
"arrancar la computadora. Ésta es la opción recomendada."
|
||||
|
||||
#. Type: string
|
||||
#. Description
|
||||
@ -37,12 +41,20 @@ msgstr "Usuario del demonio I2P:"
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../i2p.templates:3001
|
||||
msgid "By default I2P is configured to run under the account i2psvc when running as a daemon. To use an **existing** I2P profile you may enter a different account name here. For example, if your previous I2P installation is at /home/user/i2p, you may enter 'user' here."
|
||||
msgstr "Por defecto, I2P está configurado para ejecutarse con el usuario i2psvc si el modo de demonio está activado. Para usar un perfíl **ya existente** de I2P, puedes especificar aquí un nombre de cuenta diferente. Por ejemplo, si tu anterior instalación de I2P se halla en /home/user/i2p, puedes entrar 'user' aquí."
|
||||
msgid ""
|
||||
"By default I2P is configured to run under the account i2psvc when running as "
|
||||
"a daemon. To use an **existing** I2P profile you may enter a different "
|
||||
"account name here. For example, if your previous I2P installation is at /"
|
||||
"home/user/i2p, you may enter 'user' here."
|
||||
msgstr ""
|
||||
"Por defecto, I2P está configurado para ejecutarse con el usuario i2psvc si "
|
||||
"el modo de demonio está activado. Para usar un perfíl **ya existente** de "
|
||||
"I2P, puedes especificar aquí un nombre de cuenta diferente. Por ejemplo, si "
|
||||
"tu anterior instalación de I2P se halla en /home/user/i2p, puedes entrar "
|
||||
"'user' aquí."
|
||||
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../i2p.templates:3001
|
||||
msgid "Very important: The account specified here *MUST* already exist."
|
||||
msgstr "Muy importante: El usuario especificado aquí ya *TIENE QUE* existir."
|
||||
|
||||
|
||||
38
debian/po/ru.po
vendored
38
debian/po/ru.po
vendored
@ -1,17 +1,17 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
|
||||
# This file is distributed under the same license as the PACKAGE package.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
# Russian debconf translation
|
||||
# Copyright (C) 2011 The I2P Project
|
||||
# This file is distributed under the same license as the i2p package.
|
||||
# Hidden Z <hiddenz@mail.i2p>, 2011
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Project-Id-Version: i2p 0.8.7\n"
|
||||
"Report-Msgid-Bugs-To: debian@mail.i2p\n"
|
||||
"POT-Creation-Date: 2011-06-16 17:09+0000\n"
|
||||
"PO-Revision-Date: 2011-06-21 20:59+0500\n"
|
||||
"Last-Translator: Hidden Z <hiddenz@mail.i2p>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"Language: \n"
|
||||
"Language-Team: ru\n"
|
||||
"Language: ru\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
@ -25,8 +25,12 @@ msgstr "Должен ли I2P-роутер запускаться во врем
|
||||
#. Type: boolean
|
||||
#. Description
|
||||
#: ../i2p.templates:2001
|
||||
msgid "The I2P router can be run as a daemon that starts automatically when your computer boots up. This is the recommended configuration."
|
||||
msgstr "I2P-роутер может работать в качестве демона, который запускается автоматически во время загрузки компьютера. Это рекомендованная конфигурация."
|
||||
msgid ""
|
||||
"The I2P router can be run as a daemon that starts automatically when your "
|
||||
"computer boots up. This is the recommended configuration."
|
||||
msgstr ""
|
||||
"I2P-роутер может работать в качестве демона, который запускается "
|
||||
"автоматически во время загрузки компьютера. Это рекомендованная конфигурация."
|
||||
|
||||
#. Type: string
|
||||
#. Description
|
||||
@ -37,12 +41,20 @@ msgstr "Псевдопользователь для I2P-демона:"
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../i2p.templates:3001
|
||||
msgid "By default I2P is configured to run under the account i2psvc when running as a daemon. To use an **existing** I2P profile you may enter a different account name here. For example, if your previous I2P installation is at /home/user/i2p, you may enter 'user' here."
|
||||
msgstr "При работе в качестве демона, I2P по умолчанию использует аккаунт i2psvc для работы. Для использования **существующего** профиля I2P вы можете ввести здесь другое имя пользователя. Для примера, если ваша предыдущая инсталляция I2P находится в /home/user/i2p, вы можете ввести здесь 'user'."
|
||||
msgid ""
|
||||
"By default I2P is configured to run under the account i2psvc when running as "
|
||||
"a daemon. To use an **existing** I2P profile you may enter a different "
|
||||
"account name here. For example, if your previous I2P installation is at /"
|
||||
"home/user/i2p, you may enter 'user' here."
|
||||
msgstr ""
|
||||
"При работе в качестве демона, I2P по умолчанию использует аккаунт i2psvc для "
|
||||
"работы. Для использования **существующего** профиля I2P вы можете ввести "
|
||||
"здесь другое имя пользователя. Для примера, если ваша предыдущая инсталляция "
|
||||
"I2P находится в /home/user/i2p, вы можете ввести здесь 'user'."
|
||||
|
||||
#. Type: string
|
||||
#. Description
|
||||
#: ../i2p.templates:3001
|
||||
msgid "Very important: The account specified here *MUST* already exist."
|
||||
msgstr "Очень важно: аккаунт, указанный здесь, обязательно должен существовать."
|
||||
|
||||
msgstr ""
|
||||
"Очень важно: аккаунт, указанный здесь, обязательно должен существовать."
|
||||
|
||||
Reference in New Issue
Block a user