[Pkg-citadel-devel] Bug#494682: Bug#494682: Working on this bug
Thadeu Lima de Souza Cascardo
cascardo at minaslivre.org
Tue Aug 12 18:45:02 UTC 2008
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: meskes at jabber.org
> 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.
-------------- next part --------------
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 <cascardo at minaslivre.org> 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?en Sie die Authentifizierungsmethode f?utzer. Standardm?g "
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 <kozlov.y at gmail.com>, 2008.
msgid ""
msgstr ""
-"Project-Id-Version: citadel 7.33-2\n"
+"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: citadel at packages.debian.org\n"
"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 <kozlov.y at gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\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 <edu at iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish at lists.debian.org>\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, "
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/pkg-citadel-devel/attachments/20080812/38a37c66/attachment-0001.pgp
More information about the Pkg-citadel-devel
mailing list