[SCM] live-build branch, debian, updated. debian/3.0_a37-1-26-g739cd67

Daniel Baumann daniel at debian.org
Mon Nov 14 11:49:20 UTC 2011 

The following commit has been merged in the debian branch:
commit ff334ed4d52f6c07c95ca151977878e5cf2fcac6
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Nov 14 12:07:10 2011 +0100

    Applying some of the suggestions from the reviewed template file from debian-l10n-english.

diff --git a/debian/live-build-cron.templates b/debian/live-build-cron.templates
index f088c3e..6575214 100644
--- a/debian/live-build-cron.templates
+++ b/debian/live-build-cron.templates
@@ -5,104 +5,111 @@ _Description: Debian Live - System Build Scripts (cron autobuilder)
 Template: live-build-cron/images-enable
 Type: boolean
 Default: false
-_Description: Enable images autobuild?
- Do you want to enable autobuild for images?
- .
- If unsure, use 'no' (default).
+_Description: Enable live image autobuilds?
+ Please choose whether live images should be built automatically.
 
 Template: live-build-cron/images-directory
 Type: string
-_Default: /srv/debian.net/live-cdimage
-_Description: What directory to put builds to?
- Enter the directory where the images should be stored in.
+Default: /srv/debian.net/live-cdimage
+_Description: Image destination directory:
+ Please specify the directory where live images should be stored.
 
 Template: live-build-cron/images-cron
 Type: string
-_Default: 0 0 * * *
-_Description: What directory to put builds to?
- Enter the cron times where the images should be build.
+Default: 0 0 * * *
+_Description: Cron expression for image builds:
+ Please specify the scheduling for the cron job defining when live images
+ should be built.
+ .
+ This defaults to: 0 0 * * *
 
 Template: live-build-cron/images-build
 Type: select
-_Choices: git, host, release
+Choices: git, host, release
 Default: host
-_Description: Which version of live-build to use?
- Select the version of live-build to use.
+_Description: Live-build version to use:
+ Please select the version of live-build to use.
  .
- If you choose git, the current version of live-build from git will be
- used. host will use the live-build from the host system, and release will
- use the last released version.
+ If you choose "git", the current version of live-build from git will be
+ used. If you choose "host", the live-build from the host system will be
+ used. Finally, "release" will use the last released version.
 
 Template: live-build-cron/images-daily-distributions
 Type: multiselect
-_Choices: squeeze, wheezy, sid
+Choices: squeeze, wheezy, sid
 Default: sid
-_Description: What distributions to build for daily images?
- Select the distributions you would like to build for daily-images.
+_Description: Daily image distribution(s):
+ Please select the distributions you would like to include for live images
+ daily-builds.
 
 Template: live-build-cron/images-daily-flavours
 Type: multiselect
-_Choices: standard, rescue, gnome-desktop, kde-desktop, lxde-desktop, xfce-desktop
+Choices: standard, rescue, gnome-desktop, kde-desktop, lxde-desktop, xfce-desktop
 Default: standard
-_Description: What flavours to build for daily images?
- Select the flavours you would like to build for daily-images.
+_Description: Daily image flavor(s):
+ Please select the flavors you would like to include for live images
+ daily-builds.
 
 Template: live-build-cron/images-weekly-distributions
 Type: multiselect
-_Choices: squeeze, wheezy, sid
+Choices: squeeze, wheezy, sid
 Default: wheezy
-_Description: What distributions to build for weekly images?
- Select the distributions you would like to build for weekly-images.
+_Description: Weekly image distribution(s):
+ Please select the distributions you would like to include for live images
+ weekly-builds.
 
 Template: live-build-cron/images-weekly-flavours
 Type: multiselect
-_Choices: standard, rescue, gnome-desktop, kde-desktop, lxde-desktop, xfce-desktop
+Choices: standard, rescue, gnome-desktop, kde-desktop, lxde-desktop, xfce-desktop
 Default: standard
-_Description: What flavours to build for weekly images?
- Select the flavours you would like to build for weekly-images.
+_Description: Weekly image flavor(s):
+ Please select the flavors you would like to include for live images
+ weekly-builds.
 
 Template: live-build-cron/images-monthly-distributions
 Type: multiselect
 _Choices: squeeze, wheezy, sid
 Default: squeeze
-_Description: What distributions to build for monthly images?
- Select the distributions you would like to build for monthly-images.
+_Description: Monthly image distribution(s):
+ Please select the distributions you would like to include for live images
+ monthly-builds.
 
 Template: live-build-cron/images-monthly-flavours
 Type: multiselect
 _Choices: standard, rescue, gnome-desktop, kde-desktop, lxde-desktop, xfce-desktop
 Default: standard
