Reverted debconf template and translation changes.

diff --git a/debian/changelog b/debian/changelog
index 8f441cca302ebdc62a3de80409b543e68b38bdd6..df9e22703024277ba1458ba43a548e5f12244804 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ion3 (20070608-1) unstable; urgency=medium
+
+  * New upstream release - closes: #428118, #430370, #430815
+  * Applied patch by Nedko Arnaudov to fix an upstream bug that would
+    result in a crash when using single-byte character encodings
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Thu, 28 Jun 2007 01:00:01 +0100
+

 ion3 (20070506-2) unstable; urgency=low
 
   * Applied upstream version check to upgrades as well as first
 ion3 (20070506-2) unstable; urgency=low
 
   * Applied upstream version check to upgrades as well as first

diff --git a/debian/control b/debian/control
index 139a2df561e8e7a46ec3ac65ef5afbe37330d870..7d75d49a5c2f4ba696c21a1c6b2b1f3e858c8a0f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -20,14 +20,16 @@ Description: keyboard-friendly window manager with tiled windows
  easier. Flexible configuration is possible thanks to Lua, which is
  used as the configuration language.
  .
  easier. Flexible configuration is possible thanks to Lua, which is
  used as the configuration language.
  .

- There is also support for so-called 'floating workspaces' where
+ There is also support for so-called "floating workspaces" where

  windows are managed the conventional way, so that you can still run
  applications which do not fit very well into Ion's window management
  approach. A pwm3 binary is included which starts Ion with floating
  workspaces as the default, thus replacing the now obsolete PWM window
  manager.
  .
  windows are managed the conventional way, so that you can still run
  applications which do not fit very well into Ion's window management
  approach. A pwm3 binary is included which starts Ion with floating
  workspaces as the default, thus replacing the now obsolete PWM window
  manager.
  .

-  Homepage: http://iki.fi/tuomov/ion/
+ This is the current development branch of Ion.
+ .
+ Website: http://iki.fi/tuomov/ion/

 
 Package: ion3-dev
 Section: non-free/devel
 
 Package: ion3-dev
 Section: non-free/devel


@@ -36,7 +38,7 @@ Architecture: all
 Depends: libx11-dev, libsm-dev, lua5.1, gcc (>> 3)
 Description: ion3 development files
  This package contains the files necessary for building extension
 Depends: libx11-dev, libsm-dev, lua5.1, gcc (>> 3)
 Description: ion3 development files
  This package contains the files necessary for building extension

- modules to the Ion window manager.
+ modules to the window manager Ion.

 
 Package: ion3-doc
 Section: non-free/doc
 
 Package: ion3-doc
 Section: non-free/doc


@@ -44,6 +46,6 @@ Architecture: all
 Recommends: lynx | www-browser
 Suggests: doc-base, dwww | doc-central | dhelp
 Description: ion3 documentation
 Recommends: lynx | www-browser
 Suggests: doc-base, dwww | doc-central | dhelp
 Description: ion3 documentation

- This package contains the document 'Configuring and extending Ion3
- with Lua' which explains how to configure and extend the Ion window
- manager.
+ This package contains the document "Configuring and extending Ion3
+ with Lua" which explains how to configure and extend the window
+ manager Ion.

diff --git a/debian/ion3.templates b/debian/ion3.templates
index 348fe16eaf543da1d53f8b7de874301d1a67bbb8..7edf09f491fd2011999d0c0973da08b863c1fc26 100644 (file)
--- a/debian/ion3.templates
+++ b/debian/ion3.templates
@@ -1,31 +1,21 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# for an advice to debian-l10n-english@lists.debian.org
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-

 Template: ion3/acknowledge-outdated
 Type: boolean
 Default: false
 Template: ion3/acknowledge-outdated
 Type: boolean
 Default: false

-_Description: Do you understand that this version is not supported by the author?
+_Description: Do you understand this version is not supported by the author?

  The version of Ion3 you are installing (version ${version}) is not
  the latest version released by the author.
  .
  DO NOT send bug reports or questions to the author unless they apply
  The version of Ion3 you are installing (version ${version}) is not
  the latest version released by the author.
  .
  DO NOT send bug reports or questions to the author unless they apply

