If there are active X logins, don't restart kdm, wdm, and xdm by default;

instead, display a debconf error if they haven't been restarted.

8 files changed, 53 insertions, 49 deletions

diff --git a/po/cs.po b/po/cs.po
index 9b557c15..9d5fe666 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam\n"
 "Report-Msgid-Bugs-To: vorlon@debian.org\n"
-"POT-Creation-Date: 2007-09-03 23:24-0700\n"
+"POT-Creation-Date: 2007-09-24 17:06-0700\n"
 "PO-Revision-Date: 2007-09-08 18:26+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -56,12 +56,12 @@ msgstr "Správce displeje se musí restartovat ručně"
 #. Type: error
 #. Description
 #: ../libpam0g.templates:2001
+#, fuzzy
 msgid ""
 "The kdm, wdm, and xdm display managers require a restart for the new version "
-"of libpam, but restarting these services would terminate any X session "
-"running inside.  Because the $DISPLAY variable is set in your environment, "
-"these services have not been restarted for you.  You will therefore need to "
-"restart them by hand before they will be usable again."
+"of libpam, but there are X login sessions active on your system that would "
+"be terminated by this restart.  You will therefore need to restart these "
+"services by hand before further X logins will be possible."
 msgstr ""
 "Správcové displejů kdm, wdm a xdm musí být s novou verzí libpam "
 "restartováni. Restart těchto služeb by však ukončil všechna stávající X "
diff --git a/po/de.po b/po/de.po
index e93453d2..41a35c36 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam 0.99.7.1-5\n"
 "Report-Msgid-Bugs-To: vorlon@debian.org\n"
-"POT-Creation-Date: 2007-09-03 23:24-0700\n"
+"POT-Creation-Date: 2007-09-24 17:06-0700\n"
 "PO-Revision-Date: 2007-09-04 17:08+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -58,12 +58,12 @@ msgstr "Display-Manager müssen manuell neu gestartet werden"
 #. Type: error
 #. Description
 #: ../libpam0g.templates:2001
+#, fuzzy
 msgid ""
 "The kdm, wdm, and xdm display managers require a restart for the new version "
-"of libpam, but restarting these services would terminate any X session "
-"running inside.  Because the $DISPLAY variable is set in your environment, "
-"these services have not been restarted for you.  You will therefore need to "
-"restart them by hand before they will be usable again."
+"of libpam, but there are X login sessions active on your system that would "
+"be terminated by this restart.  You will therefore need to restart these "
+"services by hand before further X logins will be possible."
 msgstr ""
 "Die Display-Manager kdm, wdm und xdm erfordern einen Neustart für die neue "
 "Version von libpam, aber diese Dienste neu zu starten würde jede unter ihnen "
diff --git a/po/es.po b/po/es.po
index dddc05ca..7de06e1d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -33,7 +33,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam 0.79-4\n"
 "Report-Msgid-Bugs-To: vorlon@debian.org\n"
-"POT-Creation-Date: 2007-09-03 23:24-0700\n"
+"POT-Creation-Date: 2007-09-24 17:06-0700\n"
 "PO-Revision-Date: 2007-09-04 23:48+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -84,12 +84,12 @@ msgstr "Debe reiniciar manualmente los gestores de pantalla"
 #. Type: error
 #. Description
 #: ../libpam0g.templates:2001
+#, fuzzy
 msgid ""
 "The kdm, wdm, and xdm display managers require a restart for the new version "
-"of libpam, but restarting these services would terminate any X session "
-"running inside.  Because the $DISPLAY variable is set in your environment, "
-"these services have not been restarted for you.  You will therefore need to "
-"restart them by hand before they will be usable again."
+"of libpam, but there are X login sessions active on your system that would "
+"be terminated by this restart.  You will therefore need to restart these "
+"services by hand before further X logins will be possible."
 msgstr ""
 "Entre los servicios que deben reiniciarse debido a la nueva versión de "
 "libpam están los gestores de pantalla kdm, wdm y xdm. El reinicio de estos "
diff --git a/po/pt.po b/po/pt.po
index 8a6d74fe..8b110210 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam 0.99.7.1-5\n"
 "Report-Msgid-Bugs-To: vorlon@debian.org\n"
-"POT-Creation-Date: 2007-09-03 23:24-0700\n"
+"POT-Creation-Date: 2007-09-24 17:06-0700\n"
 "PO-Revision-Date: 2007-09-04 18:32+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -57,12 +57,12 @@ msgstr "O gestor de display tem que ser reiniciado manualmente"
 #. Type: error
 #. Description
 #: ../libpam0g.templates:2001
+#, fuzzy
 msgid ""
 "The kdm, wdm, and xdm display managers require a restart for the new version "
-"of libpam, but restarting these services would terminate any X session "
-"running inside.  Because the $DISPLAY variable is set in your environment, "
-"these services have not been restarted for you.  You will therefore need to "
-"restart them by hand before they will be usable again."
+"of libpam, but there are X login sessions active on your system that would "
+"be terminated by this restart.  You will therefore need to restart these "
+"services by hand before further X logins will be possible."
 msgstr ""
 "Os gestores de display kdm, wdm, e xdm necessitam de reiniciar para a nova "
 "versão de libpam, mas reiniciar estes serviços iria terminar qualquer sessão "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 47289262..34b02e3d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam_0.99-7.1-5\n"
 "Report-Msgid-Bugs-To: vorlon@debian.org\n"
-"POT-Creation-Date: 2007-09-03 23:24-0700\n"
+"POT-Creation-Date: 2007-09-24 17:06-0700\n"
 "PO-Revision-Date: 2007-09-06 12:43-0300\n"
 "Last-Translator: Eder L. Marques <frolic@debian-ce.org>\n"
 "Language-Team: l10n Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -58,12 +58,12 @@ msgstr "Gerenciadores de display devem ser reiniciados manualmente"
 #. Type: error
 #. Description
 #: ../libpam0g.templates:2001
+#, fuzzy
 msgid ""
 "The kdm, wdm, and xdm display managers require a restart for the new version "
-"of libpam, but restarting these services would terminate any X session "
-"running inside.  Because the $DISPLAY variable is set in your environment, "
-"these services have not been restarted for you.  You will therefore need to "
-"restart them by hand before they will be usable again."
+"of libpam, but there are X login sessions active on your system that would "
+"be terminated by this restart.  You will therefore need to restart these "
+"services by hand before further X logins will be possible."
 msgstr ""
 "Os gerenciadores de display kdm, wdm e xdm precisam ser reiniciados para a "
 "nova versão da libpam, mas reiniciar estes serviços pode terminar qualquer "
diff --git a/po/ru.po b/po/ru.po
index 4f9ec6ca..fa850bdb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.99.7.1-4\n"
 "Report-Msgid-Bugs-To: vorlon@debian.org\n"
-"POT-Creation-Date: 2007-09-03 23:24-0700\n"
+"POT-Creation-Date: 2007-09-24 17:06-0700\n"
 "PO-Revision-Date: 2007-09-05 21:38+0400\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -59,12 +59,12 @@ msgstr "Программу входа в систему нужно переза�
 #. Type: error
 #. Description
 #: ../libpam0g.templates:2001
+#, fuzzy
 msgid ""
 "The kdm, wdm, and xdm display managers require a restart for the new version "
-"of libpam, but restarting these services would terminate any X session "
-"running inside.  Because the $DISPLAY variable is set in your environment, "
-"these services have not been restarted for you.  You will therefore need to "
-"restart them by hand before they will be usable again."
+"of libpam, but there are X login sessions active on your system that would "
+"be terminated by this restart.  You will therefore need to restart these "
+"services by hand before further X logins will be possible."
 msgstr ""
 "Для работы с новой версией libpam программы для входа в систему -- kdm, wdm "
 "и xdm, нужно перезапустить, но это прервёт все запущенные X-сессии. Так как "
diff --git a/po/templates.pot b/po/templates.pot
index 81c456e2..0d388eec 100644
--- a/po/templates.pot
+++ b/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam 0.99.7.1-5\n"
 "Report-Msgid-Bugs-To: vorlon@debian.org\n"
-"POT-Creation-Date: 2007-09-03 23:24-0700\n"
+"POT-Creation-Date: 2007-09-24 17:06-0700\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"
@@ -52,10 +52,9 @@ msgstr ""
 #: ../libpam0g.templates:2001
 msgid ""
 "The kdm, wdm, and xdm display managers require a restart for the new version "
-"of libpam, but restarting these services would terminate any X session "
-"running inside.  Because the $DISPLAY variable is set in your environment, "
-"these services have not been restarted for you.  You will therefore need to "
-"restart them by hand before they will be usable again."
+"of libpam, but there are X login sessions active on your system that would "
+"be terminated by this restart.  You will therefore need to restart these "
+"services by hand before further X logins will be possible."
 msgstr ""
 
 #. Type: error