-_Description: What flavours to build for monthly images?
- Select the flavours you would like to build for monthly-images.
+_Description: Monthly image flavor(s):
+ Please select the flavors you would like to include for live images
+ monthly-builds.
 
 Template: live-build-cron/images-source
 Type: boolean
 Default: false
 _Description: Enable source for live-build-cron-images?
- Do you sources for live-build-cron-images?
 
 Template: live-build-cron/manual-enable
 Type: boolean
 Default: false
-_Description: Enable live-build-cron-manual?
- Do you want to enable live-build-cron-manual?
- .
- If unsure, use 'no' (default).
+_Description: Enable live-manual autobuilds?
+ Please choose whether the live-manual should be built automatically.
 
 Template: live-build-cron/manual-directory
 Type: string
 _Default: /srv/debian.net/live-manual
-_Description: What directory to put builds to?
- Enter the directory where the manual should be stored in.
+_Description: live-manual destination directory:
+ Please specify the directory where live-manual should be stored.
 
 Template: live-build-cron/manual-cron
 Type: string
-_Default: 0-59/10 * * * *
-_Description: What interval to use for the cron job?
- Enter the cron times where the manual should be build.
+Default: 0-59/10 * * * *
+ _Description: Cron expression for builds of live-manual:
+ Please specify the scheduling for the cron job defining when live-manual
+ should be built.
+ .
+ This defaults to: 0-59/10 * * * *
 
 Template: live-build-cron/manual-username
 Type: string
 _Default: live-build-cron-manual
-_Description: What useraccount to use to build the manual?
- Enter the name of the username.
+_Description: User account for builds of live-manual:
+ Please enter the username that should be used for builds of live-manual.
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 4406a85..88b8f82 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: live-build at packages.debian.org\n"
-"POT-Creation-Date: 2011-07-20 11:04+0200\n"
+"POT-Creation-Date: 2011-11-14 12:06+0100\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"
@@ -26,178 +26,163 @@ msgstr ""
 #. Type: boolean
 #. Description
 #: ../live-build-cron.templates:2001
-msgid "Enable images autobuild?"
+msgid "Enable live image autobuilds?"
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../live-build-cron.templates:2001
-msgid "Do you want to enable autobuild for images?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../live-build-cron.templates:2001 ../live-build-cron.templates:13001
-msgid "If unsure, use 'no' (default)."
+msgid "Please choose whether live images should be built automatically."
 msgstr ""
 
 #. Type: string
-#. Default
+#. Description
 #: ../live-build-cron.templates:3001
-msgid "/srv/debian.net/live-cdimage"
+msgid "Image destination directory:"
 msgstr ""
 
 #. Type: string
 #. Description
-#. Type: string
-#. Description
-#. Type: string
-#. Description
-#: ../live-build-cron.templates:3002 ../live-build-cron.templates:4002
-#: ../live-build-cron.templates:14002
-msgid "What directory to put builds to?"
+#: ../live-build-cron.templates:3001
+msgid "Please specify the directory where live images should be stored."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../live-build-cron.templates:3002
-msgid "Enter the directory where the images should be stored in."
+#: ../live-build-cron.templates:4001
+msgid "Cron expression for image builds:"
 msgstr ""
 
 #. Type: string
-#. Default
+#. Description
 #: ../live-build-cron.templates:4001
-msgid "0 0 * * *"
+msgid ""
+"Please specify the scheduling for the cron job defining when live images "
+"should be built."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../live-build-cron.templates:4002
-msgid "Enter the cron times where the images should be build."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../live-build-cron.templates:5001
-msgid "git, host, release"
+#: ../live-build-cron.templates:4001
+msgid "This defaults to: 0 0 * * *"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../live-build-cron.templates:5002
-msgid "Which version of live-build to use?"
+#: ../live-build-cron.templates:5001
+msgid "Live-build version to use:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../live-build-cron.templates:5002
-msgid "Select the version of live-build to use."
+#: ../live-build-cron.templates:5001
+msgid "Please select the version of live-build to use."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../live-build-cron.templates:5002
+#: ../live-build-cron.templates:5001
 msgid ""
-"If you choose git, the current version of live-build from git will be used. "
-"host will use the live-build from the host system, and release will use the "
-"last released version."
+"If you choose \"git\", the current version of live-build from git will be "
+"used. If you choose \"host\", the live-build from the host system will be "
+"used. Finally, \"release\" will use the last released version."
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#. Type: multiselect
-#. Choices
-#. Type: multiselect
-#. Choices
-#: ../live-build-cron.templates:6001 ../live-build-cron.templates:8001
-#: ../live-build-cron.templates:10001
-msgid "squeeze, wheezy, sid"
+#. Description
+#: ../live-build-cron.templates:6001
+msgid "Daily image distribution(s):"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../live-build-cron.templates:6002
-msgid "What distributions to build for daily images?"
+#: ../live-build-cron.templates:6001
+msgid ""
+"Please select the distributions you would like to include for live images "
+"daily-builds."
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../live-build-cron.templates:6002
-msgid "Select the distributions you would like to build for daily-images."
+#: ../live-build-cron.templates:7001
+msgid "Daily image flavor(s):"
 msgstr ""
 
 #. Type: multiselect
