[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#643957: [RFR] templates://live-build/{live-build-cron.templates}



Christian PERRIER wrote:
>  _Description: Enable images autobuild?

I think you mean:
   _Description: Enable image autobuilds?

[...]
> + Please choose whether you want to enable autobuild for images.

Getting rid of second person and giving readers an alternative
phrasing in case they didn't understand the first:

    Please choose whether live-images should be built automatically.
 
>  Template: live-build-cron/images-directory
[...]
> +Default: /srv/debian.net/live-cdimage
> +_Description: Directory for live images build:

That could be just

   _Description: Image build directory:

> + Please enter the directory where the images should be stored in.
                                                                 ^^
It doesn't need both "where" and "in", and to keep the people who
worry about sentence-final prepostions quiet:

    Please specify the directory where live-images should be stored.

Also avoiding "enter the directory", and expanding "image" to
"live-image" wherever possible in long descriptions.
  
>  Template: live-build-cron/images-cron
[...]
> +Default: 0 0 * * *
> +_Description: Cron times entry for image builds:
> + Please enter cron times entry that will define times where the images
> + should be built.

Well, for a start it's a cron "expression", and if I'm defining all
six fields I can control dates as well as times.  And "where" is the
directory again.  Maybe:

   _Description: Cron expression for image builds:
    Please specify the scheduling for the cronjob defining when live-images
    should be built.
 
>  Template: live-build-cron/images-build
[...]
> +_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. If you choose "host", live-build wille be used from the host
> + system. Finally, "release" will use the last released version.

Nice except for
    used. If you choose "host", the live-build from the host system will be
    used.
(There was a typo anyway: s/wille/will/)
  
>  Template: live-build-cron/images-daily-distributions
[...]
> +_Description: Distribution(s) for built daily images:
> + Please select the distributions you would like to include on daily images.

   _Description: Daily image distribution(s):
    Please select the distributions you would like to include for live-images
    built daily.
  
>  Template: live-build-cron/images-daily-flavours
[...]
> +_Description: Daily images flavours:
> + Please select the flavours you would like to include on daily images.

en_USify (throughout):

   _Description: Daily image flavor(s):
    Please select the flavors you would like to include for live-images
    built daily.

(But watch out for the template names.)

[...]
>  Template: live-build-cron/manual-enable
[...]
>  _Description: Enable live-build-cron-manual?
> + Please choose whether you want to enable scheduled manual builds.

Automatic manual builds?  Oh, wait, maybe you mean manual in the nroff
sense?  No, it's interpretation #3: http://live.debian.net/manual.  So
long descriptions should always talk about "builds of the manual", or
whatever, not "manual builds".

Anyway, shouldn't this just be parallel to images-enable?

    Please choose whether the manual should be built automatically.
 
>  Template: live-build-cron/manual-cron
[...]
> +_Description: Cron times entry for manual builds:
> + Please enter cron times entry that will define times where the manual
> + should be built.

  _Description: Cron expression for manual builds:
   Please specify the scheduling for the cronjob defining when the manual
   should be built.
  
>  Template: live-build-cron/manual-username
> +_Description: User account to use for manual builds.
> + Please enter the username that should be sued for manual builds.

   _Description: User account for manual builds:
    Please enter the username that should be used for builds of the manual.

In the control file:
> +Description: Debian Live - system build scripts
> +Description: Debian Live - system build scripts - CGI frontend
> +Description: Debian Live - system build scripts - cron autobuilder

My only suggestion is that it could drop the first dash.
-- 
JBR	with qualifications in linguistics, experience as a Debian
	sysadmin, and probably no clue about this particular package
diff -ru live-build.orig/debian/control live-build/debian/control
--- live-build.orig/debian/control	2011-09-30 13:54:48.000000000 +0100
+++ live-build/debian/control	2011-10-01 18:17:52.477960866 +0100
@@ -20,25 +20,21 @@
  dosfstools, genisoimage, memtest86+ | memtest86, mtools, parted,
  squashfs-tools | mtd-tools, sudo | fakeroot, syslinux | grub,
  uuid-runtime, win32-loader
-Description: Debian Live - System Build Scripts
- live-build contains the scripts that build a Debian Live system image from a
+Description: Debian Live system build scripts
+ This package provides the scripts that build a Debian Live system image from a
  configuration directory.
 
 Package: live-build-cgi
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: apache2 | httpd
-Description: Debian Live - System Build Scripts (cgi frontend)
- live-build contains the scripts that build a Debian Live system image from a
- configuration directory.
- .
- This package contains the cgi frontend.
+Description: Debian Live system build scripts - CGI frontend
+ This package provides the CGI frontend for scripts that build a
+ Debian Live system image from a configuration directory.
 
 Package: live-build-cron
 Architecture: all
 Depends: ${misc:Depends}, live-build (= ${source:Version}), cron
-Description: Debian Live - System Build Scripts (cron autobuilder)
- live-build contains the scripts that build a Debian Live system image from a
- configuration directory.
- .
- This package contains the cron autobuilder.
+Description: Debian Live system build scripts - cron autobuilder
+ This package provides the cron autobuilder that builds a
+ Debian Live system image from a configuration directory.
diff -ru live-build.orig/debian/live-build-cron.templates live-build/debian/live-build-cron.templates
--- live-build.orig/debian/live-build-cron.templates	2011-09-30 13:54:48.000000000 +0100
+++ live-build/debian/live-build-cron.templates	2011-10-01 18:14:24.606290974 +0100
@@ -1,3 +1,12 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
 Template: live-build-cron/title
 Type: title
 _Description: Debian Live - System Build Scripts (cron autobuilder)
@@ -5,104 +14,107 @@
 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 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 build 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 cronjob defining when live-images
+ should be built.
 
 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
+ built daily.
 
 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 for live-images
+ built daily.
 
 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
+ built weekly.
 
 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
+ built weekly.
 
 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
+ built monthly.
 
 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
+ built monthly.
 
 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).
