[Pkg-citadel-devel] Bug#686027: [RFR] templates://citadel/{control, citadel-server.templates}

[Justin B Rye]

David Prévot wrote:
> Make template translatable by prepending "_" (the actual reason while
> I've spotted this package), and use of an article. Other member of the
> list may have other remarks and improvements to propose, thus this
> formal call for review.

Well, the citadel/LoginType template has a line with a comma splice,
and while I'm fixing that I'd rephrase slightly too:

> Please choose the user authentication mode. By default Citadel will use its
> own internal user accounts database. If you choose Host, Citadel users will
> have accounts on the host system, authenticated via /etc/passwd or a PAM
> source. LDAP chooses an RFC 2307 compliant directory server, the last option
> chooses the nonstandard MS Active Directory LDAP scheme.

I would suggest:

  Please choose the user authentication mode. By default Citadel will use its
  own internal user accounts database. If you choose "Host", Citadel users
  will have accounts on the host system, authenticated via /etc/passwd or a
  PAM source. "LDAP" means an RFC 2307 compliant directory server; "Active
  Directory" means the nonstandard Microsoft Active Directory LDAP scheme.

In the package description... well, it makes me wonder what an
"AJAX-style web interface" is if not actually an AJAX web interface,
but I don't see anything really worth the trouble of changing.
-- 
JBR	with qualifications in linguistics, experience as a Debian
	sysadmin, and probably no clue about this particular package
-------------- next part --------------
diff -ru citadel-8.14.orig/debian/citadel-server.templates citadel-8.14/debian/citadel-server.templates
--- citadel-8.14.orig/debian/citadel-server.templates	2012-08-27 19:59:34.000000000 +0100
+++ citadel-8.14/debian/citadel-server.templates	2012-08-27 20:20:48.204411510 +0100
@@ -14,10 +14,10 @@
 Default: Internal
 _Description: Authentication method to use:
  Please choose the user authentication mode. By default Citadel will use its
- own internal user accounts database. If you choose Host, Citadel users will
- have accounts on the host system, authenticated via /etc/passwd or a PAM
- source. LDAP chooses an RFC 2307 compliant directory server, the last option
- chooses the nonstandard MS Active Directory LDAP scheme.
+ own internal user accounts database. If you choose "Host", Citadel users
+ will have accounts on the host system, authenticated via /etc/passwd or a
+ PAM source. "LDAP" means an RFC 2307 compliant directory server; "Active
+ Directory" means the nonstandard Microsoft Active Directory LDAP scheme.
  .
  Do not change this option unless you are sure it is required, since
  changing back requires a full reinstall of Citadel.
@@ -75,8 +75,8 @@
 
 Template: citadel/Password_again
 Type: password
-Description: Repeat password for the administrator user:
+_Description: Repeat password for the administrator user:
 
 Template: citadel/BadUser
 Type: error
-Description: User does not exist.
+_Description: The user does not exist.
-------------- next part --------------
Template: citadel/ServerIPAddress
Type: string
Default: 0.0.0.0
_Description: Listening address for the Citadel server:
 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.
 .
 This can usually be left to the default unless multiple instances
 of Citadel are running on the same computer.

Template: citadel/LoginType
Type: select
__Choices: Internal, Host, LDAP, Active Directory
Default: Internal
_Description: Authentication method to use:
 Please choose the user authentication mode. By default Citadel will use its
 own internal user accounts database. If you choose "Host", Citadel users
 will have accounts on the host system, authenticated via /etc/passwd or a
 PAM source. "LDAP" means an RFC 2307 compliant directory server; "Active
 Directory" means the nonstandard Microsoft Active Directory LDAP scheme.
 .
 Do not change this option unless you are sure it is required, since
 changing back requires a full reinstall of Citadel.

Template: citadel/LDAPServer
Type: string
Default: 0.0.0.0
_Description: LDAP host:
 Please enter host name or IP address of your LDAP server.

Template: citadel/LDAPServerPort
Type: string
Default: 389
_Description: LDAP port number:
 Please enter the port number of your LDAP service (usually 389).

Template: citadel/LDAPBaseDN
Type: string
Default: dc=example,dc=com
_Description: LDAP base DN:
 Please enter the Base DN to search for authentication
 (for example: dc=example,dc=com).

Template: citadel/LDAPBindDN
Type: string
Default:
_Description: LDAP bind DN:
 Please enter the DN of an account to use for binding to the LDAP server
 for performing queries. The account does not require any other
 privileges. If your LDAP server allows anonymous queries, you can
 leave this blank.

Template: citadel/LDAPBindDNPassword
Type: string
Default: OpenSesame
_Description: LDAP bind password:
 If you entered a Bind DN in the previous question, you must now enter
 the password associated with that account. Otherwise, you can leave this
 blank.

Template: citadel/Administrator
Type: string
Default: admin
_Description: Citadel administrator username:
 Please enter the name of the Citadel user account that should be granted
 administrative privileges once created.
 If using internal authentication this user account will be created if it does
 not exist. For external authentication this user account has to exist.

Template: citadel/Password
Type: password
_Description: Administrator password:
 While not mandatory, it is highly recommended that you set a password
 for the administrator user.

Template: citadel/Password_again
Type: password
_Description: Repeat password for the administrator user:

Template: citadel/BadUser
Type: error
_Description: The user does not exist.