[Pkg-nagios-changes] [SCM] Debian packaging of icinga-web branch, master, updated. debian/1.7.0-2-12-g8253475

[Markus Frosch]

The following commit has been merged in the master branch:
commit 8253475b9b438fc2d9aab74742c8f2ebd5b139b9
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Tue Jun 19 08:55:57 2012 +0200

    added partial update for l10n recommendations (Updates: #677843)

diff --git a/debian/control b/debian/control
index ed1687f..c0017df 100644
--- a/debian/control
+++ b/debian/control
@@ -38,15 +38,15 @@ Description: host and network monitoring system - modern web interface
   * web output: current status, notifications, problem history, log
     file, etc.
  .
- This package provides the new webinterface to view Icinga monitoring
+ This package provides the new web interface to view Icinga monitoring
  results and send commands to the Icinga Core. Host and service status,
  history, notifications and status maps are available to keep a check on
- the health of your network in real-time.
+ the health of your network in real time.
 
 Package: icinga-web-pnp
 Architecture: all
 Depends: icinga-web (= ${source:Version}), pnp4nagios, ${misc:Depends}
-Description: host and network monitoring system - modern web interface plugin for pnp4nagios
+Description: host and network monitoring system - PNP4Nagios web plugin
  Icinga is a modular monitoring framework for hosts, services, and
  networks, based on the Nagios project. It is designed to be easy to
  understand and modify to fit any need.
@@ -62,5 +62,6 @@ Description: host and network monitoring system - modern web interface plugin fo
   * web output: current status, notifications, problem history, log
     file, etc.
  .
- This package provides a plugin for Icinga new webinterface integrating
- pnp4nagios into the interface for accessing the pnp4nagio data directly.
+ This package provides a plugin for Icinga's new web interface,
+ integrating PNP4Nagios to provide direct access to its data.
+
diff --git a/debian/icinga-web.templates b/debian/icinga-web.templates
index 656583a..27ef931 100644
--- a/debian/icinga-web.templates
+++ b/debian/icinga-web.templates
@@ -1,9 +1,9 @@
 Template: icinga-web/httpd
 Type: multiselect
 Choices: apache2
-Default: apache2
-_Description: Apache servers to configure for icinga:
- Please select which Apache servers should be configured for icinga.
+__Default: apache2
+_Description: Apache servers to configure for Icinga:
+ Please select which Apache servers should be configured for Icinga.
  .
  If you would prefer to perform configuration manually, leave all
  servers unselected.
@@ -11,19 +11,19 @@ _Description: Apache servers to configure for icinga:
 Template: icinga-web/rootpassword
 Type: password
 _Description: Icinga new web administrative password:
- Please provide the password for the user "root" in the webinterface.
+ Please provide the password for the user "root" in Icinga's web interface.
  .
- This is password you need to access the webinterface with the
- default administrative user. After login you will be able
- to create new users and set permissions for the users.
+ This is the password you need to access the web interface with the
+ default administrative user. After login, you will be able
+ to create new users and set their permissions.
  .
- Please be aware that the password will be reset to this password
- after each run of the postinstall process.
+ Please be aware that the password will be reset to this value
+ each time the package is upgraded.
 
 Template: icinga-web/rootpassword-repeat
 Type: password
-_Description: Please re-enter the password:
- Please enter the same user password again to verify you have typed it
+_Description: Re-enter password to verify:
+ Please enter the same root password again to verify that you have typed it
  correctly.
 
 Template: icinga-web/rootpassword-mismatch
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 93fe7b5..13d5894 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: icinga-web\n"
 "Report-Msgid-Bugs-To: icinga-web at packages.debian.org\n"
-"POT-Creation-Date: 2012-06-14 18:10+0200\n"
+"POT-Creation-Date: 2012-06-19 08:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,20 +18,26 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. Type: multiselect
-#. Description
+#. Default
 #: ../icinga-web.templates:1001
-msgid "Apache servers to configure for icinga:"
+msgid "apache2"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../icinga-web.templates:1001
-msgid "Please select which Apache servers should be configured for icinga."
+#: ../icinga-web.templates:1002
+msgid "Apache servers to configure for Icinga:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../icinga-web.templates:1001
+#: ../icinga-web.templates:1002
+msgid "Please select which Apache servers should be configured for Icinga."
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../icinga-web.templates:1002
 msgid ""
 "If you would prefer to perform configuration manually, leave all servers "
 "unselected."
@@ -46,37 +52,38 @@ msgstr ""
 #. Type: password
 #. Description
 #: ../icinga-web.templates:2001
-msgid "Please provide the password for the user \"root\" in the webinterface."
+msgid ""
+"Please provide the password for the user \"root\" in Icinga's web interface."
 msgstr ""
 
 #. Type: password
 #. Description
 #: ../icinga-web.templates:2001
 msgid ""
-"This is password you need to access the webinterface with the default "
-"administrative user. After login you will be able to create new users and "
-"set permissions for the users."
+"This is the password you need to access the web interface with the default "
+"administrative user. After login, you will be able to create new users and "
+"set their permissions."
 msgstr ""
 
 #. Type: password
 #. Description
 #: ../icinga-web.templates:2001
 msgid ""
-"Please be aware that the password will be reset to this password after each "
-"run of the postinstall process."
+"Please be aware that the password will be reset to this value each time the "
+"package is upgraded."
 msgstr ""
 
 #. Type: password
 #. Description
 #: ../icinga-web.templates:3001
-msgid "Please re-enter the password:"
+msgid "Re-enter password to verify:"
 msgstr ""
 
 #. Type: password
 #. Description
 #: ../icinga-web.templates:3001
 msgid ""
-"Please enter the same user password again to verify you have typed it "
+"Please enter the same root password again to verify that you have typed it "
 "correctly."
 msgstr ""
 

-- 
Debian packaging of icinga-web