prebaseconfig: new changes from Debian require merging

[Merge-o-Matic]

New changes from Debian require merging into Ubuntu.

Some, if not all, of this work has been done automatically;
however the changes should be reviewed before signing and
uploading.

The new source package, along with various patches to aid
your review are available at:

        http://people.ubuntu.com/~scott/ongoing-merge/prebaseconfig/

In particular see the REPORT file for details.

If this is the first time you have received one of these
bugs, or are just unsure what to do, see:

        http://people.ubuntu.com/~scott/ongoing-merge/README

 -- Your friendly neighbourhood Merge-O-Matic.

[Colin Watson (cjwatson)]

prebaseconfig (1.12ubuntu1) dapper; urgency=low

  * Resynchronise with Debian.

 -- Colin Watson <email address hidden> Tue, 15 Nov 2005 16:30:14 +0000

prebaseconfig (1.12) unstable; urgency=low

  [ Colin Watson ]
  * Reword reboot templates to avoid unnecessary Debian "branding", and
    incidentally make it a bit clearer why you need to remove the
    installation media.

  [ Joey Hess ]
  * Remove dbootstrap_settings creation and woody installation support.
  * Add a progress template for the save-debconf step, which is visible
    on slower hardware.

  * Updated translations:
    - Catalan (ca.po) by Guillem Jover
    - Czech (cs.po) by Miroslav Kure
    - Danish (da.po) by Claus Hindsgaul
    - German (de.po) by Holger Wansing
    - Greek, Modern (1453-) (el.po) by Greek Translation Team
    - Esperanto (eo.po) by Serge Leblanc
    - Spanish (es.po) by Javier Fernández-Sanguino Peña
    - Persian (fa.po) by Arash Bijanzadeh
    - French (fr.po) by Christian Perrier
    - Galician (gl.po) by Jacobo Tarrio
    - Italian (it.po) by Giuseppe Sacco
    - Japanese (ja.po) by Kenshi Muto
    - Kurdish (ku.po) by Erdal Ronahi
    - Lithuanian (lt.po) by Kęstutis Biliūnas
    - Macedonian (mk.po) by Georgi Stanojevski
    - Bokmål, Norwegian (nb.po) by Bjørn Steensrud
    - Dutch (nl.po) by Bart Cornelis
    - Polish (pl.po) by Bartosz Fenski
    - Portuguese (pt.po) by Miguel Figueiredo
    - Portuguese (Brazil) (pt_BR.po) by André Luís Lopes
    - Romanian (ro.po) by Eddy Petrisor
    - Russian (ru.po) by Yuri Kozlov
    - Slovak (sk.po) by Peter Mann
    - Slovenian (sl.po) by Jure Čuhalev
    - Ukrainian (uk.po) by Eugeniy Meshcheryakov
    - Vietnamese (vi.po) by Clytie Siddall
    - Wolof (wo.po) by Mouhamadou Mamoune Mbacke
    - Simplified Chinese (zh_CN.po) by Carlos Z.F. Liu

 -- Joey Hess <email address hidden> Mon, 26 Sep 2005 15:59:31 +0200

prebaseconfig (1.11) unstable; urgency=low

  * Updated translations:
    - Greek, Modern (1453-) (el.po) by Greek Translation Team
    - Estonian (et.po) by Siim Põder
    - Lithuanian (lt.po) by Kęstutis Biliūnas
    - Portuguese (pt.po) by Miguel Figueiredo
    - Romanian (ro.po) by Eddy Petrişor
    - Tagalog (tl.po) by Eric Pareja
    - Ukrainian (uk.po) by Eugeniy Meshcheryakov
    - Vietnamese (vi.po) by Clytie Siddall
    - Wolof (wo.po) by Mouhamadou Mamoune Mbacke
    - Xhosa (xh.po) by Canonical Ltd

 -- Joey Hess <email address hidden> Fri, 15 Jul 2005 17:03:03 +0300