Commit caa4e09c authored by david.verdin's avatar david.verdin
Browse files

[svn] Retrieving latest modifications from the 6.1 branch.


git-svn-id: https://subversion.renater.fr/sympa/trunk@6658 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 8c3c1387
This diff is collapsed.
No preview for this file type
......@@ -13,7 +13,7 @@ charset.conf defines mappings between locale and legacy character
set for service messages. If you want to enable legacy character
set support, simply copy sample charset.conf onto etc directory:
# cp /home/sympa/bin/etc/script/charset.conf /home/sympa/etc/charset.conf
# cp /home/sympa/default/charset.conf /home/sympa/etc/charset.conf
And set the 'legacy_character_support_feature' parameter value to 'on'.
......
......@@ -19,8 +19,8 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
AC_PREREQ(2.59)
AC_INIT(sympa, 6.1b.4, sympa-authors@cru.fr)
AC_PREREQ(2.60)
AC_INIT(sympa, 6.1b.6, sympa-authors@cru.fr)
AM_INIT_AUTOMAKE([foreign -Wall -Werror])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_PO_SUBDIRS
......@@ -32,64 +32,68 @@ AC_PREFIX_DEFAULT(/home/sympa)
if test "$prefix" = "NONE"; then
prefix=$ac_default_prefix
fi
# standard variables
# check current value before re-assigning
if test "$sbindir" = '${exec_prefix}/sbin'; then
sbindir=$prefix/bin
fi
if test "$libexecdir" = '${exec_prefix}/libexec'; then
libexecdir=$prefix/bin
fi
# custom variables
initdir=/etc/rc.d/init.d
localstatedir=/var
piddir=$localstatedir/run
lockdir=$localstatedir/lock/subsys
modulesdir=$prefix/bin
scriptdir=$prefix/bin
defaultdir=$prefix/default
mailtemplatedir=$defaultdir/mail_tt2
webtemplatedir=$defaultdir/web_tt2
execcgidir=$prefix/bin
expldir=$prefix/list_data
spooldir=$prefix/spool
staticdir=$prefix/static_content
arcdir=$prefix/arc
bouncedir=$prefix/bounce
confdir=/etc
localedir=$prefix/locale
docdir=$prefix/doc
## If installer wants to use the FHS standard, change
## allow user to select FHS-compliant installation
AC_ARG_ENABLE(
fhs,
AS_HELP_STRING(
[--enable-fhs],
[use standard FHS files and directories locations and naming (default is no)]
),
[
if test $enableval = 'yes';then
initdir=$sysconfdir/rc.d/init.d
piddir=$localstatedir/run/sympa
lockdir=$localstatedir/lock/subsys
modulesdir=$datadir/sympa/lib
scriptdir=$datadir/sympa/bin
defaultdir=$datadir/sympa/default
mailtemplatedir=$defaultdir/mail_tt2
webtemplatedir=$defaultdir/web_tt2
execcgidir=$libdir/sympa/cgi
expldir=$localstatedir/lib/sympa
staticdir=$localstatedir/lib/sympa/static_content
spooldir=$localstatedir/spool/sympa
arcdir=$localstatedir/lib/sympa/arc
bouncedir=$localstatedir/lib/sympa/bounce
confdir=$sysconfdir
docdir=$datadir/doc/sympa
fi
],
[fhs=$enableval]
)
if test "$fhs" = "yes"; then
# only define custom variables
initdir=$sysconfdir/rc.d/init.d
piddir=$localstatedir/run/sympa
lockdir=$localstatedir/lock/subsys
modulesdir=$datadir/sympa/lib
scriptdir=$datadir/sympa/bin
defaultdir=$datadir/sympa/default
mailtemplatedir=$defaultdir/mail_tt2
webtemplatedir=$defaultdir/web_tt2
execcgidir=$libdir/sympa/cgi
expldir=$localstatedir/lib/sympa
staticdir=$localstatedir/lib/sympa/static_content
spooldir=$localstatedir/spool/sympa
arcdir=$localstatedir/lib/sympa/arc
bouncedir=$localstatedir/lib/sympa/bounce
confdir=$sysconfdir
else
# redefine default values for some standard variables,
# but only if no value was given
if test "$sbindir" = '${exec_prefix}/sbin'; then
sbindir=$prefix/bin
fi
if test "$libexecdir" = '${exec_prefix}/libexec'; then
libexecdir=$prefix/bin
fi
if test "$localstatedir" = '${prefix}/var'; then
localstatedir=/var
fi
if test "$localedir" = '${datarootdir}/locale'; then
localedir=$prefix/locale
fi
# define custom variables
initdir=/etc/rc.d/init.d
piddir=$prefix
lockdir=$localstatedir/lock/subsys
modulesdir=$prefix/bin
scriptdir=$prefix/bin
defaultdir=$prefix/default
mailtemplatedir=$defaultdir/mail_tt2
webtemplatedir=$defaultdir/web_tt2
execcgidir=$prefix/bin
expldir=$prefix/list_data
spooldir=$prefix/spool
staticdir=$prefix/static_content
arcdir=$prefix/arc
bouncedir=$prefix/bounce
confdir=/etc
fi
# substitute custom variables
AC_SUBST(initdir)
AC_SUBST(piddir)
......
This diff is collapsed.
......@@ -15,14 +15,14 @@ msgstr ""
"Project-Id-Version: sympa\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2007-11-13 14:50+0200\n"
"PO-Revision-Date: 2010-06-07 09:59+0200\n"
"PO-Revision-Date: 2010-07-29 11:49+0200\n"
"Last-Translator: Serguei S. Dukachev <iam@dukess.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Pootle 1.0.2\n"
"X-Rosetta-Version: 0.1\n"
......@@ -640,6 +640,9 @@ msgid ""
"Send your message in plain text, not in <acronym lang=\"en\" xml:lang=\"en\" "
"title=\"HyperText Markup Language\">HTML</acronym> (no formatting)."
msgstr ""
"Отправляемое сообщение должно состоять из обычного текста, без использования "
"<acronym lang=\"en\" xml:lang=\"en\" title=\"HyperText Markup "
"Language\">HTML</acronym> (без форматирования)."
#: ../web_tt2/help_user.tt2:19
msgid ""
......@@ -653,19 +656,21 @@ msgid ""
"A description of all the commands you can send to Sympa is available at <a "
"href=\"%1/help/mail_commands\">%1/help/mail_commands</a>."
msgstr ""
"Описание всех команд, которые могут быть посланы Sympa, доступно <a "
"href=\"%1/help/mail_commands\">%1 help/mail_commands</a>."
#: ../web_tt2/help_user.tt2:25
msgid "Subscribing to mailing lists"
msgstr ""
msgstr "Подписка на списки рассылки"
#: ../web_tt2/help_user.tt2:26
msgid "Subscribing to a mailing list is very simple:"
msgstr ""
msgstr "Процедура подписки на список рассылки очень проста:"
#: ../web_tt2/help_user.tt2:28
msgid ""
"Choose the address</strong> with which you want to subscribe to the list."
msgstr ""
msgstr "Выберите адрес</strong>, которым Вы хотите подписаться на рассылку."
#: ../web_tt2/help_user.tt2:29
msgid ""
......@@ -673,12 +678,18 @@ msgid ""
"large storage capacity for your email: some lists distribute many messages, "
"which sometimes contain large attachments."
msgstr ""
"Вам необходимо выбрать такой адрес, который Вы сможете часто проверять и "
"который имеет большой объём почтового ящика: в некоторых списках рассылки "
"распространяется много сообщений, которые иногда содержат большие вложения. "
#: ../web_tt2/help_user.tt2:30
msgid ""
"Of course you can subscribe to the same list with several email addresses. "
"Then you will need to redo the whole process with a different email address."
msgstr ""
"Конечно, Вы можете подписаться на один и тот же список рассылки несколькими "
"почтовыми адресами. Поэтому Вым придётся повторить этот процесс с различными "
"почтовыми адресами."
#. (conf.email,conf.host)
#: ../web_tt2/help_user.tt2:31
......@@ -686,12 +697,16 @@ msgid ""
"Send a <strong>message to %1@%2</strong> from the address you want to "
"subscribe to the list."
msgstr ""
"Отправьте <strong>сообщение на %1@%2</strong> с адреса, который планируется "
"подписать на рассылку."
#: ../web_tt2/help_user.tt2:32
msgid ""
"Sympa is not a person but a mailing list management robot. Thus it is "
"useless to send it loving words! ;-)"
msgstr ""
"Sympa не человек, а всего лишь почтовый робот. Ему бесполезно слать "
"признания в любви! :-)"
#: ../web_tt2/help_user.tt2:33
msgid ""
......@@ -700,10 +715,13 @@ msgid ""
"of the list you want to subscribe to and indicate your own first name and "
"name)."
msgstr ""
"В теме письма напишите <strong>subscribe названиеспискарассылки Имя "
"Фамилия</strong> (замените 'названиеспискарассылки ' на название списка "
"рассылки, на которую хотите подписаться и укажите свои имя и фамилию)."
#: ../web_tt2/help_user.tt2:168 ../web_tt2/help_user.tt2:34
msgid "<strong>Leave the message body blank</strong>."
msgstr ""
msgstr "<strong>Тело письма оставьте пустым</strong>."
#: ../web_tt2/help_user.tt2:169 ../web_tt2/help_user.tt2:35
msgid ""
......@@ -711,6 +729,9 @@ msgid ""
"To do that, follow the instructions available in the <a href=\"#howitworks"
"\">How the mailing list service works</a> section."
msgstr ""
"Чтобы сэкономить немного времени, Вы можете послать несколько команд в одном "
"письме. Чтобы это сделать, действуйте по инструкции, доступной в секции <a "
"href=\"#howitworks\">Как работает сервис почтовой рассылки</a>."
#. (conf.host)
#: ../web_tt2/help_user.tt2:38
......
......@@ -9122,6 +9122,34 @@ msgstr ""
msgid "you do not receive your own posts"
msgstr "لا تستلم الرسائل التي قمت بإرسالها"
#: ../web_tt2/serveradmin.tt2:27
msgid "Sympa URL:"
msgstr ""
#: ../web_tt2/serveradmin.tt2:27
msgid "Mail domain:"
msgstr ""
#: ../src/lib/List.pm:443
msgid "human readable"
msgstr ""
#: ../src/lib/List.pm:1230
msgid "Reject mail from automates (crontab, etc)?"
msgstr ""
#: ../src/lib/List.pm:1350
msgid "Timeout for fetch of include_sql_query"
msgstr ""
#, fuzzy
#~ msgid "Listmaster(s):"
#~ msgstr "صاحب القائمة"
#, fuzzy
#~ msgid "who created the list"
#~ msgstr "من عدل المواصفات"
#, fuzzy
#~ msgid " to "
#~ msgstr "إلى"
......
......@@ -8853,6 +8853,34 @@ msgstr ""
msgid "you do not receive your own posts"
msgstr ""
#: ../web_tt2/serveradmin.tt2:27
msgid "Sympa URL:"
msgstr ""
#: ../web_tt2/serveradmin.tt2:27
msgid "Mail domain:"
msgstr ""
#: ../web_tt2/serveradmin.tt2:27
msgid "Listmaster(s):"
msgstr ""
#: ../src/lib/List.pm:443
msgid "human readable"
msgstr ""
#: ../src/lib/List.pm:448
msgid "who created the list"
msgstr ""
#: ../src/lib/List.pm:1230
msgid "Reject mail from automates (crontab, etc)?"
msgstr ""
#: ../src/lib/List.pm:1350
msgid "Timeout for fetch of include_sql_query"
msgstr ""
#, fuzzy
#~ msgid "Your Lists"
#~ msgstr " Последните листове "
......
......@@ -8787,6 +8787,34 @@ msgstr ""
msgid "you do not receive your own posts"
msgstr ""
#: ../web_tt2/serveradmin.tt2:27
msgid "Sympa URL:"
msgstr ""
#: ../web_tt2/serveradmin.tt2:27
msgid "Mail domain:"
msgstr ""
#: ../web_tt2/serveradmin.tt2:27
msgid "Listmaster(s):"
msgstr ""
#: ../src/lib/List.pm:443
msgid "human readable"
msgstr ""
#: ../src/lib/List.pm:448
msgid "who created the list"
msgstr ""
#: ../src/lib/List.pm:1230
msgid "Reject mail from automates (crontab, etc)?"
msgstr ""
#: ../src/lib/List.pm:1350
msgid "Timeout for fetch of include_sql_query"
msgstr ""
#, fuzzy
#~ msgid "Rejection message"
#~ msgstr "kannadoù nevez"
......
......@@ -9839,6 +9839,34 @@ msgstr "sense correu (útil per vacances)"
msgid "you do not receive your own posts"
msgstr "No pot rebre els seus propis missatges"
#: ../web_tt2/serveradmin.tt2:27
msgid "Sympa URL:"
msgstr ""
#: ../web_tt2/serveradmin.tt2:27
msgid "Mail domain:"
msgstr ""
#: ../src/lib/List.pm:443
msgid "human readable"
msgstr ""
#: ../src/lib/List.pm:1230
msgid "Reject mail from automates (crontab, etc)?"
msgstr ""
#: ../src/lib/List.pm:1350
msgid "Timeout for fetch of include_sql_query"
msgstr ""
#, fuzzy
#~ msgid "Listmaster(s):"
#~ msgstr "administrador"
#, fuzzy
#~ msgid "who created the list"
#~ msgstr "Qui pot actualitzar la configuració"
#, fuzzy
#~ msgid " to "
#~ msgstr "a"
......
......@@ -9706,6 +9706,34 @@ msgstr ""
msgid "you do not receive your own posts"
msgstr "Pro získání hesla :"
#: ../web_tt2/serveradmin.tt2:27
msgid "Sympa URL:"
msgstr ""
#: ../web_tt2/serveradmin.tt2:27
msgid "Mail domain:"
msgstr ""
#: ../src/lib/List.pm:443
msgid "human readable"
msgstr ""
#: ../src/lib/List.pm:1230
msgid "Reject mail from automates (crontab, etc)?"
msgstr ""
#: ../src/lib/List.pm:1350
msgid "Timeout for fetch of include_sql_query"
msgstr ""
#, fuzzy
#~ msgid "Listmaster(s):"
#~ msgstr "Správce"
#, fuzzy
#~ msgid "who created the list"
#~ msgstr "Poslední změna konfigurace"
#, fuzzy
#~ msgid "Your Lists"
#~ msgstr "Konference"
......
......@@ -9506,6 +9506,34 @@ msgstr "keine Nachricht (nützlich für Urlaube)"
msgid "you do not receive your own posts"
msgstr "Sie empfangen Ihre eigenen Nachrichten nicht"
#: ../web_tt2/serveradmin.tt2:27
msgid "Sympa URL:"
msgstr ""
#: ../web_tt2/serveradmin.tt2:27
msgid "Mail domain:"
msgstr ""
#: ../src/lib/List.pm:443
msgid "human readable"
msgstr ""
#: ../src/lib/List.pm:1230
msgid "Reject mail from automates (crontab, etc)?"
msgstr ""
#: ../src/lib/List.pm:1350
msgid "Timeout for fetch of include_sql_query"
msgstr ""
#, fuzzy
#~ msgid "Listmaster(s):"
#~ msgstr "listmaster"
#, fuzzy
#~ msgid "who created the list"
#~ msgstr "Konfigurationsaktualisierung durchgeführt von"
#, fuzzy
#~ msgid " to "
#~ msgstr "an"
......
......@@ -9663,6 +9663,34 @@ msgstr ""
msgid "you do not receive your own posts"
msgstr ""
#: ../web_tt2/serveradmin.tt2:27
msgid "Sympa URL:"
msgstr ""
#: ../web_tt2/serveradmin.tt2:27
msgid "Mail domain:"
msgstr ""
#: ../src/lib/List.pm:443
msgid "human readable"
msgstr ""
#: ../src/lib/List.pm:1230
msgid "Reject mail from automates (crontab, etc)?"
msgstr ""
#: ../src/lib/List.pm:1350
msgid "Timeout for fetch of include_sql_query"
msgstr ""
#, fuzzy
#~ msgid "Listmaster(s):"
#~ msgstr "Διαχειριστής λίστας"
#, fuzzy
#~ msgid "who created the list"
#~ msgstr "Δημιουργία της λίστας"
#~ msgid "Your Lists"
#~ msgstr "Οι λίστες μου"
......
......@@ -212,7 +212,7 @@ msgstr "Post"
msgid "RSS"
msgstr "RSS"
#: ../src/lib/List.pm:1320 ../web_tt2/list_menu.tt2:80
#: ../src/lib/List.pm:1326 ../web_tt2/list_menu.tt2:80
#: ../web_tt2/list_menu.tt2:82
msgid "Shared documents"
msgstr "Shared documents"
......@@ -2498,6 +2498,16 @@ msgstr ""
msgid "Closed lists"
msgstr "Closed lists"
#: ../src/etc/mhonarc-ressources.tt2:212 ../src/etc/mhonarc-ressources.tt2:328
#: ../web_tt2/get_closed_lists.tt2:29 ../web_tt2/get_closed_lists.tt2:9
#: ../web_tt2/modindex.tt2:125 ../web_tt2/modindex.tt2:182
#: ../web_tt2/modindex.tt2:64 ../web_tt2/review.tt2:138
#: ../web_tt2/reviewbouncing.tt2:131 ../web_tt2/reviewbouncing.tt2:60
#: ../web_tt2/subindex.tt2:10 ../web_tt2/subindex.tt2:57
#: ../web_tt2/subscriber_table.tt2:7
msgid "Toggle Selection"
msgstr "Toggle Selection"
#: ../web_tt2/get_closed_lists.tt2:10 ../web_tt2/get_pending_lists.tt2:9
msgid "list name"
msgstr "list name"
......@@ -2510,13 +2520,6 @@ msgstr "list subject"
msgid "Requested by"
msgstr "Requested by"
#: ../src/etc/mhonarc-ressources.tt2:212 ../src/etc/mhonarc-ressources.tt2:328
#: ../web_tt2/get_closed_lists.tt2:29 ../web_tt2/modindex.tt2:125
#: ../web_tt2/modindex.tt2:182 ../web_tt2/review.tt2:138
#: ../web_tt2/reviewbouncing.tt2:131
msgid "Toggle Selection"
msgstr "Toggle Selection"
#: ../web_tt2/get_closed_lists.tt2:30
msgid "Purge selected lists"
msgstr "Purge selected lists"
......@@ -3855,6 +3858,19 @@ msgstr "Lists sorted by last message date"
msgid "The following virtual robots are running on this server:"
msgstr "The following virtual robots are running on this server:"
#: ../web_tt2/serveradmin.tt2:27
msgid "Sympa URL:"
msgstr ""
#: ../web_tt2/serveradmin.tt2:27
msgid "Mail domain:"
msgstr ""
#: ../web_tt2/serveradmin.tt2:27
#, fuzzy
msgid "Listmaster(s):"
msgstr "Listmaster"
#: ../web_tt2/serveradmin.tt2:30
msgid "No Virtual Robot defined on this server"
msgstr "No Virtual Robot defined on this server"
......@@ -4583,11 +4599,11 @@ msgstr "Listing subscription to moderate"
msgid "No subscription requests"
msgstr "No subscription requests"
#: ../web_tt2/subindex.tt2:57
#: ../web_tt2/subindex.tt2:58
msgid "Add selected addresses"
msgstr "Add selected addresses"
#: ../web_tt2/subindex.tt2:58
#: ../web_tt2/subindex.tt2:59
msgid "Reject selected addresses"
msgstr "Reject selected addresses"
......@@ -4929,7 +4945,7 @@ msgstr "Search period: "
#. (date_to_formated)
#. This entry is a date/time format
#. Check the strftime manpage for format details : http://docs.freebsd.org/info/gawk/gawk.info.Time_Functions.html
#: ../web_tt2/viewlogs.tt2:113 ../wwsympa/wwsympa.fcgi.in:16130
#: ../web_tt2/viewlogs.tt2:113 ../wwsympa/wwsympa.fcgi.in:16135
msgid "%d %b %Y %H:%M:%S"
msgstr "%d %b %Y %H:%M:%S"
......@@ -5611,7 +5627,7 @@ msgid "%1 Digest %2"
msgstr "%1 Digest %2"
#: ../mail_tt2/digest.tt2:10 ../mail_tt2/digest_plain.tt2:9
#: ../mail_tt2/get_archive.tt2:9 ../src/lib/List.pm:2771
#: ../mail_tt2/get_archive.tt2:9 ../src/lib/List.pm:2784
msgid "Table of contents:"
msgstr "Table of contents:"
......@@ -8610,7 +8626,7 @@ msgstr "%d %b %Y %H:%M"
#. This entry is a date/time format
#. Check the strftime manpage for format details : http://docs.freebsd.org/info/gawk/gawk.info.Time_Functions.html
#: ../src/lib/Commands.pm:963 ../wwsympa/wwsympa.fcgi.in:9767
#: ../src/lib/Commands.pm:963 ../wwsympa/wwsympa.fcgi.in:9766
msgid "%A"
msgstr "%A"
......@@ -8627,8 +8643,8 @@ msgstr "Error at line %d: %s"
#. This entry is a date/time format
#. Check the strftime manpage for format details : http://docs.freebsd.org/info/gawk/gawk.info.Time_Functions.html
#: ../src/lib/Family.pm:2591 ../src/lib/Family.pm:388 ../src/lib/Family.pm:665
#: ../src/lib/List.pm:1861 ../wwsympa/Auth.pm:459
#: ../wwsympa/wwsympa.fcgi.in:1059 ../wwsympa/wwsympa.fcgi.in:2859
#: ../src/lib/List.pm:1874 ../wwsympa/Auth.pm:459
#: ../wwsympa/wwsympa.fcgi.in:1059 ../wwsympa/wwsympa.fcgi.in:2853
msgid "%d %b %Y at %H:%M:%S"
msgstr "%d %b %Y at %H:%M:%S"
......@@ -8648,7 +8664,7 @@ msgstr "Anonymous sender"
msgid "frequency"
msgstr "frequency"
#: ../src/lib/List.pm:1414 ../src/lib/List.pm:341
#: ../src/lib/List.pm:1427 ../src/lib/List.pm:341
msgid "access right"
msgstr "access right"
......@@ -8709,6 +8725,19 @@ msgstr "Expiration of unmoderated messages"
msgid "Secret string for generating unique keys"
msgstr "Secret string for generating unique keys"
#: ../src/lib/List.pm:1090 ../src/lib/List.pm:1383 ../src/lib/List.pm:439
msgid "epoch date"
msgstr "epoch date"
#: ../src/lib/List.pm:443
msgid "human readable"
msgstr ""
#: ../src/lib/List.pm:448
#, fuzzy
msgid "who created the list"
msgstr "who updated the config"
#: ../src/lib/List.pm:452
msgid "Creation of the list"
msgstr "Creation of the list"
......@@ -9073,119 +9102,127 @@ msgstr "profile"
msgid "Priority"
msgstr "Priority"
#: ../src/lib/List.pm:1228
#: ../src/lib/List.pm:1230
msgid "Reject mail from automates (crontab, etc)?"
msgstr ""
#: ../src/lib/List.pm:1234
msgid "Who can start a remind process"
msgstr "Who can start a remind process"
#: ../src/lib/List.pm:1233
#: ../src/lib/List.pm:1239
msgid "Return-path of the REMIND command"
msgstr "Return-path of the REMIND command"
#: ../src/lib/List.pm:1257 ../src/lib/List.pm:1277
#: ../src/lib/List.pm:1263 ../src/lib/List.pm:1283