undo English changes

diff --git a/debian/control b/debian/control
index b34d44799687457e13f3f4f9a20ca19f39c1c4dd..5480815eaad37329711f690d9a43e4c4c69e7c2c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Build-Depends: xfonts-utils, pcf2bdf, debhelper (>=8), po-debconf
 Package: xfonts-traditional
 Architecture: all
 Depends: xfonts-utils, pcf2bdf, libsys-cpu-perl, ${misc:Depends}, ${perl:Depends}
 Package: xfonts-traditional
 Architecture: all
 Depends: xfonts-utils, pcf2bdf, libsys-cpu-perl, ${misc:Depends}, ${perl:Depends}

-Description: traditional fixed-width fonts for X
- This package provides "traditional" versions of fixed-width fonts.
+Description: Traditional fixed-width fonts for X
+ 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
  .
  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 @@ Description: traditional fixed-width fonts for X
   - traditional appearance of  W a
  .
  These changes make the fonts compatible with the US-ASCII character
   - traditional appearance of  W a
  .
  These changes make the fonts compatible with the US-ASCII character

- set, as UTF-8 is not compatible with ASCII in its usage of the
- backquote and some other characters.  With these fonts, pre-2000
+ set.  (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.
  .
  documents (including ASCII art and GNU manuals) will render
  correctly.
  .

- Optionally, this package will edit the system's configuration to make
+ Optionally, this package will edit your system configuration to make

  the default fonts used by xterm refer to the traditional font.
  .
  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
  rather, it automatically generates the required modified fonts for

- each relevant font that's installed.
+ each relevant font you have installed.)

diff --git a/debian/xfonts-traditional.templates b/debian/xfonts-traditional.templates
index bef8884edaf0d16cc50279a61b70efd844bfe617..d305cc9972ac9c4225722872f3e765613ed95a20 100644 (file)
--- a/debian/xfonts-traditional.templates
+++ b/debian/xfonts-traditional.templates
@@ -1,37 +1,28 @@
-# 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: xfonts-traditional/generate
 Type: boolean
 Default: true
 _Description: Generate traditional versions of fonts?
 Template: xfonts-traditional/generate
 Type: boolean
 Default: true
 _Description: Generate traditional versions of fonts?

- 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".
+ 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").

  .
  .

- But you may prefer just to have the tool installed and not to do this
- automatically.
+ But you may prefer not to do this automatically, and would rather
+ just have the tool installed.

 
 Template: xfonts-traditional/reconfigure-xterm
 Type: boolean
 Default: false
 
 Template: xfonts-traditional/reconfigure-xterm
 Type: boolean
 Default: false

-_Description: Configure xterm to use traditional font?
+_Description: Configure xterm to use traditional fonts?

  You can have the xterm default UTF-8 font changed to the traditional
  version.
  .
  You can have the xterm default UTF-8 font changed to the traditional
  version.
  .

- 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.
+ 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.)

  .
  .

- Alternatively, if you do not want to change the default, XTerm.trad
- will be created but not used.
+ Alternatively, if you do not want me to change the default, I will
+ generate the file XTerm.trad, but it will not be used.

  .
  To revert the change, simply change the key "*VT100.utf8Fonts.font"
  back from "-trad-..." to "-misc-...", or rename the old file back
  .
  To revert the change, simply change the key "*VT100.utf8Fonts.font"
  back from "-trad-..." to "-misc-...", or rename the old file back


@@ -41,27 +32,27 @@ Template: xfonts-traditional/remap-fixed
 Type: boolean
 Default: false
 _Description: Configure system to use traditional "fixed"?
 Type: boolean
 Default: false
 _Description: Configure system to use traditional "fixed"?

- The "fixed" font alias can be remapped to the traditional version.
+ I can remap the font alias "fixed" to the traditional version.

  .
  .

- 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.
+ 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.)

  .
  .

- Alternatively, if you do not want to change the default, xfonts-base-alias.trad
- will be created but not used.
+ 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.

  .
  .

- To revert the change, simply change the alias "fixed"
- back from "-trad-..." to "-misc-...", or rename the old file back
- into place.
+ To revert this 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
 
 Template: xfonts-traditional/confirm-break-remove
 Type: boolean
 Default: false

-_Description: Remove xfonts-traditional, breaking "fixed" and the X server?
- Removing xfonts-traditional would break the X server by removing "fixed".
+_Description: Remove xfonts-traditional, breaking "fixed" and your X server?
+ Removing xfonts-traditional would break your X server by removing "fixed".

  .
  You should not remove xfonts-traditional while "fixed" refers to one
  .
  You should not remove xfonts-traditional while "fixed" refers to one

- of its fonts.  You first need to check the differences between the
+ of its fonts.  You probably want to check the differences between the

  various /etc/X11/fonts/misc/xfonts-base.alias*, reconcile any changes,
  various /etc/X11/fonts/misc/xfonts-base.alias*, reconcile any changes,

- and then run "update-fonts-alias misc".
+ and then run "update-fonts-alias misc".  After that you can retry the
+ removal.