diff --git a/po/vi.po b/po/vi.po
index a85228e5..ae21fe72 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pam 0.99.7.1-5\n"
 "Report-Msgid-Bugs-To: vorlon@debian.org\n"
-"POT-Creation-Date: 2007-09-03 23:24-0700\n"
+"POT-Creation-Date: 2007-09-24 17:06-0700\n"
 "PO-Revision-Date: 2007-09-04 19:04+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b1\n"
 
-#: ../libpam0g.templates:1001
 #. Type: string
 #. Description
+#: ../libpam0g.templates:1001
 msgid "Services to restart for PAM library upgrade:"
 msgstr "Dịch vụ cần khởi chạy lại khi nâng cấp thư viện PAM:"
 
-#: ../libpam0g.templates:1001
 #. Type: string
 #. Description
+#: ../libpam0g.templates:1001
 msgid ""
 "Most services that use PAM need to be restarted to use modules built for "
 "this new version of libpam.  Please review the following space-separated "
@@ -36,9 +36,9 @@ msgstr ""
 "định giới bằng dấu cách theo đây hiển thị các dịch vụ cần khởi chạy lại ngay "
 "bây giờ, và sửa chữa nếu cần thiết."
 
-#: ../libpam0g.templates:1001
 #. Type: string
 #. Description
+#: ../libpam0g.templates:1001
 msgid ""
 "Some other services such as xscreensaver, gnome-screensaver, and xlockmore "
 "cannot be restarted for you.  You will not be able to authenticate to these "
@@ -48,40 +48,45 @@ msgstr ""
 "thể được khởi chạy lại cho bạn.Bạn sẽ không thể xác thực được tới dịch vụ "
 "như vậy nếu bạn chưa tự khởi chạy lại nó."
 
-#: ../libpam0g.templates:2001
 #. Type: error
 #. Description
+#: ../libpam0g.templates:2001
 msgid "Display manager must be restarted manually"
 msgstr "Trình quản lý trình bày phải được khởi chạy bằng tay"
 
-#: ../libpam0g.templates:2001
 #. Type: error
 #. Description
+#: ../libpam0g.templates:2001
+#, fuzzy
 msgid ""
 "The kdm, wdm, and xdm display managers require a restart for the new version "
-"of libpam, but restarting these services would terminate any X session "
-"running inside.  Because the $DISPLAY variable is set in your environment, "
-"these services have not been restarted for you.  You will therefore need to "
-"restart them by hand before they will be usable again."
-msgstr "Trình quản lý trình bày kdm, wdm, hay xdm cần thiết được khởi chạy lại để sử dụng phiên bản mới của thư viện libpam, nhưng việc khởi chạy lại dịch vụ này sẽ cũng chấm dứt phiên chạy X đang hoạt động. Không tự động khởi chạy lại dịch vụ này cho bạn, vì biến môi trường $DISPLAY đã được đặt. Vì vậy bạn cần phải tự khởi chạy trình quản lý trình bày để có khả năng sử dụng nó lại."
+"of libpam, but there are X login sessions active on your system that would "
+"be terminated by this restart.  You will therefore need to restart these "
+"services by hand before further X logins will be possible."
+msgstr ""
+"Trình quản lý trình bày kdm, wdm, hay xdm cần thiết được khởi chạy lại để sử "
+"dụng phiên bản mới của thư viện libpam, nhưng việc khởi chạy lại dịch vụ này "
+"sẽ cũng chấm dứt phiên chạy X đang hoạt động. Không tự động khởi chạy lại "
+"dịch vụ này cho bạn, vì biến môi trường $DISPLAY đã được đặt. Vì vậy bạn cần "
+"phải tự khởi chạy trình quản lý trình bày để có khả năng sử dụng nó lại."
 
-#: ../libpam0g.templates:3001
 #. Type: error
 #. Description
+#: ../libpam0g.templates:3001
 msgid "Failure restarting some services for PAM upgrade"
 msgstr "Lỗi khởi chạy lại một số dịch vụ để nâng cấp PAM"
 
-#: ../libpam0g.templates:3001
 #. Type: error
 #. Description
+#: ../libpam0g.templates:3001
 msgid ""
 "The following services could not be restarted for the PAM library upgrade:"
 msgstr ""
 "Những dịch vụ theo đây không thể được khởi chạy lại để nâng cấp thư viện PAM:"
 
-#: ../libpam0g.templates:3001
 #. Type: error
 #. Description
+#: ../libpam0g.templates:3001
 msgid ""
 "You will need to start these manually by running '/etc/init.d/<service> "
 "start'."