[pkg-fso-commits] [SCM] Automatic Display Manager branch, master, updated. nodm/0.3-1-7-gc197411

[Joachim Breitner]

The following commit has been merged in the master branch:
commit 968e121b0eabe3fa5931da0102a6c141a4a369e8
Author: Christian Perrier <bubulle at debian.org>
Date:   Wed Apr 29 21:55:31 2009 +0200

    Debconf templates and debian/control review

diff --git a/debian/changelog b/debian/changelog
index 1f25583..5950cbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nodm (0.3-3) UNRELEASED; urgency=low
+
+  * Reviewed Debconf templates and debian/control (Closes: #525149)
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 29 Apr 2009 21:54:45 +0200
+
 nodm (0.3-2) unstable; urgency=low
 
   * Set the maintainer to be the pkg-fso list
diff --git a/debian/control b/debian/control
index 54a829a..7563c76 100644
--- a/debian/control
+++ b/debian/control
@@ -12,11 +12,7 @@ Package: nodm
 Architecture: any
 Depends: xinit, x11-common, xterm | x-terminal-emulator, ${shlibs:Depends}, ${misc:Depends}
 Conflicts: gdm, xdm, kdm, x-display-manager, zhone-session
-Description: Automatic Display Manager
- This packages prepares the system to automatically start an X session at
- system boot. It is targeted for devices like smartphones, but can be used
+Description: automatic display manager
+ This package prepares the system to automatically start an X session at
+ system boot. It is meant for devices like smartphones, but can be used on
  a regular computer as well, if the security implications are acceptable.
- .
- It should not be installed on a regular Debian system, as it would interfere
- with an installed display manager.
-
diff --git a/debian/nodm.templates b/debian/nodm.templates
index aac033e..e3c2d69 100644
--- a/debian/nodm.templates
+++ b/debian/nodm.templates
@@ -1,48 +1,67 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english at lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
 Template: nodm/enabled
 Type: boolean
 Default: false
 _Description: Start nodm on boot?
- nodm starts an X session for a user without asking for authentication.  While
- this is welcome for embedded or kiosks systems, it is a security problem in
- most other machines, so by default nodm is configured not to start.
+ Designed for embedded or kiosk systems, nodm starts an X session
+ for a user without asking for authentication. On regular
+ machines, this has security implications and is therefore disabled
+ by default.
  .
- If you need autologin on this machine, enable nodm.
+ You should enable nodm only if you need autologin on this machine.
 
 Template: nodm/user
 Type: string
 Default: root
 _Description: User to start a session for:
- Name of the user that will automatically be logged into X by nodm.
+ Please enter the login name of the user that will automatically be logged into X by nodm.
 
 Template: nodm/x_options
 Type: string
 Default: vt7 -nolisten tcp
+#flag:translate!:3
 _Description: Options for the X server:
- Options to pass to the X server when starting the session.
+ Please enter the options to pass to the X server when starting the session.
+ These options will be used in the NODM_X_OPTIONS variable in the command line used
+ by nodm to start the X session:
+ .
+ $NODM_XINIT $NODM_XSESSION -- $NODM_X_OPTIONS
 
 Template: nodm/min_session_time
 Type: string
 Default: 60
-_Description: Minimum time (in seconds) for a session to be considered ok:
+_Description: Minimum time (in seconds) for a session to be considered OK:
  If an X session will run for less than this time in seconds, nodm will wait an
- amount of time before restarting the session.  The waiting time will grow
+ amount of time before restarting the session. The waiting time will grow
  until a session lasts longer than this amount.
 
 Template: nodm/xinit
 Type: string
 Default: /usr/bin/xinit
+#flag:translate!:3
 _Description: xinit program to use:
- You can change this to use a different xinit program.
+ Please choose the name of the "xinit" program to use with nodm. This
+ name will be stored in the NODM_XINIT variable in the command line used
+ by nodm to start the X session:
  .
- nodm will start the X session with the command:
  $NODM_XINIT $NODM_XSESSION -- $NODM_X_OPTIONS
 
 Template: nodm/xsession
 Type: string
 Default: /etc/X11/Xsession
+#flag:translate!:3
 _Description: X session to use:
- You can change this to use a different X session script.
+ Please choose the name of the X session script to use with nodm. This
+ name will be stored in the NODM_XSESSION variable in the command line used
+ by nodm to start the X session:
  .
- nodm will start the X session with the command:
  $NODM_XINIT $NODM_XSESSION -- $NODM_X_OPTIONS
 

-- 
Automatic Display Manager