[Pkg-nagios-changes] [pkg-nagios] r910 - nagios2/trunk/debian

[Sean Finney]

Author: seanius
Date: 2006-05-23 15:38:12 +0000 (Tue, 23 May 2006)
New Revision: 910

Modified:
   nagios2/trunk/debian/changelog
   nagios2/trunk/debian/nagios2-common.templates
Log:
christian perriers debconf suggestions

Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog	2006-05-23 14:58:46 UTC (rev 909)
+++ nagios2/trunk/debian/changelog	2006-05-23 15:38:12 UTC (rev 910)
@@ -14,6 +14,8 @@
   * include the needed function from the webapps-common httpd stub inline
     in the config script, as fresh installations may not have the file
     available (if using apt instead of dpkg, for example).  Closes: #353966.
+  * remove "do not translate" remark and incorporate Christian Perrier's
+    suggested modifications to the debconf templates (closes: #352771).
 
  -- Marc Haber <mh+debian-packages at zugschlus.de>  Tue, 23 May 2006 14:58:11 +0000
 

Modified: nagios2/trunk/debian/nagios2-common.templates
===================================================================
--- nagios2/trunk/debian/nagios2-common.templates	2006-05-23 14:58:46 UTC (rev 909)
+++ nagios2/trunk/debian/nagios2-common.templates	2006-05-23 15:38:12 UTC (rev 910)
@@ -1,13 +1,8 @@
-Template: nagios2/do-not-translate
-Type: note
-_Description: These templates are work in progress and will change a
- lot. Do not translate yet!
-
 Template: nagios2/httpd
 Type: multiselect
 _Choices: apache, apache-ssl, apache2
 _Default: apache2
-_Description: Please select apache servers to configure for nagios2
+_Description: Apache servers to configure for nagios2:
  Please select which apache servers should be configured for nagios2.
  .
  If you would prefer to perform configuration manually, leave all
@@ -15,8 +10,8 @@
 
 Template: nagios2/adminpassword
 Type: password
-_Description: Nagios web administration password?
- Please provide the password to be created with the "nagiosadmin" user
+_Description: Nagios web administration password:
+ Please provide the password to be created with the "nagiosadmin" user.
  .
  This is the username and password you will use to log in to your nagios
  installation after configuration is complete.  If you do not provide
@@ -24,7 +19,7 @@
 
 Template: nagios2/adminpassword-repeat
 Type: password
-_Description: Please retype the password.
+_Description: Password confirmation:
 
 Template: nagios2/adminpassword-mismatch
 Type: note
@@ -34,10 +29,10 @@
 Type: boolean
 _Default: false
 _Description: Enable support for nagios 1.x links in nagios2?
- Should the apache configuration for nagios2 provide compatibility
- with links from nagios 1.x?
+ Please choose whether the Apache configuration for nagios2 should
+ provide compatibility with links from nagios 1.x.
  .
  If you select this option, the apache configuration used for nagios
- will include directives to support URLs from nagios 1.x.  Warning:
- you should not choose this option if you still have nagios 1.x on your
+ will include directives to support URLs from nagios 1.x.
+ You should not choose this option if you still have nagios 1.x on your
  system, or unpredictable results may occur.