I found three minor errors in the debconf templates rewrite:

- a trailing space after "traditional" in one place (the trailing
space is at the end of a line). It triggers double spacing in the
displayed template when the quesiton is asked

- double spaces in the middle of sentences before "to" in two other
places.

Please find attached a modified patch fixing these issues. I'll also
send corrected translation files to the translation bug reports so
that these translations are not broken by these minor changes in
English texts, that shouldn't affect translated texts.

--- xfonts-traditional.old/debian/xfonts-traditional.templates  2012-02-02 
22:26:54.913955741 +0100
+++ xfonts-traditional/debian/xfonts-traditional.templates      2012-03-01 
07:47:37.478601591 +0100
@@ -1,59 +1,67 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-engl...@lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
 Template: xfonts-traditional/generate
 Type: boolean
 Default: true
 _Description: Generate traditional versions of fonts?
- xfonts-traditional can automatically generate traditional versions
- (with foundry "Trad" instead of "Misc" of all fonts for which it has
- an idea about the glyphs.  (Currently this is versions of 6x13, aka
- "fixed").
+ With xfonts-traditional it is possible to automatically generate
+ traditional versions (with foundry "Trad" instead of "Misc") of all
+ fonts where it is clear what needs to be done.  Currently this means
+ versions of 6x13, also known as "fixed".
  .
- But you may prefer not to do this automatically, and would rather
- just have the tool installed.
+ But you may prefer just to have the tool installed and not to do this
+ automatically.
 
 Template: xfonts-traditional/reconfigure-xterm
 Type: boolean
 Default: false
 _Description: Configure xterm to use traditional font?
- You can have the xterm default UTF-8 font changed to the traditional 
+ You can have the xterm default UTF-8 font changed to the traditional
  version.
  .
- If you approve, I will edit /etc/X11/app-default/XTerm for you, and
- save your old file as XTerm.backup.not-trad.  (Note that this is a
- conffile so you may get prompts from dpkg about it in the future.)
+ Choosing this option will modify /etc/X11/app-defaults/XTerm, preserving
+ the old file as XTerm.backup.not-trad.  As this is a configuration file,
+ you may get prompts from dpkg about it in the future.
  .
- Alternatively, if you do not want me to change the default, I will
- generate XTerm.trad for you to do what you like with.
+ Alternatively, if you do not want to change the default, XTerm.trad
+ will be created but not used.
  .
  To revert the change, simply change the key "*VT100.utf8Fonts.font"
- back from "-trad-..."  to "-misc-...", or rename the old file back
+ back from "-trad-..." to "-misc-...", or rename the old file back
  into place.
 
 Template: xfonts-traditional/remap-fixed
 Type: boolean
 Default: false
 _Description: Configure system to use traditional "fixed"?
- You can have the font alias "fixed" remapped to the traditional version.
+ The "fixed" font alias can be remapped to the traditional version.
  .
- If you approve, I will edit /etc/X11/fonts/misc/xfonts-base.alias for
- you, and save your old file as xfonts-base.alias.backup.not-trad.
- (Note that this is a conffile so you may get prompts from dpkg about
- it in the future.)
+ Choosing this option will modify /etc/X11/fonts/misc/xfonts-base.alias,
+ preserving the old file as xfonts-base.alias.backup.not-trad.  As this is
+ a configuration file, you may get prompts from dpkg about it in the
+ future.
  .
- Alternatively, if you do not want me to change the default, I will
- generate xfonts-base-alias.trad for you to do what you like with.
+ Alternatively, if you do not want to change the default, 
xfonts-base-alias.trad
+ will be created but not used.
  .
- To revert the change to the default, simply change the alias "fixed"
- back from "-trad-..."  to "-misc-...", or rename the old file back
+ To revert the change, simply change the alias "fixed"
+ back from "-trad-..." to "-misc-...", or rename the old file back
  into place.
 
 Template: xfonts-traditional/confirm-break-remove
 Type: boolean
 Default: false
-_Description: Remove anyway, breaking "fixed" and your X server?
- Removing xfonts-traditional would break your X server by removing "fixed".
+_Description: Remove xfonts-traditional, breaking "fixed" and the X server?
+ Removing xfonts-traditional would break the X server by removing "fixed".
  .
  You should not remove xfonts-traditional while "fixed" refers to one
- of its fonts.  You probably want to check the differences between the
+ of its fonts.  You first need to check the differences between the
  various /etc/X11/fonts/misc/xfonts-base.alias*, reconcile any changes,
- and then run "update-fonts-alias misc".  After that you can retry the
- removal.
+ and then run "update-fonts-alias misc".
--- xfonts-traditional.old/debian/control       2012-02-02 22:26:54.913955741 
+0100
+++ xfonts-traditional/debian/control   2012-02-14 06:53:43.205457928 +0100
@@ -8,8 +8,8 @@
 Package: xfonts-traditional
 Architecture: all
 Depends: xfonts-utils, pcf2bdf, libsys-cpu-perl, ${misc:Depends}, 
${perl:Depends}
-Description: Traditional fixed-width fonts for X
- Provides "traditional" versions of fixed-width fonts.
+Description: traditional fixed-width fonts for X
+ This package provides "traditional" versions of fixed-width fonts.
  .
  These are a set of 6x13 fonts (including "fixed"), with foundry name
  "trad" instead of "misc", with several glyphs replaced with earlier
@@ -22,14 +22,14 @@
   - traditional appearance of  W a
  .
  These changes make the fonts compatible with the US-ASCII character
- set.  (UTF-8 is not compatible with ASCII in its usage of the
- backquote and some other characters.)  With these fonts, pre-2000
+ set, as UTF-8 is not compatible with ASCII in its usage of the
+ backquote and some other characters.  With these fonts, pre-2000
  documents (including ASCII art and GNU manuals) will render
  correctly.
  .
- Optionally, this package will edit your system configuration to make
+ Optionally, this package will edit the system's configuration to make
  the default fonts used by xterm refer to the traditional font.
  .
- (This package does not actually contain the bulk of the font data;
+ This package does not actually contain the bulk of the font data;
  rather, it automatically generates the required modified fonts for
- each relevant font you have installed.)
+ each relevant font that's installed.
--- xfonts-traditional.old/debian/changelog     2012-02-02 22:26:54.913955741 
+0100
+++ xfonts-traditional/debian/changelog 2012-03-01 07:18:49.682003245 +0100
@@ -1,3 +1,17 @@
+xfonts-traditional (1.6) UNRELEASED; urgency=low
+
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+    english team as part of the Smith review project. Closes: #658416
+  * [Debconf translation updates]
+  * Debconf templates and debian/control reviewed by the debian-l10n-
+    english team as part of the Smith review project. Closes: #660965
+  * [Debconf translation updates]
+  * Polish (Michał Kułach).  Closes: #661479
+  * Russian (Yuri Kozlov).  Closes: #661718
+  * Danish (Joe Hansen).  Closes: #661742
+
+ -- Christian Perrier <bubu...@debian.org>  Thu, 23 Feb 2012 09:49:35 +0100
+
 xfonts-traditional (1.4) unstable; urgency=low
 
   * Add missing dependency on libsys-cpu-perl.  Closes: #657438.

Attachment: signature.asc
Description: Digital signature

Reply via email to