+ Please choose whether the 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: Manual build directory:
+ Please specify the directory where the 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 manual builds:
+ Please specify the scheduling for the cronjob defining when the manual
+ should be built.
 
 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 manual builds:
+ Please enter the username that should be used for builds of the manual.
# These templates have been reviewed by the debian-l10n-english
# team
#
# If modifications/additions/rewording are needed, please ask
# debian-l10n-english@lists.debian.org for advice.
#
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.

Template: live-build-cron/title
Type: title
_Description: Debian Live - System Build Scripts (cron autobuilder)

Template: live-build-cron/images-enable
Type: boolean
Default: false
_Description: Enable 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: Image build directory:
 Please specify the directory where live-images should be stored.

Template: live-build-cron/images-cron
Type: string
Default: 0 0 * * *
_Description: Cron expression for image builds:
 Please specify the scheduling for the cronjob defining when live-images
 should be built.

Template: live-build-cron/images-build
Type: select
Choices: git, host, release
Default: host
_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. 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
Default: sid
_Description: Daily image distribution(s):
 Please select the distributions you would like to include for live-images
 built daily.

Template: live-build-cron/images-daily-flavours
Type: multiselect
Choices: standard, rescue, gnome-desktop, kde-desktop, lxde-desktop, xfce-desktop
Default: standard
_Description: Daily image flavor(s):
 Please select the flavors you would like to include for for live-images
 built daily.

Template: live-build-cron/images-weekly-distributions
Type: multiselect
Choices: squeeze, wheezy, sid
Default: wheezy
_Description: Weekly image distribution(s):
 Please select the distributions you would like to include for live-images
 built weekly.

Template: live-build-cron/images-weekly-flavours
Type: multiselect
Choices: standard, rescue, gnome-desktop, kde-desktop, lxde-desktop, xfce-desktop
Default: standard
_Description: Weekly image flavor(s):
 Please select the flavors you would like to include for live-images
 built weekly.

Template: live-build-cron/images-monthly-distributions
Type: multiselect
_Choices: squeeze, wheezy, sid
Default: squeeze
_Description: Monthly image distribution(s):
 Please select the distributions you would like to include for live-images
 built monthly.

Template: live-build-cron/images-monthly-flavours
Type: multiselect
_Choices: standard, rescue, gnome-desktop, kde-desktop, lxde-desktop, xfce-desktop
Default: standard
_Description: Monthly image flavor(s):
 Please select the flavors you would like to include for live-images
 built monthly.

Template: live-build-cron/images-source
Type: boolean
Default: false
_Description: Enable source for live-build-cron-images?

Template: live-build-cron/manual-enable
Type: boolean
Default: false
_Description: Enable live-build-cron-manual?
 Please choose whether the manual should be built automatically.

Template: live-build-cron/manual-directory
Type: string
_Default: /srv/debian.net/live-manual
_Description: Manual build directory:
 Please specify the directory where the manual should be stored.

Template: live-build-cron/manual-cron
Type: string
Default: 0-59/10 * * * *
 _Description: Cron expression for manual builds:
 Please specify the scheduling for the cronjob defining when the manual
 should be built.

Template: live-build-cron/manual-username
Type: string
_Default: live-build-cron-manual
_Description: User account for manual builds:
 Please enter the username that should be used for builds of the manual.
Source: live-build
Section: misc
Priority: optional
Maintainer: Debian Live Project <debian-live@lists.debian.org>
Uploaders: Daniel Baumann <daniel@debian.org>
Build-Depends: debhelper (>= 8)
Build-Depends-Indep: gettext
Standards-Version: 3.9.2
Homepage: http://live.debian.net/devel/live-build/
Vcs-Browser: http://live.debian.net/gitweb/?p=live-build.git
Vcs-Git: git://live.debian.net/git/live-build.git

Package: live-build
Architecture: all
Depends: ${misc:Depends}, debootstrap | cdebootstrap | cdebootstrap-static
Recommends:
 live-boot-doc, live-config-doc, live-manual-html | live-manual, cpio,
 gettext-base, gnu-fdisk
Suggests:
 dosfstools, genisoimage, memtest86+ | memtest86, mtools, parted,
 squashfs-tools | mtd-tools, sudo | fakeroot, syslinux | grub,
 uuid-runtime, win32-loader
Description: Debian Live system build scripts
 This package provides the scripts that build a Debian Live system image from a
 configuration directory.

Package: live-build-cgi
Architecture: all
Depends: ${misc:Depends}
Recommends: apache2 | httpd
Description: Debian Live system build scripts - CGI frontend
 This package provides the CGI frontend for scripts that build a
 Debian Live system image from a configuration directory.

Package: live-build-cron
Architecture: all
Depends: ${misc:Depends}, live-build (= ${source:Version}), cron
Description: Debian Live system build scripts - cron autobuilder
 This package provides the cron autobuilder that builds a
 Debian Live system image from a configuration directory.

Reply to: