Quoting Christian PERRIER (bubulle@debian.org): > Dear Debian maintainer, > > On Tuesday, May 26, 2015, I notified you of the beginning of a review process > concerning debconf templates for neurodebian. > > The debian-l10n-english contributors have now reviewed these templates, > and the final proposed changes are attached to this update to the > original bug report. > > Please review the suggested changes, and if you have any > objections, let me know in the next 3 days. > > However, please try to avoid uploading neurodebian with these changes > right now. A typo has been discovered by a translator in the rewritten templates (dpg-reconfigure" instead of "dpkg-reconfigure).* Please find the modified patch attache dto this mail.
--- neurodebian.old/debian/neurodebian.templates 2015-05-21 21:14:37.627014717 +0200
+++ neurodebian/debian/neurodebian.templates 2015-06-23 14:57:27.128604119 +0200
@@ -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: neurodebian/title
Type: title
_Description: NeuroDebian APT repository installer
@@ -5,26 +14,30 @@
Template: neurodebian/enable
Type: boolean
Default: false
-_Description: Should NeuroDebian repository be enabled?
- NeuroDebian project provides a separate APT repository with backport
- builds of most recent releases of maintained software, datasets and
- some software not in Debian proper yet. Enabling this additional
- repository will make those packages available on your base system.
- .
- Note: although NeuroDebian team aims to assure robust and correct
- operation of provided packages, enabling this additional archive
- might compromise the integrity of your base system.
+_Description: Enable the NeuroDebian package repository?
+ The NeuroDebian project provides a separate APT repository with
+ software that is not available in Debian, including datasets and
+ backported new releases.
+ .
+ If you choose this option, these packages will be available for
+ installation and upgrades.
+ .
+ Even though these packages are closely maintained
+ by the NeuroDebian team, enabling this additional archive
+ may compromise the integrity of the system.
Template: neurodebian/release
Type: select
-Choices: auto, ${releases}
+__Choices: automatic, ${releases}
+Choices-C: auto, ${releases}
Default: auto
_Description: Release name of the base system:
- Specify for which Debian or Ubuntu release (e.g. wheezy or trusty).
+ Please specify the appropriate Debian or Ubuntu release codename
+ (for instance "stretch" or "trusty").
.
- If 'auto', Debian or Ubuntu release name will be '${release}' as
- deduced from the output of apt-cache policy. If the release of your
- system is not '${release}' -- please choose specific one which
+ If this is set to "automatic"', the release name is chosen according
+ to the output of "apt-cache policy". If the release name for this
+ system is not "${release}", you should choose the specific one which
matches best.
@@ -33,16 +46,16 @@
Choices: origin, best, custom, ${mirrors}
Default: best
_Description: NeuroDebian mirror to use:
- NeuroDebian project has a number of community-maintainer mirrors
+ The NeuroDebian project has a number of community-maintained mirrors
around the globe.
.
- If you do not know which mirror URL to choose, select among
+ If you do not know which mirror URL to choose, select one of:
.
- - origin: original NeuroDebian repository
- - best: will try to use netselect to select "closest" mirror.
- Depending on the configuration of the firewall, and actual mirror
- setup, might fail to select actually closest one. If netselect
- is not available, default mirror (possibly 'origin') will be used.
+ * origin: the original NeuroDebian repository;
+ * best: will try to use netselect to select the "closest" mirror.
+ This may fail depending on the current mirror setup and the
+ configuration of the firewall. If netselect is not available, the
+ default mirror will be used.
Template: neurodebian/flavor
@@ -50,69 +63,75 @@
Choices: auto, libre, full
Default: auto
_Description: NeuroDebian flavor to use:
- NeuroDebian project adheres to Debian Free Software Guidelines and
- has three areas of the archive in all suites/releases:
+ The NeuroDebian project adheres to the Debian Free Software Guidelines,
+ and offers three packages areas, classified by license, for all
+ suites/releases:
.
libre
- only the DFSG-compliant materials
+ DFSG-compliant material only
full
all three areas (main, contrib, non-free)
auto
- according to output of apt-cache policy '${flavor}' will be used.
- If that is not the flavor you need, select manually another one.
+ picked from the output of "apt-cache policy"
+ (for this machine: "${flavor}").
Template: neurodebian/components
Type: multiselect
Choices: software, data, devel
Default: software, data
_Description: NeuroDebian repository components to enable:
- NeuroDebian repository provides
+ NeuroDebian repository provides three different sets of packages:
.
software
- Packages containing software packages, often backports of stable
- software releases for previous Debian/Ubuntu releases
+ Packages containing software, often backports of stable software
+ releases for previous Debian/Ubuntu releases;
devel
- Additional "bleeding edge" software packages, which might not be a
- good fit for being enabled by default. (Similar to Debian
- experimental)
+ Additional "bleeding edge" software packages (like those in Debian
+ experimental), which it may not be safe to enable by default.
data
- Packages containing data (e.g. atlases, sample datasets), often
- required by software packages. Should generally be enabled.
+ Packages containing data (such as atlases or sample datasets), often
+ required by other packages. This should usually be enabled.
Template: neurodebian/overwrite
Type: boolean
Default: true
-_Description: Should existing NeuroDebian APT file be overridden?
- If not allowed, configuration would fail if there is
- an existing apt configuration file for the NeuroDebian.
+_Description: Overwrite the existing NeuroDebian APT file?
+ If an APT sources.list file already exists for NeuroDebian, this
+ package will fail to configure unless given permission to overwrite it.
Template: neurodebian/suffix
Type: string
Default:
_Description: Additional suffix for the NeuroDebian APT file name:
- For instance if you would like to enable additional repository
- (e.g. NeuroDebian devel) or release, without interfering with the
- main/default configuration file. Generally should be left empty.
+ Adding a suffix makes it possible to enable an additional repository
+ (such as NeuroDebian devel) or release, without interfering with the
+ main NeuroDebian sources list.
+ .
+ It should usually be left empty.
Template: neurodebian/run-update-note
Type: note
-_Description: APT list of packages needs to be updated
- For the installed (or removed) NeuroDebian APT configuration to take
- an effect, list of packages needs to be updated. This needs to be
- done "manually" (e.g., via apt-get update) upon completion of
- installation or reconfiguration of the neurodebian package.
+_Description: APT update required
+ For the installation (or removal) of a NeuroDebian sources.list file
+ to take effect, APT's packages list needs to be updated. Please
+ manually run "apt-get update" after the neurodebian package has been
+ installed or reconfigured.
Template: neurodebian/netselect-not-found
Type: error
-_Description: netselect tool was not found!
- Please install netselect tool first (apt-get install netselect) or
- choose a specific mirror.
+_Description: Missing netselect tool
+ The "netselect" utility was not found. You probably need to
+ install the netselect package.
+ .
+ Alternatively, you can manually select the mirror to use.
Template: neurodebian/netselect-cannot-be-used
Type: error
-_Description: netselect tool was not found (no other mirror)!
- Please install netselect tool first (apt-get install netselect)
- before installing/configuring this package, or run with a lower
- DEBIAN_PRIORITY to choose a specific mirror.
-
+_Description: Missing netselect tool
+ The "netselect" utility was not found. You probably need to
+ install the netselect package.
+ .
+ Unless this package is installed, the NeuroDebian mirror to use has
+ to be chosen manually. To be prompted with the relevant question, you
+ can run "dpkg-reconfigure -plow neurodebian".
--- neurodebian.old/debian/control 2015-05-21 21:14:37.627014717 +0200
+++ neurodebian/debian/control 2015-06-08 16:20:21.528826554 +0200
@@ -14,13 +14,13 @@
Depends: python, wget, neurodebian-archive-keyring, ${misc:Depends}
Recommends: netselect
Suggests: neurodebian-desktop, neurodebian-popularity-contest
-Description: turnkey platform for the neuroscience
- The NeuroDebian project integrates and maintain a variety of
- neuroscience-oriented (such as AFNI, FSL, PsychoPy, etc.) and many
- generic computational (such as condor, pandas, etc.) software projects
- within Debian.
+Description: neuroscience-oriented distribution - repository configuration
+ The NeuroDebian project integrates and maintains a variety of software
+ projects within Debian that are useful for neuroscience (such as AFNI,
+ FSL, PsychoPy, etc.) or generic computation (such as HTCondor,
+ pandas, etc.).
.
- This package enables NeuroDebian repository on top of the stock
+ This package enables the NeuroDebian repository on top of a standard
Debian or Ubuntu system.
@@ -29,8 +29,13 @@
Depends: ${misc:Depends}, devscripts, cowbuilder, neurodebian-archive-keyring
Recommends: python, zerofree, moreutils, time, ubuntu-keyring, debian-archive-keyring, apt-utils
Suggests: virtualbox-ose, virtualbox-ose-fuse
-Description: NeuroDebian development tools
- neuro.debian.net sphinx website sources and development tools used by
+Description: neuroscience-oriented distribution - development tools
+ The NeuroDebian project integrates and maintains a variety of software
+ projects within Debian that are useful for neuroscience (such as AFNI,
+ FSL, PsychoPy, etc.) or generic computation (such as HTCondor,
+ pandas, etc.).
+ .
+ This package provides sources and development tools used by
NeuroDebian to provide backports for a range of Debian/Ubuntu
releases.
@@ -40,10 +45,15 @@
Depends: ${misc:Depends}, ssh-askpass-gnome | ssh-askpass, desktop-base, gnome-icon-theme,
neurodebian-popularity-contest
Suggests:
-Description: neuroscience research environment
- This package contains NeuroDebian artwork (icons, background image)
- and a NeuroDebian menu featuring most popular neuroscience tools
- automatically installed upon initial invocation.
+Description: neuroscience-oriented distribution - desktop integration
+ The NeuroDebian project integrates and maintains a variety of software
+ projects within Debian that are useful for neuroscience (such as AFNI,
+ FSL, PsychoPy, etc.) or generic computation (such as HTCondor,
+ pandas, etc.).
+ .
+ This package provides NeuroDebian artwork (icons, background image)
+ and a NeuroDebian menu featuring the most popular neuroscience tools,
+ which will be automatically installed upon initial invocation.
Package: neurodebian-archive-keyring
@@ -51,29 +61,37 @@
Depends: ${misc:Depends}
Replaces: neurodebian-keyring (<< 0.34~)
Breaks: neurodebian-keyring (<< 0.34~)
-Description: GnuPG archive keys of the NeuroDebian archive
+Description: neuroscience-oriented distribution - GnuPG archive keys
+ The NeuroDebian project integrates and maintains a variety of software
+ projects within Debian that are useful for neuroscience (such as AFNI,
+ FSL, PsychoPy, etc.) or generic computation (such as HTCondor,
+ pandas, etc.).
+ .
The NeuroDebian project digitally signs its Release files. This package
contains the archive keys used for that.
Package: neurodebian-popularity-contest
Architecture: all
Depends: ${misc:Depends}, popularity-contest
-Description: Helper for NeuroDebian popularity contest submissions
+Description: neuroscience-oriented distribution - popcon integration
+ The NeuroDebian project integrates and maintains a variety of software
+ projects within Debian that are useful for neuroscience (such as AFNI,
+ FSL, PsychoPy, etc.) or generic computation (such as HTCondor,
+ pandas, etc.).
+ .
This package is a complement to the generic popularity-contest
package to enable anonymous submission of usage statistics to
NeuroDebian in addition to the popcon submissions to the underlying
- distribution (e.g. Debian or Ubuntu) popcon server.
+ distribution (either Debian or Ubuntu) popcon server.
.
- Your participation in popcon is important for following reasons:
- - Popular packages receive more attention from developers, bugs are
+ Participating in popcon is important for the following reasons:
+ * Popular packages receive more attention from developers; bugs are
fixed faster and updates are provided quicker.
- - Assure that we do not drop support for a previous release of Debian
- or Ubuntu while are active users.
- - User statistics could be used by upstream research software
- developers to acquire funding for continued development.
- .
- It has an effect only if you have decided to participate in the
- Popularity Contest of your distribution, i.e. Debian or Ubuntu.
- You can always enable or disable your participation in popcon by
- running 'dpkg-reconfigure popularity-contest' as root.
-
+ * It ensures that support is not dropped for a previous release of
+ Debian or Ubuntu while there are active users.
+ * User statistics may be useful for upstream research software
+ developers seeking funding for continued development.
+ .
+ This requires that popcon is activated for the underlying distribution
+ (Debian or Ubuntu), which can be achieved by running
+ "dpkg-reconfigure popularity-contest" as root.
--- neurodebian.old/debian/changelog 2015-05-21 21:14:37.627014717 +0200
+++ neurodebian/debian/changelog 2015-05-22 06:49:37.248270396 +0200
@@ -1,3 +1,11 @@
+neurodebian (0.35) UNRELEASED; urgency=low
+
+ * Debconf templates and debian/control reviewed by the debian-l10n-
+ english team as part of the Smith review project. Closes: #786448
+ * [Debconf translation updates]
+
+ -- Christian Perrier <bubulle@debian.org> Fri, 22 May 2015 06:49:37 +0200
+
neurodebian (0.34) unstable; urgency=medium
* Re-upload to Debian proper (Closes: #757279), addressing Debian
diff -Nru neurodebian.old/debian/po/templates.pot neurodebian/debian/po/templates.pot
--- neurodebian.old/debian/po/templates.pot 2015-05-21 21:14:37.627014717 +0200
+++ neurodebian/debian/po/templates.pot 2015-06-22 06:55:28.325606851 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: neurodebian\n"
"Report-Msgid-Bugs-To: neurodebian@packages.debian.org\n"
-"POT-Creation-Date: 2014-08-14 12:27-0400\n"
+"POT-Creation-Date: 2015-06-22 06:55+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,212 +19,241 @@
#. Type: title
#. Description
-#: ../neurodebian.templates:1001
+#: ../neurodebian.templates:2001
msgid "NeuroDebian APT repository installer"
msgstr ""
#. Type: boolean
#. Description
-#: ../neurodebian.templates:2001
-msgid "Should NeuroDebian repository be enabled?"
+#: ../neurodebian.templates:3001
+msgid "Enable the NeuroDebian package repository?"
msgstr ""
#. Type: boolean
#. Description
-#: ../neurodebian.templates:2001
+#: ../neurodebian.templates:3001
msgid ""
-"NeuroDebian project provides a separate APT repository with backport builds "
-"of most recent releases of maintained software, datasets and some software "
-"not in Debian proper yet. Enabling this additional repository will make "
-"those packages available on your base system."
+"The NeuroDebian project provides a separate APT repository with software "
+"that is not available in Debian, including datasets and backported new "
+"releases."
msgstr ""
#. Type: boolean
#. Description
-#: ../neurodebian.templates:2001
+#: ../neurodebian.templates:3001
msgid ""
-"Note: although NeuroDebian team aims to assure robust and correct operation "
-"of provided packages, enabling this additional archive might compromise the "
-"integrity of your base system."
+"If you choose this option, these packages will be available for installation "
+"and upgrades."
msgstr ""
-#. Type: select
+#. Type: boolean
#. Description
#: ../neurodebian.templates:3001
+msgid ""
+"Even though these packages are closely maintained by the NeuroDebian team, "
+"enabling this additional archive may compromise the integrity of the system."
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../neurodebian.templates:4001
+msgid "automatic"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../neurodebian.templates:4001
+msgid "${releases}"
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../neurodebian.templates:4002
msgid "Release name of the base system:"
msgstr ""
#. Type: select
#. Description
-#: ../neurodebian.templates:3001
-msgid "Specify for which Debian or Ubuntu release (e.g. wheezy or trusty)."
+#: ../neurodebian.templates:4002
+msgid ""
+"Please specify the appropriate Debian or Ubuntu release codename (for "
+"instance \"stretch\" or \"trusty\")."
msgstr ""
#. Type: select
#. Description
-#: ../neurodebian.templates:3001
+#: ../neurodebian.templates:4002
msgid ""
-"If 'auto', Debian or Ubuntu release name will be '${release}' as deduced "
-"from the output of apt-cache policy. If the release of your system is not "
-"'${release}' -- please choose specific one which matches best."
+"If this is set to \"automatic\"', the release name is chosen according to "
+"the output of \"apt-cache policy\". If the release name for this system is "
+"not \"${release}\", you should choose the specific one which matches best."
msgstr ""
#. Type: select
#. Description
-#: ../neurodebian.templates:4001
+#: ../neurodebian.templates:5001
msgid "NeuroDebian mirror to use:"
msgstr ""
#. Type: select
#. Description
-#: ../neurodebian.templates:4001
+#: ../neurodebian.templates:5001
msgid ""
-"NeuroDebian project has a number of community-maintainer mirrors around the "
-"globe."
+"The NeuroDebian project has a number of community-maintained mirrors around "
+"the globe."
msgstr ""
#. Type: select
#. Description
-#: ../neurodebian.templates:4001
-msgid "If you do not know which mirror URL to choose, select among"
+#: ../neurodebian.templates:5001
+msgid "If you do not know which mirror URL to choose, select one of:"
msgstr ""
#. Type: select
#. Description
-#: ../neurodebian.templates:4001
+#: ../neurodebian.templates:5001
msgid ""
-" - origin: original NeuroDebian repository\n"
-" - best: will try to use netselect to select \"closest\" mirror.\n"
-" Depending on the configuration of the firewall, and actual mirror\n"
-" setup, might fail to select actually closest one. If netselect\n"
-" is not available, default mirror (possibly 'origin') will be used."
+" * origin: the original NeuroDebian repository;\n"
+" * best: will try to use netselect to select the \"closest\" mirror.\n"
+" This may fail depending on the current mirror setup and the\n"
+" configuration of the firewall. If netselect is not available, the\n"
+" default mirror will be used."
msgstr ""
#. Type: select
#. Description
-#: ../neurodebian.templates:5001
+#: ../neurodebian.templates:6001
msgid "NeuroDebian flavor to use:"
msgstr ""
#. Type: select
#. Description
-#: ../neurodebian.templates:5001
+#: ../neurodebian.templates:6001
msgid ""
-"NeuroDebian project adheres to Debian Free Software Guidelines and has three "
-"areas of the archive in all suites/releases:"
+"The NeuroDebian project adheres to the Debian Free Software Guidelines, and "
+"offers three packages areas, classified by license, for all suites/releases:"
msgstr ""
#. Type: select
#. Description
-#: ../neurodebian.templates:5001
+#: ../neurodebian.templates:6001
msgid ""
" libre\n"
-" only the DFSG-compliant materials\n"
+" DFSG-compliant material only\n"
" full\n"
" all three areas (main, contrib, non-free)\n"
" auto\n"
-" according to output of apt-cache policy '${flavor}' will be used.\n"
-" If that is not the flavor you need, select manually another one."
+" picked from the output of \"apt-cache policy\"\n"
+" (for this machine: \"${flavor}\")."
msgstr ""
#. Type: multiselect
#. Description
-#: ../neurodebian.templates:6001
+#: ../neurodebian.templates:7001
msgid "NeuroDebian repository components to enable:"
msgstr ""
#. Type: multiselect
#. Description
-#: ../neurodebian.templates:6001
-msgid "NeuroDebian repository provides"
+#: ../neurodebian.templates:7001
+msgid "NeuroDebian repository provides three different sets of packages:"
msgstr ""
#. Type: multiselect
#. Description
-#: ../neurodebian.templates:6001
+#: ../neurodebian.templates:7001
msgid ""
" software\n"
-" Packages containing software packages, often backports of stable\n"
-" software releases for previous Debian/Ubuntu releases\n"
+" Packages containing software, often backports of stable software\n"
+" releases for previous Debian/Ubuntu releases;\n"
" devel\n"
-" Additional \"bleeding edge\" software packages, which might not be a\n"
-" good fit for being enabled by default. (Similar to Debian\n"
-" experimental)\n"
+" Additional \"bleeding edge\" software packages (like those in Debian\n"
+" experimental), which it may not be safe to enable by default.\n"
" data\n"
-" Packages containing data (e.g. atlases, sample datasets), often\n"
-" required by software packages. Should generally be enabled."
+" Packages containing data (such as atlases or sample datasets), often\n"
+" required by other packages. This should usually be enabled."
msgstr ""
#. Type: boolean
#. Description
-#: ../neurodebian.templates:7001
-msgid "Should existing NeuroDebian APT file be overridden?"
+#: ../neurodebian.templates:8001
+msgid "Overwrite the existing NeuroDebian APT file?"
msgstr ""
#. Type: boolean
#. Description
-#: ../neurodebian.templates:7001
+#: ../neurodebian.templates:8001
msgid ""
-"If not allowed, configuration would fail if there is an existing apt "
-"configuration file for the NeuroDebian."
+"If an APT sources.list file already exists for NeuroDebian, this package "
+"will fail to configure unless given permission to overwrite it."
msgstr ""
#. Type: string
#. Description
-#: ../neurodebian.templates:8001
+#: ../neurodebian.templates:9001
msgid "Additional suffix for the NeuroDebian APT file name:"
msgstr ""
#. Type: string
#. Description
-#: ../neurodebian.templates:8001
+#: ../neurodebian.templates:9001
msgid ""
-"For instance if you would like to enable additional repository (e.g. "
-"NeuroDebian devel) or release, without interfering with the main/default "
-"configuration file. Generally should be left empty."
+"Adding a suffix makes it possible to enable an additional repository (such "
+"as NeuroDebian devel) or release, without interfering with the main "
+"NeuroDebian sources list."
msgstr ""
-#. Type: note
+#. Type: string
#. Description
#: ../neurodebian.templates:9001
-msgid "APT list of packages needs to be updated"
+msgid "It should usually be left empty."
msgstr ""
#. Type: note
#. Description
-#: ../neurodebian.templates:9001
+#: ../neurodebian.templates:10001
+msgid "APT update required"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../neurodebian.templates:10001
msgid ""
-"For the installed (or removed) NeuroDebian APT configuration to take an "
-"effect, list of packages needs to be updated. This needs to be done "
-"\"manually\" (e.g., via apt-get update) upon completion of installation or "
-"reconfiguration of the neurodebian package."
+"For the installation (or removal) of a NeuroDebian sources.list file to take "
+"effect, APT's packages list needs to be updated. Please manually run \"apt-"
+"get update\" after the neurodebian package has been installed or "
+"reconfigured."
msgstr ""
#. Type: error
#. Description
-#: ../neurodebian.templates:10001
-msgid "netselect tool was not found!"
+#. Type: error
+#. Description
+#: ../neurodebian.templates:11001 ../neurodebian.templates:12001
+msgid "Missing netselect tool"
msgstr ""
#. Type: error
#. Description
-#: ../neurodebian.templates:10001
+#. Type: error
+#. Description
+#: ../neurodebian.templates:11001 ../neurodebian.templates:12001
msgid ""
-"Please install netselect tool first (apt-get install netselect) or choose a "
-"specific mirror."
+"The \"netselect\" utility was not found. You probably need to install the "
+"netselect package."
msgstr ""
#. Type: error
#. Description
#: ../neurodebian.templates:11001
-msgid "netselect tool was not found (no other mirror)!"
+msgid "Alternatively, you can manually select the mirror to use."
msgstr ""
#. Type: error
#. Description
-#: ../neurodebian.templates:11001
+#: ../neurodebian.templates:12001
msgid ""
-"Please install netselect tool first (apt-get install netselect) before "
-"installing/configuring this package, or run with a lower DEBIAN_PRIORITY to "
-"choose a specific mirror."
+"Unless this package is installed, the NeuroDebian mirror to use has to be "
+"chosen manually. To be prompted with the relevant question, you can run "
+"\"dpg-reconfigure -plow neurodebian\"."
msgstr ""
Attachment:
signature.asc
Description: Digital signature