- to the latest version, available at:
+ to the latest version, available from:

   http://modeemi.fi/~tuomov/ion/download.html
  .
   http://modeemi.fi/~tuomov/ion/download.html
  .

- Otherwise, you should send any bug reports about this package to the
- Debian bug tracking system and any other questions to the Debian
- maintainer.
+ You should send any bug reports about this package to the Debian bug
+ tracking system and any other questions to the Debian maintainer.

 
 Template: ion3/acknowledge-maybe-outdated
 Type: boolean
 Default: false
 
 Template: ion3/acknowledge-maybe-outdated
 Type: boolean
 Default: false

-_Description: Do you understand that this version may not be supported by the author?
+_Description: Do you understand this version may not be supported by the author?

  The version of Ion3 you are installing (version ${version}) may not
  be the latest version released by the author.
  .
  The version of Ion3 you are installing (version ${version}) may not
  be the latest version released by the author.
  .


@@ -39,6 +29,6 @@ _Description: Do you understand that this version may not be supported by the au
 
 Template: ion3/did-not-acknowledge-outdated
 Type: error
 
 Template: ion3/did-not-acknowledge-outdated
 Type: error

-Description: Non-acknowledged installation of an old version
+Description: You did not acknowledge installation of an old version.

  You must acknowledge that the author does not support old versions
  and should not be contacted about them.
  You must acknowledge that the author does not support old versions
  and should not be contacted about them.

diff --git a/debian/po/de.po b/debian/po/de.po
deleted file mode 100644 (file)
index 291ec7f..0000000
--- a/debian/po/de.po
+++ /dev/null
@@ -1,74 +0,0 @@
-# German translation of ion3 templates
-# Helge Kreutzmann <debian@helgefjell.de>, 2007.
-# This file is distributed under the same license as the ion3 package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ion3\n"
-"Report-Msgid-Bugs-To: ben@decadent.org.uk\n"
-"POT-Creation-Date: 2007-06-28 00:31+0100\n"
-"PO-Revision-Date: 2007-06-26 19:08+0200\n"
-"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
-"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001
-msgid "Do you understand that this version is not supported by the author?"
-msgstr "Ist Ihnen klar, dass diese Version vom Autor nicht unterstützt wird?"
-
-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001
-msgid ""
-"The version of Ion3 you are installing (version ${version}) is not the "
-"latest version released by the author."
-msgstr ""
-"Version ${version} von Ion3, die Sie installieren, ist nicht die neuste, vom "
-"Autor veröffentlichte Version."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001 ../ion3.templates:3001
-msgid ""
-"DO NOT send bug reports or questions to the author unless they apply to the "
-"latest version, available at:\n"
-" http://modeemi.fi/~tuomov/ion/download.html"
-msgstr ""
-"Senden Sie KEINE Fehlerberichte oder Fragen zum Autor, es sei denn, diese "
-"treffen auch auf die neuste Version zu, die unter\n"
-" http://modeemi.fi/~tuomov/ion/download.htmlerhältlich ist."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001 ../ion3.templates:3001
-msgid ""
-"Otherwise, you should send any bug reports about this package to the Debian "
-"bug tracking system and any other questions to the Debian maintainer."
-msgstr ""
-"Andernfalls sollten Sie alle Fehlerberichte zu diesem Paket an die Debian-"
-"Fehlerdatenbank und andere Fragen an den Debian-Betreuer schicken."
-
-#. Type: boolean
-#. Description
-#: ../ion3.templates:3001
-msgid "Do you understand that this version may not be supported by the author?"
-msgstr ""
-"Ist Ihnen klar, dass diese Version vom Autor nicht unterstützt werden könnte?"
-
-#. Type: boolean
-#. Description
-#: ../ion3.templates:3001
-msgid ""
-"The version of Ion3 you are installing (version ${version}) may not be the "
-"latest version released by the author."
-msgstr ""
-"Version ${version} von Ion3, die Sie installieren, könnte nicht die neuste, "
-"vom Autor veröffentlichte Version sein."

