From 23459e12373f65168a3fc716f7f6b1f4e221cb87 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Thu, 29 Sep 2005 11:15:34 +0200 Subject: [PATCH] Import Debian changes 1.0.4-3 tinc (1.0.4-3) unstable; urgency=low * Depend on debconf | debconf-2.0. * Include vietnamese debconf translation. Closes: #322305 * Include japanese debconf translation. Closes: #319591 --- debian/changelog | 8 ++++++++ debian/control | 6 +----- debian/po/ja.po | 49 ++++++++++++++++++++++++++++++++++++++++++++++++ debian/po/vi.po | 48 +++++++++++++++++++++++++++++++++++++++++++++++ debian/postinst | 8 ++++---- 5 files changed, 110 insertions(+), 9 deletions(-) create mode 100644 debian/po/ja.po create mode 100644 debian/po/vi.po diff --git a/debian/changelog b/debian/changelog index 4653767..64e6c7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +tinc (1.0.4-3) unstable; urgency=low + + * Depend on debconf | debconf-2.0. + * Include vietnamese debconf translation. Closes: #322305 + * Include japanese debconf translation. Closes: #319591 + + -- Guus Sliepen Thu, 29 Sep 2005 11:15:34 +0200 + tinc (1.0.4-2) unstable; urgency=low * Compensate for change in texinfo's output directory. Closes: #318562 diff --git a/debian/control b/debian/control index 067f4ea..9f8d73f 100644 --- a/debian/control +++ b/debian/control @@ -7,13 +7,9 @@ Build-Depends: libssl-dev, debhelper (>= 4.1.16), gettext, texi2html, zlib1g-dev Package: tinc Architecture: any -Depends: debconf, ${shlibs:Depends} +Depends: debconf | debconf-2.0, ${shlibs:Depends} Description: Virtual Private Network daemon tinc is a daemon with which you can create a virtual private network (VPN). One daemon can handle multiple connections, so you can create an entire (moderately sized) VPN with only one daemon per participating computer. - . - You need to have two kernel modules installed, on a Debian system - they should already be there. If they are not, the manual will - explain you how to do that. diff --git a/debian/po/ja.po b/debian/po/ja.po new file mode 100644 index 0000000..946afa4 --- /dev/null +++ b/debian/po/ja.po @@ -0,0 +1,49 @@ +msgid "" +msgstr "" +"Project-Id-Version: tinc 1.0.4-1\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-11-11 20:06+0000\n" +"PO-Revision-Date: 2005-06-14 21:09+0900\n" +"Last-Translator: Atsushi Shimono \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "Restart tinc on each upgrade?" +msgstr "アップグレードのたびに tinc を再起動しますか？" + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"You may choose if you want me to restart the tinc daemon every time you " +"install a new version of this package." +msgstr "" +"このパッケージの新しいバージョンをインストールするたびに、tinc デーモンを" +"再起動するかどうかを選択できます。" + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"Sometimes you don't want to do this, for example if you are doing the " +"upgrade over a tunnel that is created with tinc. Stopping the daemon would " +"probably leave you with a dead connection, and tinc may not be started again." +msgstr "" +"tinc のトンネルを経由してアップグレードを行っているときなど、これを行い" +"たくないことがあると思います。デーモンを止めることで接続が失われ、tinc " +"も再起動しなくなります。" + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"If you refuse, you have to restart tinc yourself if you upgraded, by typing " +"`invoke-rc.d tinc restart' whenever it suits you." +msgstr "" +"これを選択しない場合、アップグレードを行った際、都合が良いときに " +"'invoke-rc.d tinc restart' を実行して tinc を自分で再起動する必要があります。" diff --git a/debian/po/vi.po b/debian/po/vi.po new file mode 100644 index 0000000..8177667 --- /dev/null +++ b/debian/po/vi.po @@ -0,0 +1,48 @@ +# Vietnamese translation for tinc. +# Copyright 息 2005 Free Software Foundation, Inc. +# Clytie Siddall , 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: tinc 1.0.4-2\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-11-11 20:06+0000\n" +"PO-Revision-Date: 2005-08-10 17:13+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: LocFactoryEditor 1.2.2\n" + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "Restart tinc on each upgrade?" +msgstr "Kh畛i ch畉y l畉i tr狸nh tinc m畛i l畉n n但ng c畉p kh担ng?" + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"You may choose if you want me to restart the tinc daemon every time you " +"install a new version of this package." +msgstr "T畉i 但y b畉n c坦 th畛 ch畛n t畛 畛ng kh畛i ch畉y l畉i tr狸nh n畛n (d脱mon) tinc m畛i l畉n b畉n ci 畉t phi棚n b畉n m畛i c畛a g坦i ny hay kh担ng." + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"Sometimes you don't want to do this, for example if you are doing the " +"upgrade over a tunnel that is created with tinc. Stopping the daemon would " +"probably leave you with a dead connection, and tinc may not be started again." +msgstr "担i khi b畉n kh担ng mu畛n lm nh動 th畉, l畉y th鱈 d畛 n畉u b畉n ang n但ng c畉p qua 動畛ng h畉m m tinc t畉o. Trong tr動畛ng h畛p ny, ng畛ng tr狸nh n畛n r畉t c坦 th畛 s畉 ng畉t k畉t n畛i, v c坦 l畉 tinc s畉 kh担ng kh畛i ch畉y l畉i." + +#. Type: boolean +#. Description +#: ../tinc.templates:4 +msgid "" +"If you refuse, you have to restart tinc yourself if you upgraded, by typing " +"`invoke-rc.d tinc restart' whenever it suits you." +msgstr "N畉u b畉n t畛 ch畛i th狸 b畉n c畉n ph畉i t畛 kh畛i ch畉y l畉i tr狸nh tinc m畛i l畉n n但ng c畉p, b畉ng c叩ch g探 l畛nh 束 invoke-rc.d tinc restart 損 (g畛i-rc.d tinc kh畛i ch畉y l畉i) khi th鱈ch h畛p." diff --git a/debian/postinst b/debian/postinst index e7671c3..7fccffd 100644 --- a/debian/postinst +++ b/debian/postinst @@ -51,12 +51,12 @@ fi case "$1" in configure) - if [ ! -e /dev/.devfsd -a ! -e /dev/.devfs ] ; then - if [ ! -e /dev/net/tun -a ! -e /dev/tun ] ; then + if [ ! -e /dev/.devfsd ] ; then if [ ! -e /dev/.devfs ] ; then + if [ ! -e /dev/net/tun ] ; then if [ ! -e /dev/tun ] ; then echo "Creating tun device..." cd /dev && ./MAKEDEV net/tun 2>/dev/null || ./MAKEDEV tun 2>/dev/null || echo "Failed to create tun device." - fi - fi + fi; fi + fi; fi if [ ! -e $NETSFILE ] ; then echo "## This file contains all names of the networks to be started on system startup." > $NETSFILE