On Tue, Aug 12, 2008 at 03:29:02PM +0200, Michael Meskes wrote: > On Mon, Aug 11, 2008 at 07:12:47PM -0300, Thadeu Lima de Souza Cascardo wrote: > > Please, wait until tomorrow, Aug 12th, by 17:00 UTC, which is when I'm > > going to ask for the sponsorship and attach the NMU diff. If I don't do > > that by that time, you may start working on it. > > Could it be you got the order of things slightly reversed? You ask the > maintainers to not upload before you can ask someone to upload your NMU? Don't > you think the right way is to send the patch and give us a chance to upload > ourselves? > > I do value your effort of creating the patch which reduces our workload but it > appears to me I misunderstood your email. > > Michael > -- > Michael Meskes > Email: Michael at Fam-Meskes dot De, Michael at Meskes dot (De|Com|Net|Org) > ICQ: 179140304, AIM/Yahoo: michaelmeskes, Jabber: [EMAIL PROTECTED] > Go VfL Borussia! Go SF 49ers! Use Debian GNU/Linux! Use PostgreSQL!
Yes, I thought of attaching the patch, which I am doing right now. I am sorry for not being nice and doing it. I just wanted to upload the Brazillian Portuguese translation too and avoid having to do two uploads in the case you didn't want to wait for it. Anyway, this is no excuse for not sending the patch. Since you seem to be pretty active, I am just sending the patch and let you revise and upload it with your modifications, instead of asking for someone else's sponshorship. Thank you very much for your work and reminding me that we all should be nicer with our fellow Debian Developers/Maintainers. :-) This patch does not include the pt_BR translation because I didn't get it from my friend in the timeframe I expected. Thadeu Cascardo.
diff -u citadel-7.37/debian/citadel-common.postinst
citadel-7.37/debian/citadel-common.postinst
--- citadel-7.37/debian/citadel-common.postinst
+++ citadel-7.37/debian/citadel-common.postinst
@@ -9,7 +9,7 @@
case "$1" in
configure)
if ! getent group citadel >/dev/null; then
- groupadd citadel
+ addgroup --system citadel
fi
if ! getent passwd citadel >/dev/null; then
diff -u citadel-7.37/debian/citadel-server.templates
citadel-7.37/debian/citadel-server.templates
--- citadel-7.37/debian/citadel-server.templates
+++ citadel-7.37/debian/citadel-server.templates
@@ -14,7 +14,7 @@
_Description: Enable external authentication mode?
Please choose the user authentication mode. By default Citadel will
use its own internal user accounts database. If you accept this
- option, Citadel users will have accounts on the host system,
+ option, Citadel users will have accounts on the host system,
authenticated via /etc/passwd (or LDAP).
.
Do not accept this option unless you are sure it is required, since
diff -u citadel-7.37/debian/changelog citadel-7.37/debian/changelog
--- citadel-7.37/debian/changelog
+++ citadel-7.37/debian/changelog
@@ -1,3 +1,13 @@
+citadel (7.37-1.1) unstable; urgency=low
+
+ * NMU.
+ * Adds a system group instead of a regular one (Closes: #494682)
+ * Fix a typo in the debconf po template and update the finnish
+ translation (Closes: #492611)
+ * Updated the russian translation (Closes: #492386)
+
+ -- Thadeu Lima de Souza Cascardo <[EMAIL PROTECTED]> Mon, 11 Aug 2008
17:59:37 -0300
+
citadel (7.37-1) unstable; urgency=low
[ Wilfried Goesgens ]
diff -u citadel-7.37/debian/po/de.po citadel-7.37/debian/po/de.po
--- citadel-7.37/debian/po/de.po
+++ citadel-7.37/debian/po/de.po
@@ -53,7 +53,7 @@
msgid ""
"Please choose the user authentication mode. By default Citadel will use its "
"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
+"users will have accounts on the host system, authenticated via /etc/passwd "
"(or LDAP)."
msgstr ""
"Bitte w�hlen Sie die Authentifizierungsmethode f�r Benutzer. Standardm��ig "
diff -u citadel-7.37/debian/po/templates.pot
citadel-7.37/debian/po/templates.pot
--- citadel-7.37/debian/po/templates.pot
+++ citadel-7.37/debian/po/templates.pot
@@ -50,7 +50,7 @@
msgid ""
"Please choose the user authentication mode. By default Citadel will use its "
"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
+"users will have accounts on the host system, authenticated via /etc/passwd "
"(or LDAP)."
msgstr ""
diff -u citadel-7.37/debian/po/vi.po citadel-7.37/debian/po/vi.po
--- citadel-7.37/debian/po/vi.po
+++ citadel-7.37/debian/po/vi.po
@@ -52,7 +52,7 @@
msgid ""
"Please choose the user authentication mode. By default Citadel will use its "
"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
+"users will have accounts on the host system, authenticated via /etc/passwd "
"(or LDAP)."
msgstr ""
diff -u citadel-7.37/debian/po/ru.po citadel-7.37/debian/po/ru.po
--- citadel-7.37/debian/po/ru.po
+++ citadel-7.37/debian/po/ru.po
@@ -5,26 +5,23 @@
# Yuri Kozlov <[EMAIL PROTECTED]>, 2008.
msgid ""
msgstr ""
-"Project-Id-Version: citadel 7.33-2\n"
+"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
"POT-Creation-Date: 2008-04-11 21:46+0200\n"
-"PO-Revision-Date: 2008-04-19 16:38+0400\n"
+"PO-Revision-Date: 2008-07-25 22:06+0400\n"
"Last-Translator: Yuri Kozlov <[EMAIL PROTECTED]>\n"
"Language-Team: Russian <[EMAIL PROTECTED]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\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"
#. Type: string
#. Description
#: ../citadel-server.templates:1001
-#, fuzzy
-#| msgid "Listen IP for Citadel:"
msgid "Listening address for the Citadel server:"
-msgstr "Прослушиваемый IP-адрес для Citadel:"
+msgstr "Прослушиваемый адрес для сервера Citadel:"
#. Type: string
#. Description
@@ -33,6 +30,9 @@
"Please specify the IP address which the server should be listening to. If "
"you specify 0.0.0.0, the server will listen on all addresses."
msgstr ""
+"Введите IP-адрес, который будет использовать сервер для ожидания "
+"подключений. Если указать 0.0.0.0, то Citadel будет ожидать подключения "
+"на любой адрес."
#. Type: string
#. Description
@@ -41,14 +41,14 @@
"This can usually be left to the default unless multiple instances of Citadel "
"are running on the same computer."
msgstr ""
+"Обычно, можно оставить значение по умолчанию, если вы не "
+"запускаете несколько экземпляров Citadel на одном компьютере."
#. Type: boolean
#. Description
#: ../citadel-server.templates:2001
-#, fuzzy
-#| msgid "Enable external accounting mode?"
msgid "Enable external authentication mode?"
-msgstr "Использовать внешнюю базу учётных записей?"
+msgstr "Включить режим внешней аутентификации?"
#. Type: boolean
#. Description
@@ -56,9 +56,14 @@
msgid ""
"Please choose the user authentication mode. By default Citadel will use its "
"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
+"users will have accounts on the host system, authenticated via /etc/passwd "
"(or LDAP)."
msgstr ""
+"Выберите режим пользовательской аутентификации. По умолчанию Citadel "
+"использует свою собственную внутреннюю базу данных учётных записей. "
+"Если вы ответите утвердительно, то пользовательскими учётными "
+"записями Citadel будут считаться учётные записи машины, на которой он
установлен, "
+"а для аутентификации будет использоваться файл /etc/passwd (или каталог
LDAP)."
#. Type: boolean
#. Description
@@ -67,14 +72,14 @@
"Do not accept this option unless you are sure it is required, since changing "
"back requires a full reinstall of Citadel."
msgstr ""
+"Не отвечайте утвердительно, если не уверены, что это действительно нужно, "
+"так как изменение потребует полную перестановку Citadel."
#. Type: string
#. Description
#: ../citadel-server.templates:3001
-#, fuzzy
-#| msgid "Citadel administrator:"
msgid "Citadel administrator username:"
-msgstr "Администратор Citadel:"
+msgstr "Имя пользователя администратора Citadel:"
#. Type: string
#. Description
@@ -86,48 +91,3 @@
+"Введите название учётной записи администратора Citadel, которой будут "
+"даны административные права после создания."
-#~ msgid ""
-#~ "Specify the IP address on which your server will run. If you specify "
-#~ "0.0.0.0, Citadel will listen on all addresses. You can usually skip "
-#~ "this unless you are running multiple instances of Citadel on the same "
-#~ "computer."
-#~ msgstr ""
-#~ "Введите IP-адрес, который сервер будет использовать для ожидания "
-#~ "подключений. Если указать 0.0.0.0, то Citadel будет ожидать подключения "
-#~ "на любой адрес. Обычно, можно пропустить этот вопрос, если вы не "
-#~ "запускаете несколько экземпляров Citadel на одном компьютере."
-
-#~ msgid ""
-#~ "Specify the way authentication is done, either host based or Citadel "
-#~ "internal. Host based accounting could be /etc/passwd or an LDAP "
-#~ "directory. WARNING: do not change this setting once your system is "
-#~ "installed. Answer \"no\" unless you completely understand this option."
-#~ msgstr ""
-#~ "Определите, откуда будет выполняться аутентификация -- под данным "
-#~ "компьютера или с помощью собственной базы Citadel. Данными компьютера "
-#~ "может быть файл /etc/passwd или каталог LDAP. ПРЕДУПРЕЖДЕНИЕ: не "
-#~ "изменяйте это значение после установки. Ответьте \"Нет\", если не знаете, "
-#~ "что делать."
-
-#~ msgid ""
-#~ "Enter the name of the Citadel administrator (which is probably you). "
-#~ "When an account is created with this name, it will automatically be given "
-#~ "administrator-level access."
-#~ msgstr ""
-#~ "Введите название учётной записи администратора Citadel (возможно, для "
-#~ "себя). При создании учётной записи с таким именем, ей будет автоматически "
-#~ "назначен администраторский уровень доступа."
-
-#~ msgid "Citadel/UX"
-#~ msgstr "Citadel/UX"
-
-#~ msgid ""
-#~ "For post configuring your Citadel Server, use citadel-webcit with your "
-#~ "browser, log in as the user you specified as the Administrator, and "
-#~ "review the Points under the Administration menu. If you have further "
-#~ "questions review www.citadel.org, specialy the FAQ and Documentation "
-#~ "section."
-#~ msgstr ""
-#~ "Для дальнейшей настройки сервера Citadel, используйте citadel-webcit из "
-#~ "браузера, войдите пользователем, которого вы указали как Администратора, "
-#~ "и просмотрите Points в меню Administration. Если у вас возникли вопросы, "
-#~ "обратитесь к сайту www.citadel.org, особенно к разделам FAQ и "
-#~ "Documentation."
diff -u citadel-7.37/debian/po/ar.po citadel-7.37/debian/po/ar.po
--- citadel-7.37/debian/po/ar.po
+++ citadel-7.37/debian/po/ar.po
@@ -61,7 +61,7 @@
msgid ""
"Please choose the user authentication mode. By default Citadel will use its "
"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
+"users will have accounts on the host system, authenticated via /etc/passwd "
"(or LDAP)."
msgstr ""
diff -u citadel-7.37/debian/po/cs.po citadel-7.37/debian/po/cs.po
--- citadel-7.37/debian/po/cs.po
+++ citadel-7.37/debian/po/cs.po
@@ -53,7 +53,7 @@
msgid ""
"Please choose the user authentication mode. By default Citadel will use its "
"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
+"users will have accounts on the host system, authenticated via /etc/passwd "
"(or LDAP)."
msgstr ""
diff -u citadel-7.37/debian/po/pt.po citadel-7.37/debian/po/pt.po
--- citadel-7.37/debian/po/pt.po
+++ citadel-7.37/debian/po/pt.po
@@ -53,7 +53,7 @@
msgid ""
"Please choose the user authentication mode. By default Citadel will use its "
"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
+"users will have accounts on the host system, authenticated via /etc/passwd "
"(or LDAP)."
msgstr ""
"Por favor, escolha o método de autenticação de utilizadores. Por omissão o "
diff -u citadel-7.37/debian/po/fi.po citadel-7.37/debian/po/fi.po
--- citadel-7.37/debian/po/fi.po
+++ citadel-7.37/debian/po/fi.po
@@ -6,124 +6,56 @@
-"PO-Revision-Date: 2008-03-25 11:31+0200\n"
+"PO-Revision-Date: 2008-07-27 21:26+0200\n"
"Last-Translator: Esko Arajärvi <[EMAIL PROTECTED]>\n"
"Language-Team: Finnish <[EMAIL PROTECTED]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Finnish\n"
"X-Poedit-Country: FINLAND\n"
#. Type: string
#. Description
#: ../citadel-server.templates:1001
-#, fuzzy
-#| msgid "Listen IP for Citadel:"
msgid "Listening address for the Citadel server:"
-msgstr "IP, jota Citadel kuuntelee:"
+msgstr "Osoite, jota Citadel-palvelin kuuntelee:"
#. Type: string
#. Description
#: ../citadel-server.templates:1001
-#, fuzzy
-#| msgid ""
-#| "Specify the IP address on which your server will run. If you specify "
-#| "0.0.0.0, Citadel will listen on all addresses. You can usually skip this "
-#| "unless you are running multiple instances of Citadel on the same "
-#| "computer."
-msgid ""
-"Please specify the IP address which the server should be listening to. If "
-"you specify 0.0.0.0, the server will listen on all addresses."
-msgstr ""
-"Anna IP-osoite, jossa palvelinta ajetaan. Jos syötät 0.0.0.0 Citadel "
-"kuuntelee kaikkia osoitteita. Tämä voidaan normaalisti ohittaa, ellei "
-"samalla koneella ajeta useampia Citadel-instansseja."
+msgid "Please specify the IP address which the server should be listening to.
If you specify 0.0.0.0, the server will listen on all addresses."
+msgstr "Anna IP-osoite, jota palvelin kuuntelee. Jos syötät 0.0.0.0 palvelin
kuuntelee kaikkia osoitteita."
#. Type: string
#. Description
#: ../citadel-server.templates:1001
-msgid ""
-"This can usually be left to the default unless multiple instances of Citadel "
-"are running on the same computer."
-msgstr ""
+msgid "This can usually be left to the default unless multiple instances of
Citadel are running on the same computer."
+msgstr "Oletusarvoa voidaan yleensä käyttää, ellei samalla koneella ajeta
useampia Citadel-instansseja."
#. Type: boolean
#. Description
#: ../citadel-server.templates:2001
-#, fuzzy
-#| msgid "Enable external accounting mode?"
msgid "Enable external authentication mode?"
msgstr "Otetaanko ulkoinen tunnistautumistapa käyttöön?"
#. Type: boolean
#. Description
#: ../citadel-server.templates:2001
-msgid ""
-"Please choose the user authentication mode. By default Citadel will use its "
-"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
-"(or LDAP)."
-msgstr ""
+msgid "Please choose the user authentication mode. By default Citadel will use
its own internal user accounts database. If you accept this option, Citadel
users will have accounts on the host system, authenticated via /etc/passwd (or
LDAP)."
+msgstr "Valitse käyttäjien tunnistautumistapa. Oletuksena Citadel käyttää omaa
sisäistä käyttäjätunnustietokantaa. Jos tämä vaihtoehto valitaan,
Citadel-käyttäjille tehdään tunnukset isäntäkoneelle ja tunnistautuminen
tapahtuu tiedoston /etc/passwd (tai LDAP:n) avulla."
#. Type: boolean
#. Description
#: ../citadel-server.templates:2001
-msgid ""
-"Do not accept this option unless you are sure it is required, since changing "
-"back requires a full reinstall of Citadel."
-msgstr ""
+msgid "Do not accept this option unless you are sure it is required, since
changing back requires a full reinstall of Citadel."
+msgstr "Älä valitse tätä vaihtoehtoa, ellet ole varma, että sitä tarvitaan,
koska takaisin vaihtaminen vaatii, että Citadel asennetaan täysin uudelleen."
#. Type: string
#. Description
#: ../citadel-server.templates:3001
-#, fuzzy
-#| msgid "Citadel administrator:"
msgid "Citadel administrator username:"
-msgstr "Citadel-ylläpitäjä:"
+msgstr "Citadel-ylläpitäjän käyttäjätunnus:"
#. Type: string
#. Description
#: ../citadel-server.templates:3001
-#, fuzzy
-#| msgid ""
-#| "Enter the name of the Citadel administrator (which is probably you). When "
-#| "an account is created with this name, it will automatically be given "
-#| "administrator-level access."
-msgid ""
-"Please enter the name of the Citadel user account that should be granted "
-"administrative privileges once created."
-msgstr ""
-"Anna Citadel-ylläpitäjän nimi. Kun tämän niminen tunnus luodaan, sille "
-"annetaan automaattisesti ylläpitotason oikeudet."
-
-#, fuzzy
-#~| msgid ""
-#~| "Specify the way authentication is done, either host based or Citadel "
-#~| "internal. Host based accounting could be /etc/passwd or an LDAP "
-#~| "directory. WARNING: do not change this setting once your system is "
-#~| "installed. Answer \"no\" unless you completely understand this option."
-#~ msgid ""
-#~ "Specify the way authentication is done, either host based or Citadel "
-#~ "internal. Host based authentication could be /etc/passwd or an LDAP "
-#~ "directory. WARNING: do not change this setting once your system is "
-#~ "installed. Answer \"no\" unless you completely understand this option."
-#~ msgstr ""
-#~ "Valitse tapa, jolla tunnistautuminen tehdään: konekohtaisesti tai "
-#~ "Citadelin sisäisellä järjestelmällä. Konekohtainen tunnistautuminen voi "
-#~ "olla /etc/passwd tai LDAP-hakemisto. VAROITUS: Älä muuta tätä tätä "
-#~ "asetusta sen jälkeen, kun asennus on valmis. Älä valitse tätä, ellet "
-#~ "täysin ymmärrä valintaa."
-
-#~ msgid "Citadel/UX"
-#~ msgstr "Citadel/UX"
-
-#~ msgid ""
-#~ "For post configuring your Citadel Server, use citadel-webcit with your "
-#~ "browser, log in as the user you specified as the Administrator, and "
-#~ "review the Points under the Administration menu. If you have further "
-#~ "questions review www.citadel.org, especially the FAQ and Documentation "
-#~ "section."
-#~ msgstr ""
-#~ "Tehdäksesi Citadel-palvelimen asetuksia asennuksen jälkeen, käytä citadel-"
-#~ "webcitiä selaimellasi, kirjaudu ylläpitäjäksi määritetyllä "
-#~ "käyttäjätunnuksella ja käy läpi ylläpitovalikon kohdat. Lisätietoja "
-#~ "löytyy sivulta http://www.citadel.org, erityisesti osiosta FAQ and "
-#~ "Documentation."
+msgid "Please enter the name of the Citadel user account that should be
granted administrative privileges once created."
+msgstr "Anna Citadel-tunnus, jolle annetaan luotaessa ylläpito-oikeudet."
+
diff -u citadel-7.37/debian/po/fr.po citadel-7.37/debian/po/fr.po
--- citadel-7.37/debian/po/fr.po
+++ citadel-7.37/debian/po/fr.po
@@ -56,7 +56,7 @@
msgid ""
"Please choose the user authentication mode. By default Citadel will use its "
"own internal user accounts database. If you accept this option, Citadel "
-"users will have accounts on the host system, authenticated via /etc/passwd "
+"users will have accounts on the host system, authenticated via /etc/passwd "
"(or LDAP)."
msgstr ""
"Veuille choisir le mode d'authentification des utilisateurs. Par défaut, "
signature.asc
Description: Digital signature