diff --git a/debian/po/gl.po b/debian/po/gl.po
deleted file mode 100644 (file)
index 8e4bea5..0000000
--- a/debian/po/gl.po
+++ /dev/null
@@ -1,73 +0,0 @@
-# Galician translation of ion3's debconf templates
-# This file is distributed under the same license as the ion3 package.
-# Jacobo Tarrio <jtarrio@debian.org>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ion3\n"
-"Report-Msgid-Bugs-To: ben@decadent.org.uk\n"
-"POT-Creation-Date: 2007-06-28 00:31+0100\n"
-"PO-Revision-Date: 2007-06-26 19:21+0200\n"
-"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
-"Language-Team: Galician <proxecto@trasno.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001
-msgid "Do you understand that this version is not supported by the author?"
-msgstr "¿Comprende que esta versión non ten soporte do autor?"
-
-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001
-msgid ""
-"The version of Ion3 you are installing (version ${version}) is not the "
-"latest version released by the author."
-msgstr ""
-"A versión de Ion3 que está a instalar (a versión ${version}) non é a última "
-"versión publicada polo autor."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001 ../ion3.templates:3001
-msgid ""
-"DO NOT send bug reports or questions to the author unless they apply to the "
-"latest version, available at:\n"
-" http://modeemi.fi/~tuomov/ion/download.html"
-msgstr ""
-"NON envíe informes de erro ou preguntas ao autor a menos que teñan que ver "
-"coa última versión, que está dispoñible en:\n"
-" http://modeemi.fi/~tuomov/ion/download.html"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001 ../ion3.templates:3001
-msgid ""
-"Otherwise, you should send any bug reports about this package to the Debian "
-"bug tracking system and any other questions to the Debian maintainer."
-msgstr ""
-"Nos demáis casos, envíe os informes sobre erros neste paquete ao sistema de "
-"seguemento de erros de Debian, e as preguntas ao mantedor en Debian."
-
-#. Type: boolean
-#. Description
-#: ../ion3.templates:3001
-msgid "Do you understand that this version may not be supported by the author?"
-msgstr "¿Comprende que esta versión pode non ter soporte do autor?"
-
-#. Type: boolean
-#. Description
-#: ../ion3.templates:3001
-msgid ""
-"The version of Ion3 you are installing (version ${version}) may not be the "
-"latest version released by the author."
-msgstr ""
-"A versión de Ion3 que está a instalar (a versión ${version}) pode non ser a "
-"última versión publicada polo autor."

diff --git a/debian/po/pt.po b/debian/po/pt.po
deleted file mode 100644 (file)
index ce0108a..0000000
--- a/debian/po/pt.po
+++ /dev/null
@@ -1,93 +0,0 @@
-# Portuguese translations for ion package.
-# Copyright (C) 2007 Miguel Figueiredo
-# This file is distributed under the same license as the ion package.
-# Miguel Figueiredo <elmig@debianpt.org>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ion 3\n"
-"Report-Msgid-Bugs-To: ben@decadent.org.uk\n"
-"POT-Creation-Date: 2007-06-28 00:31+0100\n"
-"PO-Revision-Date: 2007-06-26 21:11+0100\n"
-"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
-"Language-Team: Portuguese <traduz@debianpt.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001
-msgid "Do you understand that this version is not supported by the author?"
-msgstr "Você compreendeu que esta versão não é suportada pelo autor?"
-
-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001
-msgid ""
-"The version of Ion3 you are installing (version ${version}) is not the "
-"latest version released by the author."
-msgstr ""
-"Esta versão, que está a instalar, do Ion3 (versão ${version}) não é a última "
-"versão lançada pelo autor."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001 ../ion3.templates:3001
-msgid ""
-"DO NOT send bug reports or questions to the author unless they apply to the "
-"latest version, available at:\n"
-" http://modeemi.fi/~tuomov/ion/download.html"
-msgstr ""
-"NÃO envie ao autor relatórios de bugs ou questões a menos que estas se "
-"apliquem à última versão, disponível em:\n"
-" http://modeemi.fi/~tuomov/ion/download.html"
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001 ../ion3.templates:3001
-msgid ""
-"Otherwise, you should send any bug reports about this package to the Debian "
-"bug tracking system and any other questions to the Debian maintainer."
-msgstr ""
-"Em vez disso, você deve enviar qualquer relatório de bug acerca deste pacote "
-"para o sistema Debian de seguimento de bugs (BTS) e quaisquer outras "
-"questões ao 'maintainer' Debian."
-
-#. Type: boolean
-#. Description
-#: ../ion3.templates:3001
-msgid "Do you understand that this version may not be supported by the author?"
-msgstr "Você compreendeu que esta versão pode não ser suportada pelo autor?"
-
-#. Type: boolean
-#. Description
-#: ../ion3.templates:3001
-msgid ""
-"The version of Ion3 you are installing (version ${version}) may not be the "
-"latest version released by the author."
-msgstr ""
-"Esta versão, que está a instalar, do Ion3 (versão ${version}) pode não ser a "
-"última versão lançada pelo autor."
-
-#~ msgid ""
-#~ "DO NOT send bug reports or questions to the author unless they apply to "
-#~ "the latest version, available from:\n"
-#~ " http://modeemi.fi/~tuomov/ion/download.html"
-#~ msgstr ""
-#~ "NÃO envie ao autor relatórios de bugs ou questões a menos que estas se "
-#~ "apliquem à última versão, disponível em:\n"
-#~ " http://modeemi.fi/~tuomov/ion/download.html"
-
-#~ msgid ""
-#~ "You should send any bug reports about this package to the Debian bug "
-#~ "tracking system and any other questions to the Debian maintainer."
-#~ msgstr ""
-#~ "Você deve enviar qualquer relatório de bug acerca deste pacote para o "
-#~ "sistema Debian de seguimento de bugs (BTS) e quaisquer outras questões ao "
-#~ "'maintainer' Debian."

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index e025be8a3e965a7468761229efaf31bde3609e41..3e204b0f08a2d1ea0bca6fb835a3b452b276bf9f 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: ben@decadent.org.uk\n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: ben@decadent.org.uk\n"

-"POT-Creation-Date: 2007-06-28 00:31+0100\n"
+"POT-Creation-Date: 2007-05-15 22:03+0100\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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -18,13 +18,13 @@ msgstr ""
 
 #. Type: boolean
 #. Description
 
 #. Type: boolean
 #. Description

-#: ../ion3.templates:2001
-msgid "Do you understand that this version is not supported by the author?"
+#: ../ion3.templates:1001
+msgid "Do you understand this version is not supported by the author?"

 msgstr ""
 
 #. Type: boolean
 #. Description
 msgstr ""
 
 #. Type: boolean
 #. Description

-#: ../ion3.templates:2001
+#: ../ion3.templates:1001

 msgid ""
 "The version of Ion3 you are installing (version ${version}) is not the "
 "latest version released by the author."
 msgid ""
 "The version of Ion3 you are installing (version ${version}) is not the "
 "latest version released by the author."


@@ -32,35 +32,48 @@ msgstr ""
 
 #. Type: boolean
 #. Description
 
 #. Type: boolean
 #. Description

-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001 ../ion3.templates:3001
+#: ../ion3.templates:1001

 msgid ""
 "DO NOT send bug reports or questions to the author unless they apply to the "
 msgid ""
 "DO NOT send bug reports or questions to the author unless they apply to the "

-"latest version, available at:\n"
+"latest version, available from:\n"

 " http://modeemi.fi/~tuomov/ion/download.html"
 msgstr ""
 
 #. Type: boolean
 #. Description
 " http://modeemi.fi/~tuomov/ion/download.html"
 msgstr ""
 
 #. Type: boolean
 #. Description

-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001 ../ion3.templates:3001
+#: ../ion3.templates:1001

 msgid ""
 msgid ""

-"Otherwise, you should send any bug reports about this package to the Debian "
-"bug tracking system and any other questions to the Debian maintainer."
+"You should send any bug reports about this package to the Debian bug "
+"tracking system and any other questions to the Debian maintainer."

 msgstr ""
 
 #. Type: boolean
 #. Description
 msgstr ""
 
 #. Type: boolean
 #. Description

