From: Vincent Bernat Date: Sat, 16 May 2009 13:30:17 +0000 (+0200) Subject: Imported Debian patch 0.2.1-2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=68b99d8007942a1160eb4401003da0120032db02;p=roundcube.git Imported Debian patch 0.2.1-2 --- diff --git a/debian/changelog b/debian/changelog index 741708e..f2856bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +roundcube (0.2.1-2) unstable; urgency=low + + * Update debconf translations: + + German, thanks to Helge Kreutzmann. Closes: #520004. + + Japanese, thanks to Hideki Yamane. Closes: #520024. + + Spanish, thanks to Francisco Javier. Closes: #526696. + + Russian, thanks to Yuri Kozlov. Closes: #528796. + * Depend on php-mdb2-* (>= 1.5.0b2) since it is needed to fix some + bugs. Closes: #519104, #519293. Remove not needed any more patch from + debian/patches/series. Keep it in debian/patches to help backports. + + -- Vincent Bernat Sat, 16 May 2009 15:30:17 +0200 + roundcube (0.2.1-1) unstable; urgency=low * New upstream release: diff --git a/debian/control b/debian/control index a743200..a67f432 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube Package: roundcube-core Architecture: all -Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1 +Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1 Replaces: roundcube Conflicts: roundcube (<< 0.1~rc2-2) Description: skinnable AJAX based webmail solution for IMAP servers @@ -40,7 +40,7 @@ Description: skinnable AJAX based webmail solution for IMAP servers - metapackag Package: roundcube-mysql Architecture: all -Depends: php-mdb2-driver-mysql, mysql-client | virtual-mysql-client, ${misc:Depends} +Depends: php-mdb2-driver-mysql (>= 1.5.0b2), mysql-client | virtual-mysql-client, ${misc:Depends} Suggests: mysql-server Description: metapackage providing MySQL dependencies for RoundCube This package provides MySQL dependencies for RoundCube Webmail, a @@ -49,7 +49,7 @@ Description: metapackage providing MySQL dependencies for RoundCube Package: roundcube-pgsql Architecture: all -Depends: php-mdb2-driver-pgsql, postgresql-client-8.1 | postgresql-client, ${misc:Depends} +Depends: php-mdb2-driver-pgsql (>= 1.5.0b2), postgresql-client-8.1 | postgresql-client, ${misc:Depends} Suggests: postgresql-server Description: metapackage providing PostgreSQL dependencies for RoundCube This package provides PostgreSQL dependencies for RoundCube Webmail, @@ -58,7 +58,7 @@ Description: metapackage providing PostgreSQL dependencies for RoundCube Package: roundcube-sqlite Architecture: all -Depends: php-mdb2-driver-sqlite, sqlite, ${misc:Depends} +Depends: php-mdb2-driver-sqlite (>= 1.5.0b2), sqlite, ${misc:Depends} Description: metapackage providing sqlite dependencies for RoundCube This package provides sqlite dependencies for RoundCube Webmail, a skinnable AJAX based webmail solution for IMAP servers. Install this diff --git a/debian/patches/series b/debian/patches/series index e148aed..853b6e7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,3 @@ dbconfig-common_support.patch correct_install_path.patch use_packaged_tinymce.patch correct-magic-path.patch -too-old-mdb2.patch diff --git a/debian/po/de.po b/debian/po/de.po index 4fe63b4..8871f95 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -1,13 +1,13 @@ # German translation of roundcube templates -# Helge Kreutzmann , 2007, 2008. +# Helge Kreutzmann , 2007-2009. # This file is distributed under the same license as the roundcube package. # msgid "" msgstr "" -"Project-Id-Version: roundcube 0.1-3\n" +"Project-Id-Version: roundcube 0.2.1-1\n" "Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" "POT-Creation-Date: 2009-02-15 17:05+0100\n" -"PO-Revision-Date: 2008-03-07 19:08+0100\n" +"PO-Revision-Date: 2009-03-16 21:15+0100\n" "Last-Translator: Helge Kreutzmann \n" "Language-Team: de \n" "MIME-Version: 1.0\n" @@ -77,11 +77,9 @@ msgstr "IMAP-Server, die mit RoundCube verwendet werden sollen:" #. Type: string #. Description #: ../templates:4001 -#, fuzzy -#| msgid "Please select the IMAP server that should be used with RoundCube." msgid "Please select the IMAP server(s) that should be used with RoundCube." msgstr "" -"Bitte wählen Sie den IMAP-Server aus, der mit RoundCube verwendet werden " +"Bitte wählen Sie den/die IMAP-Server aus, die mit RoundCube verwendet werden " "soll." #. Type: string diff --git a/debian/po/es.po b/debian/po/es.po index 5162bd6..7f903a8 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -1,38 +1,40 @@ -# roundcube translation to spanish -# Copyright (C) 2004 Software in the Public Interest +# roundcube po-debconf translation to Spanish +# Copyright (C) 2004, 2007, 2009 Software in the Public Interest # This file is distributed under the same license as the roundcube package. # # Changes: -# - Initial translation +# - Initial translation # Carlos Galisteo de Cabo , 2007 # +# - Updates +# Francisco Javier Cuadrado , 2009 # -# Traductores, si no conoce el formato PO, merece la pena leer la -# documentación de gettext, especialmente las secciones dedicadas a este -# formato, por ejemplo ejecutando: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' # # Equipo de traducción al español, por favor lean antes de traducir # los siguientes documentos: # -# - El proyecto de traducción de Debian al español -# http://www.debian.org/intl/spanish/coordinacion -# especialmente las notas de traducción en -# http://www.debian.org/intl/spanish/notas +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/coordinacion +# especialmente las notas de traducción en +# http://www.debian.org/intl/spanish/notas # -# - La guía de traducción de po's de debconf: -# /usr/share/doc/po-debconf/README-trans -# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans # msgid "" msgstr "" -"Project-Id-Version: roundcube_0.1~rc1~dfsg-1\n" +"Project-Id-Version: roundcube 0.2.1-1\n" "Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" "POT-Creation-Date: 2009-02-15 17:05+0100\n" "PO-Revision-Date: 2008-04-01 18:21+0200\n" "Last-Translator: Carlos Galisteo \n" -"Language-Team: \n" +"Language-Team: Debian l10n Spanishf \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -100,8 +102,6 @@ msgstr "Servidor/es IMAP usado/s por RoundCube:" #. Type: string #. Description #: ../templates:4001 -#, fuzzy -#| msgid "Please select the IMAP server that should be used with RoundCube." msgid "Please select the IMAP server(s) that should be used with RoundCube." msgstr "Seleccione el/los servidor/es IMAP que se usará/n con RoundCube." diff --git a/debian/po/ja.po b/debian/po/ja.po new file mode 100644 index 0000000..c223765 --- /dev/null +++ b/debian/po/ja.po @@ -0,0 +1,127 @@ +# Copyright (C) 2009 Debian Roundcube Maintainers +# This file is distributed under the same license as roundcube package. +# Hideki Yamane (Debian-JP) , 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: roundcube 0.2~stable-1\n" +"Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" +"POT-Creation-Date: 2009-02-15 17:05+0100\n" +"PO-Revision-Date: 2009-03-06 06:26+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) \n" +"Language-Team: Japanese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: multiselect +#. Choices +#: ../templates:2001 +msgid "apache2" +msgstr "apache2" + +#. Type: multiselect +#. Choices +#: ../templates:2001 +msgid "lighttpd" +msgstr "lighttpd" + +#. Type: multiselect +#. Description +#: ../templates:2002 +msgid "Web server(s) to configure automatically:" +msgstr "自動的に設定するウェブサーバ:" + +#. Type: multiselect +#. Description +#: ../templates:2002 +msgid "" +"RoundCube supports any web server supported by PHP, however only Apache 2 " +"and lighttpd can be configured automatically." +msgstr "" +"RoundCube は PHP をサポートしているウェブサーバであればどれでもサポートしてい" +"ますが、自動的に設定できるのは Apache2 と lighttpd のみです。" + +#. Type: multiselect +#. Description +#: ../templates:2002 +msgid "" +"Please select the web server(s) that should be configured automatically for " +"RoundCube." +msgstr "RoundCube 用の設定を自動的に実施するウェブサーバを選択してください。" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "Should the webserver(s) be restarted now?" +msgstr "今すぐウェブサーバを再起動しますか?" + +#. Type: boolean +#. Description +#: ../templates:3001 +msgid "" +"In order to activate the new configuration, the reconfigured web server(s) " +"have to be restarted." +msgstr "" +"新しい設定を反映するには、再設定したウェブサーバを再起動する必要があります。" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "IMAP server(s) used with RoundCube:" +msgstr "RoundCube で利用する IMAP サーバ:" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "Please select the IMAP server(s) that should be used with RoundCube." +msgstr "RoundCube で利用する IMAP サーバを選択してください。" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"If this is left blank, a text box will be displayed at login. Entering a " +"space-separated list of hosts will display a pull-down menu. Entering a " +"single host will enforce using this host." +msgstr "" +"ここで入力しない場合は、ログイン時にテキストボックスが表示されます。空白で区" +"切られたホストのリストを入力すると、プルダウンメニューが表示されます。ホスト" +"名を一つだけ入力した場合はそのホストが強制的に利用されます。" + +#. Type: string +#. Description +#: ../templates:4001 +msgid "" +"To use SSL connections, please enter host names as 'ssl://hostname:993'." +msgstr "" +"SSL 接続を利用するには、'ssl://hostname:993' のようにしてホスト名を入力してく" +"ださい。" + +#. Type: select +#. Description +#: ../templates:5001 +msgid "Default language:" +msgstr "標準の言語:" + +#. Type: select +#. Description +#: ../templates:5001 +msgid "Please choose the default language for RoundCube." +msgstr "RoundCube での標準の言語を入力してください。" + +#. Type: select +#. Description +#: ../templates:5001 +msgid "This choice can be overridden by individual users in their preferences." +msgstr "ここでの選択は、個々のユーザの個人設定で上書きできます。" + +#. Type: select +#. Description +#: ../templates:5001 +msgid "" +"However, the default language will be used for the login screen and the " +"first connection of users." +msgstr "" +"しかし、標準に設定した言語はログイン画面とユーザの初回の接続画面に利用されま" +"す。" diff --git a/debian/po/ru.po b/debian/po/ru.po index 12df36d..8f75ef2 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Yuri Kozlov , 2007, 2008. +# Yuri Kozlov , 2009. msgid "" msgstr "" -"Project-Id-Version: roundcube 0.1-3\n" +"Project-Id-Version: roundcube 0.2.1-1\n" "Report-Msgid-Bugs-To: roundcube@packages.debian.org\n" "POT-Creation-Date: 2009-02-15 17:05+0100\n" -"PO-Revision-Date: 2008-03-07 16:44+0300\n" -"Last-Translator: Yuri Kozlov \n" +"PO-Revision-Date: 2009-05-15 21:20+0400\n" +"Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,8 +69,8 @@ msgid "" "In order to activate the new configuration, the reconfigured web server(s) " "have to be restarted." msgstr "" -"Чтобы новая конфигурация вступила в силу, нужно перезапустить " -"перенастроенный веб-сервер(ы)." +"Чтобы новые настройки вступили в силу, нужно перезапустить перенастроенный " +"веб-сервер(ы)." #. Type: string #. Description @@ -80,10 +81,8 @@ msgstr "IMAP-сервер(ы), используемые с RoundCube:" #. Type: string #. Description #: ../templates:4001 -#, fuzzy -#| msgid "Please select the IMAP server that should be used with RoundCube." msgid "Please select the IMAP server(s) that should be used with RoundCube." -msgstr "Укажите сервер IMAP, который нужно использовать с RoundCube." +msgstr "Укажите сервер(ы) IMAP, который нужно использовать с RoundCube." #. Type: string #. Description @@ -104,7 +103,7 @@ msgstr "" msgid "" "To use SSL connections, please enter host names as 'ssl://hostname:993'." msgstr "" -"Чтобы использовать SSL-соединения, вводите имена хостов в виде 'ssl://" +"Чтобы использовать соединение через SSL, вводите имена хостов в виде 'ssl://" "хост:993'." #. Type: select