-#. Choices
-#. Type: multiselect
-#. Choices
-#. Type: multiselect
-#. Choices
-#: ../live-build-cron.templates:7001 ../live-build-cron.templates:9001
-#: ../live-build-cron.templates:11001
+#. Description
+#: ../live-build-cron.templates:7001
 msgid ""
-"standard, rescue, gnome-desktop, kde-desktop, lxde-desktop, xfce-desktop"
+"Please select the flavors you would like to include for live images daily-"
+"builds."
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../live-build-cron.templates:7002
-msgid "What flavours to build for daily images?"
+#: ../live-build-cron.templates:8001
+msgid "Weekly image distribution(s):"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../live-build-cron.templates:7002
-msgid "Select the flavours you would like to build for daily-images."
+#: ../live-build-cron.templates:8001
+msgid ""
+"Please select the distributions you would like to include for live images "
+"weekly-builds."
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../live-build-cron.templates:8002
-msgid "What distributions to build for weekly images?"
+#: ../live-build-cron.templates:9001
+msgid "Weekly image flavor(s):"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../live-build-cron.templates:8002
-msgid "Select the distributions you would like to build for weekly-images."
+#: ../live-build-cron.templates:9001
+msgid ""
+"Please select the flavors you would like to include for live images weekly-"
+"builds."
 msgstr ""
 
 #. Type: multiselect
-#. Description
-#: ../live-build-cron.templates:9002
-msgid "What flavours to build for weekly images?"
+#. Choices
+#: ../live-build-cron.templates:10001
+msgid "squeeze, wheezy, sid"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../live-build-cron.templates:9002
-msgid "Select the flavours you would like to build for weekly-images."
+#: ../live-build-cron.templates:10002
+msgid "Monthly image distribution(s):"
 msgstr ""
 
 #. Type: multiselect
 #. Description
 #: ../live-build-cron.templates:10002
-msgid "What distributions to build for monthly images?"
+msgid ""
+"Please select the distributions you would like to include for live images "
+"monthly-builds."
 msgstr ""
 
 #. Type: multiselect
-#. Description
-#: ../live-build-cron.templates:10002
-msgid "Select the distributions you would like to build for monthly-images."
+#. Choices
+#: ../live-build-cron.templates:11001
+msgid ""
+"standard, rescue, gnome-desktop, kde-desktop, lxde-desktop, xfce-desktop"
 msgstr ""
 
 #. Type: multiselect
 #. Description
 #: ../live-build-cron.templates:11002
-msgid "What flavours to build for monthly images?"
+msgid "Monthly image flavor(s):"
 msgstr ""
 
 #. Type: multiselect
 #. Description
 #: ../live-build-cron.templates:11002
-msgid "Select the flavours you would like to build for monthly-images."
+msgid ""
+"Please select the flavors you would like to include for live images monthly-"
+"builds."
 msgstr ""
 
 #. Type: boolean
@@ -208,20 +193,14 @@ msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../live-build-cron.templates:12001
-msgid "Do you sources for live-build-cron-images?"
-msgstr ""
-
-#. Type: boolean
-#. Description
 #: ../live-build-cron.templates:13001
-msgid "Enable live-build-cron-manual?"
+msgid "Enable live-manual autobuilds?"
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../live-build-cron.templates:13001
-msgid "Do you want to enable live-build-cron-manual?"
+msgid "Please choose whether the live-manual should be built automatically."
 msgstr ""
 
 #. Type: string
@@ -233,25 +212,13 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../live-build-cron.templates:14002
-msgid "Enter the directory where the manual should be stored in."
-msgstr ""
-
-#. Type: string
-#. Default
-#: ../live-build-cron.templates:15001
-msgid "0-59/10 * * * *"
+msgid "live-manual destination directory:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../live-build-cron.templates:15002
-msgid "What interval to use for the cron job?"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../live-build-cron.templates:15002
-msgid "Enter the cron times where the manual should be build."
+#: ../live-build-cron.templates:14002
+msgid "Please specify the directory where live-manual should be stored."
 msgstr ""
 
 #. Type: string
@@ -263,11 +230,12 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../live-build-cron.templates:16002
-msgid "What useraccount to use to build the manual?"
+msgid "User account for builds of live-manual:"
 msgstr ""
 
 #. Type: string
 #. Description
 #: ../live-build-cron.templates:16002
-msgid "Enter the name of the username."
+msgid ""
+"Please enter the username that should be used for builds of live-manual."
 msgstr ""

-- 
live-build

More information about the debian-live-changes mailing list