Bug#489754: please use Choices-C in templates where appropriate
tags 489754 + patch
thanks
I had a look at this, and believe this patch will implement the
proposed change. It will cause all translations to be rendered partly
outdated, and should probably be scheduled together with other changes
causing changes to the texts.
One such change being considered at the moment is the introduction of
a new profile (Roaming workstation). If it is being implemented, we
should implement this change too.
Index: debian/changelog
===================================================================
--- debian/changelog (revision 63898)
+++ debian/changelog (working copy)
@@ -8,6 +8,9 @@
* Adjust networked preseeding to enable TLS and certificate checking
in nslcd.
* Commit changes at the end of pre-pkgsel.
+ * Change profile options to use Choices-C for the string passed to
+ the scripts, and __Choices for the user visible strings, and
+ convert dash to space where it make sense (Closes: #489754).
[ Translations ]
* Update Italian (it) by Claudio Carboncini.
Index: debian/debian-edu-profile-udeb.templates
===================================================================
--- debian/debian-edu-profile-udeb.templates (revision 63786)
+++ debian/debian-edu-profile-udeb.templates (working copy)
@@ -5,16 +5,17 @@
Template: debian-edu-install/profile
Type: multiselect
-__Choices: Main-Server, Workstation, Thin-Client-Server, Standalone
+__Choices: Main Server, Workstation, Thin Client Server, Standalone
+Choices-C: Main-Server, Workstation, Thin-Client-Server, Standalone
_Description: Profile(s) to apply to this machine:
Profiles determine how the machine can be used out-of-the-box:
.
- - Main-Server: reserved for the Debian Edu server. It does not
+ - Main Server: reserved for the Debian Edu server. It does not
include any GUI (Graphical User Interface). There
should only be one such server on a Debian Edu
network.
- Workstation: for normal machines on the Debian Edu network.
- - Thin-Client-Server:
+ - Thin Client Server:
includes 'Workstation' and requires two network
cards.
- Standalone: for machines meant to be used outside the Debian Edu
@@ -24,19 +25,20 @@
Template: debian-edu-install/profile-expert
Type: multiselect
#flag:translate!:6
-#__Choices: Main-Server, Workstation, Thin-Client-Server, Standalone, Minimal, Sugar
-__Choices: Main-Server, Workstation, Thin-Client-Server, Standalone, Minimal
+#__Choices: Main Server, Workstation, Thin Client Server, Standalone, Minimal, Sugar
+__Choices: Main Server, Workstation, Thin Client Server, Standalone, Minimal
+Choices-C: Main-Server, Workstation, Thin-Client-Server, Standalone, Minimal
#flag:comment:3
## Translators, do not translate "Sugar"
_Description: Profile(s) to apply to this machine:
Profiles determine how the machine can be used out-of-the-box:
.
- - Main-Server: reserved for the Debian Edu server. It does not
+ - Main Server: reserved for the Debian Edu server. It does not
include any GUI (Graphical User Interface). There
should only be one such server on a Debian Edu
network.
- Workstation: for normal machines on the Debian Edu network.
- - Thin-Client-Server:
+ - Thin Client Server:
includes 'Workstation' and requires two network
cards.
- Standalone: for machines meant to be used outside the Debian Edu
@@ -108,15 +110,15 @@
Type: text
# Debian Edu main server menu entry for partman recipe.
#flag:translate!:2
-_Description: Debian Edu Main-Server
- Prepare partitions for Main-Server installation.
+_Description: Debian Edu Main Server
+ Prepare partitions for Main Server installation.
Template: debian-edu-install/text/partman-debian-edu-ltsp
Type: text
# Debian Edu ltsp server menu entry for partman recipe.
#flag:translate!:2
-_Description: Debian Edu Thin-Client-Server
- Prepare partitions for Thin-Client-Server installation.
+_Description: Debian Edu Thin Client Server
+ Prepare partitions for Thin Client Server installation.
Template: debian-edu-install/text/partman-debian-edu-workstation
Type: text
@@ -128,16 +130,16 @@
Template: debian-edu-install/text/partman-debian-edu-main+ltsp
Type: text
# Debian Edu combo main+ltsp menu entry for partman recipe.
-_Description: Debian Edu Main-Server and Thin-Client-Server
+_Description: Debian Edu Main Server and Thin Client Server
#flag:translate!:2
- Prepare partitions for Main-Server and Thin-Client-Server installation.
+ Prepare partitions for Main Server and Thin Client Server installation.
Template: debian-edu-install/text/partman-debian-edu-main+ws
Type: text
# Debian Edu combo main+ws menu entry for partman recipe.
#flag:translate!:2
-_Description: Debian Edu Main-Server and Workstation
- Prepare partitions for Debian Edu Main-Server and Workstation installation.
+_Description: Debian Edu Main Server and Workstation
+ Prepare partitions for Debian Edu Main Server and Workstation installation.
Template: debian-edu-install/text/partman-debian-edu-minimal
Type: text
Happy hacking,
--
Petter Reinholdtsen
Reply to: