Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package nvidia-support
* debconf templates reviewd by d-l-english@
* translation updates
debdiff ...+1 ...+2 | filterdiff -x '*.po*'
is attached.
unblock nvidia-support/20120630+2
Andreas
diffstat for nvidia-support-20120630+1 nvidia-support-20120630+2
changelog | 21 +++
nvidia-installer-cleanup.templates | 32 ++---
nvidia-support.templates | 32 ++---
po/cs.po | 170 +++++++++++++++++++------------
po/da.po | 181 ++++++++++++++++++++-------------
po/de.po | 184 +++++++++++++++++++++-------------
po/es.po | 198 ++++++++++++++++++++++---------------
po/fi.po | 150 +++++++++++++++++++---------
po/fr.po | 171 +++++++++++++++++++++++--------
po/it.po | 176 ++++++++++++++++++++------------
po/ja.po | 150 +++++++++++++++++++---------
po/nl.po | 169 +++++++++++++++++++++++--------
po/pl.po | 176 ++++++++++++++++++++------------
po/pt.po | 196 ++++++++++++++++++++++--------------
po/ru.po | 172 +++++++++++++++++++-------------
po/sk.po | 165 +++++++++++++++++++-----------
po/sv.po | 171 +++++++++++++++++++------------
po/templates.pot | 121 ++++++++++++++--------
po/zh_CN.po | 160 ++++++++++++++++++-----------
19 files changed, 1799 insertions(+), 996 deletions(-)
diff -Nru nvidia-support-20120630+1/debian/changelog nvidia-support-20120630+2/debian/changelog
--- nvidia-support-20120630+1/debian/changelog 2012-06-30 18:00:28.000000000 +0200
+++ nvidia-support-20120630+2/debian/changelog 2012-08-01 10:44:11.000000000 +0200
@@ -1,3 +1,24 @@
+nvidia-support (20120630+2) unstable; urgency=low
+
+ [ Andreas Beckmann ]
+ * Debconf templates reviewed by debian-l10n-english@.
+ * Turn some 'note' templates into 'error' templates.
+
+ [ Debconf translations ]
+ * Chinese (zh_CN): YunQiang Su (Closes: #683468)
+ * Czech (cs): Michal Šimůnek (Closes: #683072)
+ * Danish (da): Joe Hansen (Closes: #682356)
+ * German (de): Chris Leick (Closes: #682860)
+ * Italian (it): Dario Santamaria (Closes: #683330)
+ * Polish (pl): Michał Kułach (Closes: #682386)
+ * Portuguese (pt): Miguel Figueiredo (Closes: #683055)
+ * Russian (ru): Yuri Kozlov (Closes: #682556)
+ * Slovak (sk): Ivan Masár (Closes: #682783)
+ * Spanish (es): Norman Garcia Aguilar(Closes: #683362)
+ * Swedish (sv): Martin Bagge (Closes: #682566)
+
+ -- Andreas Beckmann <deb...@abeckmann.de> Wed, 01 Aug 2012 10:44:11 +0200
+
nvidia-support (20120630+1) unstable; urgency=low
* Add kmod as preferred alternative to module-init-tools.
diff -Nru nvidia-support-20120630+1/debian/nvidia-installer-cleanup.templates nvidia-support-20120630+2/debian/nvidia-installer-cleanup.templates
--- nvidia-support-20120630+1/debian/nvidia-installer-cleanup.templates 2012-02-15 13:33:52.000000000 +0100
+++ nvidia-support-20120630+2/debian/nvidia-installer-cleanup.templates 2012-07-19 15:52:17.000000000 +0200
@@ -1,23 +1,23 @@
Template: nvidia-installer-cleanup/uninstall-nvidia-installer
Type: boolean
Default: true
-_Description: Run 'nvidia-installer --uninstall'?
- The 'nvidia-installer' program was found on your system. This is
- probably left over from an earlier installation of the non-free NVIDIA
- graphics driver, installed using the NVIDIA *.run file directly. This
- installation is incompatible with the Debian packages. To install the
+_Description: Run "nvidia-installer --uninstall"?
+ The nvidia-installer program was found on this system. This is
+ probably left over from an earlier installation of the non-free Nvidia
+ graphics driver, installed using the Nvidia *.run file directly. This
+ installation is incompatible with the Debian packages. To install the
Debian packages safely, it is therefore necessary to undo the changes
- performed by 'nvidia-installer'.
+ performed by nvidia-installer.
Template: nvidia-installer-cleanup/delete-nvidia-installer
Type: boolean
Default: true
-_Description: Delete 'nvidia-installer' files?
- Some files from the 'nvidia-installer' still remain on your system.
- These probably come from an earlier installation of the non-free NVIDIA
- graphics driver using the *.run file directly. Running the
- uninstallation procedure may have failed and left these behind. These
- files conflict with the packages providing the non-free NVIDIA graphics
+_Description: Delete nvidia-installer files?
+ Some files from the nvidia-installer program still remain on this system.
+ These probably come from an earlier installation of the non-free Nvidia
+ graphics driver using the *.run file directly. Running the
+ uninstallation procedure may have failed and left these behind. These
+ files conflict with the packages providing the non-free Nvidia graphics
driver and must be removed before the package installation can continue.
Template: nvidia-installer-cleanup/remove-conflicting-libraries
@@ -25,11 +25,11 @@
Default: true
#flag:translate!:3
_Description: Remove conflicting library files?
- The following libraries were found on your system and conflict with
- the current installation of the NVIDIA graphics drivers:
+ The following libraries were found on this system and conflict with
+ the current installation of the Nvidia graphics drivers:
.
${conflict-libs}
.
These libraries are most likely remnants of an old installation using the
- nvidia-installer and do not belong to any package managed by dpkg. It
- should be safe to delete them.
+ nvidia-installer program and do not belong to any package managed by dpkg.
+ It should be safe to delete them.
diff -Nru nvidia-support-20120630+1/debian/nvidia-support.templates nvidia-support-20120630+2/debian/nvidia-support.templates
--- nvidia-support-20120630+1/debian/nvidia-support.templates 2012-06-30 16:04:55.000000000 +0200
+++ nvidia-support-20120630+2/debian/nvidia-support.templates 2012-08-01 10:39:20.000000000 +0200
@@ -13,34 +13,34 @@
warn only once for each version.
Template: nvidia-support/warn-mismatching-module-version
-Type: note
-# Translators, do not translate the substitution variables (${new-version},
-# ${running-version}) and the command 'rmmod nvidia'.
+Type: error
_Description: Mismatching nvidia kernel module loaded
- The nvidia driver that is being installed (version ${new-version})
+ The Nvidia driver that is being installed (version ${new-version})
does not match the nvidia kernel module currently loaded
(version ${running-version}).
.
- The X server, OpenGL or GPGPU applications may not work properly.
+ The X server, OpenGL, and GPGPU applications may not work properly.
.
- The easiest way to 'fix' this is to reboot the machine once the
- installation has finished. You can also stop the X server (usually by
- stopping the login manager, e.g. gdm3, kdm or xdm), manually unload the
- module (rmmod nvidia) and restart the X server.
+ The easiest way to fix this is to reboot the machine once the
+ installation has finished. You can also stop the X server (usually by
+ stopping the login manager, e.g. gdm3, kdm, or xdm), manually unload the
+ module ("rmmod nvidia"), and restart the X server.
Template: nvidia-support/warn-nouveau-module-loaded
-Type: note
+Type: error
_Description: Conflicting nouveau kernel module loaded
- The free 'nouveau' kernel module is currently loaded and conflicts with the
- non-free 'nvidia' kernel module.
+ The free nouveau kernel module is currently loaded and conflicts with the
+ non-free nvidia kernel module.
.
The easiest way to fix this is to reboot the machine once the
installation has finished.
Template: nvidia-support/needs-xorg-conf-to-enable
Type: note
-Description: Manual configuration required to enable nvidia driver
- The nvidia driver is not yet configured.
+_Description: Manual configuration required to enable Nvidia driver
+ The Nvidia driver is not yet configured; it needs to be enabled in
+ xorg.conf before it can be used.
+ .
Please see the package documentation for instructions.
Template: nvidia-support/check-xorg-conf-on-removal
@@ -51,9 +51,9 @@
enabled in xorg.conf(.d/) when removing the package.
Template: nvidia-support/removed-but-enabled-in-xorg-conf
-Type: note
+Type: error
#flag:translate!:3
-Description: Nvidia driver is still enabled in xorg.conf
+_Description: Nvidia driver is still enabled in xorg.conf
The Nvidia driver was just removed, but it is still enabled in the
Xorg configuration. X cannot be (re-)started successfully until Nvidia
is disabled in the following config file(s):
diff -Nru nvidia-support-20120630+1/debian/po/cs.po nvidia-support-20120630+2/debian/po/cs.po
diff -Nru nvidia-support-20120630+1/debian/po/da.po nvidia-support-20120630+2/debian/po/da.po
diff -Nru nvidia-support-20120630+1/debian/po/de.po nvidia-support-20120630+2/debian/po/de.po
diff -Nru nvidia-support-20120630+1/debian/po/es.po nvidia-support-20120630+2/debian/po/es.po
diff -Nru nvidia-support-20120630+1/debian/po/fi.po nvidia-support-20120630+2/debian/po/fi.po
diff -Nru nvidia-support-20120630+1/debian/po/fr.po nvidia-support-20120630+2/debian/po/fr.po
diff -Nru nvidia-support-20120630+1/debian/po/it.po nvidia-support-20120630+2/debian/po/it.po
diff -Nru nvidia-support-20120630+1/debian/po/ja.po nvidia-support-20120630+2/debian/po/ja.po
diff -Nru nvidia-support-20120630+1/debian/po/nl.po nvidia-support-20120630+2/debian/po/nl.po
diff -Nru nvidia-support-20120630+1/debian/po/pl.po nvidia-support-20120630+2/debian/po/pl.po
diff -Nru nvidia-support-20120630+1/debian/po/pt.po nvidia-support-20120630+2/debian/po/pt.po
diff -Nru nvidia-support-20120630+1/debian/po/ru.po nvidia-support-20120630+2/debian/po/ru.po
diff -Nru nvidia-support-20120630+1/debian/po/sk.po nvidia-support-20120630+2/debian/po/sk.po
diff -Nru nvidia-support-20120630+1/debian/po/sv.po nvidia-support-20120630+2/debian/po/sv.po
diff -Nru nvidia-support-20120630+1/debian/po/templates.pot nvidia-support-20120630+2/debian/po/templates.pot
diff -Nru nvidia-support-20120630+1/debian/po/zh_CN.po nvidia-support-20120630+2/debian/po/zh_CN.po