-#: ../ion3.templates:3001
-msgid "Do you understand that this version may not be supported by the author?"
+#: ../ion3.templates:2001
+msgid "Do you understand this version may not be supported by the author?"

 msgstr ""
 
 #. Type: boolean
 #. Description
 msgstr ""
 
 #. Type: boolean
 #. Description

-#: ../ion3.templates:3001
+#: ../ion3.templates:2001

 msgid ""
 "The version of Ion3 you are installing (version ${version}) may not be the "
 "latest version released by the author."
 msgstr ""
 msgid ""
 "The version of Ion3 you are installing (version ${version}) may not be the "
 "latest version released by the author."
 msgstr ""

+
+#. Type: boolean
+#. Description
+#: ../ion3.templates:2001
+msgid ""
+"DO NOT send bug reports or questions to the author unless they apply to the "
+"latest version, available at:\n"
+" http://modeemi.fi/~tuomov/ion/download.html"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../ion3.templates:2001
+msgid ""
+"Otherwise, you should send any bug reports about this package to the Debian "
+"bug tracking system and any other questions to the Debian maintainer."
+msgstr ""

diff --git a/debian/po/vi.po b/debian/po/vi.po
deleted file mode 100644 (file)
index 4f90fb4..0000000
--- a/debian/po/vi.po
+++ /dev/null
@@ -1,74 +0,0 @@
-# Vietnamese translation for Ion3.
-# Copyright © 2007 Free Software Foundation, Inc.
-# Clytie Siddall <clytie@riverland.net.au>, 2007
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ion3\n"
-"Report-Msgid-Bugs-To: ben@decadent.org.uk\n"
-"POT-Creation-Date: 2007-06-28 00:31+0100\n"
-"PO-Revision-Date: 2007-06-27 14:43+0930\n"
-"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
-"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: LocFactoryEditor 1.6.4a5\n"
-
-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001
-msgid "Do you understand that this version is not supported by the author?"
-msgstr "Bạn có hiểu rằng phiên bản này không do tác giả hỗ trợ không?"
-
-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001
-msgid ""
-"The version of Ion3 you are installing (version ${version}) is not the "
-"latest version released by the author."
-msgstr ""
-"Phiên bản Ion3 bạn đang cài đặt (phiên bản ${version}) không phải là phiên "
-"bản mới nhất do tác giả phát hành."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001 ../ion3.templates:3001
-msgid ""
-"DO NOT send bug reports or questions to the author unless they apply to the "
-"latest version, available at:\n"
-" http://modeemi.fi/~tuomov/ion/download.html"
-msgstr ""
-"ĐỪNG gửi báo cáo lỗi hay câu hỏi cho tác giả nếu nó không áp dụng cho phiên "
-"bản mới nhất, công bố ở « http://modeemi.fi/~tuomov/ion/download.html »."
-
-#. Type: boolean
-#. Description
-#. Type: boolean
-#. Description
-#: ../ion3.templates:2001 ../ion3.templates:3001
-msgid ""
-"Otherwise, you should send any bug reports about this package to the Debian "
-"bug tracking system and any other questions to the Debian maintainer."
-msgstr ""
-"Không thì bạn nên gửi báo cáo lỗi nào về gói này cho Hệ thống Theo dõi Lỗi "
-"(BTS) Debian, và câu hỏi khác nào cho nhà duy trì Debian."
-
-#. Type: boolean
-#. Description
-#: ../ion3.templates:3001
-msgid "Do you understand that this version may not be supported by the author?"
-msgstr "Bạn có hiểu rằng phiên bản này có lẽ không do tác giả hỗ trợ không?"
-
-#. Type: boolean
-#. Description
-#: ../ion3.templates:3001
-msgid ""
-"The version of Ion3 you are installing (version ${version}) may not be the "
-"latest version released by the author."
-msgstr ""
-"Phiên bản Ion3 bạn đang cài đặt (phiên bản ${version}) có lẽ không phải là "
-"phiên bản mới nhất do tác giả phát hành."