aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorFrederic Lepied <flepied@mandriva.com>2005-03-29 16:29:54 +0000
committerFrederic Lepied <flepied@mandriva.com>2005-03-29 16:29:54 +0000
commit3c0476a16b295cd681ef4ef0e2534d84f2c379dd (patch)
tree3633e6dc1cde050e6ddb479bb0435b50a603b22e /ChangeLog
parentb7fdfa9096df770f7d37d0eba24125303e7597c7 (diff)
downloadcommon-data-3c0476a16b295cd681ef4ef0e2534d84f2c379dd.tar
common-data-3c0476a16b295cd681ef4ef0e2534d84f2c379dd.tar.gz
common-data-3c0476a16b295cd681ef4ef0e2534d84f2c379dd.tar.bz2
common-data-3c0476a16b295cd681ef4ef0e2534d84f2c379dd.tar.xz
common-data-3c0476a16b295cd681ef4ef0e2534d84f2c379dd.zip
Generated by cvs2cl the 29_Mar
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1087
1 files changed, 391 insertions, 696 deletions
diff --git a/ChangeLog b/ChangeLog
index 39a0be8..47214b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,26 @@
-2005-03-23 17:44 Frederic Crozat <fcrozat@mandrakesoft.com>
+2005-03-29 18:29 Frederic Lepied <flepied at mandrakesoft.com>
+
+ * mandrake_desk.spec: 10.2-4mdk
+
+2005-03-29 18:26 Frederic Lepied <flepied at mandrakesoft.com>
+
+ * bin/www-browser: test if the $BROWSER variable is set to
+ something valid (bug #14903).
+
+2005-03-23 17:44 Frederic Crozat <fcrozat at mandrakesoft.com>
* menu/menu-simplified: Forgot simplified menu
-2005-03-23 16:48 Frederic Crozat <fcrozat@mandrakesoft.com>
+2005-03-23 16:48 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec, menu/menu: - don't use .desktop files for
order directive
-2005-03-09 15:04 Frederic Crozat <fcrozat@mandrakesoft.com>
+2005-03-09 15:04 Frederic Crozat <fcrozat at mandrakesoft.com>
* bin/www-browser: fix stripping value from GNOME
-2005-03-09 14:43 Frederic Crozat <fcrozat@mandrakesoft.com>
+2005-03-09 14:43 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec, bin/www-browser, bin/xvt: - change
www-browser to use BROWSER variable if set or use running
@@ -19,544 +28,230 @@
alternative : choose programs to start based on running
environment
-2005-03-09 14:37 Laurent Montel <lmontel@mandrakesoft.com>
+2005-03-09 14:37 Laurent Montel <lmontel at mandrakesoft.com>
* mandrake_desk.spec, menu/menu, menu/menu-simplified: Remove
alias_inline
-2005-03-02 10:57 Laurent Montel <lmontel@mandrakesoft.com>
+2005-03-02 10:57 Laurent Montel <lmontel at mandrakesoft.com>
* mandrake_desk.spec, menu/menu-simplified: Fix order into
simplified menu
-2005-03-01 17:20 Laurent Montel <lmontel@mandrakesoft.com>
+2005-03-01 17:20 Laurent Montel <lmontel at mandrakesoft.com>
* mandrake_desk.spec, menu/menu: Fix menu order for Menuname with
id
-2005-03-01 16:18 Laurent Montel <lmontel@mandrakesoft.com>
+2005-03-01 16:18 Laurent Montel <lmontel at mandrakesoft.com>
* mandrake_desk.spec, menu/menu: Recreate order as in 10.1
-2005-03-01 09:43 Laurent Montel <lmontel@mandrakesoft.com>
+2005-02-28 18:08 Frederic Crozat <fcrozat at mandrakesoft.com>
- * dm/: KdmGreeterTheme.desktop, mdk-kde.xml: Add kdm theme
+ * mandrake_desk.spec: Add shared theme for GDM/KDM
-2005-02-28 18:08 Frederic Crozat <fcrozat@mandrakesoft.com>
-
- * mandrake_desk.spec, dm/GdmGreeterTheme.desktop,
- dm/disconnect.png, dm/languages.png, dm/mdk-gdm.xml,
- dm/reboot.png, dm/screenshot.png, dm/sessions.png, dm/star.png,
- dm/system.png: Add shared theme for GDM/KDM
-
-2005-01-25 19:16 Frederic Crozat <fcrozat@mandrakesoft.com>
+2005-01-25 19:16 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec, menu/defaultlayout-simplified.menu,
menu/defaultlayout.menu: Fix small errors in default layout menu
files
-2004-12-14 16:01 Frederic Crozat <fcrozat@mandrakesoft.com>
+2004-12-14 16:01 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec, menu/defaultlayout-simplified.menu,
menu/defaultlayout.menu, menu/menu, menu/menu-simplified,
- menu/translate_menus, menu/translate_menus-simplified,
- menu/icons/accessibility_section.png,
- menu/icons/addressbook_section.png,
- menu/icons/adventure_section.png,
- menu/icons/amusement_section.png,
- menu/icons/applications_section.png,
- menu/icons/arcade_section.png, menu/icons/archiving_section.png,
- menu/icons/artificial_intelligence_section.png,
- menu/icons/astronomy_section.png, menu/icons/backup_section.png,
- menu/icons/biology_section.png, menu/icons/boards_section.png,
- menu/icons/boot_init_section.png, menu/icons/cards_section.png,
- menu/icons/cd_burning_section.png, menu/icons/chat_section.png,
- menu/icons/chemistry_section.png, menu/icons/chinese_section.png,
- menu/icons/code_generator_section.png,
- menu/icons/communications_fax_section.png,
- menu/icons/communications_other_section.png,
- menu/icons/communications_phone_section.png,
- menu/icons/communications_section.png,
- menu/icons/compression_section.png,
- menu/icons/computer_science_section.png,
- menu/icons/configuration_section.png,
- menu/icons/data_visualization_section.png,
- menu/icons/databases_section.png,
- menu/icons/development_environment_section.png,
- menu/icons/development_section.png,
- menu/icons/development_tools_section.png,
- menu/icons/documentation_section.png,
- menu/icons/editors_section.png,
- menu/icons/education_economy_section.png,
- menu/icons/education_geography_section.png,
- menu/icons/education_history_section.png,
- menu/icons/education_languages_section.png,
- menu/icons/education_literature_section.png,
- menu/icons/education_mathematics.png,
- menu/icons/education_other_section.png,
- menu/icons/education_sciences.png,
- menu/icons/education_section.png,
- menu/icons/education_sport_section.png,
- menu/icons/education_tool.png,
- menu/icons/electricity_section.png,
- menu/icons/emulators_section.png,
- menu/icons/file_tools_section.png,
- menu/icons/file_transfer_section.png,
- menu/icons/finances_section.png,
- menu/icons/geosciences_section.png, menu/icons/gnome_section.png,
- menu/icons/graphics_section.png, menu/icons/graphs_section.png,
- menu/icons/hardware_configuration_section.png,
- menu/icons/hardware_section.png,
- menu/icons/image_processing_section.png,
- menu/icons/instant_messaging_section.png,
- menu/icons/internet_section.png,
- menu/icons/interpreters_section.png, menu/icons/irc_section.png,
- menu/icons/kde_section.png, menu/icons/mail_section.png,
- menu/icons/mandrake.png, menu/icons/mathematics_section.png,
- menu/icons/monitoring_section.png,
- menu/icons/more_applications_other_section.png,
- menu/icons/more_applications_section.png,
- menu/icons/multimedia_section.png,
- menu/icons/networking_configuration_section.png,
- menu/icons/networking_section.png,
- menu/icons/networking_www_section.png,
- menu/icons/news_section.png,
- menu/icons/numerical_analysis_section.png,
- menu/icons/office_accessories_section.png,
- menu/icons/office_drawing_section.png,
- menu/icons/office_section.png, menu/icons/other_amusement.png,
- menu/icons/other_archiving.png,
- menu/icons/other_configuration.png,
- menu/icons/other_networking.png, menu/icons/other_sciences.png,
- menu/icons/packaging_section.png,
- menu/icons/parallel_computing_section.png,
- menu/icons/pda_section.png, menu/icons/physics_section.png,
- menu/icons/presentation_section.png,
- menu/icons/printing_section.png,
- menu/icons/publishing_section.png, menu/icons/puzzle_section.png,
- menu/icons/remote_access_section.png,
- menu/icons/robotics_section.png, menu/icons/sciences_section.png,
- menu/icons/shells_section.png, menu/icons/sound_section.png,
- menu/icons/sport_section.png, menu/icons/spreadsheet_section.png,
- menu/icons/strategy_section.png,
- menu/icons/system_other_section.png,
- menu/icons/system_section.png,
- menu/icons/taskmanagement_section.png,
- menu/icons/terminals_section.png,
- menu/icons/text_tools_section.png,
- menu/icons/timemanagement_section.png,
- menu/icons/toys_section.png,
- menu/icons/video_conferences_section.png,
- menu/icons/video_section.png, menu/icons/web_browser_section.png,
- menu/icons/web_editors_section.png,
- menu/icons/windowmanager_section.png,
- menu/icons/wordprocessor_section.png,
- menu/icons/large/accessibility_section.png,
- menu/icons/large/addressbook_section.png,
- menu/icons/large/adventure_section.png,
- menu/icons/large/amusement_section.png,
- menu/icons/large/applications_section.png,
- menu/icons/large/arcade_section.png,
- menu/icons/large/archiving_section.png,
- menu/icons/large/artificial_intelligence_section.png,
- menu/icons/large/astronomy_section.png,
- menu/icons/large/backup_section.png,
- menu/icons/large/biology_section.png,
- menu/icons/large/boards_section.png,
- menu/icons/large/boot_init_section.png,
- menu/icons/large/cards_section.png,
- menu/icons/large/cd_burning_section.png,
- menu/icons/large/chat_section.png,
- menu/icons/large/chemistry_section.png,
- menu/icons/large/chinese_section.png,
- menu/icons/large/code_generator_section.png,
- menu/icons/large/communications_fax_section.png,
- menu/icons/large/communications_other_section.png,
- menu/icons/large/communications_phone_section.png,
- menu/icons/large/communications_section.png,
- menu/icons/large/compression_section.png,
- menu/icons/large/computer_science_section.png,
- menu/icons/large/configuration_section.png,
- menu/icons/large/data_visualization_section.png,
- menu/icons/large/databases_section.png,
- menu/icons/large/development_environment_section.png,
- menu/icons/large/development_section.png,
- menu/icons/large/development_tools_section.png,
- menu/icons/large/documentation_section.png,
- menu/icons/large/editors_section.png,
- menu/icons/large/education_economy_section.png,
- menu/icons/large/education_geography_section.png,
- menu/icons/large/education_history_section.png,
- menu/icons/large/education_languages_section.png,
- menu/icons/large/education_literature_section.png,
- menu/icons/large/education_mathematics.png,
- menu/icons/large/education_other_section.png,
- menu/icons/large/education_sciences.png,
- menu/icons/large/education_section.png,
- menu/icons/large/education_sport_section.png,
- menu/icons/large/education_tool.png,
- menu/icons/large/electricity_section.png,
- menu/icons/large/emulators_section.png,
- menu/icons/large/file_tools_section.png,
- menu/icons/large/file_transfer_section.png,
- menu/icons/large/finances_section.png,
- menu/icons/large/geosciences_section.png,
- menu/icons/large/gnome_section.png,
- menu/icons/large/graphics_section.png,
- menu/icons/large/graphs_section.png,
- menu/icons/large/hardware_configuration_section.png,
- menu/icons/large/hardware_section.png,
- menu/icons/large/image_processing_section.png,
- menu/icons/large/instant_messaging_section.png,
- menu/icons/large/internet_section.png,
- menu/icons/large/interpreters_section.png,
- menu/icons/large/irc_section.png,
- menu/icons/large/kde_section.png,
- menu/icons/large/mail_section.png, menu/icons/large/mandrake.png,
- menu/icons/large/mathematics_section.png,
- menu/icons/large/monitoring_section.png,
- menu/icons/large/more_applications_other_section.png,
- menu/icons/large/more_applications_section.png,
- menu/icons/large/multimedia_section.png,
- menu/icons/large/networking_configuration_section.png,
- menu/icons/large/networking_section.png,
- menu/icons/large/networking_www_section.png,
- menu/icons/large/news_section.png,
- menu/icons/large/numerical_analysis_section.png,
- menu/icons/large/office_accessories_section.png,
- menu/icons/large/office_drawing_section.png,
- menu/icons/large/office_section.png,
- menu/icons/large/other_amusement.png,
- menu/icons/large/other_archiving.png,
- menu/icons/large/other_configuration.png,
- menu/icons/large/other_networking.png,
- menu/icons/large/other_sciences.png,
- menu/icons/large/packaging_section.png,
- menu/icons/large/parallel_computing_section.png,
- menu/icons/large/pda_section.png,
- menu/icons/large/physics_section.png,
- menu/icons/large/presentation_section.png,
- menu/icons/large/printing_section.png,
- menu/icons/large/publishing_section.png,
- menu/icons/large/puzzle_section.png,
- menu/icons/large/remote_access_section.png,
- menu/icons/large/robotics_section.png,
- menu/icons/large/sciences_section.png,
- menu/icons/large/shells_section.png,
- menu/icons/large/sound_section.png,
- menu/icons/large/sport_section.png,
- menu/icons/large/spreadsheet_section.png,
- menu/icons/large/strategy_section.png,
- menu/icons/large/system_other_section.png,
- menu/icons/large/system_section.png,
- menu/icons/large/taskmanagement_section.png,
- menu/icons/large/terminals_section.png,
- menu/icons/large/text_tools_section.png,
- menu/icons/large/timemanagement_section.png,
- menu/icons/large/toys_section.png,
- menu/icons/large/video_conferences_section.png,
- menu/icons/large/video_section.png,
- menu/icons/large/web_browser_section.png,
- menu/icons/large/web_editors_section.png,
- menu/icons/large/windowmanager_section.png,
- menu/icons/large/wordprocessor_section.png,
- menu/icons/mini/accessibility_section.png,
- menu/icons/mini/addressbook_section.png,
- menu/icons/mini/adventure_section.png,
- menu/icons/mini/amusement_section.png,
- menu/icons/mini/applications_section.png,
- menu/icons/mini/arcade_section.png,
- menu/icons/mini/archiving_section.png,
- menu/icons/mini/artificial_intelligence_section.png,
- menu/icons/mini/astronomy_section.png,
- menu/icons/mini/backup_section.png,
- menu/icons/mini/biology_section.png,
- menu/icons/mini/boards_section.png,
- menu/icons/mini/boot_init_section.png,
- menu/icons/mini/cards_section.png,
- menu/icons/mini/cd_burning_section.png,
- menu/icons/mini/chat_section.png,
- menu/icons/mini/chemistry_section.png,
- menu/icons/mini/chinese_section.png,
- menu/icons/mini/code_generator_section.png,
- menu/icons/mini/communications_fax_section.png,
- menu/icons/mini/communications_other_section.png,
- menu/icons/mini/communications_phone_section.png,
- menu/icons/mini/communications_section.png,
- menu/icons/mini/compression_section.png,
- menu/icons/mini/computer_science_section.png,
- menu/icons/mini/configuration_section.png,
- menu/icons/mini/data_visualization_section.png,
- menu/icons/mini/databases_section.png,
- menu/icons/mini/development_environment_section.png,
- menu/icons/mini/development_section.png,
- menu/icons/mini/development_tools_section.png,
- menu/icons/mini/documentation_section.png,
- menu/icons/mini/editors_section.png,
- menu/icons/mini/education_economy_section.png,
- menu/icons/mini/education_geography_section.png,
- menu/icons/mini/education_history_section.png,
- menu/icons/mini/education_languages_section.png,
- menu/icons/mini/education_literature_section.png,
- menu/icons/mini/education_mathematics.png,
- menu/icons/mini/education_other_section.png,
- menu/icons/mini/education_sciences.png,
- menu/icons/mini/education_section.png,
- menu/icons/mini/education_sport_section.png,
- menu/icons/mini/education_tool.png,
- menu/icons/mini/electricity_section.png,
- menu/icons/mini/emulators_section.png,
- menu/icons/mini/file_tools_section.png,
- menu/icons/mini/file_transfer_section.png,
- menu/icons/mini/finances_section.png,
- menu/icons/mini/geosciences_section.png,
- menu/icons/mini/gnome_section.png,
- menu/icons/mini/graphics_section.png,
- menu/icons/mini/graphs_section.png,
- menu/icons/mini/hardware_configuration_section.png,
- menu/icons/mini/hardware_section.png,
- menu/icons/mini/image_processing_section.png,
- menu/icons/mini/instant_messaging_section.png,
- menu/icons/mini/internet_section.png,
- menu/icons/mini/interpreters_section.png,
- menu/icons/mini/irc_section.png, menu/icons/mini/kde_section.png,
- menu/icons/mini/mail_section.png, menu/icons/mini/mandrake.png,
- menu/icons/mini/mathematics_section.png,
- menu/icons/mini/monitoring_section.png,
- menu/icons/mini/more_applications_other_section.png,
- menu/icons/mini/more_applications_section.png,
- menu/icons/mini/multimedia_section.png,
- menu/icons/mini/networking_configuration_section.png,
- menu/icons/mini/networking_section.png,
- menu/icons/mini/networking_www_section.png,
- menu/icons/mini/news_section.png,
- menu/icons/mini/numerical_analysis_section.png,
- menu/icons/mini/office_accessories_section.png,
- menu/icons/mini/office_drawing_section.png,
- menu/icons/mini/office_section.png,
- menu/icons/mini/other_amusement.png,
- menu/icons/mini/other_archiving.png,
- menu/icons/mini/other_configuration.png,
- menu/icons/mini/other_networking.png,
- menu/icons/mini/other_sciences.png,
- menu/icons/mini/packaging_section.png,
- menu/icons/mini/parallel_computing_section.png,
- menu/icons/mini/pda_section.png,
- menu/icons/mini/physics_section.png,
- menu/icons/mini/presentation_section.png,
- menu/icons/mini/printing_section.png,
- menu/icons/mini/publishing_section.png,
- menu/icons/mini/puzzle_section.png,
- menu/icons/mini/remote_access_section.png,
- menu/icons/mini/robotics_section.png,
- menu/icons/mini/sciences_section.png,
- menu/icons/mini/shells_section.png,
- menu/icons/mini/sound_section.png,
- menu/icons/mini/sport_section.png,
- menu/icons/mini/spreadsheet_section.png,
- menu/icons/mini/strategy_section.png,
- menu/icons/mini/system_other_section.png,
- menu/icons/mini/system_section.png,
- menu/icons/mini/taskmanagement_section.png,
- menu/icons/mini/terminals_section.png,
- menu/icons/mini/text_tools_section.png,
- menu/icons/mini/timemanagement_section.png,
- menu/icons/mini/toys_section.png,
- menu/icons/mini/video_conferences_section.png,
- menu/icons/mini/video_section.png,
- menu/icons/mini/web_browser_section.png,
- menu/icons/mini/web_editors_section.png,
- menu/icons/mini/windowmanager_section.png,
- menu/icons/mini/wordprocessor_section.png: Move all menu
- informations (layout/icons) from menu to mandrake_desk package
-
-2004-09-29 11:51 David Baudens <baudens@mandrakesoft.com>
+ menu/translate_menus, menu/translate_menus-simplified: Move all
+ menu informations (layout/icons) from menu to mandrake_desk
+ package
+
+2004-09-29 11:51 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec, menu/mandrake_desk: Fix "Listen to Music
Files" menu entry
-2004-09-29 10:08 David Baudens <baudens@mandrakesoft.com>
+2004-09-29 10:08 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2004-09-29 10:08 David Baudens <baudens@mandrakesoft.com>
+2004-09-29 10:08 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Add missing menu entry for french
mandrakelinux documentation
-2004-09-29 09:25 David Baudens <baudens@mandrakesoft.com>
+2004-09-29 09:25 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2004-09-29 09:24 David Baudens <baudens@mandrakesoft.com>
+2004-09-29 09:24 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Fix import and sort your photos
-2004-09-10 08:48 David Baudens <baudens@mandrakesoft.com>
+2004-09-10 08:48 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec, menu/mandrake_desk: Add Mandrakelinux
documentation
-2004-09-09 12:35 David Baudens <baudens@mandrakesoft.com>
+2004-09-09 12:35 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec, menu/mandrake_desk: Remove all longtitle
-2004-09-09 12:27 Laurent Montel <lmontel@mandrakesoft.com>
+2004-09-09 12:27 Laurent Montel <lmontel at mandrakesoft.com>
* mandrake_desk.spec, menu/mandrake_desk: Update last changes
-2004-09-09 12:19 David Baudens <baudens@mandrakesoft.com>
+2004-09-09 12:19 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Remove non task oriented description for
KPhone
-2004-09-07 10:40 Pablo Saratxaga <pablo@mandrakesoft.com>
+2004-09-07 10:40 Pablo Saratxaga <pablo at mandrakesoft.com>
* man/it/chksession.8: Added Italian Man page
-2004-09-01 08:31 Laurent Montel <lmontel@mandrakesoft.com>
+2004-09-01 08:31 Laurent Montel <lmontel at mandrakesoft.com>
* menu/mandrake_desk: Update menu Fix capitalization
-2004-08-31 09:37 Frederic Lepied <flepied@mandrakesoft.com>
+2004-08-31 09:37 Frederic Lepied <flepied at mandrakesoft.com>
* mandrake_desk.spec: 10.1-6mdk
-2004-08-31 09:36 Frederic Lepied <flepied@mandrakesoft.com>
+2004-08-31 09:36 Frederic Lepied <flepied at mandrakesoft.com>
* bin/www-browser: first version
-2004-08-31 09:35 Frederic Lepied <flepied@mandrakesoft.com>
+2004-08-31 09:35 Frederic Lepied <flepied at mandrakesoft.com>
* Makefile: added standard rules to build packages
-2004-08-27 11:51 Frederic Crozat <fcrozat@mandrakesoft.com>
+2004-08-27 11:51 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec, menu/mandrake_desk: Fix typo in gnome-cd
entry
-2004-08-16 04:18 Laurent Montel <lmontel@mandrakesoft.com>
+2004-08-16 04:18 Laurent Montel <lmontel at mandrakesoft.com>
* mandrake_desk.spec: Fix "Play Games" entry
-2004-08-16 04:12 Laurent Montel <lmontel@mandrakesoft.com>
+2004-08-16 04:12 Laurent Montel <lmontel at mandrakesoft.com>
* menu/mandrake_desk: Fix "Play Games" entry
-2004-08-11 12:31 Frederic Crozat <fcrozat@mandrakesoft.com>
+2004-08-11 12:31 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec, menu/mandrake_desk: - Add GNOME version of
task oriented menu - Fix capitalisations in task oriented menu
-2004-08-05 11:21 David Baudens <baudens@mandrakesoft.com>
+2004-08-05 11:21 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Fix typo
-2004-08-05 09:24 David Baudens <baudens@mandrakesoft.com>
+2004-08-05 09:24 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2004-08-05 09:23 David Baudens <baudens@mandrakesoft.com>
+2004-08-05 09:23 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Add "Make a phone call" (using kphone at
present time)
-2004-08-05 08:41 David Baudens <baudens@mandrakesoft.com>
+2004-08-05 08:41 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Update task oriented menu
-2004-08-04 09:52 Pixel <pixel@mandrakesoft.com>
+2004-08-04 09:52 Pixel <pixel at mandrakesoft.com>
* mandrake_desk.spec: fix descriptions (use Mandrakelinux instead
of simply Mandrake)
-2004-08-04 09:49 Pixel <pixel@mandrakesoft.com>
+2004-08-04 09:49 Pixel <pixel at mandrakesoft.com>
* mandrake_desk.spec, sbin/chksession: add "chksession -L" used by
DrakX to configure ~/.dmrc
-2004-08-04 09:39 Pixel <pixel@mandrakesoft.com>
+2004-08-04 09:39 Pixel <pixel at mandrakesoft.com>
* sbin/chksession: - don't generate
/etc/X11/dm/Sessions/Default.desktop (otherwise gdm gives 2
"default" entries) - cleanup
-2004-03-02 09:43 Frederic Lepied <flepied@mandrakesoft.com>
+2004-03-02 09:43 Frederic Lepied <flepied at mandrakesoft.com>
* mandrake_desk.spec: 10.0-10mdk
-2004-03-02 09:42 Frederic Lepied <flepied@mandrakesoft.com>
+2004-03-02 09:42 Frederic Lepied <flepied at mandrakesoft.com>
* sbin/chksession: don't pass /etc/X11/xdm/Xsession in Exec field
for the KDE sessions
-2004-02-27 18:28 Frederic Lepied <flepied@mandrakesoft.com>
+2004-02-27 18:28 Frederic Lepied <flepied at mandrakesoft.com>
* mandrake_desk.spec: call fndSession in %post
-2004-02-27 18:26 Frederic Lepied <flepied@mandrakesoft.com>
+2004-02-27 18:26 Frederic Lepied <flepied at mandrakesoft.com>
* sbin/fndSession: use simply chksession -k for kdm
-2004-02-27 18:24 Frederic Lepied <flepied@mandrakesoft.com>
+2004-02-27 18:24 Frederic Lepied <flepied at mandrakesoft.com>
* sbin/chksession: do not generate Default session for kdm remove
files before generating the sessions
-2004-02-27 18:00 Frederic Lepied <flepied@mandrakesoft.com>
+2004-02-27 18:00 Frederic Lepied <flepied at mandrakesoft.com>
* mandrake_desk.spec: 10.0-9mdk
-2004-02-27 17:59 Frederic Lepied <flepied@mandrakesoft.com>
+2004-02-27 17:59 Frederic Lepied <flepied at mandrakesoft.com>
* Makefile: use rpm -ta to build an rpm
-2004-02-27 17:56 Frederic Lepied <flepied@mandrakesoft.com>
+2004-02-27 17:56 Frederic Lepied <flepied at mandrakesoft.com>
* sbin/chksession: fix KDE sessions
-2004-02-27 17:20 Laurent Montel <lmontel@mandrakesoft.com>
+2004-02-27 17:20 Laurent Montel <lmontel at mandrakesoft.com>
* mandrake_desk.spec: Update
-2004-02-27 09:44 Laurent Montel <lmontel@mandrakesoft.com>
+2004-02-27 09:44 Laurent Montel <lmontel at mandrakesoft.com>
* menu/mandrake_desk: s/ORC/OCR
-2004-02-24 11:14 Laurent Montel <lmontel@mandrakesoft.com>
+2004-02-24 11:14 Laurent Montel <lmontel at mandrakesoft.com>
* mandrake_desk.spec: Update
-2004-02-24 11:09 David Baudens <baudens@mandrakesoft.com>
+2004-02-24 11:09 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2004-02-24 11:05 Laurent Montel <lmontel@mandrakesoft.com>
+2004-02-24 11:05 Laurent Montel <lmontel at mandrakesoft.com>
* menu/mandrake_desk: Fix icons
-2004-02-05 15:54 David Baudens <baudens@mandrakesoft.com>
+2004-02-05 15:54 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Fix simplified menu
-2004-02-05 14:49 David Baudens <baudens@mandrakesoft.com>
+2004-02-05 14:49 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Fix title of "Organize your time" in
simplified menu
-2004-02-05 14:26 David Baudens <baudens@mandrakesoft.com>
+2004-02-05 14:26 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Fix typos
-2004-01-29 18:21 David Baudens <baudens@mandrakesoft.com>
+2004-01-29 18:21 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2004-01-29 17:29 David Baudens <baudens@mandrakesoft.com>
+2004-01-29 17:29 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2004-01-29 17:11 David Baudens <baudens@mandrakesoft.com>
+2004-01-29 17:11 David Baudens <baudens at mandrakesoft.com>
* backgrounds/: default-9.1.png, default-root-9.1.png,
default-root.png, default.png, discovery-1280x1024.png,
@@ -566,103 +261,103 @@
pwp-ps-root-1280x1024.png, pwp-ps-root.png, pwp-ps.png: Remove
old images
-2004-01-19 16:39 Laurent Montel <lmontel@mandrakesoft.com>
+2004-01-19 16:39 Laurent Montel <lmontel at mandrakesoft.com>
* menu/mandrake_desk: Add "kontact" entry
-2004-01-13 18:43 Laurent Montel <lmontel@mandrakesoft.com>
+2004-01-13 18:43 Laurent Montel <lmontel at mandrakesoft.com>
* mandrake_desk.spec: Update
-2004-01-13 18:29 Laurent Montel <lmontel@mandrakesoft.com>
+2004-01-13 18:29 Laurent Montel <lmontel at mandrakesoft.com>
* menu/mandrake_desk: Fix drakbackup menu entry
-2004-01-13 17:48 Laurent Montel <lmontel@mandrakesoft.com>
+2004-01-13 17:48 Laurent Montel <lmontel at mandrakesoft.com>
* menu/mandrake_desk: Update new simplified menu
-2004-01-13 14:07 Laurent Montel <lmontel@mandrakesoft.com>
+2004-01-13 14:07 Laurent Montel <lmontel at mandrakesoft.com>
* menu/mandrake_desk-9.2: Save old version
-2003-09-10 17:11 Guillaume Cottenceau <gc@mandrakesoft.com>
+2003-09-10 17:11 Guillaume Cottenceau
* Makefile, mandrake_desk.spec, backgrounds/xfdrake-test-card.jpg,
backgrounds/xfdrake-test-card.png: xfdrake-test-card needs to be
in .png format since we don't have have the jpeg pixbug loader
during install
-2003-09-10 17:09 David Baudens <baudens@mandrakesoft.com>
+2003-09-10 17:09 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec, menu/mandrake_desk: Update
-2003-09-06 15:29 alus
+2003-09-06 15:29 Arkadiusz Lipiec <alipiec at elka.pw.edu.pl>
* README: TYPO fix
-2003-09-05 17:53 David Baudens <baudens@mandrakesoft.com>
+2003-09-05 17:53 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Update
-2003-09-01 16:40 David Baudens <baudens@mandrakesoft.com>
+2003-09-01 16:40 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec, menu/mandrake_desk: Remove Record sound entry
-2003-08-28 22:33 David Baudens <baudens@mandrakesoft.com>
+2003-08-28 22:33 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec, menu/mandrake_desk: Update
-2003-08-28 19:23 David Baudens <baudens@mandrakesoft.com>
+2003-08-28 19:23 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Update
-2003-08-28 17:54 David Baudens <baudens@mandrakesoft.com>
+2003-08-28 17:54 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Update
-2003-08-28 11:54 David Baudens <baudens@mandrakesoft.com>
+2003-08-28 11:54 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Update
-2003-08-27 19:15 David Baudens <baudens@mandrakesoft.com>
+2003-08-27 19:15 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Fix kmix entry
-2003-08-27 18:49 David Baudens <baudens@mandrakesoft.com>
+2003-08-27 18:49 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Fix bad end of lines
-2003-08-27 18:23 David Baudens <baudens@mandrakesoft.com>
+2003-08-27 18:23 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Begin to update
-2003-08-27 17:15 Frederic Crozat <fcrozat@mandrakesoft.com>
+2003-08-27 17:15 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec, sbin/fndSession: Fix bug 4572 (bad path for
gdm session in fndSession)
-2003-08-26 18:21 David Baudens <baudens@mandrakesoft.com>
+2003-08-26 18:21 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2003-08-26 18:13 Frederic Crozat <fcrozat@mandrakesoft.com>
+2003-08-26 18:13 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec: Release 9.2-3mdk
-2003-08-26 18:09 Frederic Crozat <fcrozat@mandrakesoft.com>
+2003-08-26 18:09 Frederic Crozat <fcrozat at mandrakesoft.com>
* sbin/chksession: Add default session for GDM
-2003-08-26 17:46 Frederic Lepied <flepied@mandrakesoft.com>
+2003-08-26 17:46 Frederic Lepied <flepied at mandrakesoft.com>
* sbin/chksession: Corrections by Bernard Lang
-2003-08-22 15:02 David Baudens <baudens@mandrakesoft.com>
+2003-08-22 15:02 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2003-08-22 14:04 David Baudens <baudens@mandrakesoft.com>
+2003-08-22 14:04 David Baudens <baudens at mandrakesoft.com>
* backgrounds/: default-9.1.png, default-root-9.1.png,
discovery-1280x1024.png, discovery-root-1280x1024.png,
@@ -671,90 +366,90 @@
pwp-ps-1280x1024.png, pwp-ps-root-1280x1024.png, pwp-ps-root.png,
pwp-ps.png: New images for 9.2
-2003-08-22 09:25 Frederic Lepied <flepied@mandrakesoft.com>
+2003-08-22 09:25 Frederic Lepied <flepied at mandrakesoft.com>
* man/C/chksession.8: corrections by Bernard Lang
-2003-07-30 17:31 David Baudens <baudens@mandrakesoft.com>
+2003-07-30 17:31 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Fix %post (thanks to Pixel)
-2003-06-13 18:52 Frederic Crozat <fcrozat@mandrakesoft.com>
+2003-06-13 18:52 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec, sbin/chksession: gdm session format has
changed, fix chksession
-2003-06-04 12:09 David Baudens <baudens@mandrakesoft.com>
+2003-06-04 12:09 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Add version in %changelog
-2003-06-04 12:08 David Baudens <baudens@mandrakesoft.com>
+2003-06-04 12:08 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Create a link to allow users to access to
Mandrake's backgrounds from KDE
-2003-05-08 11:42 Pablo Saratxaga <pablo@mandrakesoft.com>
+2003-05-08 11:42 Pablo Saratxaga <pablo at mandrakesoft.com>
* man/uk/chksession.8: Added Ukrainian file
-2003-03-14 12:37 David Baudens <baudens@mandrakesoft.com>
+2003-03-14 12:37 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2003-03-14 12:36 David Baudens <baudens@mandrakesoft.com>
+2003-03-14 12:36 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Update for 9.1
-2003-03-12 15:46 David Baudens <baudens@mandrakesoft.com>
+2003-03-12 15:46 David Baudens <baudens at mandrakesoft.com>
* screensavers/: 1.png, 18.png, 19.png, 2.png, 20.png, 21.png,
22.png, 23.png, 24.png, 25.png, 26.png, 27.png, 3.png, 4.png,
5.png, 6.png, 7.png, 8.png, 9.png: Update
-2003-03-12 15:43 David Baudens <baudens@mandrakesoft.com>
+2003-03-12 15:43 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec, screensavers/10.png, screensavers/11.png,
screensavers/12.png, screensavers/13.png, screensavers/14.png,
screensavers/15.png, screensavers/16.png, screensavers/17.png:
Update
-2003-02-14 11:43 David Baudens <baudens@mandrakesoft.com>
+2003-02-14 11:43 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec, backgrounds/default-root.png,
backgrounds/default.png: New default bacground for MDK 9.1
-2003-01-31 13:07 Pablo Saratxaga <pablo@mandrakesoft.com>
+2003-01-31 13:07 Pablo Saratxaga <pablo at mandrakesoft.com>
* man/et/chksession.8: Added Estonian man page
-2002-09-06 15:16 David Baudens <baudens@mandrakesoft.com>
+2002-09-06 15:16 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update spec Add mandrake-club icon
-2002-09-02 13:36 Laurent Montel <lmontel@mandrakesoft.com>
+2002-09-02 13:36 Laurent Montel <lmontel at mandrakesoft.com>
* mandrake_desk.spec: Update spec file
-2002-09-02 13:25 Laurent Montel <lmontel@mandrakesoft.com>
+2002-09-02 13:25 Laurent Montel <lmontel at mandrakesoft.com>
* menu/mandrake_desk: Fix drakconf menu entry
-2002-08-29 18:24 David Baudens <baudens@mandrakesoft.com>
+2002-08-29 18:24 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2002-08-29 18:22 David Baudens <baudens@mandrakesoft.com>
+2002-08-29 18:22 David Baudens <baudens at mandrakesoft.com>
* faces/: ic-tux1.png, ic-tux2.png, ic-tux3.png, ic-tux4.png,
ic-tux5.png, ic-tuxgeneric.png: New tux family
-2002-08-29 18:21 David Baudens <baudens@mandrakesoft.com>
+2002-08-29 18:21 David Baudens <baudens at mandrakesoft.com>
* faces/: ic-util-tux1.png, ic-util-tux2.png, ic-util-tux2bis.png,
ic-util-tux3.png, ic-util-tux4.png, ic-util-tuxgeneric.png:
Remove
-2002-08-29 17:37 David Baudens <baudens@mandrakesoft.com>
+2002-08-29 17:37 David Baudens <baudens at mandrakesoft.com>
* screensavers/01.png, screensavers/02.png, screensavers/03.png,
screensavers/04.png, screensavers/05.png, screensavers/06.png,
@@ -766,57 +461,57 @@
screensavers/22.png, screensavers/23.png, mandrake_desk.spec:
Update
-2002-08-29 11:58 David Baudens <baudens@mandrakesoft.com>
+2002-08-29 11:58 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2002-08-29 11:58 David Baudens <baudens@mandrakesoft.com>
+2002-08-29 11:58 David Baudens <baudens at mandrakesoft.com>
* faces/: ic-util-tux1.png, ic-util-tux2.png, ic-util-tux2bis.png,
ic-util-tux3.png, ic-util-tux4.png, ic-util-tuxgeneric.png: Tux
family is back
-2002-08-27 15:32 David Baudens <baudens@mandrakesoft.com>
+2002-08-27 15:32 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2002-08-27 15:29 David Baudens <baudens@mandrakesoft.com>
+2002-08-27 15:29 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec, screensavers/02.png: Update
-2002-08-26 17:29 Pablo Saratxaga <pablo@mandrakesoft.com>
+2002-08-26 17:29 Pablo Saratxaga <pablo at mandrakesoft.com>
* man/: cs/chksession.8, ru/chksession.8: Added Czech and Russian
man pages
-2002-08-23 16:48 David Baudens <baudens@mandrakesoft.com>
+2002-08-23 16:48 David Baudens <baudens at mandrakesoft.com>
* screensavers/02.png, mandrake_desk.spec: Update
-2002-08-23 16:13 David Baudens <baudens@mandrakesoft.com>
+2002-08-23 16:13 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec, backgrounds/xfdrake-test-card.jpg: Update
-2002-08-22 17:16 David Baudens <baudens@mandrakesoft.com>
+2002-08-22 17:16 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2002-08-22 17:12 David Baudens <baudens@mandrakesoft.com>
+2002-08-22 17:12 David Baudens <baudens at mandrakesoft.com>
* backgrounds/xfdrake-test-card.jpg: Update for 9.0
-2002-08-22 11:10 David Baudens <baudens@mandrakesoft.com>
+2002-08-22 11:10 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2002-08-22 11:09 David Baudens <baudens@mandrakesoft.com>
+2002-08-22 11:09 David Baudens <baudens at mandrakesoft.com>
* screensavers/: 01.png, 02.png, 03.png, 04.png, 05.png, 06.png,
07.png, 08.png, 09.png, 10.png, 11.png, 12.png, 13.png, 14.png,
15.png, 16.png, 17.png, 18.png, 19.png, 20.png, 21.png, 22.png,
23.png: Add new images for 9.0
-2002-08-22 11:07 David Baudens <baudens@mandrakesoft.com>
+2002-08-22 11:07 David Baudens <baudens at mandrakesoft.com>
* screensavers/: 1-boot&init.png, 10-service.png, 11-support.png,
12-Xdrake.png, 13-filetools.png, 14-filetransfert.png,
@@ -825,15 +520,15 @@
6-shell.png, 7-bugfix.png, 8-bureau.png, 9-docu.png: Remove 8.2
images
-2002-08-02 14:03 David Baudens <baudens@mandrakesoft.com>
+2002-08-02 14:03 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2002-08-01 17:57 David Baudens <baudens@mandrakesoft.com>
+2002-08-01 17:57 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2002-08-01 17:52 David Baudens <baudens@mandrakesoft.com>
+2002-08-01 17:52 David Baudens <baudens at mandrakesoft.com>
* screensavers/: 1-boot&init.png, 10-service.png, 11-support.png,
12-Xdrake.png, 13-filetools.png, 14-filetransfert.png,
@@ -841,74 +536,74 @@
2-hardware.png, 3-rouage.png, 4-rpmsecu.png, 5-carte.png,
6-shell.png, 7-bugfix.png, 8-bureau.png, 9-docu.png: Add
-2002-08-01 12:12 alus
+2002-08-01 12:12 Arkadiusz Lipiec <alipiec at elka.pw.edu.pl>
* TRANSLATORS: polish translator added
-2002-07-31 18:06 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 18:06 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2002-07-31 17:54 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 17:54 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2002-07-31 17:50 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 17:50 David Baudens <baudens at mandrakesoft.com>
* kde/kdm-mdk-logo.png: Add kdm logo
-2002-07-31 17:16 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 17:16 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2002-07-31 17:12 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 17:12 David Baudens <baudens at mandrakesoft.com>
* backgrounds/: flower.jpg, nature.jpg: Add new backgrounds
-2002-07-31 16:46 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 16:46 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2002-07-31 16:02 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 16:02 David Baudens <baudens at mandrakesoft.com>
* xml-i18n-extract.in, xml-i18n-merge.in, xml-i18n-update.in:
Remove old xml-i18n stuff
-2002-07-31 15:58 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 15:58 David Baudens <baudens at mandrakesoft.com>
* Makefile, mandrake_desk.spec: Update
-2002-07-31 15:20 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 15:20 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update
-2002-07-31 15:13 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 15:13 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec, bin/DrakWM, bin/createbackground.sh: Update
-2002-07-31 14:55 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 14:55 David Baudens <baudens at mandrakesoft.com>
* backgrounds/: XFdrake-test-card.jpg, xfdrake-test-card.jpg: Fix
typo
-2002-07-31 14:53 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 14:53 David Baudens <baudens at mandrakesoft.com>
* backgrounds/: XFdrake-image-test.jpg, XFdrake-test-card.jpg:
Rename xfdrake test card
-2002-07-31 14:49 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 14:49 David Baudens <baudens at mandrakesoft.com>
* backgrounds/default-root.png: Add default background for root
-2002-07-31 14:42 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 14:42 David Baudens <baudens at mandrakesoft.com>
* backgrounds/default.png: New default background
-2002-07-31 14:41 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 14:41 David Baudens <baudens at mandrakesoft.com>
* README.CVS, mandrake_desk.spec: Update
-2002-07-31 13:19 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 13:19 David Baudens <baudens at mandrakesoft.com>
* gtkrc, krootwarning/AUTHORS, krootwarning/COPYING,
krootwarning/INSTALL, krootwarning/Makefile.am,
@@ -920,33 +615,33 @@
krootwarning/messages.log, krootwarning/subdirs: Remove
krootwarning & krozat stuff. Moved in their own modules
-2002-07-31 11:14 David Baudens <baudens@mandrakesoft.com>
+2002-07-31 11:14 David Baudens <baudens at mandrakesoft.com>
* backgrounds/: ICE-1024.png, ICE-1280.png, ICE-1600.png,
ICE-640.png, ICE-800.png: Remove old badgrouds
-2002-07-31 11:03 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-07-31 11:03 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec, menu/mandrake_desk: -Fix GNOME entry for Crux
theme applet - Fix menu entries for simplified menu
-2002-07-30 10:01 David Baudens <baudens@mandrakesoft.com>
+2002-07-30 10:01 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update spec
-2002-07-30 09:59 David Baudens <baudens@mandrakesoft.com>
+2002-07-30 09:59 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Upload Laurent Montel's spec file
-2002-07-30 09:52 David Baudens <baudens@mandrakesoft.com>
+2002-07-30 09:52 David Baudens <baudens at mandrakesoft.com>
* faces/default.png: New defalt user image
-2002-07-23 14:52 David Baudens <baudens@mandrakesoft.com>
+2002-07-23 14:52 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update spec
-2002-07-18 17:56 David Baudens <baudens@mandrakesoft.com>
+2002-07-18 17:56 David Baudens <baudens at mandrakesoft.com>
* faces/: default.png, ic-bird.png, ic-bird2.png, ic-cat.png,
ic-dog.png, ic-fish.png, ic-flower1.png, ic-flower2.png,
@@ -954,37 +649,37 @@
ic-nature2.png, ic-nature3.png, ic-nature4.png, ic-nature5.png:
Add new users images for 9.0 beta 1
-2002-07-18 17:52 David Baudens <baudens@mandrakesoft.com>
+2002-07-18 17:52 David Baudens <baudens at mandrakesoft.com>
* faces/: aman.png, cinderella.png, dog.png, donuts.png, fish.png,
moon.png, mouse.png, mouse2.png, roller.png, sun.png, woman.png:
Remove old users icons
-2002-06-28 11:28 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-06-28 11:28 Frederic Crozat <fcrozat at mandrakesoft.com>
* menu/mandrake_desk: Png icons
-2002-06-28 10:33 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-06-28 10:33 Frederic Crozat <fcrozat at mandrakesoft.com>
* menu/mandrake_desk: GNOME 2 adaption (by Goetz Waschk)
-2002-03-15 15:10 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-03-15 15:10 Frederic Crozat <fcrozat at mandrakesoft.com>
* gtkrc, mandrake_desk.spec: Fix default gtk theme
-2002-03-07 15:50 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-03-07 15:50 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec, faces/root: fix root icons (remove it)
-2002-03-07 15:32 David Baudens <baudens@mandrakesoft.com>
+2002-03-07 15:32 David Baudens <baudens at mandrakesoft.com>
* faces/: aman.png, woman.png: Add new faces
-2002-03-07 15:21 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-03-07 15:21 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec: Release 8.2-12mdk
-2002-03-05 19:38 David Baudens <baudens@mandrakesoft.com>
+2002-03-05 19:38 David Baudens <baudens at mandrakesoft.com>
* faces/: aman.png, avn-rat.png, cinderella.png, dadou-fish.png,
dear-chief-moon.png, dog.png, donuts.png, fish.png,
@@ -992,151 +687,151 @@
mouse.png, mouse2.png, renaud-sun.png, roller.png, sun.png,
vince-donut.png, warly-roller.png, woman.png: [no log message]
-2002-03-05 19:23 David Baudens <baudens@mandrakesoft.com>
+2002-03-05 19:23 David Baudens <baudens at mandrakesoft.com>
* faces/aman.png: Remove obsoletes faces
-2002-03-05 18:42 David Baudens <baudens@mandrakesoft.com>
+2002-03-05 18:42 David Baudens <baudens at mandrakesoft.com>
* faces/: user-curly-mdk.png, user-girl-mdk.png, user-hat-mdk.png,
utildame.png, utilmons.png: Remove old faces
-2002-03-05 18:35 David Baudens <baudens@mandrakesoft.com>
+2002-03-05 18:35 David Baudens <baudens at mandrakesoft.com>
* faces/: tux.png, tuxbaby.png, tuxbox.png, tuxcoocker.png,
tuxdad.png, tuxgirl.png, tuxhead1.png, tuxhead2.png, tuxmam.png,
tuxmecano.png: Remove obsolete faces
-2002-03-01 16:35 David Baudens <baudens@mandrakesoft.com>
+2002-03-01 16:35 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: [no log message]
-2002-02-28 04:19 David Baudens <baudens@mandrakesoft.com>
+2002-02-28 04:19 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: [no log message]
-2002-02-26 16:28 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-02-26 16:28 Frederic Crozat <fcrozat at mandrakesoft.com>
* gtkrc, mandrake_desk.spec: Fix default GTK theme
-2002-02-26 14:43 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-02-26 14:43 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec: Change Mandrake Control Center to Control
Center in GNOME
-2002-02-26 03:20 David Baudens <baudens@mandrakesoft.com>
+2002-02-26 03:20 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: [no log message]
-2002-02-26 03:05 David Baudens <baudens@mandrakesoft.com>
+2002-02-26 03:05 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: [no log message]
-2002-02-26 02:54 David Baudens <baudens@mandrakesoft.com>
+2002-02-26 02:54 David Baudens <baudens at mandrakesoft.com>
* Makefile: Install png icons instead xpm in
/usr/share/pixmaps/mdk/
-2002-02-26 02:49 David Baudens <baudens@mandrakesoft.com>
+2002-02-26 02:49 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: [no log message]
-2002-02-25 17:09 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-02-25 17:09 Frederic Crozat <fcrozat at mandrakesoft.com>
* gtkrc, mandrake_desk.spec: Fix default mdk theme with evolution
-2002-02-22 21:13 Pablo Saratxaga <pablo@mandrakesoft.com>
+2002-02-22 21:13 Pablo Saratxaga <pablo at mandrakesoft.com>
* man/eu/chksession.8: Added Basque file
-2002-02-20 19:20 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-02-20 19:20 Frederic Crozat <fcrozat at mandrakesoft.com>
* Makefile: Fix tagging
-2002-02-20 19:12 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-02-20 19:12 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec: Really fix mdk-eazel-engine-capplet location
-2002-02-20 19:06 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-02-20 19:06 Frederic Crozat <fcrozat at mandrakesoft.com>
* Makefile, mandrake_desk.spec: Fix location of mdk-eazel-engine
capplet
-2002-02-20 14:36 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-02-20 14:36 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec: Fix build
-2002-02-20 14:31 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-02-20 14:31 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec, menu/mandrake_desk: Fix english strings and
makefile
-2002-02-18 22:51 David Baudens <baudens@mandrakesoft.com>
+2002-02-18 22:51 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Fix and update spec
-2002-02-18 05:26 David Baudens <baudens@mandrakesoft.com>
+2002-02-18 05:26 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Various fix for simplified menu (fix typos,
icons, remove duplicate entries with kdebase, etc.)
-2002-02-18 05:12 David Baudens <baudens@mandrakesoft.com>
+2002-02-18 05:12 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Fix icon for howto (simplified menu)
-2002-02-12 18:16 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-02-12 18:16 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec, menu/mandrake_desk: Fix simplified menu
-2002-01-29 16:14 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-01-29 16:14 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec, menu/mandrake_desk: Add menu entry for Mdk
Eazel engine Fix menu entry for Simplified menu
-2002-01-28 17:38 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-01-28 17:38 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec: Fix icons for GNOME Desktop
-2002-01-28 14:00 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-01-28 14:00 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec: Release 8.2-3mdk
-2002-01-28 13:59 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-01-28 13:59 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec: Release 8.2-2mdk
-2002-01-26 21:50 David Baudens <baudens@mandrakesoft.com>
+2002-01-26 21:50 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: - Fix some menu entries - Use new default png
icons when it is needed
-2002-01-14 11:37 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2002-01-14 11:37 Chmouel Boudjnah
* sbin/chksession: Remove space in name.
-2002-01-11 18:03 Frederic Crozat <fcrozat@mandrakesoft.com>
+2002-01-11 18:03 Frederic Crozat <fcrozat at mandrakesoft.com>
* Makefile, mandrake_desk.spec, man/C/chksession.8,
menu/mandrake_desk: Resync with package Remove generated files
Fix screensaver images
-2001-10-02 10:32 Stefan Siegel <siegel@linux-mandrake.com>
+2001-10-02 10:32 Stefan Siegel <siegel at linux-mandrake.com>
* README.CVS: fixed URL
-2001-10-02 10:29 Stefan Siegel <siegel@linux-mandrake.com>
+2001-10-02 10:29 Stefan Siegel <siegel at linux-mandrake.com>
* man/: C/chksession.8, fr/chksession.8: fixed link for bug reports
-2001-09-20 12:08 David Baudens <baudens@mandrakesoft.com>
+2001-09-20 12:08 David Baudens <baudens at mandrakesoft.com>
* menu/mandrake_desk: Add support for simplified menu
-2001-09-20 10:02 Frederic Crozat <fcrozat@mandrakesoft.com>
+2001-09-20 10:02 Frederic Crozat <fcrozat at mandrakesoft.com>
* .cvsignore, krootwarning/.cvsignore: Clean cvs
-2001-09-19 20:34 Frederic Crozat <fcrozat@mandrakesoft.com>
+2001-09-19 20:34 Frederic Crozat <fcrozat at mandrakesoft.com>
* mandrake_desk.spec, krootwarning/Makefile.in,
krootwarning/acinclude.m4, krootwarning/aclocal.m4,
@@ -1144,7 +839,7 @@
krootwarning/stamp-h.in: Remove generated files, fix package
generation add mdk-eazel-engine-capplet package
-2001-09-19 13:25 David Baudens <baudens@mandrakesoft.com>
+2001-09-19 13:25 David Baudens <baudens at mandrakesoft.com>
* faces/: aman.png, avn-rat.png, dadou-fish.png,
dear-chief-moon.png, gwegwe-rat.png, lmonspread-dog.png,
@@ -1152,51 +847,51 @@
warly-roller.png, woman.png: Fix icons to allow clean display on
a white background
-2001-09-19 11:16 David Baudens <baudens@mandrakesoft.com>
+2001-09-19 11:16 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update spec file
-2001-09-18 18:08 David Baudens <baudens@mandrakesoft.com>
+2001-09-18 18:08 David Baudens <baudens at mandrakesoft.com>
* faces/: tuxegg.png, user-brunette-mdk.png, user-default-mdk.png,
user-tie-mdk.png, user-woman-blond-mdk.png: Remove some old faces
(LN)
-2001-09-18 16:36 David Baudens <baudens@mandrakesoft.com>
+2001-09-18 16:36 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update spec
-2001-09-18 16:35 David Baudens <baudens@mandrakesoft.com>
+2001-09-18 16:35 David Baudens <baudens at mandrakesoft.com>
* faces/: aman.png, man.png: mv man.png aman.png to display it by
default in DrakX
-2001-09-17 15:27 Laurent Montel <lmontel@mandrakesoft.com>
+2001-09-17 15:27 Laurent Montel <lmontel at mandrakesoft.com>
* krootwarning/Makefile.am: Fix makefile error
-2001-09-14 13:55 David Baudens <baudens@mandrakesoft.com>
+2001-09-14 13:55 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Add gnome-mandrakestore.xpm and updaet
gnome-mandrakecampus.xpm and gnome-mandrakeexpert.xpm
-2001-09-13 19:32 David Baudens <baudens@mandrakesoft.com>
+2001-09-13 19:32 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update spec
-2001-09-13 17:04 David Baudens <baudens@mandrakesoft.com>
+2001-09-13 17:04 David Baudens <baudens at mandrakesoft.com>
* Makefile: Update Makefile
-2001-09-13 16:00 David Baudens <baudens@mandrakesoft.com>
+2001-09-13 16:00 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update spec
-2001-09-13 15:52 David Baudens <baudens@mandrakesoft.com>
+2001-09-13 15:52 David Baudens <baudens at mandrakesoft.com>
* Makefile, mandrake_desk.spec: [no log message]
-2001-09-12 17:42 David Baudens <baudens@mandrakesoft.com>
+2001-09-12 17:42 David Baudens <baudens at mandrakesoft.com>
* faces/: tux.xpm, tuxbaby.xpm, tuxbox.xpm, tuxcoocker.xpm,
tuxdad.xpm, tuxegg.xpm, tuxgirl.xpm, tuxhead1.xpm, tuxhead2.xpm,
@@ -1205,7 +900,7 @@
user-hat-mdk.xpm, user-tie-mdk.xpm, user-woman-blond-mdk.xpm,
utildame.xpm, utilmons.xpm: Remove xpm faces
-2001-09-12 17:31 David Baudens <baudens@mandrakesoft.com>
+2001-09-12 17:31 David Baudens <baudens at mandrakesoft.com>
* backgrounds/: DKP1-1024.png, DKP1-1280.png, DKP1-1600.png,
DKP1-640.png, DKP1-800.png, DKP2-1024.png, DKP2-1280.png,
@@ -1225,66 +920,66 @@
nature-1280.png, nature-1600.png, nature-640.png, nature-800.png:
Remove old backgrounds
-2001-09-04 17:43 David Baudens <baudens@mandrakesoft.com>
+2001-09-04 17:43 David Baudens <baudens at mandrakesoft.com>
* Makefile: Update Makefile, remove login/loging100.png and
krozat/config.cache
-2001-09-04 17:35 David Baudens <baudens@mandrakesoft.com>
+2001-09-04 17:35 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update spec
-2001-09-04 17:18 David Baudens <baudens@mandrakesoft.com>
+2001-09-04 17:18 David Baudens <baudens at mandrakesoft.com>
* default_background.jpg, default_logo.jpg, mandrake-small.xpm:
Remove some old images
-2001-09-04 16:58 David Baudens <baudens@mandrakesoft.com>
+2001-09-04 16:58 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update spec
-2001-09-03 03:10 Pablo Saratxaga <pablo@mandrakesoft.com>
+2001-09-03 03:10 Pablo Saratxaga <pablo at mandrakesoft.com>
* mandrake_desk.spec: added French man page to the spec file
-2001-09-03 03:02 Pablo Saratxaga <pablo@mandrakesoft.com>
+2001-09-03 03:02 Pablo Saratxaga <pablo at mandrakesoft.com>
* Makefile, man/chksession.8, man/C/chksession.8,
man/fr/chksession.8: Added French man page, moved English page to
its own directory
-2001-09-01 16:01 Laurent Montel <lmontel@mandrakesoft.com>
+2001-09-01 16:01 Laurent Montel <lmontel at mandrakesoft.com>
* krootwarning/Makefile.in: Autostart
-2001-08-27 14:06 David Baudens <baudens@mandrakesoft.com>
+2001-08-27 14:06 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update spec
-2001-08-27 12:51 David Baudens <baudens@mandrakesoft.com>
+2001-08-27 12:51 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update spec
-2001-08-27 12:40 David Baudens <baudens@mandrakesoft.com>
+2001-08-27 12:40 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update spec
-2001-08-24 19:11 David Baudens <baudens@mandrakesoft.com>
+2001-08-24 19:11 David Baudens <baudens at mandrakesoft.com>
* faces/: avn-rat.png, dadou-fish.png, dear-chief-moon.png,
gwegwe-rat.png, lmonspread-dog.png, ln-cendrillon.png, man.png,
renaud-sun.png, vince-donut.png, warly-roller.png, woman.png: Add
some MandrakeSoft employees :o)
-2001-08-24 18:39 David Baudens <baudens@mandrakesoft.com>
+2001-08-24 18:39 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update spec file
-2001-08-13 15:20 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2001-08-13 15:20 Chmouel Boudjnah
* sbin/fndSession: Fix path of kdmrc.
-2001-08-08 15:49 David Baudens <baudens@mandrakesoft.com>
+2001-08-08 15:49 David Baudens <baudens at mandrakesoft.com>
* krootwarning/: Makefile.dist, TODO, AUTHORS, COPYING, INSTALL,
Makefile.am, Makefile.in, README, acinclude.m4, aclocal.m4,
@@ -1292,7 +987,7 @@
configure.in.in, krootwarning.kdevprj, krootwarning.kdevses,
krootwarning.lsm, messages.log, stamp-h.in, subdirs: v 0.1
-2001-08-08 15:19 David Baudens <baudens@mandrakesoft.com>
+2001-08-08 15:19 David Baudens <baudens at mandrakesoft.com>
* krootwarning/: AUTHORS, COPYING, INSTALL, Makefile.am,
Makefile.dist, Makefile.in, README, TODO, acinclude.m4,
@@ -1305,36 +1000,36 @@
* mandrake_desk.spec: - Move face in /usr/share/mdk/faces
-2001-07-31 15:29 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2001-07-31 15:29 Chmouel Boudjnah
* sbin/chksession: Ignore backup files. Cleanup codes.
-2001-07-31 09:21 Frederic Lepied <flepied@mandrakesoft.com>
+2001-07-31 09:21 Frederic Lepied <flepied at mandrakesoft.com>
* Makefile: no need to run autoconf!
-2001-07-31 09:19 Frederic Lepied <flepied@mandrakesoft.com>
+2001-07-31 09:19 Frederic Lepied <flepied at mandrakesoft.com>
* mandrake_desk.spec: 8.1-1mdk
-2001-07-31 09:17 Frederic Lepied <flepied@mandrakesoft.com>
+2001-07-31 09:17 Frederic Lepied <flepied at mandrakesoft.com>
* sbin/chksession: put back my change to the Xsession path that was
reverted by the resync.
-2001-07-31 09:16 Frederic Lepied <flepied@mandrakesoft.com>
+2001-07-31 09:16 Frederic Lepied <flepied at mandrakesoft.com>
* Makefile: added rules to build test and distrib rpm.
-2001-07-31 09:15 Frederic Lepied <flepied@mandrakesoft.com>
+2001-07-31 09:15 Frederic Lepied <flepied at mandrakesoft.com>
* mandrake-small.xpm: resync with 8.0-12mdk
-2001-07-31 08:00 Frederic Lepied <flepied@mandrakesoft.com>
+2001-07-31 08:00 Frederic Lepied <flepied at mandrakesoft.com>
* gtkrc: resync with 8.0-12mdk
-2001-07-31 07:52 Frederic Lepied <flepied@mandrakesoft.com>
+2001-07-31 07:52 Frederic Lepied <flepied at mandrakesoft.com>
* Makefile, TRANSLATORS, mandrake_desk.spec,
backgrounds/DKP1-1024.png, backgrounds/DKP1-1280.png,
@@ -1367,60 +1062,60 @@
backgrounds/nature-800.png, bin/DrakWM, bin/createbackground.sh,
bin/print-cups.sh, sbin/chksession: resync with 8.0-12mdk
-2001-07-26 11:35 Frederic Lepied <flepied@mandrakesoft.com>
+2001-07-26 11:35 Frederic Lepied <flepied at mandrakesoft.com>
* sbin/chksession: use /etc/X11/xdm/Xsession instead of
/etc/X11/Xsession for gdm sessions.
-2001-05-06 19:20 Pablo Saratxaga <pablo@mandrakesoft.com>
+2001-05-06 19:20 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: Updated Chinese file
-2001-04-12 06:41 Daouda Lo <daouda@mandrakesoft.com>
+2001-04-12 06:41 Daouda Lo <daouda at mandrakesoft.com>
* mandrake_desk.spec: cleanups
-2001-04-12 06:26 Daouda Lo <daouda@mandrakesoft.com>
+2001-04-12 06:26 Daouda Lo <daouda at mandrakesoft.com>
* Makefile: remove kdelnk dir
-2001-04-12 06:25 Daouda Lo <daouda@mandrakesoft.com>
+2001-04-12 06:25 Daouda Lo <daouda at mandrakesoft.com>
* mandrake_desk.spec: macros bis
-2001-04-12 06:23 Daouda Lo <daouda@mandrakesoft.com>
+2001-04-12 06:23 Daouda Lo <daouda at mandrakesoft.com>
* mandrake_desk.spec: macros to ease rpm build from cvs
-2001-04-12 06:16 Daouda Lo <daouda@mandrakesoft.com>
+2001-04-12 06:16 Daouda Lo <daouda at mandrakesoft.com>
* Makefile: fix typo in var RPM
-2001-04-12 06:15 Daouda Lo <daouda@mandrakesoft.com>
+2001-04-12 06:15 Daouda Lo <daouda at mandrakesoft.com>
* mandrake_desk.spec: add define tags
-2001-04-12 06:14 Daouda Lo <daouda@mandrakesoft.com>
+2001-04-12 06:14 Daouda Lo <daouda at mandrakesoft.com>
* Makefile: define RPM var
-2001-04-12 06:11 Daouda Lo <daouda@mandrakesoft.com>
+2001-04-12 06:11 Daouda Lo <daouda at mandrakesoft.com>
* Makefile: commented kdelnk related stuffs
-2001-04-12 06:08 Daouda Lo <daouda@mandrakesoft.com>
+2001-04-12 06:08 Daouda Lo <daouda at mandrakesoft.com>
* Makefile: add eazel themes + gtkrc for rpm build
-2001-04-12 06:08 Daouda Lo <daouda@mandrakesoft.com>
+2001-04-12 06:08 Daouda Lo <daouda at mandrakesoft.com>
* gtkrc: new gtkrc :resync with spec
-2001-04-12 06:06 Daouda Lo <daouda@mandrakesoft.com>
+2001-04-12 06:06 Daouda Lo <daouda at mandrakesoft.com>
* mandrake_desk.spec: commit
-2001-04-12 02:57 David Baudens <baudens@mandrakesoft.com>
+2001-04-12 02:57 David Baudens <baudens at mandrakesoft.com>
* faces/: root, tux.png, tux.xpm, tuxbaby.png, tuxbaby.xpm,
tuxbox.png, tuxbox.xpm, tuxcoocker.png, tuxcoocker.xpm,
@@ -1435,369 +1130,369 @@
user-woman-blond-mdk.xpm, utildame.png, utildame.xpm,
utilmons.png, utilmons.xpm: [no log message]
-2001-04-12 02:52 David Baudens <baudens@mandrakesoft.com>
+2001-04-12 02:52 David Baudens <baudens at mandrakesoft.com>
* faces/: user-brunette-mdk.png, user-curly-mdk.png,
user-default-mdk.png, user-girl-mdk.png, user-hat-mdk.png,
user-tie-mdk.png, user-woman-blond-mdk.png: [no log message]
-2001-04-12 00:53 Daouda Lo <daouda@mandrakesoft.com>
+2001-04-12 00:53 Daouda Lo <daouda at mandrakesoft.com>
* mandrake_desk.spec: resync specs with cvs
-2001-03-29 10:14 Pablo Saratxaga <pablo@mandrakesoft.com>
+2001-03-29 10:14 Pablo Saratxaga <pablo at mandrakesoft.com>
* Makefile, README, TRANSLATORS, xml-i18n-extract.in,
xml-i18n-merge.in, xml-i18n-update.in: Now uses xml-i18n-tools to
handle i18n
-2001-03-24 13:29 Pablo Saratxaga <pablo@mandrakesoft.com>
+2001-03-24 13:29 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: Updated Korean strings
-2001-03-17 17:09 Pablo Saratxaga <pablo@mandrakesoft.com>
+2001-03-17 17:09 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: updated the Portuguese strings
-2001-03-02 20:45 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2001-03-02 20:45 Chmouel Boudjnah
* bin/DrakWM: Call xvt.
-2001-01-07 07:23 Pablo Saratxaga <pablo@mandrakesoft.com>
+2001-01-07 07:23 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: updated Basque strings
-2000-11-17 14:31 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-11-17 14:31 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: Added Georgian strings
-2000-10-16 02:01 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-10-16 02:01 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: updated Brazilian strings
-2000-09-13 21:19 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-09-13 21:19 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: corrected email address
-2000-09-13 12:55 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-09-13 12:55 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: Added Azeri strings
-2000-09-05 22:48 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-09-05 22:48 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: updated Polish strings
-2000-08-31 22:39 David Baudens <baudens@mandrakesoft.com>
+2000-08-31 22:39 David Baudens <baudens at mandrakesoft.com>
* kde/.kderc: [no log message]
-2000-08-31 19:20 David Baudens <baudens@mandrakesoft.com>
+2000-08-31 19:20 David Baudens <baudens at mandrakesoft.com>
* kde/.kderc: [no log message]
-2000-08-31 12:31 David Baudens <baudens@mandrakesoft.com>
+2000-08-31 12:31 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Re add a BuildRoot :(
-2000-08-31 12:25 David Baudens <baudens@mandrakesoft.com>
+2000-08-31 12:25 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update mandrake_desk.spec
-2000-08-31 03:51 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-08-31 03:51 Chmouel Boudjnah
* sbin/chksession: Avoid opendir use csh internal globing...
-2000-08-24 11:51 David Baudens <baudens@mandrakesoft.com>
+2000-08-24 11:51 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update Spec
-2000-08-24 11:16 David Baudens <baudens@mandrakesoft.com>
+2000-08-24 11:16 David Baudens <baudens at mandrakesoft.com>
* Makefile: Update Makefile (for .desktop)
-2000-08-24 11:10 David Baudens <baudens@mandrakesoft.com>
+2000-08-24 11:10 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update Spec
-2000-08-24 11:04 David Baudens <baudens@mandrakesoft.com>
+2000-08-24 11:04 David Baudens <baudens at mandrakesoft.com>
* faces/: default.png, root, root.png: [no log message]
-2000-08-24 10:11 David Baudens <baudens@mandrakesoft.com>
+2000-08-24 10:11 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update Spec and Makefile
-2000-08-24 10:08 David Baudens <baudens@mandrakesoft.com>
+2000-08-24 10:08 David Baudens <baudens at mandrakesoft.com>
* faces/root: Add a "root" link to make GDM happy
-2000-08-23 19:30 David Baudens <baudens@mandrakesoft.com>
+2000-08-23 19:30 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update Makefile and spec file
-2000-08-23 19:28 David Baudens <baudens@mandrakesoft.com>
+2000-08-23 19:28 David Baudens <baudens at mandrakesoft.com>
* faces/: default.png, root.png: Add link default.png and root.png
to make KDM happy
-2000-08-23 10:44 David Baudens <baudens@mandrakesoft.com>
+2000-08-23 10:44 David Baudens <baudens at mandrakesoft.com>
* faces/: user-brunette-mdk.xpm, user-curly-mdk.xpm,
user-default-mdk.xpm, user-girl-mdk.xpm, user-hat-mdk.xpm,
user-tie-mdk.xpm, user-woman-blond-mdk.xpm: Removed unneeded
files
-2000-08-23 10:40 David Baudens <baudens@mandrakesoft.com>
+2000-08-23 10:40 David Baudens <baudens at mandrakesoft.com>
* faces/: user-brunette-mdk.png, user-curly-mdk.png,
user-default-mdk.png, user-girl-mdk.png, user-hat-mdk.png,
user-tie-mdk.png, user-woman-blond-mdk.png: Convert faces/*.xpm
to faces/*.png
-2000-08-23 10:39 David Baudens <baudens@mandrakesoft.com>
+2000-08-23 10:39 David Baudens <baudens at mandrakesoft.com>
* Makefile, README.CVS, TRANSLATORS, default_background.jpg,
default_logo.jpg, mandrake_desk.spec: [no log message]
-2000-08-22 19:10 David Baudens <baudens@mandrakesoft.com>
+2000-08-22 19:10 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Re fix spec
-2000-08-22 19:06 David Baudens <baudens@mandrakesoft.com>
+2000-08-22 19:06 David Baudens <baudens at mandrakesoft.com>
* Makefile, mandrake_desk.spec: Fix Makefile and spec
-2000-08-22 18:51 David Baudens <baudens@mandrakesoft.com>
+2000-08-22 18:51 David Baudens <baudens at mandrakesoft.com>
* faces/: user-brunette-mdk.xpm, user-curly-mdk.xpm,
user-default-mdk.xpm, user-girl-mdk.xpm, user-hat-mdk.xpm,
user-tie-mdk.xpm, user-woman-blond-mdk.xpm: Move users icons in
/usr/share/faces
-2000-08-22 18:46 David Baudens <baudens@mandrakesoft.com>
+2000-08-22 18:46 David Baudens <baudens at mandrakesoft.com>
* Makefile, README.CVS, TRANSLATORS, default_background.jpg,
default_logo.jpg, mandrake_desk.spec: [no log message]
-2000-08-22 18:41 David Baudens <baudens@mandrakesoft.com>
+2000-08-22 18:41 David Baudens <baudens at mandrakesoft.com>
* Makefile, mandrake_desk.spec: [no log message]
-2000-08-19 11:28 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-08-19 11:28 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: Added Belarussian strings
-2000-08-12 11:47 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-08-12 11:47 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: fixed an email address
-2000-07-22 21:28 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-07-22 21:28 Chmouel Boudjnah
* Makefile, mandrake_desk.spec: BM.
-2000-07-18 23:31 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-07-18 23:31 Chmouel Boudjnah
* mandrake_desk.spec, sbin/chksession: * sbin/chksession: Set
support for KDE2 by default when generating session.
-2000-07-18 11:42 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-07-18 11:42 Chmouel Boudjnah
* Makefile, mandrake_desk.spec: window-managers no longer needed.
-2000-07-18 11:41 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-07-18 11:41 Chmouel Boudjnah
* window-managers: window-managers is no longer needed.
-2000-07-18 11:39 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-07-18 11:39 Chmouel Boudjnah
* mandrake_desk.spec, bin/DrakWM: * bin/DrakWM: Add -i options to
launch with xinit. add -a option to provide alias for bash.
-2000-07-17 13:20 Dam's <damien@mandrakesoft.com>
+2000-07-17 13:20 Dam's
* mandrake_desk.spec: new release
-2000-07-16 14:11 Dam's <damien@mandrakesoft.com>
+2000-07-16 14:11 Dam's
* window-managers: sawmill -> sawfish
-2000-07-11 23:43 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-07-11 23:43 Chmouel Boudjnah
* sbin/convertsession: A new greatest hit.
-2000-07-11 23:43 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-07-11 23:43 Chmouel Boudjnah
* mandrake_desk.spec, sbin/chksession: sbin/chksession: make
window-managers file dynamic by simple entry in
/etc/X11/wmsession.d/ sbin/convertsession: a new greatest hit.
mandrake_desk.spec: %post with convertsession
-2000-06-26 16:00 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-06-26 16:00 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: added Arabic strings
-2000-06-07 18:37 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-06-07 18:37 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: Added Korean strings
-2000-05-29 13:23 Dam's <damien@mandrakesoft.com>
+2000-05-29 13:23 Dam's
* mandrake_desk.spec: see changelog
-2000-05-27 21:42 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-05-27 21:42 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: Updated Serbian strings
-2000-05-19 01:43 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-05-19 01:43 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: Added Afrikaans strings
-2000-05-12 16:16 Frederic Lepied <flepied@mandrakesoft.com>
+2000-05-12 16:16 Frederic Lepied <flepied at mandrakesoft.com>
* sbin/chksession: * use /etc/X11/Xsession for gnome sessions.
-2000-05-12 16:16 Frederic Lepied <flepied@mandrakesoft.com>
+2000-05-12 16:16 Frederic Lepied <flepied at mandrakesoft.com>
* mandrake_desk.spec: * 1.0.3-21mdk
-2000-05-12 11:21 Dam's <damien@mandrakesoft.com>
+2000-05-12 11:21 Dam's
* mandrake_desk.spec: new mdk rel ; added gnome desktop entries
-2000-05-09 23:33 Dam's <damien@mandrakesoft.com>
+2000-05-09 23:33 Dam's
* mandrake_desk.spec: mdk release
-2000-05-09 19:58 Dam's <damien@mandrakesoft.com>
+2000-05-09 19:58 Dam's
* mandrake_desk.spec: new release
-2000-05-09 19:53 Pixel <pixel@mandrakesoft.com>
+2000-05-09 19:53 Pixel <pixel at mandrakesoft.com>
* sbin/kdeDesktopCleanup: [no log message]
-2000-05-09 19:38 Dam's <damien@mandrakesoft.com>
+2000-05-09 19:38 Dam's
* mandrake_desk.spec: no more netscape.desktop
-2000-05-09 19:38 Dam's <damien@mandrakesoft.com>
+2000-05-09 19:38 Dam's
* Makefile: removed netscape.desktop copy
-2000-05-09 17:00 Dam's <damien@mandrakesoft.com>
+2000-05-09 17:00 Dam's
* mandrake_desk.spec: removed gnome desktop icons...
-2000-05-09 10:15 Dam's <damien@mandrakesoft.com>
+2000-05-09 10:15 Dam's
* mandrake_desk.spec: see changelog. new release, cosmetic fix.
-2000-05-06 22:55 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-05-06 22:55 Chmouel Boudjnah
* mandrake_desk.spec, sbin/chksession: * sbin/chksession: if icewm
is not here by default launch twm.
-2000-05-05 12:21 Pixel <pixel@mandrakesoft.com>
+2000-05-05 12:21 Pixel <pixel at mandrakesoft.com>
* mandrake_desk.spec, sbin/kdeDesktopCleanup: no_comment
-2000-05-04 16:09 Dam's <damien@mandrakesoft.com>
+2000-05-04 16:09 Dam's
* mandrake_desk.spec:
mandrake_desk.spec gnome/mandrake.links :cleaned gnome
desktop
-2000-04-30 17:28 Dam's <damien@mandrakesoft.com>
+2000-04-30 17:28 Dam's
* mandrake_desk.spec:
mandrake_desk.spec :bad date
-2000-04-30 17:16 Dam's <damien@mandrakesoft.com>
+2000-04-30 17:16 Dam's
* mandrake_desk.spec:
mandrake_desk.spec :bad release
-2000-04-30 17:15 Dam's <damien@mandrakesoft.com>
+2000-04-30 17:15 Dam's
* mandrake_desk.spec:
ChangeLog mandrake_desk.spec :see Changelog
-2000-04-29 19:26 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-04-29 19:26 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: Updated Britton, Esperanto and Estonian strings
-2000-04-28 16:40 Stefan Siegel <siegel@linux-mandrake.com>
+2000-04-28 16:40 Stefan Siegel <siegel at linux-mandrake.com>
* TRANSLATORS: - add cdwriter_supermount.xpm - correct TRANSLATOR
address - use kdecolors in icons
-2000-04-28 14:40 Dam's <damien@mandrakesoft.com>
+2000-04-28 14:40 Dam's
* mandrake_desk.spec:
ChangeLog mandrake_desk.spec :corrected xfce entry in
windowmanagers.
-2000-04-28 12:15 Dam's <damien@mandrakesoft.com>
+2000-04-28 12:15 Dam's
* mandrake_desk.spec, window-managers:
ChangeLog mandrake_desk.spec window-managers : recovering
old files
-2000-04-28 10:27 Dam's <damien@mandrakesoft.com>
+2000-04-28 10:27 Dam's
* mandrake_desk.spec:
mandrake_desk.spec :fixed bad date
-2000-04-28 10:15 Dam's <damien@mandrakesoft.com>
+2000-04-28 10:15 Dam's
* mandrake_desk.spec, window-managers:
ChangeLog mandrake_desk.spec window-managers :corrected
xfce entry
-2000-04-27 15:57 Dam's <damien@mandrakesoft.com>
+2000-04-27 15:57 Dam's
* mandrake_desk.spec:
mandrake_desk.spec : bad date
-2000-04-27 15:46 Dam's <damien@mandrakesoft.com>
+2000-04-27 15:46 Dam's
* mandrake_desk.spec, window-managers:
ChangeLog mandrake_desk.spec window-managers :corrected
wmaker entry
kdelnk/Updates.kdelnk :unfortunally removed, so re-added
-2000-04-21 17:55 David Baudens <baudens@mandrakesoft.com>
+2000-04-21 17:55 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec, window-managers: Upload (see ChangeLog)
-2000-04-21 05:58 David Baudens <baudens@mandrakesoft.com>
+2000-04-21 05:58 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec: Update .spec
-2000-04-20 19:15 Fançois Pons <fpons@mandrakesoft.com>
+2000-04-20 19:15 Fançois Pons
* mandrake_desk.spec, window-managers: [no log message]
-2000-04-20 16:48 Fançois Pons <fpons@mandrakesoft.com>
+2000-04-20 16:48 Fançois Pons
* mandrake_desk.spec, window-managers: [no log message]
-2000-04-18 15:24 Dam's <damien@mandrakesoft.com>
+2000-04-18 15:24 Dam's
* mandrake_desk.spec:
mandrake_desk.spec :corrected bad version number
-2000-04-18 15:21 Dam's <damien@mandrakesoft.com>
+2000-04-18 15:21 Dam's
* Makefile:
Makefile :updated for new mdk relese
-2000-04-18 15:18 Dam's <damien@mandrakesoft.com>
+2000-04-18 15:18 Dam's
* mandrake_desk.spec:
ChangeLog mandrake_desk.spec : new mdk release
-2000-04-18 14:26 Dam's <damien@mandrakesoft.com>
+2000-04-18 14:26 Dam's
* window-managers:
window-managers : minor correction
@@ -1805,96 +1500,96 @@
kdelnk/RpmDrake.kdelnk kdelnk/Updates.kdelnk
kdelnk/XKill.kdelnk : desktops needed to be cleaned
-2000-04-18 11:20 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-04-18 11:20 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: Added Welsh strings
-2000-04-17 15:22 Dam's <damien@mandrakesoft.com>
+2000-04-17 15:22 Dam's
* mandrake_desk.spec:
Modified Files: mandrake_desk.spec updated
-2000-04-17 04:56 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-04-17 04:56 Chmouel Boudjnah
* window-managers: Various fix.
-2000-04-17 00:49 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-04-17 00:49 Chmouel Boudjnah
* mandrake_desk.spec: Add /usr/bin
-2000-04-17 00:46 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-04-17 00:46 Chmouel Boudjnah
* Makefile, mandrake_desk.spec: DrakWM a new greatest hit.
-2000-04-17 00:45 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-04-17 00:45 Chmouel Boudjnah
* bin/DrakWM: Add file.
-2000-04-16 21:37 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-04-16 21:37 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: Added Greek strings
-2000-04-16 15:12 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-04-16 15:12 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: Added Finnsih strings
-2000-04-11 18:55 Dam's <damien@mandrakesoft.com>
+2000-04-11 18:55 Dam's
* mandrake_desk.spec:
Modified Files: mandrake_desk.spec added ref for
/usr/share/icons/*.jpg
-2000-04-11 18:21 Dam's <damien@mandrakesoft.com>
+2000-04-11 18:21 Dam's
* default_logo.jpg:
Modified Files: default_logo.jpg final logo
-2000-04-11 17:46 Dam's <damien@mandrakesoft.com>
+2000-04-11 17:46 Dam's
* default_background.jpg, default_logo.jpg:
Added Files: default_background.jpg default_logo.jpg needed
for new release of gdm/kdm
-2000-04-11 17:43 Dam's <damien@mandrakesoft.com>
+2000-04-11 17:43 Dam's
* Makefile, mandrake_desk.spec:
updated icons
-2000-04-09 01:42 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-04-09 01:42 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: Added Swedish strings
-2000-04-07 03:46 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-04-07 03:46 Chmouel Boudjnah
* window-managers: "Seethechangelog"
-2000-04-05 23:49 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-04-05 23:49 Chmouel Boudjnah
* mandrake_desk.spec, Makefile: "Seethechangelog"
-2000-04-05 23:46 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-04-05 23:46 Chmouel Boudjnah
* Makefile, mandrake_desk.spec: "Seethechangelog"
-2000-04-05 23:41 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-04-05 23:41 Chmouel Boudjnah
* mandrake_desk.spec: "Seethechangelog"
-2000-04-05 23:38 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-04-05 23:38 Chmouel Boudjnah
* Makefile, mandrake_desk.spec, window-managers: "Seethechangelog"
-2000-04-04 15:57 David Baudens <baudens@mandrakesoft.com>
+2000-04-04 15:57 David Baudens <baudens at mandrakesoft.com>
* backgrounds/default_background.jpg: Add default background
-2000-04-04 15:55 David Baudens <baudens@mandrakesoft.com>
+2000-04-04 15:55 David Baudens <baudens at mandrakesoft.com>
* backgrounds/: mandrake_background3_1024.jpg,
mandrake_background4_1024.jpg: Add backgrounds
-2000-04-04 15:53 David Baudens <baudens@mandrakesoft.com>
+2000-04-04 15:53 David Baudens <baudens at mandrakesoft.com>
* backgrounds/: mandrake_background1_1024.jpg,
mandrake_background2_1024.jpg, mandrake_background_1024-1.jpg,
@@ -1902,196 +1597,196 @@
mandrake_background_1024.jpg, mandrake_background_800.jpg,
mandrake_background_blue_1024.jpg: Add & remove backgrounds
-2000-03-26 20:00 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-03-26 20:00 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: Added Slovenian strings
-2000-03-24 13:18 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-03-24 13:18 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: updated translators list
-2000-03-06 11:08 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-03-06 11:08 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: Added Chinese entries
-2000-02-02 05:51 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-02-02 05:51 Chmouel Boudjnah
* mandrake_desk.spec, window-managers: "See_The_Changelog"
-2000-01-27 15:50 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-01-27 15:50 Chmouel Boudjnah
* mandrake_desk.spec: "Seethechangelog"
-2000-01-27 15:44 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-01-27 15:44 Chmouel Boudjnah
* backgrounds/: mandrake_background_1024-1.jpg,
mandrake_background_1024-2.jpg, mandrake_background_1024-3.jpg:
"Seethechangelog"
-2000-01-20 11:18 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-01-20 11:18 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: updated Peter email address
-2000-01-10 00:20 Pixel <pixel@mandrakesoft.com>
+2000-01-10 00:20 Pixel <pixel at mandrakesoft.com>
* mandrake_desk.spec: no_comment
-2000-01-07 10:59 Pixel <pixel@mandrakesoft.com>
+2000-01-07 10:59 Pixel <pixel at mandrakesoft.com>
* mandrake_desk.spec, window-managers: no_comment
-2000-01-07 10:23 Frederic Lepied <flepied@mandrakesoft.com>
+2000-01-07 10:23 Frederic Lepied <flepied at mandrakesoft.com>
* mandrake_desk.spec: [no log message]
-2000-01-07 10:20 Frederic Lepied <flepied@mandrakesoft.com>
+2000-01-07 10:20 Frederic Lepied <flepied at mandrakesoft.com>
* mandrake_desk.spec: * standard mandrake: none.
-2000-01-07 07:54 Pixel <pixel@mandrakesoft.com>
+2000-01-07 07:54 Pixel <pixel at mandrakesoft.com>
* mandrake_desk.spec, sbin/chksession: no_comment
-2000-01-05 23:38 Pixel <pixel@mandrakesoft.com>
+2000-01-05 23:38 Pixel <pixel at mandrakesoft.com>
* mandrake_desk.spec, sbin/kdeDesktopCleanup: no_comment
-2000-01-05 19:16 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-01-05 19:16 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: added Turkish entries
-2000-01-05 17:03 Pablo Saratxaga <pablo@mandrakesoft.com>
+2000-01-05 17:03 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: added Latvian entries
-2000-01-05 00:49 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-01-05 00:49 Chmouel Boudjnah
* Makefile, mandrake_desk.spec: "Seethechangelog"
-2000-01-04 13:24 David Baudens <baudens@mandrakesoft.com>
+2000-01-04 13:24 David Baudens <baudens at mandrakesoft.com>
* mandrake_desk.spec, window-managers: Use BBDrake & WMDrake for
BlackBox & Window Maker
-2000-01-03 02:36 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-01-03 02:36 Chmouel Boudjnah
* mandrake_desk.spec, window-managers: "Seethechangelog"
-1999-12-31 03:28 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-31 03:28 Chmouel Boudjnah
* Makefile: "Seethechangelog"
-1999-12-28 23:45 Pablo Saratxaga <pablo@mandrakesoft.com>
+1999-12-28 23:45 Pablo Saratxaga <pablo at mandrakesoft.com>
* mandrake_desk.spec: added the Gnome menu entries to the spec file
-1999-12-28 17:27 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-28 17:27 Chmouel Boudjnah
* Makefile, mandrake_desk.spec, sbin/chksession: "Seethechangelog"
-1999-12-28 16:12 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-28 16:12 Chmouel Boudjnah
* man/chksession.8: "Seethechangelog"
-1999-12-27 17:18 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-27 17:18 Chmouel Boudjnah
* Makefile, mandrake_desk.spec, sbin/chksession: "Seethechangelog"
-1999-12-27 12:57 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-27 12:57 Chmouel Boudjnah
* mandrake_desk.spec: "Seethechangelog"
-1999-12-27 12:53 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-27 12:53 Chmouel Boudjnah
* mandrake_desk.spec: "Seethechangelog"
-1999-12-27 12:21 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-27 12:21 Chmouel Boudjnah
* bin/linuxconf_kdesu: "Seethechangelog"
-1999-12-25 20:30 Pablo Saratxaga <pablo@mandrakesoft.com>
+1999-12-25 20:30 Pablo Saratxaga <pablo at mandrakesoft.com>
* Makefile, mandrake_desk.spec: added menu entries for Gnome
-1999-12-25 20:13 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-25 20:13 Chmouel Boudjnah
* window-managers, mandrake_desk.spec: "Seethechangelog"
-1999-12-25 20:09 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-25 20:09 Chmouel Boudjnah
* mandrake_desk.spec: "Seethechangelog"
-1999-12-25 18:25 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-25 18:25 Chmouel Boudjnah
* window-managers, mandrake_desk.spec, sbin/kdeDesktopCleanup:
"Seethechangelog"
-1999-12-24 13:00 Pixel <pixel@mandrakesoft.com>
+1999-12-24 13:00 Pixel <pixel at mandrakesoft.com>
* mandrake_desk.spec: no_comment
-1999-12-23 23:34 Pablo Saratxaga <pablo@mandrakesoft.com>
+1999-12-23 23:34 Pablo Saratxaga <pablo at mandrakesoft.com>
* mandrake_desk.spec: added Gnome desktop icons previously done in
gmc package
-1999-12-23 01:38 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-23 01:38 Chmouel Boudjnah
* mandrake_desk.spec: "Seethechangelog"
-1999-12-23 00:59 Pablo Saratxaga <pablo@mandrakesoft.com>
+1999-12-23 00:59 Pablo Saratxaga <pablo at mandrakesoft.com>
* TRANSLATORS: added Bulgarian entries
-1999-12-22 03:28 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-22 03:28 Chmouel Boudjnah
* Makefile, mandrake_desk.spec: "Seethechangelog"
-1999-12-22 03:21 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-22 03:21 Chmouel Boudjnah
* Makefile, mandrake_desk.spec, sbin/fndSession, sbin/chksession,
window-managers: "Seethechangelog"
-1999-12-22 03:08 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-22 03:08 Chmouel Boudjnah
* bin/fndSession, sbin/Xsession: "Seethechangelog"
-1999-12-21 13:18 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-21 13:18 Chmouel Boudjnah
* Makefile, mandrake_desk.spec: "Seethechangelog"
-1999-12-21 02:00 David Baudens <baudens@mandrakesoft.com>
+1999-12-21 02:00 David Baudens <baudens at mandrakesoft.com>
* sbin/: Xsession, fndSession:
Add some WM. Sort in alphabetic order-
-1999-12-20 14:59 Pixel <pixel@mandrakesoft.com>
+1999-12-20 14:59 Pixel <pixel at mandrakesoft.com>
* Makefile, mandrake_desk.spec: no_comment
-1999-12-19 19:55 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-19 19:55 Chmouel Boudjnah
* bin/fndSession: "Seethechangelog"
-1999-12-19 19:50 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-19 19:50 Chmouel Boudjnah
* Makefile, mandrake_desk.spec, README.CVS: "Seethechangelog"
-1999-12-19 19:09 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-19 19:09 Chmouel Boudjnah
* sbin/fndSession: "Seethechangelog"
-1999-12-19 19:05 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-19 19:05 Chmouel Boudjnah
* bin/fndSession, mandrake_desk.spec: "Seethechangelog"
-1999-12-19 19:02 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-19 19:02 Chmouel Boudjnah
* Makefile, TRANSLATORS, backgrounds/mandrake_background_1024.jpg,
backgrounds/mandrake_background_800.jpg, bin/linuxconf_kdesu,
sbin/kdeDesktopCleanup: Initial revision
-1999-12-19 19:02 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+1999-12-19 19:02 Chmouel Boudjnah
* Makefile, TRANSLATORS, backgrounds/mandrake_background_1024.jpg,
backgrounds/mandrake_background_800.jpg, bin/linuxconf_kdesu,
' href='#n4068'>4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 4420 4421 4422 4423 4424 4425 4426 4427 4428 4429 4430 4431 4432 4433 4434 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 4474 4475 4476 4477 4478 4479 4480 4481 4482 4483 4484 4485 4486 4487 4488 4489 4490 4491 4492 4493 4494 4495 4496 4497 4498 4499 4500 4501 4502 4503 4504 4505 4506 4507 4508 4509 4510 4511 4512 4513 4514 4515 4516 4517 4518 4519 4520 4521 4522 4523 4524 4525 4526 4527 4528 4529 4530 4531 4532 4533 4534 4535 4536 4537 4538 4539 4540 4541 4542 4543 4544 4545 4546 4547 4548 4549 4550 4551 4552 4553 4554 4555 4556 4557 4558 4559 4560 4561 4562 4563 4564 4565 4566 4567 4568 4569 4570 4571 4572 4573 4574 4575 4576 4577 4578 4579 4580 4581 4582 4583 4584 4585 4586 4587 4588 4589 4590 4591 4592 4593 4594 4595 4596 4597 4598 4599 4600 4601 4602 4603 4604 4605 4606 4607 4608 4609 4610 4611 4612 4613 4614 4615 4616 4617 4618 4619 4620 4621 4622 4623 4624 4625 4626 4627 4628 4629 4630 4631 4632 4633 4634 4635 4636 4637 4638 4639 4640 4641 4642 4643 4644 4645 4646 4647 4648 4649 4650 4651 4652 4653 4654 4655 4656 4657 4658 4659 4660 4661 4662 4663 4664 4665 4666 4667 4668 4669 4670 4671 4672 4673 4674 4675 4676 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 4691 4692 4693 4694 4695 4696 4697 4698 4699 4700 4701 4702 4703 4704 4705 4706 4707 4708 4709 4710 4711 4712 4713 4714 4715 4716 4717 4718 4719 4720 4721 4722 4723 4724 4725 4726 4727 4728 4729 4730 4731 4732 4733 4734 4735 4736 4737 4738 4739 4740 4741 4742 4743 4744 4745 4746 4747 4748 4749 4750 4751 4752 4753 4754 4755 4756 4757 4758 4759 4760 4761 4762 4763 4764 4765 4766 4767 4768 4769 4770 4771 4772 4773 4774 4775 4776 4777 4778 4779 4780 4781 4782 4783 4784 4785 4786 4787 4788 4789 4790 4791 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 4807 4808 4809 4810 4811 4812 4813 4814 4815 4816 4817 4818 4819 4820 4821 4822 4823 4824 4825 4826 4827 4828 4829 4830 4831 4832 4833 4834 4835 4836 4837 4838 4839 4840 4841 4842 4843 4844 4845 4846 4847 4848 4849 4850 4851 4852 4853 4854 4855 4856 4857 4858 4859 4860 4861 4862 4863 4864 4865 4866 4867 4868 4869 4870 4871 4872 4873 4874 4875 4876 4877 4878 4879 4880 4881 4882 4883 4884 4885 4886 4887 4888 4889 4890 4891 4892 4893 4894 4895 4896 4897 4898 4899 4900 4901 4902 4903 4904 4905 4906 4907 4908 4909 4910 4911 4912 4913 4914 4915 4916 4917 4918 4919 4920 4921 4922 4923 4924 4925 4926 4927 4928 4929 4930 4931 4932 4933 4934 4935 4936 4937 4938 4939 4940 4941 4942 4943 4944 4945 4946 4947 4948 4949 4950 4951 4952 4953 4954 4955 4956 4957 4958 4959 4960 4961 4962
package printer::printerdrake;
# $Id$

use strict;

use common;
use modules;
use network::network;
use log;
use interactive;
use printer::main;
use printer::services;
use printer::detect;
use printer::default;
use printer::data;

my $shortdistroname = "Mandrakelinux";

my $hp1000fwtext = N("The HP LaserJet 1000 needs its firmware to be uploaded after being turned on. Download the Windows driver package from the HP web site (the firmware on the printer's CD does not work) and extract the firmware file from it by decompressing the self-extracting '.exe' file with the 'unzip' utility and searching for the 'sihp1000.img' file. Copy this file into the '/etc/printer' directory. There it will be found by the automatic uploader script and uploaded whenever the printer is connected and turned on.
");

1;

sub config_cups {
    my ($printer, $security, $in, $upNetwork) = @_;

    local $::isWizard = 0;
    # Check whether the network functionality is configured and
    # running
    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 };

    #$in->set_help('configureRemoteCUPSServer') if $::isInstall;
    #- hack to handle cups remote server printing,
    #- first read /etc/cups/cupsd.conf for variable BrowsePoll address:port
    # Return value: 0 when nothing was changed ("Apply" never pressed), 1
    # when "Apply" was at least pressed once.
    my $retvalue = 0;
    # Read CUPS config file
    @{$printer->{cupsconfig}{cupsd_conf}} =
	printer::main::read_cupsd_conf();
    printer::main::read_cups_config($printer);
    # Read client.conf file
    my ($daemonless_cups, $remote_cups_server) =
	printer::main::read_client_conf();
    # Read state of japanese text printing mode
    my $jap_textmode = printer::main::get_jap_textmode();
    # Read state for auto-correction of cupsd.conf
    $printer->{cupsconfig}{autocorrection} =
	printer::main::get_cups_autoconf();
    my $oldautocorr = $printer->{cupsconfig}{autocorrection};
    # Human-readable strings for hosts onto which the local printers
    # are shared
    my $maindone;
    while (!$maindone) {
	my $sharehosts = printer::main::makesharehostlist($printer);
	my $browsepoll = printer::main::makebrowsepolllist($printer);
	my $buttonclicked;
	#- Show dialog
	if ($in->ask_from_(
	     { 
		 title => N("CUPS printer configuration"),
		 messages => N("Here you can choose whether the printers connected to this machine should be accessible by remote machines and by which remote machines.") .
		     N("You can also decide here whether printers on remote machines should be automatically made available on this machine."),
	     },
	     [
	      { text => N("The printers on this machine are available to other computers"), type => 'bool',
		val => \$printer->{cupsconfig}{localprintersshared},
		disabled => sub {
		    $daemonless_cups;
		} },
	      { text => N("Automatically find available printers on remote machines"), type => 'bool',
		val => \$printer->{cupsconfig}{remotebroadcastsaccepted},
		disabled => sub {
		    $daemonless_cups;
		} },
	      { val => N("Printer sharing on hosts/networks: ") .
		    ($printer->{cupsconfig}{customsharingsetup} ?
		     N("Custom configuration") :
		     ($#{$sharehosts->{list}} >= 0 ?
		      ($#{$sharehosts->{list}} > 1 ?
		       join(", ", @{$sharehosts->{list}}[0,1]) . " ..." :
		       join(", ", @{$sharehosts->{list}})) :
		      N("No remote machines"))), 
		type => 'button',
		clicked_may_quit => sub {
		    $buttonclicked = "sharehosts";
		    1;
		},
		disabled => sub {
		    $daemonless_cups ||
		    (!$printer->{cupsconfig}{localprintersshared} &&
		     !$printer->{cupsconfig}{remotebroadcastsaccepted});
		} },
	      { val => N("Additional CUPS servers: ") .
		     ($#{$browsepoll->{list}} >= 0 ?
		      ($#{$browsepoll->{list}} > 1 ?
		       join(", ", @{$browsepoll->{list}}[0,1]) . " ..." :
		       join(", ", @{$browsepoll->{list}})) :
		      N("None")), 
		type => 'button',
		help => N("To get access to printers on remote CUPS servers in your local network you only need to turn on the \"Automatically find available printers on remote machines\" option; the CUPS servers inform your machine automatically about their printers. All printers currently known to your machine are listed in the \"Remote printers\" section in the main window of Printerdrake. If your CUPS server(s) is/are not in your local network, you have to enter the IP address(es) and optionally the port number(s) here to get the printer information from the server(s)."),
		clicked_may_quit => sub {
		    $buttonclicked = "browsepoll";
		    1;
		},
		disabled => sub {
		    $daemonless_cups;
		} },
	      { text => N("Japanese text printing mode"),
		help => N("Turning on this allows to print plain text files in Japanese language. Only use this function if you really want to print text in Japanese, if it is activated you cannot print accentuated characters in latin fonts any more and you will not be able to adjust the margins, the character size, etc. This setting only affects printers defined on this machine. If you want to print Japanese text on a printer set up on a remote machine, you have to activate this function on that remote machine."),
		type => 'bool',
		val => \$jap_textmode, 
		disabled => sub {
		    $daemonless_cups;
		} },
	      if_($printer->{expert},
		  { text => N("Automatic correction of CUPS configuration"),
		    type => 'bool',
		    help => N("When this option is turned on, on every startup of CUPS it is automatically made sure that

- if LPD/LPRng is installed, /etc/printcap will not be overwritten by CUPS

- if /etc/cups/cupsd.conf is missing, it will be created

- when printer information is broadcasted, it does not contain \"localhost\" as the server name.

If some of these measures lead to problems for you, turn this option off, but then you have to take care of these points."),
		    val => \$printer->{cupsconfig}{autocorrection},
                    disabled => sub {
			$daemonless_cups;
		    } }),
	      { val => N("Remote CUPS server and no local CUPS daemon") .
		    ": " .
		    ($daemonless_cups ? 
		     N("On") . "; " . N("Server") . ": " . 
		     $remote_cups_server :
		     N("Off")),
		help => N("In this mode the local CUPS daemon will be stopped and all printing requests go directly to the server specified below. Note that it is not possible to define local print queues then and if the specified server is down it cannot be printed at all from this machine."),
		type => 'button',
		clicked_may_quit => sub {
		    $buttonclicked = "daemonlesscups";
		    1;
		} },
	      ]
	     )
	    ) {
	    if ($buttonclicked eq "sharehosts") {
		# Show dialog to add hosts to share printers to
		my $subdone = 0;
		my $choice;
		while (!$subdone) {
		    # Entry should be edited when double-clicked
		    $buttonclicked = "edit";
		    $in->ask_from_(
			 { title => N("Sharing of local printers"),
			   messages => N("These are the machines and networks on which the locally connected printer(s) should be available:"),
			   ok => "",
			   cancel => "",
		         },
			 # List the hosts
			 [ { val => \$choice, format => \&translate,
			     sort => 0, separator => "####",
			     tree_expanded => 1,
			     quit_if_double_click => 1,
			     allow_empty_list => 1,
			     list => $sharehosts->{list} },
			   { val => N("Add host/network"), 
			     type => 'button',
			     clicked_may_quit => sub {
				 $buttonclicked = "add";
				 1; 
			     } },
			   { val => N("Edit selected host/network"), 
			     type => 'button',
			     clicked_may_quit => sub {
				 $buttonclicked = "edit";
				 1; 
			     },
			     disabled => sub {
				 return $#{$sharehosts->{list}} < 0;
			     } },
			   { val => N("Remove selected host/network"), 
			     type => 'button',
			     clicked_may_quit => sub {
				 $buttonclicked = "remove";
				 1; 
			     },
			     disabled => sub {
				 return $#{$sharehosts->{list}} < 0;
			     } },
			   { val => N("Done"), 
			     type => 'button',
			     clicked_may_quit => sub {
				 $buttonclicked = "";
				 $subdone = 1;
				 1; 
			     } },
			   ]
			 );
		    if ($buttonclicked eq "add" ||
			$buttonclicked eq "edit") {
			my ($hostchoice, $ip);
			if ($buttonclicked eq "add") {
			    # Use first entry as default for a new entry
			    $hostchoice = N("Local network(s)");
			} else {
			    if ($sharehosts->{invhash}{$choice} =~ /^\@/) {
				# Entry to edit is not an IP address
				$hostchoice = $choice;
			    } else {
				# Entry is an IP address
				$hostchoice = 
				    N("IP address of host/network:");
				$ip = $sharehosts->{invhash}{$choice};
			    }
			}
			my @menu = N("Local network(s)");
			my @interfaces = 
			    printer::detect::getNetworkInterfaces();
		        foreach my $interface (@interfaces) {
			    push @menu, N("Interface \"%s\"", $interface);
			}
			push @menu, N("IP address of host/network:");
			# Show the dialog
			my $address;
			my $oldaddress = 
			    ($buttonclicked eq "edit" ?
			     $sharehosts->{invhash}{$choice} : "");
			if ($in->ask_from_(
			     { title => N("Sharing of local printers"),
			       messages => N("Choose the network or host on which the local printers should be made available:"),
			       callbacks => {
				   complete => sub {
				       if ($hostchoice eq 
					    N("IP address of host/network:") &&
					   $ip =~ /^\s*$/) {
					   
					   $in->ask_warn(N("Error"), N("Host/network IP address missing."));
					   return 1, 1;
				       }
				       if ($hostchoice eq 
					    N("IP address of host/network:") &&
					   !printer::main::is_network_ip($ip)) {
					   
					   $in->ask_warn(N("Error"), 
N("The entered host/network IP is not correct.\n") .
N("Examples for correct IPs:\n") .
  "192.168.100.194\n" .
  "10.0.0.*\n" .
  "10.1.*\n" .
  "192.168.100.0/24\n" .
  "192.168.100.0/255.255.255.0\n"
);
					   return 1, 1;
				       }
				       if ($hostchoice eq $menu[0]) {
					   $address = '@LOCAL';
				       } elsif ($hostchoice eq $menu[-1]) {
					   $address = $ip;
				       } else {
					   ($address) =
					       grep { $hostchoice =~ /$_/ } 
					       @interfaces;
					   $address = "\@IF($address)";
				       }
				       # Check whether item is duplicate
				       if ($address ne $oldaddress &&
					   member($address,
						  @{$printer->{cupsconfig}{clientnetworks}})) {
					   $in->ask_warn(N("Error"), 
							 N("This host/network is already in the list, it cannot be added again.\n"));
					   if ($hostchoice eq 
					       N("IP address of host/network:")) {
					       return 1, 1;
					   } else {
					       return 1, 0;
					   }
				       }
				       return 0;
				   },
			       },
			   },
			     # List the host types
			     [ { val => \$hostchoice, format => \&translate,
				 type => 'list',
				 sort => 0,
				 list => \@menu },
			       { val => \$ip, 
				 disabled => sub {
				     $hostchoice ne 
					 N("IP address of host/network:");
			         } },
			       ],
			     )) {
			    # OK was clicked, insert new item into the list
			    if ($buttonclicked eq "add") {
				push(@{$printer->{cupsconfig}{clientnetworks}},
				     $address);
			    } else {
				@{$printer->{cupsconfig}{clientnetworks}} =
				    map { ($_ eq
					  $sharehosts->{invhash}{$choice} ?
					  $address : $_) }
				        @{$printer->{cupsconfig}{clientnetworks}};
			    }
			    # Refresh list of hosts
			    $sharehosts = 
			    printer::main::makesharehostlist($printer);
			    # We have modified the configuration now
			    $printer->{cupsconfig}{customsharingsetup} = 0;
			    # Position the list cursor on the new/modified
			    # item
			    $choice = $sharehosts->{hash}{$address};
			}
		    } elsif ($buttonclicked eq "remove") {
			@{$printer->{cupsconfig}{clientnetworks}} =
			    grep { $_ ne $sharehosts->{invhash}{$choice} }
			    @{$printer->{cupsconfig}{clientnetworks}};
			# Refresh list of hosts
			$sharehosts = 
			    printer::main::makesharehostlist($printer);
			# We have modified the configuration now
			$printer->{cupsconfig}{customsharingsetup} = 0;
		    }
		}
		# If we have no entry in the list, we do not
		# share the local printers, mark this
		if ($#{$printer->{cupsconfig}{clientnetworks}} < 0) {
		    $printer->{cupsconfig}{localprintersshared} = 0;
		    $printer->{cupsconfig}{remotebroadcastsaccepted} = 0;
		}
	    } elsif ($buttonclicked eq "browsepoll") {
		# Show dialog to add hosts to "BrowsePoll" from
		my $subdone = 0;
		my $choice;
		while (!$subdone) {
		    # Entry should be edited when double-clicked
		    $buttonclicked = "edit";
		    $in->ask_from_(
			 { title => N("Accessing printers on remote CUPS servers"),
			   messages => N("Add here the CUPS servers whose printers you want to use. You only need to do this if the servers do not broadcast their printer information into the local network."),
			   ok => "",
			   cancel => "",
		         },
			 # List the hosts
			 [ { val => \$choice, format => \&translate,
			     sort => 0, separator => "####",
			     tree_expanded => 1,
			     quit_if_double_click => 1,
			     allow_empty_list => 1,
			     list => $browsepoll->{list} },
			   { val => N("Add server"), 
			     type => 'button',
			     clicked_may_quit => sub {
				 $buttonclicked = "add";
				 1; 
			     } },
			   { val => N("Edit selected server"), 
			     type => 'button',
			     clicked_may_quit => sub {
				 $buttonclicked = "edit";
				 1; 
			     },
			     disabled => sub {
				 return $#{$browsepoll->{list}} < 0;
			     } },
			   { val => N("Remove selected server"), 
			     type => 'button',
			     clicked_may_quit => sub {
				 $buttonclicked = "remove";
				 1; 
			     },
			     disabled => sub {
				 return $#{$browsepoll->{list}} < 0;
			     } },
			   { val => N("Done"), 
			     type => 'button',
			     clicked_may_quit => sub {
				 $buttonclicked = "";
				 $subdone = 1;
				 1; 
			     } },
			   ]
			 );
		    if ($buttonclicked eq "add" ||
			$buttonclicked eq "edit") {
			my ($ip, $port);
			if ($buttonclicked eq "add") {
			    # Use default port
			    $port = '631';
			} else {
			    if ($browsepoll->{invhash}{$choice} =~
				/^([^:]+):([^:]+)$/) {
				# Entry to edit has IP and port
				$ip = $1;
				$port = $2;
			    } else {
				# Entry is only an IP, no port, so take
				# the default port 631
				$ip = $browsepoll->{invhash}{$choice};
				$port = '631';
			    }
			}
			# Show the dialog
			my $address;
			my $oldaddress = 
			    ($buttonclicked eq "edit" ?
			     $browsepoll->{invhash}{$choice} : "");
			if ($in->ask_from_(
			     { title => N("Accessing printers on remote CUPS servers"),
			       messages => N("Enter IP address and port of the host whose printers you want to use.") . ' ' .
				   N("If no port is given, 631 will be taken as default."),
			       callbacks => {
				   complete => sub {
				       if ($ip =~ /^\s*$/) {
					   $in->ask_warn(N("Error"), N("Server IP missing!"));
					   return 1, 0;
				       }
				       if ($ip !~ 
					   /^\s*(\d+\.\d+\.\d+\.\d+)\s*$/) {
					   $in->ask_warn(N("Error"), 
N("The entered IP is not correct.\n") .
N("Examples for correct IPs:\n") .
  "192.168.100.194\n" .
  "10.0.0.2\n"
);
					   return 1, 0;
				       } else {
					   $ip = $1;
				       }
				       if ($port !~ /\S/) {
					   $port = '631';
				       } elsif ($port !~ /^\s*(\d+)\s*$/) {
					   $in->ask_warn(N("Error"), N("The port number should be an integer!"));
					   return 1, 1;
				       } else {
					   $port = $1;
				       }
				       $address = "$ip:$port";
				       # Check whether item is duplicate
				       if ($address ne $oldaddress &&
					   member($address,
						  @{$printer->{cupsconfig}{BrowsePoll}})) {
					   $in->ask_warn(N("Error"), 
							 N("This server is already in the list, it cannot be added again.\n"));
					   return 1, 0;
				       }
				       return 0;
				   },
			       },
			   },
			     # Ask for IP and port
			     [ { val => \$ip, 
				 label => N("IP address") },
			       { val => \$port, 
				 label => N("Port") },
			       ],
			     )) {
			    # OK was clicked, insert new item into the list
			    if ($buttonclicked eq "add") {
				push(@{$printer->{cupsconfig}{BrowsePoll}},
				     $address);
			    } else {
				@{$printer->{cupsconfig}{BrowsePoll}} =
				    map { ($_ eq
					  $browsepoll->{invhash}{$choice} ?
					  $address : $_) }
				        @{$printer->{cupsconfig}{BrowsePoll}};
			    }
			    # Refresh list of hosts
			    $browsepoll = 
			    printer::main::makebrowsepolllist($printer);
			    # Position the list cursor on the new/modified
			    # item
			    $choice = $browsepoll->{hash}{$address};
			}
		    } elsif ($buttonclicked eq "remove") {
			@{$printer->{cupsconfig}{BrowsePoll}} =
			    grep { $_ ne $browsepoll->{invhash}{$choice} }
			    @{$printer->{cupsconfig}{BrowsePoll}};
			# Refresh list of hosts
			$browsepoll = 
			    printer::main::makebrowsepolllist($printer);
		    }
		}
	    } elsif ($buttonclicked eq "daemonlesscups") {
		my ($modechoice, $rserver);
		if ($daemonless_cups) {
		    $modechoice = N("On, Name or IP of remote server:");
		    $rserver = $remote_cups_server;
		} else {
		    $modechoice = N("Off");
		}
		# Show the dialog
		#my $address;
		#my $oldaddress = 
		#    ($buttonclicked eq "edit" ?
		#     $sharehosts->{invhash}{$choice} : "");
		if ($in->ask_from_
		    ({ title => N("Remote CUPS server and no local CUPS daemon"),
		       messages => N("In this mode the local CUPS daemon will be stopped and all printing requests go directly to the server specified below. Note that it is not possible to define local print queues then and if the specified server is down it cannot be printed at all from this machine."),
		       callbacks => {
			   complete => sub {
			       if ($modechoice eq 
				   N("On, Name or IP of remote server:") &&
				   $rserver =~ /^\s*$/) {
				   
				   $in->ask_warn(N("Error"), N("CUPS server name or IP address missing."));
				   return 1, 1;
			       }
			       return 0;
			   },
		       },
		   },
		     # Show the widgets
		     [ { val => \$modechoice, format => \&translate,
			 type => 'list',
			 sort => 0,
			 list => [ N("Off"),
				   N("On, Name or IP of remote server:") ]},
		       { val => \$rserver, 
			 disabled => sub {
			     $modechoice ne 
				 N("On, Name or IP of remote server:");
			 } },
		       ],
		     )) {
		    # OK was clicked, update the data
		    $daemonless_cups = 
			($modechoice eq N("On, Name or IP of remote server:"));
		    $remote_cups_server = $rserver;
		}
	    } else {
		# We have clicked "OK"
		$retvalue = 1;
		$maindone = 1;
		# Write state for auto-correction of cupsd.conf
		if ($oldautocorr != 
		    $printer->{cupsconfig}{autocorrection}) {
		    printer::main::set_cups_autoconf(
			$printer->{cupsconfig}{autocorrection});
		}
		# Write state of japanese text printing mode
		printer::main::set_jap_textmode($jap_textmode);
		# Switch state of daemon-less CUPS mode and write
		# client.conf
		if (($daemonless_cups && $printer->{SPOOLER} ne "rcups") ||
		    (!$daemonless_cups && $printer->{SPOOLER} eq "rcups")) {
		    my $oldspooler = $printer->{SPOOLER};
		    $printer->{SPOOLER} = ($daemonless_cups ? 
					  "rcups" : "cups");
		    if (install_spooler($printer, $security, $in->do_pkgs, $in, $upNetwork, 1)) {
			printer::default::set_spooler($printer);
			printer::main::write_client_conf
			    ($daemonless_cups, $remote_cups_server);
			$printer->{remote_cups_server} =
			    $remote_cups_server;
			# Get the queues of this spooler
			my $w = $in->wait_message
			    (N("Printerdrake"),
			     N("Reading printer data..."));
			printer::main::read_configured_queues($printer);
			undef $w;
			# Re-read the printer database next time
			%printer::main::thedb = ();
			assure_default_printer_is_set($printer, $in);
		    } else {
			$printer->{SPOOLER} = $oldspooler;
		    }
		} elsif ($daemonless_cups) {
		    printer::main::write_client_conf($daemonless_cups,
						     $remote_cups_server);
		    $printer->{remote_cups_server} = $remote_cups_server;
		} else {
		    undef $printer->{remote_cups_server};
		}
		# Write cupsd.conf
		printer::main::write_cups_config($printer);
		my $w = 
		    $in->wait_message(N("Printerdrake"),
				      N("Restarting CUPS..."));
		printer::main::write_cupsd_conf(
		    @{$printer->{cupsconfig}{cupsd_conf}});
		#- restart cups after updating configuration.
		printer::main::SIGHUP_daemon($printer->{SPOOLER});
		undef $w;
	    }
	} else {
	    # Cancel clicked
	    $maindone = 1;
	}
    }
    printer::main::clean_cups_config($printer);
    return $retvalue;
}

sub choose_printer_type {
    my ($printer, $in, $upNetwork) = @_;
    my $havelocalnetworks = check_network($printer, $in, $upNetwork, 1) &&
	                    printer::detect::getIPsInLocalNetworks() != ();
    $printer->{str_type} = $printer_type_inv{$printer->{TYPE}};
    my $autodetect = 0;
    $autodetect = 1 if $printer->{AUTODETECT};
    my @printertypes = printer::main::printer_type($printer);
    $in->ask_from_(
		   { title => N("Select Printer Connection"),
		     messages => N("How is the printer connected?") .
			 if_($printer->{SPOOLER} eq "cups",
			  N("
Printers on remote CUPS servers do not need to be configured here; these printers will be automatically detected.")) .
			 if_(!$havelocalnetworks,
			  N("\nWARNING: No local network connection active, remote printers can neither be detected nor tested!")),
		     },
		   [
		    { val => \$printer->{str_type},
		      list => \@printertypes, 
		      not_edit => 1, sort => 0,
		      type => 'list' },
		    { text => N("Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"),
		      type => 'bool', val => \$autodetect }
		    ]
		   ) or return 0;
    $printer->{AUTODETECT} = $autodetect ? 1 : undef;
    $printer->{TYPE} = $printer_type{$printer->{str_type}};
    1;
}

sub setup_printer_connection {
    my ($printer, $in, $upNetwork) = @_;
    # Choose the appropriate connection config dialog
    my $done = 1;
    for ($printer->{TYPE}) {
	/LOCAL/    and setup_local_autoscan($printer, $in, $upNetwork) and last;
	/LPD/      and setup_lpd(      $printer, $in, $upNetwork) and last;
	/SOCKET/   and setup_socket(   $printer, $in, $upNetwork) and last;
	/SMB/      and setup_smb(      $printer, $in, $upNetwork) and last;
	/NCP/      and setup_ncp(      $printer, $in, $upNetwork) and last;
	/URI/      and setup_uri(      $printer, $in, $upNetwork) and last;
	/POSTPIPE/ and setup_postpipe( $printer, $in) and last;
	$done = 0; last;
    }
    return $done;
}

sub first_time_dialog {
    my ($printer, $in, $upNetwork) = @_;
    return 1 if printer::default::get_spooler() || $::isInstall;

    my $w = $in->wait_message(N("Printerdrake"), N("Checking your system..."));

    # Auto-detect local printers   
    my @autodetected = printer::detect::local_detect();
    my $msg = do {
	if (@autodetected) {
	    my @printerlist = 
	      map {
		  my $entry = $_->{val}{DESCRIPTION};
		  $entry ||= "$_->{val}{MANUFACTURER} $_->{val}{MODEL}";
		  if_($entry, "  -  $entry\n");
	      } @autodetected;
	    my $unknown_printers = @autodetected - @printerlist;
	    if (@printerlist) {
		my $unknown_msg = 
		  $unknown_printers == 1 ? 
		    "\n" . N("and one unknown printer") :
		  $unknown_printers > 1 ?
		    "\n" . N("and %d unknown printers", $unknown_printers) :
		    '';
		my $main_msg = 
		  @printerlist > 1 ?
		    N_("The following printers\n\n%s%s\nare directly connected to your system") :
		  $unknown_printers ?
		    N_("The following printer\n\n%s%s\nare directly connected to your system") :
		    N_("The following printer\n\n%s%s\nis directly connected to your system");
		sprintf($main_msg, join('', @printerlist), $unknown_msg);
	    } else {
		$unknown_printers == 1 ?
		  N("\nThere is one unknown printer directly connected to your system") :
		  N("\nThere are %d unknown printers directly connected to your system", $unknown_printers);
	    }
	} else {
	    N("There are no printers found which are directly connected to your machine");
	}
    };
    $msg .= N(" (Make sure that all your printers are connected and turned on).\n");

    # Do we have a local network?

    # If networking is configured, start it, but do not ask the user to
    # configure networking.
    my $havelocalnetworks = 
	 check_network($printer, $in, $upNetwork, 1) && 
           printer::detect::getIPsInLocalNetworks() != ();

    # Finish building the dialog text
    my $question = ($havelocalnetworks ?
		    (@autodetected ?
		     N("Do you want to enable printing on the printers mentioned above or on printers in the local network?\n") :
		     N("Do you want to enable printing on printers in the local network?\n")) :
		    (@autodetected ?
		     N("Do you want to enable printing on the printers mentioned above?\n") :
		     N("Are you sure that you want to set up printing on this machine?\n")));
    my $warning = N("NOTE: Depending on the printer model and the printing system up to %d MB of additional software will be installed.", 80);
    my $dialogtext = "$msg\n$question\n$warning";

    # Close wait message
    undef $w;

    while (1) {
	# Show dialog
	my $do_it = N("Yes");
	my $quit = N("Quit");
	my @choices = ($do_it, $quit);
	my $choice = $in->ask_from_list(N("Printerdrake"), $dialogtext, 
					\@choices, $quit);
	return 0 if $choice ne $do_it;
    
	if ($havelocalnetworks && !@autodetected ) {
	    return set_cups_daemon_mode($printer, $in);
	} else {
	    $printer->{SPOOLER} = "cups";
	    return 1;
	}
    }
}

sub configure_new_printers {
    my ($printer, $in, $_upNetwork) = @_;

    # This procedure auto-detects local printers and checks whether
    # there is already a queue for them. If there is no queue for an
    # auto-detected printer, a queue gets set up non-interactively.

    # Experts can have weird things as self-made CUPS backends, so do not
    # automatically pollute the system with unwished queues in expert
    # mode
    return 1 if $printer->{expert};
    
    # Wait message
    my $w = $::noX || 
	$in->wait_message(N("Printerdrake"),
			  N("Searching for new printers..."));

    # When HPOJ is running, it blocks the printer ports on which it is
    # configured, so we stop it here. If it is not installed or not 
    # configured, this command has no effect. We do not stop HPOJ if we are
    # called by the hotplug script, as HPOJ reloads the parallel port
    # kernel modules and causes a new hotplug signal which leads to
    # recursive calls of the hotplug script.
    require services;
    services::stop("hpoj") if !$::noX;

    # Auto-detect local printers
    my @autodetected = printer::detect::local_detect();

    # We are ready with auto-detection, so we restart HPOJ here. If it 
    # is not installed or not configured, this command has no effect.
    services::start("hpoj") if !$::noX;

    # No printer found? So no need of new queues.
    return 1 if !@autodetected;

    # Black-list all auto-detected printers for which there is already
    # a queue
    my @blacklist;
    foreach my $queue (keys %{$printer->{configured}}) {
	# Does the URI of this installed queue match one of the autodetected
	# printers?
	my $uri = $printer->{configured}{$queue}{queuedata}{connect};
	my $p = printer::main::autodetectionentry_for_uri(
	    $uri, @autodetected);
	if (defined($p)) {
	    # Blacklist the port
	    push(@blacklist, $p->{port});
	}
    }

    # Now install queues for all auto-detected printers which have no queue
    # yet
    $printer->{noninteractive} = 1; # Suppress all interactive steps
    foreach my $p (@autodetected) {
	if (!member($p->{port}, @blacklist)) {
	    # Initialize some variables for queue setup
	    $printer->{NEW} = 1;
	    $printer->{TYPE} = "LOCAL";
	    $printer->{currentqueue} = { queue    => "",
					 foomatic => 0,
					 desc     => "",
					 loc      => "",
					 make     => "",
					 model    => "",
					 printer  => "",
					 driver   => "",
					 connect  => "",
					 spooler  => $printer->{SPOOLER},
				       };
	    undef $w;
	    $w = $::noX || 
		$in->wait_message(N("Printerdrake"),
				  N("Found printer on %s...",
				    $p->{port}));
	    # Do configuration of multi-function devices and look up
	    # model name in the printer database
	    setup_common($printer, $in, $p->{val}{DESCRIPTION}, $p->{port},
			 1, @autodetected) or next;
	    # Do the steps of queue setup
	    get_db_entry($printer, $in);
	    # Let the user choose the model manually if it could not be
	    # auto-detected.
	    if (!$printer->{DBENTRY}) {
		# Skip this printer if we install print queues in a
		# background without X access.
		if ($::noX) {
		    # Delete some variables
		    foreach (qw(OLD_QUEUE QUEUE TYPE str_type DBENTRY ARGS OLD_CHOICE currentqueue NEW)) {
			$printer->{$_} = "";
		    }
		    next;
		}
		# Set the OLD_CHOICE to a non-existing value
		$printer->{OLD_CHOICE} = "XXX";
		# Set model selection cursor onto the "Raw Printer" entry.
		$printer->{DBENTRY} = N("Raw printer (No driver)");
		# Info about what was detected
		my $info = N("(") . if_($p->{val}{DESCRIPTION},
					$p->{val}{DESCRIPTION} . N(" on ")) .
					$p->{port} . N(")");
		# Remove wait message
		undef $w;
		# Choose the printer/driver from the list
		$printer->{DBENTRY} = 
		    $in->ask_from_treelist(N("Printer model selection"),
					   N("Which printer model do you have?") .
					   N("

Printerdrake could not determine which model your printer %s is. Please choose the correct model from the list.", $info) . " " .
					   N("If your printer is not listed, choose a compatible (see printer manual) or a similar one."), '|',
					   [ keys %printer::main::thedb ], $printer->{DBENTRY}) or next;
		# Restore wait message
		$w = $::noX ||
		    $in->wait_message(N("Printerdrake"),
				      N("Configuring printer on %s...",
					$p->{port}));
	    }
	    get_printer_info($printer, $in) or next;
	    setup_options($printer, $in) or next;
	    my $_queue = generate_queuename($printer);
	    # Change wait message
	    undef $w;
	    $w = $::noX || 
		$in->wait_message(N("Printerdrake"),
				  N("Configuring printer \"%s\"...",
				    $printer->{currentqueue}{queue}));
	    # Create the queue
	    configure_queue($printer, $in) or next;
	    # If there is no default printer set, let this one get the
	    # default
	    if (!$printer->{DEFAULT}) {
		$printer->{DEFAULT} = $printer->{QUEUE};
		printer::default::set_printer($printer);
	    }
	}
	# Delete some variables
	foreach (qw(OLD_QUEUE QUEUE TYPE str_type DBENTRY ARGS OLD_CHOICE)) {
	    $printer->{$_} = "";
	}
	$printer->{currentqueue} = {};
	$printer->{complete} = 0;
    }
    undef $printer->{noninteractive};
}

sub generate_queuename {
    my ($printer) = @_;
    my $queue;
    if ($printer->{currentqueue}{model}) {
	if ($printer->{currentqueue}{model} eq N("Unknown model")) {
	    $queue = N("Printer");
	} else {
	    $queue = $printer->{currentqueue}{make} . '|' .
		$printer->{currentqueue}{model};
	}
    } else {
	$queue = $printer->{DBENTRY};
    }
    $queue =~ s/\|/ /g;
    $printer->{currentqueue}{desc} = $queue;
    $queue =~ s/series//gi;
    $queue =~ s/[\s\(\)\-,]//g;
    my $make = $printer->{currentqueue}{make};
    my $model = $printer->{currentqueue}{model};
    $queue =~ s/$make$make/$make/gi;
    # Do not use a queue name longer than 12 characters, as otherwise
    # Windows clients will not be able to access the printer
    my $ml = 12;
    if (length($queue) > $ml) {
	my %parts;
	$parts{'make'} = $make;
	$parts{'model'} = $model;
	# Go through the two components, begin with model name, then
	# make and then driver
	for my $part (qw/model make/) {
	    $parts{$part} =~ s/[^a-zA-Z0-9_]/ /g; 

	    # Split the component into words, cutting always at the
	    # right edge of the word. Cut also at a capital in the
	    # middle of the word (ex: "S" in "PostScript").
	    my @words =
		split(/(?<=[a-zA-Z])(?![a-zA-Z])|(?<=[a-z])(?=[A-Z])/,
		      $parts{$part});
	    # Go through all words
	    for (@words) {
		# Do not abbreviate words of less than 3 letters
		next if ($_ !~ /[a-zA-Z]{3,}$/);
	        while (1) {
		    # Remove the last letter
		    chop;
		    # Build the shortened component ...
		    $parts{$part} = join('', @words);
		    # ... and the queue name
		    $queue = "$parts{'make'} $parts{'model'}";
		    $queue =~ s/\s+//g;
		    # Stop if the queue name has 12 characters or
		    # less, if there is only one letter left, or if
		    # the manufacturer name is reduced to three
		    # characters.
		    last if ((length($queue) <= $ml) ||
			     ($_ !~ /[a-zA-Z]{2,}$/) ||
			     (length($parts{'make'}) <= 3));
		}
		$parts{$part} = join('', @words);
		$queue = "$parts{'make'} $parts{'model'}";
		$queue =~ s/\s+//g;
		last if (length($queue) <= $ml);
	    }
	    last if (length($queue) <= $ml);
	}
	while ((length($queue) > $ml) &&
	       (length($parts{'model'}) > 3)) {
	    # Queue name too long? Remove last words from model name.
	    $parts{'model'} =~
		s/(?<=[a-zA-Z0-9])[^a-zA-Z0-9]+[a-zA-Z0-9]*$//;
	    $queue = "$parts{'make'} $parts{'model'}";
	    $queue =~ s/\s+//g;
	}
	if (length($queue) > $ml) {
	    # If nothing else helps ...
	    $queue = substr($queue, 0, $ml);
	}
    }

    # Append a number if the queue name already exists
    if ($printer->{configured}{$queue}) {
	my $origname = $queue;
	my $i = 1;
	while (1) {
	    my $ol = length($origname);
	    my $nl = length($i);
	    my $us = ($origname =~ m/\d$/ ? 1 : 0);
	    if ($ol + $nl + $us <= $ml) {
		$queue = $origname . ($us ? '_' : '') . $i;
	    } else {
		$queue = substr($queue, 0, $ml - $nl);
		$queue =~ s/\d$/_/;
		$queue .= $i;
	    }
	    last if (!$printer->{configured}{$queue});
	    $i ++;
	}
    }

    $printer->{currentqueue}{queue} = $queue;
    $printer->{OLD_QUEUE} = $printer->{QUEUE} = $queue;
    return $queue;
}

sub wizard_welcome {
    my ($printer, $in, $upNetwork) = @_;
    my $ret;
    my $autodetectlocal = 0;
    my $autodetectnetwork = 0;
    my $autodetectsmb = 0;
    # If networking is configured, start it, but do not ask the user to
    # configure networking.
    my $havelocalnetworks;
    if ($printer->{expert}) {
	$havelocalnetworks = 0;
	undef $printer->{AUTODETECTNETWORK};
	undef $printer->{AUTODETECTSMB};
    } else {
	$havelocalnetworks = check_network($printer, $in, $upNetwork, 1) &&
			      printer::detect::getIPsInLocalNetworks() != ();
	if (!$havelocalnetworks) {
	    undef $printer->{AUTODETECTNETWORK};
	    undef $printer->{AUTODETECTSMB};
	}
	$autodetectlocal = 1 if $printer->{AUTODETECTLOCAL};
	$autodetectnetwork = 1 if $printer->{AUTODETECTNETWORK};
	$autodetectsmb = 1 if $printer->{AUTODETECTSMB};
    }
    if ($in) {
	eval {
	    if ($printer->{expert}) {
		if ($::isWizard) {
		    $ret = $in->ask_okcancel(
			 N("Add a new printer"),
			 N("
Welcome to the Printer Setup Wizard

This wizard allows you to install local or remote printers to be used from this machine and also from other machines in the network.

It asks you for all necessary information to set up the printer and gives you access to all available printer drivers, driver options, and printer connection types."));
		} else {
		    $ret = 1;
		}
	    } else {
		$ret = $in->ask_from_(
		     { title => N("Add a new printer"),
		       messages => ($printer->{SPOOLER} ne "pdq" ? 
				   ($havelocalnetworks ? N("
Welcome to the Printer Setup Wizard

This wizard will help you to install your printer(s) connected to this computer, connected directly to the network or to a remote Windows machine.

Please plug in and turn on all printers connected to this machine so that it/they can be auto-detected. Also your network printer(s) and your Windows machines must be connected and turned on.

Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network and/or Windows-hosted printers when you do not need it.

 Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now.") : N("
Welcome to the Printer Setup Wizard

This wizard will help you to install your printer(s) connected to this computer.

Please plug in and turn on all printers connected to this machine so that it/they can be auto-detected.

 Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now.")) : 
				   ($havelocalnetworks ? N("
Welcome to the Printer Setup Wizard

This wizard will help you to install your printer(s) connected to this computer or connected directly to the network.

If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected. Also your network printer(s) must be connected and turned on.

Note that auto-detecting printers on the network takes longer than the auto-detection of only the printers connected to this machine. So turn off the auto-detection of network printers when you do not need it.

 Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now.") : N("
Welcome to the Printer Setup Wizard

This wizard will help you to install your printer(s) connected to this computer.

If you have printer(s) connected to this machine, Please plug it/them in on this computer and turn it/them on so that it/they can be auto-detected.

 Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want to set up your printer(s) now."))) },
		     [
		      { text => N("Auto-detect printers connected to this machine"), type => 'bool',
			val => \$autodetectlocal },
		           if_($havelocalnetworks,
		      { text => N("Auto-detect printers connected directly to the local network"), type => 'bool',
			val => \$autodetectnetwork },
			   if_($printer->{SPOOLER} ne "pdq",
		      { text => N("Auto-detect printers connected to machines running Microsoft Windows"), type => 'bool',
			val => \$autodetectsmb })),
		      ]);
		$printer->{AUTODETECTLOCAL} = $autodetectlocal ? 1 : undef;
		$printer->{AUTODETECTNETWORK} = $autodetectnetwork ? 1 : undef;
		$printer->{AUTODETECTSMB} = $autodetectsmb && $printer->{SPOOLER} ne "pdq" ? 1 : undef;
	    }
	};
	return $@ =~ /wizcancel/ ? 0 : $ret;
    }
}

sub wizard_congratulations {
    my ($in) = @_;
    if ($in) {
	$in->ask_okcancel(N("Add a new printer"),
			  N("
Congratulations, your printer is now installed and configured!

You can print using the \"Print\" command of your application (usually in the \"File\" menu).

If you want to add, remove, or rename a printer, or if you want to change the default option settings (paper input tray, printout quality, ...), select \"Printer\" in the \"Hardware\" section of the %s Control Center.", $shortdistroname))
    }
}

sub setup_local_autoscan {
    my ($printer, $in, $upNetwork) = @_;
    my $queue = $printer->{OLD_QUEUE};
    my $expert_or_modify = $printer->{expert} || !$printer->{NEW};
    my $do_auto_detect = 
	($expert_or_modify &&
	  $printer->{AUTODETECT} ||
	 (!$expert_or_modify &&
	  ($printer->{AUTODETECTLOCAL} ||
	   $printer->{AUTODETECTNETWORK} ||
	   $printer->{AUTODETECTSMB})));

    # If the user requested auto-detection of remote printers, check
    # whether the network functionality is configured and running
    if ($printer->{AUTODETECTNETWORK} || $printer->{AUTODETECTSMB}) {
	return 0 unless check_network($printer, $in, $upNetwork, 0);
    }

    my @autodetected;
    my $menuentries = {};
#    $in->set_help('setupLocal') if $::isInstall;
    if ($do_auto_detect) {
	if (!$::testing &&
	    !$expert_or_modify && $printer->{AUTODETECTSMB} && !files_exist('/usr/bin/smbclient')) {
	    $in->do_pkgs->install('samba-client') or do {
		$in->ask_warn(N("Warning"),
			      N("Could not install the %s packages!",
				"Samba client") . " " .
			      N("Skipping Windows/SMB server auto-detection"));
		$printer->{AUTODETECTSMB} = 0;
		return 0 if !$printer->{AUTODETECTLOCAL} &&
			     !$printer->{AUTODETECTNETWORK};
	    };
	}
	my $_w = $in->wait_message(N("Printer auto-detection"), N("Detecting devices..."));
	# When HPOJ is running, it blocks the printer ports on which it is
	# configured, so we stop it here. If it is not installed or not 
	# configured, this command has no effect.
	require services;
	services::stop("hpoj");
	@autodetected = (
	    $expert_or_modify || $printer->{AUTODETECTLOCAL} ? printer::detect::local_detect() : (),
	    !$expert_or_modify ? printer::detect::whatNetPrinter($printer->{AUTODETECTNETWORK}, $printer->{AUTODETECTSMB}) : (),
        );
	# We have more than one printer, so we must ask the user for a queue
	# name in the fully automatic printer configuration.
	$printer->{MORETHANONE} = $#autodetected > 0;
	my @str;
	foreach my $p (@autodetected) {
	    if (($p->{val}{DESCRIPTION}) || ($p->{val}{MODEL})) {
		my $menustr = ($p->{val}{DESCRIPTION} ?
			       $p->{val}{DESCRIPTION} :
			       (($p->{val}{MANUFACTURER} ? 
				 ($p->{val}{MANUFACTURER} . " ") : ()) .
				$p->{val}{MODEL}));
		if ($p->{port} =~ m!^/dev/lp(\d+)$!) {
                    my $port = $1;
		    $menustr .= N(" on parallel port #%s", $port);
		} elsif ($p->{port} =~ m!^/dev/usb/lp(\d+)$!) {
                    my $printer = $1;
		    $menustr .= N(", USB printer #%s", $printer);
		} elsif ($p->{port} =~ m!^socket://([^:]+):(\d+)$!) {
                    my ($printer, $port) = ($1, $2);
		    $menustr .= N(", network printer \"%s\", port %s", $printer, $port);
		} elsif ($p->{port} =~ m!^smb://([^/:]+)/([^/:]+)$!) {
                    my ($server, $printer) = ($1, $2);
		    $menustr .= N(", printer \"%s\" on SMB/Windows server \"%s\"", $printer, $server);
		}
		$menustr .= " ($p->{port})" if $printer->{expert};
		$menuentries->{$menustr} = $p->{port};
		push @str, N("Detected %s", $menustr);
	    } else {
		my $menustr;
		if ($p->{port} =~ m!^/dev/lp(\d+)$!) {
                    my $port = $1;
		    $menustr = N("Printer on parallel port #%s", $port);
		} elsif ($p->{port} =~ m!^/dev/usb/lp(\d+)$!) {
                    my $printer = $1;
		    $menustr = N("USB printer #%s", $printer);
		} elsif ($p->{port} =~ m!^socket://([^:]+):(\d+)$!) {
                    my ($printer, $port);
		    $menustr .= N("Network printer \"%s\", port %s", $printer, $port);
		} elsif ($p->{port} =~ m!^smb://([^/:]+)/([^/:]+)$!) {
                    my ($server, $printer) = ($1, $2);
		    $menustr .= N("Printer \"%s\" on SMB/Windows server \"%s\"", $printer, $server);
		}
		$menustr .= " ($p->{port})" if $printer->{expert};
		$menuentries->{$menustr} = $p->{port};
	    }
	}
	my @port;
	if ($printer->{expert}) {
	    @port = printer::detect::whatPrinterPort();
	  LOOP: foreach my $q (@port) {
		if (@str) {
		    foreach my $p (@autodetected) {
			last LOOP if $p->{port} eq $q;
		    }
		}
		my $menustr;
		if ($q =~ m!^/dev/lp(\d+)$!) {
                    my $port = $1;
		    $menustr = N("Printer on parallel port #%s", $port);
		} elsif ($q =~ m!^/dev/usb/lp(\d+)$!) {
                    my $printer;
		    $menustr = N("USB printer #%s", $printer);
		}
		$menustr .= " ($q)" if $printer->{expert};
		$menuentries->{$menustr} = $q;
	    }
	}
	# We are ready with auto-detection, so we restart HPOJ here. If it 
	# is not installed or not configured, this command has no effect.
	printer::services::start("hpoj");
    } else {
	# Always ask for queue name in recommended mode when no auto-
	# detection was done
	$printer->{MORETHANONE} = $#autodetected > 0;
	my $m;
	for ($m = 0; $m <= 2; $m++) {
	    my $menustr = N("Printer on parallel port #%s", $m);
	    $menustr .= " (/dev/lp$m)" if $printer->{expert};
	    $menuentries->{$menustr} = "/dev/lp$m";
	    $menustr = N("USB printer #%s", $m);
	    $menustr .= " (/dev/usb/lp$m)" if $printer->{expert};
	    $menuentries->{$menustr} = "/dev/usb/lp$m";
	}
    }
    my @menuentrieslist = sort { 
	my @prefixes = ("/dev/lp", "/dev/usb/lp", "/dev/", "socket:", 
			"smb:");
	my $first = $menuentries->{$a};
	my $second = $menuentries->{$b};
	for (my $i = 0; $i <= $#prefixes; $i++) {
	    my $firstinlist = $first =~ m!^$prefixes[$i]!;
	    my $secondinlist = $second =~ m!^$prefixes[$i]!;
	    if ($firstinlist && !$secondinlist) { return -1 };
	    if ($secondinlist && !$firstinlist) { return 1 };
	}
	return $first cmp $second;
    } keys(%$menuentries);
    my $menuchoice = "";
    my $oldmenuchoice = "";
    my $device;
    if ($printer->{configured}{$queue}) {
	my $p = printer::main::autodetectionentry_for_uri(
	    $printer->{currentqueue}{connect}, @autodetected);
	if (defined($p)) {
	    $device = $p->{port};
	    $menuchoice = { reverse %$menuentries }->{$device};
	}
    }
    if ($menuchoice eq "" && @menuentrieslist > -1) {
	$menuchoice = $menuentrieslist[0];
	$oldmenuchoice = $menuchoice;
	$device = $menuentries->{$menuchoice} if $device eq "";
    }
    if ($in) {
#	$printer->{expert} or $in->set_help('configurePrinterDev') if $::isInstall;
	if ($#menuentrieslist < 0) { # No menu entry
	    # auto-detection has failed, we must do all manually
	    $do_auto_detect = 0;
	    $printer->{MANUAL} = 1;
	    if ($printer->{expert}) {
		$device = $in->ask_from_entry(
		     N("Local Printer"),
		     N("No local printer found! To manually install a printer enter a device name/file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."),
		     { 
			 complete => sub {
			     if ($menuchoice eq "") {
				 $in->ask_warn(N("Error"), N("You must enter a device or file name!"));
				 return 1, 0;
			     }
			     return 0;
			 }
		     });
		return 0 if $device eq "";
	    } else {
		$in->ask_warn(N("Printer auto-detection"),
			      N("No printer found!"));
		return 0;
	    }
	} else {
	    my $manualconf = 0;
	    $manualconf = 1 if $printer->{MANUAL} || !$do_auto_detect;
	    if (!$in->ask_from_(
		 { title => ($expert_or_modify ?
			     N("Local Printers") :
			     N("Available printers")),
		   messages => (($do_auto_detect ?
				 ($printer->{expert} ?
				  (@menuentrieslist == 1 ?
				   (N("The following printer was auto-detected. ") .
				    ($printer->{NEW} ?
				     N("If it is not the one you want to configure, enter a device name/file name in the input line") :
				     N("Alternatively, you can specify a device name/file name in the input line"))) :
				   (N("Here is a list of all auto-detected printers. ") .
				    ($printer->{NEW} ?
				     N("Please choose the printer you want to set up or enter a device name/file name in the input line") :
				     N("Please choose the printer to which the print jobs should go or enter a device name/file name in the input line")))) :
				  (@menuentrieslist == 1 ?
				   (N("The following printer was auto-detected. ") .
				    ($printer->{NEW} ?
				     N("The configuration of the printer will work fully automatically. If your printer was not correctly detected or if you prefer a customized printer configuration, turn on \"Manual configuration\".") : 
				     N("Currently, no alternative possibility is available"))) :
				   (N("Here is a list of all auto-detected printers. ") .
				    ($printer->{NEW} ?
				     N("Please choose the printer you want to set up. The configuration of the printer will work fully automatically. If your printer was not correctly detected or if you prefer a customized printer configuration, turn on \"Manual configuration\".") :
				     N("Please choose the printer to which the print jobs should go."))))) :
				 ($printer->{expert} ?
				  N("Please choose the port that your printer is connected to or enter a device name/file name in the input line") :
				  N("Please choose the port that your printer is connected to."))) .
				if_($printer->{expert},
				    N(" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."))), 
				  callbacks => {
				      complete => sub {
					  unless ($menuchoice ne "") {
					      $in->ask_warn(N("Error"), N("You must choose/enter a printer/device!"));
					      return 1, 0;
					  }
					  return 0;
				      },
				      changed => sub {
					  if ($oldmenuchoice ne $menuchoice) {
					      $device = $menuentries->{$menuchoice};
					      $oldmenuchoice = $menuchoice;
					  }
					  return 0;
				      }
				  } },
		 [
		  if_($printer->{expert}, { val => \$device }),
		  { val => \$menuchoice, list => \@menuentrieslist, 
		    not_edit => !$printer->{expert}, format => \&translate,
		    allow_empty_list => 1, type => 'list' },
		  if_(!$printer->{expert} && $do_auto_detect && $printer->{NEW}, 
		   { text => N("Manual configuration"), type => 'bool',
		     val => \$manualconf }),
		  ]
		 )) {
		return 0;
	    }
	    if ($device ne $menuentries->{$menuchoice}) {
		$menuchoice = "";
		$do_auto_detect = 0;
	    }
	    $printer->{MANUAL} = $manualconf ? 1 : undef;
	}
    }

    #- LPD and LPRng need netcat ('nc') to access to socket printers
    if (($printer->{SPOOLER} eq 'lpd' || $printer->{SPOOLER} eq 'lprng') &&
        !$::testing && $device =~ /^socket:/ && !files_exist('/usr/bin/nc')) {
        $in->do_pkgs->install('nc') or do {
            $in->ask_warn(N("Error"),
		N("Could not install the %s packages!",
		  "nc") . " " .
		N("Aborting"));
	    return 0;
        };
    }

    # Do configuration of multi-function devices and look up model name
    # in the printer database
    setup_common($printer, $in, $menuchoice, $device, $do_auto_detect,
		  @autodetected);

    1;
}

sub setup_lpd {
    my ($printer, $in, $upNetwork) = @_;

    # Check whether the network functionality is configured and
    # running
    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 };

#    $in->set_help('setupLPD') if $::isInstall;
    my ($uri, $remotehost, $remotequeue);
    my $queue = $printer->{OLD_QUEUE};
    if ($printer->{configured}{$queue} &&
	$printer->{currentqueue}{connect} =~ m/^lpd:/) {
	$uri = $printer->{currentqueue}{connect};
	if ($uri =~ m!^\s*lpd://([^/]+)/([^/]+)/?\s*$!) {
         $remotehost = $1;
         $remotequeue = $2;
     }
    } else {
	$remotehost = "";
	$remotequeue = "lp";
    }

    return if !$in->ask_from(N("Remote lpd Printer Options"),
N("To use a remote lpd printer, you need to supply the hostname of the printer server and the printer name on that server."), [
{ label => N("Remote host name"), val => \$remotehost },
{ label => N("Remote printer name"), val => \$remotequeue } ],
complete => sub {
    if ($remotehost eq "") {
	$in->ask_warn(N("Error"), N("Remote host name missing!"));
	return 1, 0;
    }
    if ($remotequeue eq "") {
	$in->ask_warn(N("Error"), N("Remote printer name missing!"));
	return 1, 1;
    }
    return 0;
}
			      );
    #- make the DeviceURI from user input.
    $printer->{currentqueue}{connect} = "lpd://$remotehost/$remotequeue";

    #- LPD does not support filtered queues to a remote LPD server by itself
    #- It needs an additional program as "rlpr"
    if ($printer->{SPOOLER} eq 'lpd' && !$::testing &&
        !files_exist('/usr/bin/rlpr')) {
        $in->do_pkgs->install('rlpr') or do {
            $in->ask_warn(N("Error"),
		N("Could not install the %s packages!",
		  "rlpr") . " " .
		N("Aborting"));
	    return 0;
        };
    }

    # Auto-detect printer model (works if host is an ethernet-connected
    # printer)
    my $modelinfo = printer::detect::getSNMPModel($remotehost);
    my $auto_hpoj;
    if (defined($modelinfo) &&
	$modelinfo->{MANUFACTURER} ne "" &&
	$modelinfo->{MODEL} ne "") {
        $in->ask_warn(N("Information"), N("Detected model: %s %s",
                            $modelinfo->{MANUFACTURER}, $modelinfo->{MODEL}));
        $auto_hpoj = 1;
    } else {
	$auto_hpoj = 0;
    }

    # Do configuration of multi-function devices and look up model name
    # in the printer database
    setup_common($printer, $in,
		  "$modelinfo->{MANUFACTURER} $modelinfo->{MODEL}", 
		  $printer->{currentqueue}{connect}, $auto_hpoj,
                  ({port => $printer->{currentqueue}{connect},
                    val => $modelinfo }));

    1;
}

sub setup_smb {
    my ($printer, $in, $upNetwork) = @_;

    # Check whether the network functionality is configured and
    # running
    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 };

#    $in->set_help('setupSMB') if $::isInstall;
    my ($uri, $smbuser, $smbpassword, $workgroup, $smbserver, $smbserverip, $smbshare);
    my $queue = $printer->{OLD_QUEUE};
    if ($printer->{configured}{$queue} &&
	$printer->{currentqueue}{connect} =~ m/^smb:/) {
	$uri = $printer->{currentqueue}{connect};
	my $parameters = $1 if $uri =~ m!^\s*smb://(.*)$!;
	# Get the user's login and password from the URI
	if ($parameters =~ m!([^@]*)@([^@]+)!) {
	    my $login = $1;
	    $parameters = $2;
	    if ($login =~ m!([^:]*):([^:]*)!) {
		$smbuser = $1;
		$smbpassword = $2;
	    } else {
		$smbuser = $login;
		$smbpassword = "";
	    }
	} else {
	    $smbuser = "";
	    $smbpassword = "";
	}
	# Get the workgroup, server, and share name
	if ($parameters =~ m!([^/]*)/([^/]+)/([^/]+)$!) {
	    $workgroup = $1;
	    $smbserver = $2;
	    $smbshare = $3;
	} elsif ($parameters =~ m!([^/]+)/([^/]+)$!) {
	    $workgroup = "";
	    $smbserver = $1;
	    $smbshare = $2;
	} else {
	    die qq(The "smb://" URI must at least contain the server name and the share name!\n);
	}
	if (is_ip($smbserver)) {
	    $smbserverip = $smbserver;
	    $smbserver = "";
	}
    }

    my $autodetect = 0;
    my @autodetected;
    my $menuentries;
    my @menuentrieslist;
    my $menuchoice = "";
    my $oldmenuchoice = "";
    if ($printer->{AUTODETECT}) {
	$autodetect = 1;
	if (!$::testing && !files_exist('/usr/bin/smbclient')) {
	    $in->do_pkgs->install('samba-client') or do {
		$in->ask_warn(N("Error"),
			      N("Could not install the %s packages!",
				"Samba client") . " " .
			      N("Aborting"));
		return 0;
	    };
	}
	my $_w = $in->wait_message(N("Printer auto-detection"), N("Scanning network..."));
	@autodetected = printer::detect::net_smb_detect();
     my ($server, $share);
	foreach my $p (@autodetected) {
	    my $menustr;
	    if ($p->{port} =~ m!^smb://([^/:]+)/([^/:]+)$!) {
             $server = $1;
             $share = $2;
         }
	    if ($p->{val}{DESCRIPTION}) {
		$menustr = $p->{val}{DESCRIPTION};
		$menustr .= N(", printer \"%s\" on server \"%s\"",
			      $share, $server);
	    } else {
		$menustr = N("Printer \"%s\" on server \"%s\"",
			     $share, $server);
	    }
	    $menuentries->{$menustr} = $p->{port};
	    if ($server eq $smbserver &&
		$share eq $smbshare) {
		$menuchoice = $menustr;
	    }
	}
	@menuentrieslist = sort {
	    $menuentries->{$a} cmp $menuentries->{$b};
	} keys(%$menuentries);
	if ($printer->{configured}{$queue} &&
	    $printer->{currentqueue}{connect} =~ m/^smb:/ &&
	    $menuchoice eq "") {
	    my $menustr;
	    if ($printer->{currentqueue}{make}) {
		$menustr = "$printer->{currentqueue}{make} $printer->{currentqueue}{model}";
		$menustr .= N(", printer \"%s\" on server \"%s\"",
			      $smbshare, $smbserver);
	    } else {
		$menustr = N("Printer \"%s\" on server \"%s\"",
			     $smbshare, $smbserver);
	    }
	    $menuentries->{$menustr} = "smb://$smbserver/$smbshare";
	    unshift(@menuentrieslist, $menustr);
	    $menuchoice = $menustr;
	}
	if ($#menuentrieslist < 0) {
	    $autodetect = 0;
	} elsif ($menuchoice eq "") {
	    $menuchoice = $menuentrieslist[0];
	    if ($menuentries->{$menuentrieslist[0]} =~
		m!^smb://([^/:]+)/([^/:]+)$!) {
             $smbserver = $1;
             $smbshare = $2;
         }
	}
	$oldmenuchoice = $menuchoice;
    }

    return 0 if !$in->ask_from(
	 N("SMB (Windows 9x/NT) Printer Options"),
	 N("To print to a SMB printer, you need to provide the SMB host name (Note! It may be different from its TCP/IP hostname!) and possibly the IP address of the print server, as well as the share name for the printer you wish to access and any applicable user name, password, and workgroup information.") .
	 ($autodetect ? N(" If the desired printer was auto-detected, simply choose it from the list and then add user name, password, and/or workgroup if needed.") : ""),
	 [ 
	  { label => N("SMB server host"), val => \$smbserver },
	  { label => N("SMB server IP"), val => \$smbserverip },
	  { label => N("Share name"), val => \$smbshare },
	  { label => N("User name"), val => \$smbuser },
	  { label => N("Password"), val => \$smbpassword, hidden => 1 },
	  { label => N("Workgroup"), val => \$workgroup },
	  if_($autodetect,
	   { label => N("Auto-detected"),
	     val => \$menuchoice, list => \@menuentrieslist, 
	     not_edit => 1, format => \&translate, sort => 0,
	     allow_empty_list => 1, type => 'combo' }) ],
	 complete => sub {
	     if (!is_ip($smbserverip) && $smbserverip ne "") {
		 $in->ask_warn(N("Error"), N("IP address should be in format 1.2.3.4"));
		 return 1, 1;
	     }
	     if ($smbserver eq "" && $smbserverip eq "") {
		 $in->ask_warn(N("Error"), N("Either the server name or the server's IP must be given!"));
		 return 1, 0;
	     }
	     if ($smbshare eq "") {
		 $in->ask_warn(N("Error"), N("Samba share name missing!"));
		 return 1, 2;
	     }
	     if ($smbpassword ne "") {
		 local $::isWizard = 0;
		 my $yes = $in->ask_yesorno(
		      N("SECURITY WARNING!"),
		      N("You are about to set up printing to a Windows account with password. Due to a fault in the architecture of the Samba client software the password is put in clear text into the command line of the Samba client used to transmit the print job to the Windows server. So it is possible for every user on this machine to display the password on the screen by issuing commands as \"ps auxwww\".

We recommend to make use of one of the following alternatives (in all cases you have to make sure that only machines from your local network have access to your Windows server, for example by means of a firewall):

Use a password-less account on your Windows server, as the \"GUEST\" account or a special account dedicated for printing. Do not remove the password protection from a personal account or the administrator account.

Set up your Windows server to make the printer available under the LPD protocol. Then set up printing from this machine with the \"%s\" connection type in Printerdrake.

", N("Printer on remote lpd server")) .
		      ($printer->{expert} ? 
		       N("Set up your Windows server to make the printer available under the IPP protocol and set up printing from this machine with the \"%s\" connection type in Printerdrake.

", N("Enter a printer device URI")) : "") .
N("Connect your printer to a Linux server and let your Windows machine(s) connect to it as a client.

Do you really want to continue setting up this printer as you are doing now?"), 0);
		 return 0 if $yes;
		 return 1, 2;
	     }
	     return 0;
	 },
	 changed => sub {
	     return 0 if !$autodetect;
	     if ($oldmenuchoice ne $menuchoice) {
		 if ($menuentries->{$menuchoice} =~ m!^smb://([^/:]+)/([^/:]+)$!) {
               $smbserver = $1;
               $smbshare = $2;
           }
		 $oldmenuchoice = $menuchoice;
	     }
	     return 0;
	 }
	 );
    #- make the DeviceURI from, try to probe for available variable to
    #- build a suitable URI.
    $printer->{currentqueue}{connect} =
    join '', ("smb://", ($smbuser && ($smbuser . 
    ($smbpassword && ":$smbpassword") . '@')), ($workgroup && "$workgroup/"),
    ($smbserver || $smbserverip), "/$smbshare");

    if (!$::testing && !files_exist('/usr/bin/smbclient')) {
	$in->do_pkgs->install('samba-client') or do {
            $in->ask_warn(N("Error"),
		N("Could not install the %s packages!",
		  "Samba client") . " " .
		N("Aborting"));
	    return 0;
        };
    }
    $printer->{SPOOLER} eq 'cups' and printer::main::restart_queue($printer);
    1;
}

sub setup_ncp {
    my ($printer, $in, $upNetwork) = @_;

    # Check whether the network functionality is configured and
    # running
    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 };

#    $in->set_help('setupNCP') if $::isInstall;
    my ($uri, $ncpuser, $ncppassword, $ncpserver, $ncpqueue);
    my $queue = $printer->{OLD_QUEUE};
    if ($printer->{configured}{$queue} &&
	$printer->{currentqueue}{connect} =~ m/^ncp:/) {
	$uri = $printer->{currentqueue}{connect};
	my $parameters = $uri =~ m!^\s*ncp://(.*)$!;
	# Get the user's login and password from the URI
	if ($parameters =~ m!([^@]*)@([^@]+)!) {
	    my $login = $1;
	    $parameters = $2;
	    if ($login =~ m!([^:]*):([^:]*)!) {
		$ncpuser = $1;
		$ncppassword = $2;
	    } else {
		$ncpuser = $login;
		$ncppassword = "";
	    }
	} else {
	    $ncpuser = "";
	    $ncppassword = "";
	}
	# Get the workgroup, server, and share name
	if ($parameters =~ m!([^/]+)/([^/]+)$!) {
	    $ncpserver = $1;
	    $ncpqueue = $2;
	} else {
	    die qq(The "ncp://" URI must at least contain the server name and the share name!\n);
	}
    }

    return 0 if !$in->ask_from(N("NetWare Printer Options"),
N("To print on a NetWare printer, you need to provide the NetWare print server name (Note! it may be different from its TCP/IP hostname!) as well as the print queue name for the printer you wish to access and any applicable user name and password."), [
{ label => N("Printer Server"), val => \$ncpserver },
{ label => N("Print Queue Name"), val => \$ncpqueue },
{ label => N("User name"), val => \$ncpuser },
{ label => N("Password"), val => \$ncppassword, hidden => 1 } ],
complete => sub {
    unless ($ncpserver ne "") {
	$in->ask_warn(N("Error"), N("NCP server name missing!"));
	return 1, 0;
    }
    unless ($ncpqueue ne "") {
	$in->ask_warn(N("Error"), N("NCP queue name missing!"));
	return 1, 1;
    }
    return 0;
}
					);
    # Generate the Foomatic URI
    $printer->{currentqueue}{connect} =
    join '', ("ncp://", ($ncpuser && ($ncpuser . 
    ($ncppassword && ":$ncppassword") . '@')),
    "$ncpserver/$ncpqueue");

    if (!$::testing && !files_exist('/usr/bin/nprint')) {
	$in->do_pkgs->install('ncpfs') or do {
            $in->ask_warn(N("Error"),
		N("Could not install the %s packages!",
		  "ncpfs") . " " .
		N("Aborting"));
	    return 0;
        };
    } 
    1;
}

sub setup_socket {
    my ($printer, $in, $upNetwork) = @_;

    # Check whether the network functionality is configured and
    # running
    if (!check_network($printer, $in, $upNetwork, 0)) { return 0 };

#    $in->set_help('setupSocket') if $::isInstall;

    my ($uri, $remotehost, $remoteport);
    my $queue = $printer->{OLD_QUEUE};
    if ($printer->{configured}{$queue} &&
	$printer->{currentqueue}{connect} =~  m!^(socket:|ptal://?hpjd:)!) {
	$uri = $printer->{currentqueue}{connect};
	if ($uri =~ m!^ptal:!) {
	    if ($uri =~ m!^ptal://?hpjd:([^/:]+):([0-9]+)/?\s*$!) {
		my $ptalport = $2 - 9100;
		($remotehost, $remoteport) = ($1, $ptalport);
	    } elsif ($uri =~ m!^ptal://?hpjd:([^/:]+)\s*$!) {
		($remotehost, $remoteport) = ($1, 9100);
	    }
	} else {
	    ($remotehost, $remoteport) =
		$uri =~ m!^\s*socket://([^/:]+):([0-9]+)/?\s*$!;
	}
    } else {
	$remotehost = "";
	$remoteport = "9100";
    }

    my $autodetect = 0;
    my @autodetected;
    my $menuentries;
    my @menuentrieslist;
    my $menuchoice = "";
    my $oldmenuchoice = "";
    if ($printer->{AUTODETECT}) {
	$autodetect = 1;
	my $_w = $in->wait_message(N("Printer auto-detection"), N("Scanning network..."));
	@autodetected = printer::detect::net_detect();
     my ($host, $port);
	foreach my $p (@autodetected) {
	    my $menustr;
	    if ($p->{port} =~ m!^socket://([^:]+):(\d+)$!) {
             $host = $1;
             $port = $2;
         }
	    if ($p->{val}{DESCRIPTION}) {
		$menustr = $p->{val}{DESCRIPTION};
		$menustr .= N(", host \"%s\", port %s",
			      $host, $port);
	    } else {
		$menustr = N("Host \"%s\", port %s", $host, $port);
	    }
	    $menuentries->{$menustr} = $p->{port};
	    if ($host eq $remotehost &&
		$host eq $remotehost) {
		$menuchoice = $menustr;
	    }
	}
	@menuentrieslist = sort { 
	    $menuentries->{$a} cmp $menuentries->{$b};
	} keys(%$menuentries);
	if ($printer->{configured}{$queue} &&
	    $printer->{currentqueue}{connect} =~ m!^(socket:|ptal://?hpjd:)! &&
	    $menuchoice eq "") {
	    my $menustr;
	    if ($printer->{currentqueue}{make}) {
		$menustr = "$printer->{currentqueue}{make} $printer->{currentqueue}{model}";
		$menustr .= N(", host \"%s\", port %s",
			      $remotehost, $remoteport);
	    } else {
		$menustr = N("Host \"%s\", port %s",
			      $remotehost, $remoteport);
	    }
	    $menuentries->{$menustr} = "socket://$remotehost:$remoteport";
	    unshift(@menuentrieslist, $menustr);
	    $menuchoice = $menustr;
	}
	if ($#menuentrieslist < 0) {
	    $autodetect = 0;
	} elsif ($menuchoice eq "") {
	    $menuchoice = $menuentrieslist[0];
	    if ($menuentries->{$menuentrieslist[0]} =~ m!^socket://([^:]+):(\d+)$!) {
             $remotehost = $1;
             $remoteport = $2;
         }
	}
	$oldmenuchoice = $menuchoice;
    }

    return 0 if !$in->ask_from_(
	 {
	     title => N("TCP/Socket Printer Options"),
	     messages => ($autodetect ?
			  N("Choose one of the auto-detected printers from the list or enter the hostname or IP and the optional port number (default is 9100) in the input fields.") :
			  N("To print to a TCP or socket printer, you need to provide the host name or IP of the printer and optionally the port number (default is 9100). On HP JetDirect servers the port number is usually 9100, on other servers it can vary. See the manual of your hardware.")),
		 callbacks => {
		 complete => sub {
		     unless ($remotehost ne "") {
			 $in->ask_warn(N("Error"), N("Printer host name or IP missing!"));
			 return 1, 0;
		     }
		     unless ($remoteport =~ /^[0-9]+$/) {
			 $in->ask_warn(N("Error"), N("The port number should be an integer!"));
			 return 1, 1;
		     }
		     return 0;
		 },
		 changed => sub {
		     return 0 if !$autodetect;
		     if ($oldmenuchoice ne $menuchoice) {
                   if ($menuentries->{$menuchoice} =~ m!^socket://([^:]+):(\d+)$!) {
                       $remotehost = $1;
                       $remoteport = $2;
                   }
                   $oldmenuchoice = $menuchoice;
		     }
		     return 0;
		 }
	     }
	 },
	 [
	  { label => ($autodetect ? "" : N("Printer host name or IP")),
	    val => \$remotehost },
	  { label => ($autodetect ? "" : N("Port")), val => \$remoteport },
	  if_($autodetect,
	   { val => \$menuchoice, list => \@menuentrieslist, 
	     not_edit => 0, format => \&translate, sort => 0,
	     allow_empty_list => 1, type => 'list' })
	  ]
	 );
    
    #- make the Foomatic URI
    $printer->{currentqueue}{connect} = 
	join '', ("socket://$remotehost", $remoteport ? ":$remoteport" : ());

    #- LPD and LPRng need netcat ('nc') to access to socket printers
    if (($printer->{SPOOLER} eq 'lpd' || $printer->{SPOOLER} eq 'lprng') && 
        !$::testing && !files_exist('/usr/bin/nc')) {
        $in->do_pkgs->install('nc') or do {
            $in->ask_warn(N("Error"),
		N("Could not install the %s packages!",
		  "nc") . " " .
		N("Aborting"));
	    return 0;
	}
    }

    # Auto-detect printer model
    my $modelinfo;
    if ($printer->{AUTODETECT}) {
	$modelinfo = printer::detect::getSNMPModel($remotehost);
    }
    my $auto_hpoj;
    if (defined($modelinfo) &&
	$modelinfo->{MANUFACTURER} ne "" &&
	$modelinfo->{MODEL} ne "") {
        $auto_hpoj = 1;
    } else {
	$auto_hpoj = 0;
    }

    # Do configuration of multi-function devices and look up model name
    # in the printer database
    setup_common($printer, $in,
		  "$modelinfo->{MANUFACTURER} $modelinfo->{MODEL}", 
		  $printer->{currentqueue}{connect}, $auto_hpoj,
                  ({port => $printer->{currentqueue}{connect},
                    val => $modelinfo }));
    1;
}

sub setup_uri {
    my ($printer, $in, $upNetwork) = @_;

#    $in->set_help('setupURI') if $::isInstall;
    if ($printer->{AUTODETECT} && $printer->{SPOOLER} eq 'cups') {
	my $_w = $in->wait_message(N("Printerdrake"), 
				   N("Refreshing Device URI list..."));
	printer::services::restart("cups");
    }
    return if !$in->ask_from(N("Printer Device URI"),
N("You can specify directly the URI to access the printer. The URI must fulfill either the CUPS or the Foomatic specifications. Note that not all URI types are supported by all the spoolers."), [
{ label => N("Printer Device URI"),
val => \$printer->{currentqueue}{connect},
list => [ if_($printer->{currentqueue}{connect},
	      $printer->{currentqueue}{connect}),
	  ($printer->{SPOOLER} eq 'cups' ?
	   printer::cups::lpinfo_v() :
	   ("parallel:/",
	    "usb:/",
	    "serial:/",
	    "http://",
	    "ipp://",
	    "lpd://",
	    "smb://",
	    "ncp://",
	    "socket://",
	    "ptal:/mlc:",
	    "ptal:/hpjd:",
	    "file:/",
	    'postpipe:""')),
	  ], not_edit => 0, sort => 0 }, ],
complete => sub {
    unless ($printer->{currentqueue}{connect} =~ /[^:]+:.+/) {
	$in->ask_warn(N("Error"), N("A valid URI must be entered!"));
	return 1, 0;
    }
    return 0;
}
    );

    # Non-local printer, check network and abort if no network available
    if ($printer->{currentqueue}{connect} !~ m!^(file|parallel|usb|serial|mtink|ptal://?mlc):/! &&
        !check_network($printer, $in, $upNetwork, 0)) { 
        return 0;
    # If the chosen protocol needs additional software, install it.
    } elsif ($printer->{currentqueue}{connect} =~ /^lpd:/ &&
        $printer->{SPOOLER} eq 'lpd' &&
        !$::testing && !files_exist('/usr/bin/rlpr')) {
	# LPD does not support filtered queues to a remote LPD server by itself
	# It needs an additional program as "rlpr"
        $in->do_pkgs->install('rlpr') or do {
            $in->ask_warn(N("Error"),
		N("Could not install the %s packages!",
		  "rlpr") . " " .
		N("Aborting"));
		return 0;
            };
    } elsif ($printer->{currentqueue}{connect} =~ /^smb:/ &&
        !$::testing && !files_exist('/usr/bin/smbclient')) {
	$in->do_pkgs->install('samba-client') or do {
            $in->ask_warn(N("Error"),
		N("Could not install the %s packages!",
		  "Samba client") . " " .
		N("Aborting"));
		return 0;
            };
    } elsif ($printer->{currentqueue}{connect} =~ /^ncp:/ &&
	!$::testing && !files_exist('/usr/bin/nprint')) {
	$in->do_pkgs->install('ncpfs') or do {
            $in->ask_warn(N("Error"),
		N("Could not install the %s packages!",
		  "ncpfs") . " " .
		N("Aborting"));
		return 0;
            };
    } elsif ($printer->{currentqueue}{connect} =~ /^socket:/ &&
	#- LPD and LPRng need netcat ('nc') to access to socket printers
	($printer->{SPOOLER} eq 'lpd' || $printer->{SPOOLER} eq 'lprng') &&
        !$::testing && !files_exist('/usr/bin/nc')) {
        $in->do_pkgs->install('nc') or do {
            $in->ask_warn(N("Error"),
		N("Could not install the %s packages!",
		  "nc") . " " .
		N("Aborting"));
		return 0;
            };
    }

    if ($printer->{currentqueue}{connect} =~ m!^socket://([^:/]+)! ||
        $printer->{currentqueue}{connect} =~ m!^lpd://([^:/]+)! ||
        $printer->{currentqueue}{connect} =~ m!^http://([^:/]+)! ||
        $printer->{currentqueue}{connect} =~ m!^ipp://([^:/]+)!) {
	
	# Auto-detect printer model (works if host is an ethernet-connected
	# printer)
	my $remotehost = $1;
	my $modelinfo = printer::detect::getSNMPModel($remotehost);
        my $auto_hpoj;
        if (defined($modelinfo) &&
            $modelinfo->{MANUFACTURER} ne "" &&
	    $modelinfo->{MODEL} ne "") {
            $in->ask_warn(N("Information"), N("Detected model: %s %s",
                                $modelinfo->{MANUFACTURER},
				$modelinfo->{MODEL}));
            $auto_hpoj = 1;
        } else {
	    $auto_hpoj = 0;
        }

        # Do configuration of multi-function devices and look up model name
        # in the printer database
        setup_common($printer, $in,
		      "$modelinfo->{MANUFACTURER} $modelinfo->{MODEL}", 
		      $printer->{currentqueue}{connect}, $auto_hpoj,
                      ({port => $printer->{currentqueue}{connect},
                        val => $modelinfo }));
    }

    1;
}

sub setup_postpipe {
    my ($printer, $in) = @_;

#    $in->set_help('setupPostpipe') if $::isInstall;
    my $uri;
    my $commandline;
    my $queue = $printer->{OLD_QUEUE};
    if ($printer->{configured}{$queue} &&
	$printer->{currentqueue}{connect} =~ m/^postpipe:/) {
	$uri = $printer->{currentqueue}{connect};
	$commandline = $1 if $uri =~ m!^\s*postpipe:"(.*)"$!;
    } else {
	$commandline = "";
    }

    return if !$in->ask_from(N("Pipe into command"),
N("Here you can specify any arbitrary command line into which the job should be piped instead of being sent directly to a printer."), [
{ label => N("Command line"),
val => \$commandline }, ],
complete => sub {
    unless ($commandline ne "") {
	$in->ask_warn(N("Error"), N("A command line must be entered!"));
	return 1, 0;
    }
    return 0;
}
);

    #- make the Foomatic URI
    $printer->{currentqueue}{connect} = "postpipe:$commandline";
    
    1;
}

sub setup_common {

    my ($printer, $in, $makemodel, $device, $do_auto_detect, @autodetected) = @_;

    #- Check whether the printer is an HP multi-function device and 
    #- configure HPOJ if it is one

    my $ptaldevice = "";
    my $isHPOJ = 0;
    my $w;
    if ($device =~ m!^/dev/! || $device =~ m!^socket://!) {
	# Ask user whether he has a multi-function device when he did not
	# do auto-detection or when auto-detection failed
	my $searchunknown = N("Unknown model");
	if (!$do_auto_detect ||
	    $makemodel eq $searchunknown ||
	    $makemodel =~ /^\s*$/) {
	    local $::isWizard = 0;
	    if (!$printer->{noninteractive}) {
		$isHPOJ = $in->ask_yesorno(N("Add a new printer"),
					   N("Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, LaserJet 1100/1200/1220/3200/3300 with scanner, DeskJet 450, Sony IJP-V100), an HP PhotoSmart or an HP LaserJet 2200?"), 0);
	    }
	}
	if ($makemodel =~ /HP\s+(OfficeJet|PSC|PhotoSmart|LaserJet\s+(1200|1220|2200|3200|33.0)|(DeskJet|dj)\s*450)/i ||
	    $makemodel =~ /Sony\s+IJP[\s\-]+V[\s\-]+100/i ||
	    $isHPOJ) {
	    # Install HPOJ package
	    my $hpojinstallfailed = 0;
	    if (!$::testing &&
		!files_exist(qw(/usr/sbin/ptal-mlcd
				/usr/sbin/ptal-init
				/usr/bin/xojpanel
				/usr/sbin/lsusb))) {
		if ($::noX) {
		    $hpojinstallfailed = 1;
		} else {
		    $w = $in->wait_message(N("Printerdrake"),
					   N("Installing HPOJ package..."))
			if !$printer->{noninteractive};
		    $in->do_pkgs->install('hpoj', 'xojpanel', 'usbutils')
			or do {
			    $in->ask_warn(N("Warning"),
					  N("Could not install the %s packages!",
					    "HPOJ") . " " .
					  N("Only printing will be possible on the %s.",
					    $makemodel));
			    $hpojinstallfailed = 1;
			};
		}
	    }
	    # Configure and start HPOJ
	    undef $w;
	    $w = $in->wait_message(
		 N("Printerdrake"),
		 N("Checking device and configuring HPOJ..."))
		if !$printer->{noninteractive};
	    
	    eval { $ptaldevice = printer::main::configure_hpoj
		       ($device, @autodetected) if !$hpojinstallfailed };

	    if (my $err = $@) {
		warn qq(HPOJ conf failure: "$err");
		log::l(qq(HPOJ conf failure: "$err"));
	    }

	    if ($ptaldevice) {
		# HPOJ has determined the device name, make use of it if we
		# did not know it before
		if (!$do_auto_detect ||
		    !$makemodel ||
		    $makemodel eq $searchunknown ||
		    $makemodel =~ /^\s*$/) {
		    $makemodel = $ptaldevice;
		    $makemodel =~ s/^.*:([^:]+)$/$1/;
		    $makemodel =~ s/_/ /g;
		    if ($makemodel =~ /^\s*IJP/i) {
			$makemodel = "Sony $makemodel";
		    } else {
			$makemodel = "HP $makemodel";
		    }
		}
		# Configure scanning with SANE on the MF device
		if ($makemodel !~ /HP\s+PhotoSmart/i &&
		    $makemodel !~ /HP\s+LaserJet\s+2200/i &&
		    $makemodel !~ /HP\s+(DeskJet|dj)\s*450/i) {
		    # Install SANE
		    if (!$::testing &&
			(!files_exist(qw(/usr/bin/scanimage
					/usr/bin/xscanimage
					/etc/sane.d/dll.conf
					/usr/lib/libsane-hpoj.so.1)) ||
			 (!files_exist(qw(/usr/bin/xsane)) &&
			  !files_exist(qw(/usr/bin/kooka)) &&
			  ($::isInstall || !$in->do_pkgs->is_installed('scanner-gui'))))) {
			undef $w;
			$w = $in->wait_message(
			     N("Printerdrake"),
			     N("Installing SANE packages..."))
			    if !$printer->{noninteractive};
			$::noX
			    or $in->do_pkgs->install('sane-backends',
						     'sane-frontends',
						     ($::isInstall ?
						      'xsane' : 
						      'scanner-gui'), 
						     'libsane-hpoj1')
			    or do {
				$in->ask_warn(N("Warning"),
					      N("Could not install the %s packages!",
						"SANE") . " " .
					      N("Scanning on the %s will not be possible.",
						$makemodel));
			    };
		    }
		    # Configure the HPOJ SANE backend
		    printer::main::config_sane();
		}
		# Configure photo card access with mtools and MToolsFM
		if (($makemodel =~ /HP\s+PhotoSmart/i ||
		     $makemodel =~ /HP\s+PSC\s*9[05]0/i ||
		     $makemodel =~ /HP\s+PSC\s*135\d/i ||
		     $makemodel =~ /HP\s+PSC\s*21[57]\d/i ||
		     $makemodel =~ /HP\s+PSC\s*22\d\d/i ||
		     $makemodel =~ /HP\s+PSC\s*2[45]\d\d/i ||
		     $makemodel =~ /HP\s+OfficeJet\s+D\s*1[45]5/i ||
		     $makemodel =~ /HP\s+OfficeJet\s+71[34]0/i ||
		     $makemodel =~ /HP\s+(DeskJet|dj)\s*450/i) &&
		    $makemodel !~ /HP\s+PhotoSmart\s+7150/i) {
		    # Install mtools and MToolsFM
		    if (!$::testing &&
			!files_exist(qw(/usr/bin/mdir
						  /usr/bin/mcopy
						  /usr/bin/MToolsFM
						  ))) {
			undef $w;
			$w = $in->wait_message(
			     N("Printerdrake"),
			     N("Installing mtools packages..."))
			    if !$printer->{noninteractive};
			$::noX
			    or $in->do_pkgs->install('mtools', 'mtoolsfm')
			    or do {
				$in->ask_warn(N("Warning"),
					      N("Could not install the %s packages!",
						"Mtools") . " " .
					      N("Photo memory card access on the %s will not be possible.",
						$makemodel));
			    };
		    }
		    # Configure mtools/MToolsFM for photo card access
		    printer::main::config_photocard();
		}
		
		if (!$printer->{noninteractive}) {
		    my $text = "";
		    # Inform user about how to scan with his MF device
		    $text = scanner_help($makemodel, "ptal://$ptaldevice");
		    if ($text) {
			undef $w;
			$in->ask_warn(
			     N("Scanning on your HP multi-function device"),
			     $text);
		    }
		    # Inform user about how to access photo cards with his 
		    # MF device
		    $text = photocard_help($makemodel, "ptal://$ptaldevice");
		    if ($text) {
			undef $w;
			$in->ask_warn(N("Photo memory card access on your HP multi-function device"),
				      $text);
		    }
		}
		# make the DeviceURI from $ptaldevice.
		$printer->{currentqueue}{connect} = "ptal://" . $ptaldevice;
	    } else {
		# make the DeviceURI from $device.
		$printer->{currentqueue}{connect} = $device;
	    }
	    $w = $in->wait_message(
		 N("Printerdrake"),
		 N("Checking device and configuring HPOJ..."))
		if !$printer->{noninteractive} && !defined($w);
	} else {
	    # make the DeviceURI from $device.
	    $printer->{currentqueue}{connect} = $device;
	}
    } else {
	# make the DeviceURI from $device.
	$printer->{currentqueue}{connect} = $device;
    }

    if ($printer->{currentqueue}{connect} !~ /:/) {
	if ($printer->{currentqueue}{connect} =~ /usb/) {
	    $printer->{currentqueue}{connect} =
		"usb:" . $printer->{currentqueue}{connect};
	} elsif ($printer->{currentqueue}{connect} =~ /(serial|tty)/) {
	    $printer->{currentqueue}{connect} =
		"serial:" . $printer->{currentqueue}{connect};
	} elsif ($printer->{currentqueue}{connect} =~ 
		 /(printers|parallel|parport|lp\d)/) {
	    $printer->{currentqueue}{connect} =
		"parallel:" . $printer->{currentqueue}{connect};
	} else {
	    $printer->{currentqueue}{connect} =
		"file:" . $printer->{currentqueue}{connect};
	}
    }

    #- if CUPS is the spooler, make sure that CUPS knows the device
    if ($printer->{SPOOLER} eq "cups" &&
	$device !~ /^lpd:/ &&
	$device !~ /^smb:/ &&
	$device !~ /^socket:/ &&
	$device !~ /^http:/ &&
	$device !~ /^ipp:/) {
	my $_w = $in->wait_message(
             N("Printerdrake"),
	     N("Making printer port available for CUPS..."))
	    if !$printer->{noninteractive};
	printer::main::assure_device_is_available_for_cups($ptaldevice ||
							   $device);
    }

    #- Read the printer driver database if necessary
    if (keys %printer::main::thedb == 0) {
	my $_w = $in->wait_message(
	    N("Printerdrake"), N("Reading printer database..."))
	    if !$printer->{noninteractive};
        printer::main::read_printer_db($printer, $printer->{SPOOLER});
    }

    #- Search the database entry which matches the detected printer best
    my $descr = "";
    foreach (@autodetected) {
	$device eq $_->{port} or next;
	my ($automake, $automodel, $autodescr, $autocmdset, $autosku) =
	    ($_->{val}{MANUFACTURER}, $_->{val}{MODEL},
	     $_->{val}{DESCRIPTION}, $_->{val}{'COMMAND SET'},
	     $_->{val}{SKU});
	# Clean some manufacturer's names
	my $descrmake = printer::main::clean_manufacturer_name($automake);
	if ($automake && $autosku) {
	    $descr = "$descrmake|$autosku";
	} elsif ($automake && $automodel) {
	    $descr = "$descrmake|$automodel";
	} elsif ($autodescr) {
	    $descr = $autodescr;
	    $descr =~ s/ /|/;
	} elsif ($automodel) {
	    $descr = $automodel;
	    $descr =~ s/ /|/;
	} elsif ($automake) {
	    $descr = "$descrmake|";
	}
	# Remove manufacturer's name from the beginning of the
	# description (do not do this with manufacturer names which
	# contain odd characters)
	$descr =~ s/^$descrmake\|\s*$descrmake\s*/$descrmake|/i
	    if $descrmake && 
           $descrmake !~ m![\\/\(\)\[\]\|\.\$\@\%\*\?]!;
	# Clean up the description from noise which makes the best match
	# difficult
	$descr =~ s/\s+[Ss]eries//i;
	$descr =~ s/\s+\(?[Pp]rinter\)?$//i;
	$printer->{DBENTRY} = "";
	# Try to find an exact match, check both whether the detected
	# make|model is in the make|model of the database entry and vice versa
	# If there is more than one matching database entry, the longest match
	# counts.
	my $matchlength = -100;
	foreach my $entry (keys %printer::main::thedb) {
	    # Try to match the device ID string of the auto-detection
	    if ($printer::main::thedb{$entry}{make} =~ /Generic/i) {
		# Database entry for generic printer, check printer
		# languages (command set)
		my $_cmd = $printer::main::thedb{$entry}{devidcmd};
		if ($printer::main::thedb{$entry}{model} =~ 
		    m!PCL\s*5/5e!i) {
		    # Generic PCL 5/5e Printer
		    if ($autocmdset =~
			/(^|[:,])PCL\s*\-*\s*(5|)([,;]|$)/i) {
			if ($matchlength < -50) {
			    $matchlength = -50;
			    $printer->{DBENTRY} = $entry;
			    next;
			}
		    }
		} elsif ($printer::main::thedb{$entry}{model} =~ 
		    m!PCL\s*(6|XL)!i) {
		    # Generic PCL 6/XL Printer
		    if ($autocmdset =~
			/(^|[:,])PCL\s*\-*\s*(6|XL)([,;]|$)/i) {
			if ($matchlength < -40) {
			    $matchlength = -40;
			    $printer->{DBENTRY} = $entry;
			    next;
			}
		    }
		} elsif ($printer::main::thedb{$entry}{model} =~ 
		    m!(PostScript)!i) {
		    # Generic PostScript Printer
		    if ($autocmdset =~
			/(^|[:,])(PS|POSTSCRIPT)[^:;,]*([,;]|$)/i) {
			if ($matchlength < -10) {
			    $matchlength = -10;
			    $printer->{DBENTRY} = $entry;
			    next;
			}
		    }
		}
	    } else {
		# "Real" manufacturer, check manufacturer, model, and/or
		# description
		my $matched = 1;
		my ($mfg, $mdl, $des);
		if ($mfg = $printer::main::thedb{$entry}{devidmake}) {
		    $mfg =~ s/Hewlett[-\s_]Packard/HP/i;
		    if (uc($mfg) ne uc($automake)) {
			$matched = 0;
		    }
		}
		if ($mdl = $printer::main::thedb{$entry}{devidmodel}) {
		    if ($mdl ne $automodel) {
			$matched = 0;
		    }
		}
		if ($des = $printer::main::thedb{$entry}{deviddesc}) {
		    $des =~ s/Hewlett[-\s_]Packard/HP/;
		    $des =~ s/HEWLETT[-\s_]PACKARD/HP/;    
		    if ($des ne $autodescr) {
			$matched = 0;
		    }
		}
		if ($matched && ($des || $mfg && $mdl)) {
		    # Full match to known auto-detection data
		    $printer->{DBENTRY} = $entry;
		    $matchlength = 1000;
		    last;
		}
	    }
	    # Do not search human-readable make and model names if we had an
	    # exact match or a match to the auto-detection ID string 
	    next if $matchlength >= 100;
	    # Try to match the (human-readable) make and model of the
	    # Foomatic database or of thr PPD file
	    my $dbmakemodel;
	    if ($printer->{expert}) {
		$dbmakemodel = $1 if $entry =~ m/^(.*)\|[^\|]*$/;
	    } else {
		$dbmakemodel = $entry;
	    }
	    # Do not try to match if the database entry does not provide
	    # make and model
	    next unless $dbmakemodel;
	    # If make and model match exactly, we have found the correct
	    # entry and we can stop searching human-readable makes and
	    # models
	    if (lc($dbmakemodel) eq lc($descr)) {
		$printer->{DBENTRY} = $entry;
		$matchlength = 100;
		next;
	    }
	    # Matching a part of the human-readable makes and models
	    # should only be done if the search term is not the name of
	    # an old model, otherwise the newest, not yet listed models
	    # match with the oldest model of the manufacturer (as the
	    # Epson Stylus Photo 900 with the original Epson Stylus Photo)
	    my @badsearchterms = 
		("HP|DeskJet",
		 "HP|LaserJet",
		 "HP|DesignJet",
		 "HP|OfficeJet",
		 "HP|PhotoSmart",
		 "EPSON|Stylus",
		 "EPSON|Stylus Color",
		 "EPSON|Stylus Photo",
		 "EPSON|Stylus Pro",
		 "XEROX|WorkCentre",
		 "XEROX|DocuPrint");
	    if (!member($descr, @badsearchterms)) {
		my $searchterm = $descr;
		my $lsearchterm = length($searchterm);
		$searchterm =~ s!([\\/\(\)\[\]\|\.\$\@\%\*\?])!\\$1!g;
		if ($lsearchterm > $matchlength &&
		    $dbmakemodel =~ m!$searchterm!i) {
		    $matchlength = $lsearchterm;
		    $printer->{DBENTRY} = $entry;
		}
	    }
	    if (!member($dbmakemodel, @badsearchterms)) {
		my $searchterm = $dbmakemodel;
		my $lsearchterm = length($searchterm);
		$searchterm =~ s!([\\/\(\)\[\]\|\.\$\@\%\*\?])!\\$1!g;
		if ($lsearchterm > $matchlength &&
		    $descr =~ m!$searchterm!i) {
		    $matchlength = $lsearchterm;
		    $printer->{DBENTRY} = $entry;
		}
	    }
	}
	# No matching printer found, try a best match as last mean (not
	# when generating queues non-interactively)
	if (!$printer->{noninteractive}) {
	    $printer->{DBENTRY} ||=
		bestMatchSentence($descr, keys %printer::main::thedb);
	    # If the manufacturer was not guessed correctly, discard the
	    # guess.
	    my $guessedmake = lc($1) if $printer->{DBENTRY} =~ /^([^\|]+)\|/;
	    if ($guessedmake !~ /Generic/i &&
		$descr !~ /$guessedmake/i &&
		($guessedmake ne "hp" ||
		 $descr !~ /Hewlett[\s-]+Packard/i))
            { $printer->{DBENTRY} = "" };
	}
    }

    #- Pre-fill the "Description" field with the printer's model name
    if (!$printer->{currentqueue}{desc} && $descr) {
	$printer->{currentqueue}{desc} = $descr;
	$printer->{currentqueue}{desc} =~ s/\|/ /g;
    }

    #- When we have chosen a printer here, the question whether the
    #- automatically chosen model from the database is correct, should
    #- have "This model is correct" as default answer
    delete($printer->{MANUALMODEL});

    1;
}

sub choose_printer_name {
    my ($printer, $in) = @_;
    # Name, description, location
#    $in->set_help('setupPrinterName') if $::isInstall;
    my $default = $printer->{currentqueue}{queue};
    $in->ask_from_(
	 { title => N("Enter Printer Name and Comments"),
	   #cancel => !$printer->{configured}{$queue} ? '' : N("Remove queue"),
	   callbacks => { complete => sub {
	       unless ($printer->{currentqueue}{queue} =~ /^\w+$/) {
		   $in->ask_warn(N("Error"), N("Name of printer should contain only letters, numbers and the underscore"));
		   return 1, 0;
	       }
	       local $::isWizard = 0;
	       if ($printer->{configured}{$printer->{currentqueue}{queue}}
		   && $printer->{currentqueue}{queue} ne $default && 
		   !$in->ask_yesorno(N("Warning"), N("The printer \"%s\" already exists, do you really want to overwrite its configuration?",
						     $printer->{currentqueue}{queue}),
				     0)) {
		   return 1, 0; # Let the user correct the name
	       }
	       my $ml = 12;
	       if ((length($printer->{currentqueue}{queue}) > $ml) && 
		   !$in->ask_yesorno(N("Warning"), N("The printer name \"%s\" has more than 12 characters which can make the printer unaccessible from Windows clients. Do you really want to use this name?",
						     $printer->{currentqueue}{queue}),
				     0)) {
		   return 1, 0; # Let the user correct the name
	       }
	       return 0;
	   },
		      },
	   messages =>
N("Every printer needs a name (for example \"printer\"). The Description and Location fields do not need to be filled in. They are comments for the users.") }, 
	 [ { label => N("Name of printer"), val => \$printer->{currentqueue}{queue} },
	   { label => N("Description"), val => \$printer->{currentqueue}{desc} },
	   { label => N("Location"), val => \$printer->{currentqueue}{loc} },
	 ]) or return 0;

    $printer->{QUEUE} = $printer->{currentqueue}{queue};
    1;
}

sub get_db_entry {
    my ($printer, $in) = @_;
    #- Read the printer driver database if necessary
    if (keys %printer::main::thedb == 0) {
	my $_w = $in->wait_message(N("Printerdrake"),
				   N("Reading printer database..."))
	    if $printer->{noninteractive};
	printer::main::read_printer_db($printer, $printer->{SPOOLER});
    }
    my $_w = $in->wait_message(N("Printerdrake"),
			       N("Preparing printer database..."))
	if !$printer->{noninteractive};
    my $queue = $printer->{OLD_QUEUE};
    if ($printer->{configured}{$queue}) {
	# The queue was already configured
	if ($printer->{configured}{$queue}{queuedata}{foomatic}) {
	    # The queue was configured with Foomatic
	    my $driverstr;
	    if ($printer->{configured}{$queue}{queuedata}{driver} eq "Postscript") {
		$driverstr = "PostScript";
	    } else {
		$driverstr = "GhostScript + $printer->{configured}{$queue}{queuedata}{driver}";
	    }
	    my $make = uc($printer->{configured}{$queue}{queuedata}{make});
	    my $model =	$printer->{configured}{$queue}{queuedata}{model};
	    if ($printer->{expert}) {
		$printer->{DBENTRY} = "$make|$model|$driverstr";
		# database key contains the "(recommended)" for the
		# recommended driver, so add it if necessary
		unless (exists($printer::main::thedb{$printer->{DBENTRY}})) {
		    $printer->{DBENTRY} .= " (recommended)";
		}
	    } else {
		$printer->{DBENTRY} = "$make|$model";
	    }
	    $printer->{OLD_CHOICE} = $printer->{DBENTRY};
	} elsif ($printer->{configured}{$queue}{queuedata}{ppd}) {
	    # Do we have a native CUPS driver or a PostScript PPD file?
	    $printer->{DBENTRY} =
		printer::main::get_descr_from_ppd($printer) ||
		$printer->{DBENTRY};
	    unless (exists($printer::main::thedb{$printer->{DBENTRY}})) {
		$printer->{DBENTRY} .= " (recommended)";
	    }
	    $printer->{OLD_CHOICE} = $printer->{DBENTRY};
	}
	my ($make, $model);
	if ($printer->{DBENTRY} eq "") {
	    # Point the list cursor at least to manufacturer and model of 
	    # the printer
	    $printer->{DBENTRY} = "";
	    if ($printer->{configured}{$queue}{queuedata}{foomatic}) {
		$make = uc($printer->{configured}{$queue}{queuedata}{make});
		$model = $printer->{configured}{$queue}{queuedata}{model};
	    } elsif ($printer->{configured}{$queue}{queuedata}{ppd}) {
		my $makemodel =
		    printer::main::get_descr_from_ppd($printer);
		if ($makemodel =~ m!^([^\|]+)\|([^\|]+)(|\|.*)$!) {
              $make = $1;
              $model = $2;
          }
	    }
	    foreach my $key (keys %printer::main::thedb) {
		if ($printer->{expert} &&
		    $key =~ /^$make\|$model\|.*\(recommended\)$/ ||
		    !$printer->{expert} && $key =~ /^$make\|$model$/) {
		    $printer->{DBENTRY} = $key;
		}
	    }
	}
	if ($printer->{DBENTRY} eq "") {
	    # Exact match of make and model did not work, try to clean
	    # up the model name
	    $model =~ s/PS//;
	    $model =~ s/PostScript//i;
	    $model =~ s/Series//i;
	    foreach my $key (keys %printer::main::thedb) {
		if ($printer->{expert} && $key =~ /^$make\|$model\|.*\(recommended\)$/ ||
		    !$printer->{expert} && $key =~ /^$make\|$model$/) {
		    $printer->{DBENTRY} = $key;
		}
	    }
	}
	if ($printer->{DBENTRY} eq "" && $make ne "") {
	    # Exact match with cleaned-up model did not work, try a best match
	    my $matchstr = "$make|$model";
	    $printer->{DBENTRY} = 
		bestMatchSentence($matchstr, keys %printer::main::thedb);
	    # If the manufacturer was not guessed correctly, discard the
	    # guess.
	    my $guessedmake = lc($1) if $printer->{DBENTRY} =~ /^([^\|]+)\|/;
	    if ($matchstr !~ /$guessedmake/i &&
		($guessedmake ne "hp" ||
		 $matchstr !~ /Hewlett[\s-]+Packard/i))
	    { $printer->{DBENTRY} = "" };
	}
	if ($printer->{DBENTRY} eq "") {
	    # Set the OLD_CHOICE to a non-existing value
	    $printer->{OLD_CHOICE} = "XXX";
	}
    } else {
	if ($printer->{expert} && $printer->{DBENTRY} !~ /(recommended)/) {
	    my ($make, $model) = $printer->{DBENTRY} =~ /^([^\|]+)\|([^\|]+)\|/;
	    foreach my $key (keys %printer::main::thedb) {
		if ($key =~ /^$make\|$model\|.*\(recommended\)$/) {
		    $printer->{DBENTRY} = $key;
		}
	    }
	}
	$printer->{OLD_CHOICE} = $printer->{DBENTRY};
    }
    1;
}

sub is_model_correct {
    my ($printer, $in) = @_;
#    $in->set_help('chooseModel') if $::isInstall;
    my $dbentry = $printer->{DBENTRY};
    if (!$dbentry) {
	# If printerdrake could not determine the model, omit this dialog and
	# let the user choose manually.
	$printer->{MANUALMODEL} = 1;
	return 1;
    }
    $dbentry =~ s/\|/ /g;
    my $res = $in->ask_from_list_(
	     N("Your printer model"),
	     N("Printerdrake has compared the model name resulting from the printer auto-detection with the models listed in its printer database to find the best match. This choice can be wrong, especially when your printer is not listed at all in the database. So check whether the choice is correct and click \"The model is correct\" if so and if not, click \"Select model manually\" so that you can choose your printer model manually on the next screen.

For your printer Printerdrake has found:

%s", $dbentry),
	     [N("The model is correct"),
	      N("Select model manually")],
	     ($printer->{MANUALMODEL} ? N("Select model manually") : 
	      N("The model is correct")));
    return 0 if !$res;
    $printer->{MANUALMODEL} = $res eq N("Select model manually");
    1;
}

sub choose_model {
    my ($printer, $in) = @_;
#    $in->set_help('chooseModel') if $::isInstall;
    #- Read the printer driver database if necessary
    if (keys %printer::main::thedb == 0) {
	my $_w = $in->wait_message(N("Printerdrake"),
				  N("Reading printer database..."));
        printer::main::read_printer_db($printer, $printer->{SPOOLER});
    }
    unless (exists($printer::main::thedb{$printer->{DBENTRY}})) {
	$printer->{DBENTRY} = N("Raw printer (No driver)");
    }
    # Choose the printer/driver from the list
    my $choice = $printer->{DBENTRY};
    my $loadppdchosen = 0;
    while (1) {
	if ($in->ask_from_({ 
	    title => N("Printer model selection"),
	    messages => N("Which printer model do you have?") .
		N("

Please check whether Printerdrake did the auto-detection of your printer model correctly. Find the correct model in the list when a wrong model or \"Raw printer\" is highlighted.") 
		. " " .
		N("If your printer is not listed, choose a compatible (see printer manual) or a similar one."),
		#cancel => (""),
		#ok => (""),
	    }, [ 
		 # List the printers/drivers
		 { val => \$choice, format => \&translate,
		   sort => 1, separator => "|", tree_expanded => 0,
		   quit_if_double_click => 1, allow_empty_list => 1,
		   list => [ keys %printer::main::thedb ] },
		 # Button to install a manufacturer-supplied PPD file
		 { clicked_may_quit =>
		       sub { 
			   $loadppdchosen = 1;
			   1; 
		       },
		   val => N("Install a manufacturer-supplied PPD file") },
		 ])) {
	    $printer->{DBENTRY} = $choice if !$loadppdchosen;
	} else {
	    return 0;
	}
	last if !$loadppdchosen;
	# Install a manufacturer-supplied PPD file
	my $ppdentry;
	if ($ppdentry = installppd($printer, $in)) {
	    $choice = $ppdentry;
	}
	$loadppdchosen = 0;
    }
    return 1;
}

sub installppd {
    my ($printer, $in) = @_;

    # Install a manufacturer-supplied PPD file

    # The dialogs to choose the PPD file should appear as extra
    # windows and not embedded in the "Add printer" wizard.
    local $::isWizard = 0;

    my $ppdfile;
    my ($mediachoice);
    while (1) {
	# Tell user about PPD file installation
	$in->ask_from('Printerdrake',
		      N("Every PostScript printer is delivered with a PPD file which describes the printer's options and features.") . " " .
		      N("This file is usually somewhere on the CD with the Windows and Mac drivers delivered with the printer.") . " " .
		      N("You can find the PPD files also on the manufacturer's web sites.") . " " .
		      N("If you have Windows installed on your machine, you can find the PPD file on your Windows partition, too.") . "\n" .
		      N("Installing the printer's PPD file and using it when setting up the printer makes all options of the printer available which are provided by the printer's hardware") . "\n" .
		      N("Here you can choose the PPD file to be installed on your machine, it will then be used for the setup of your printer."),
		      [
		       { label => N("Install PPD file from"), 
			 val => \$mediachoice,
			 list => [N("CD-ROM"),
				  N("Floppy Disk"), 
				  N("Other place")], 
			 not_edit => 1, sort => 0 },
		       ],
		      ) or return 0;
	my $dir;
	if ($mediachoice eq N("CD-ROM")) {
	    $dir = "/mnt/cdrom";
	} elsif ($mediachoice eq N("Floppy Disk")) {
	    $dir = "/mnt/floppy";
	} elsif ($mediachoice eq N("Other place")) {
	    $dir = "/mnt";
	} else {
	    return 0;
	}
	# Let user select a PPD file from a floppy, hard disk, ...
        $ppdfile = $in->ask_file(N("Select PPD file"), $dir);
	last if !$ppdfile;
	if (! -r $ppdfile) {
	    $in->ask_warn(N("Error"),
			  N("The PPD file %s does not exist or is unreadable!",
			    $ppdfile));
	    next;
	}
	if (! printer::main::checkppd($printer, $ppdfile)) {
	    $in->ask_warn(N("Error"),
			  N("The PPD file %s does not conform with the PPD specifications!",
			    $ppdfile));
	    next;
	}
	last;
    }

    return 0 if !$ppdfile;

    # Install the PPD file in /usr/share/cups/ppd/printerdrake/
    my $w = $in->wait_message(N("Printerdrake"),
			       N("Installing PPD file..."));
    my $ppdentry = printer::main::installppd($printer, $ppdfile);
    undef $w;
    return $ppdentry;
}

my %lexmarkinkjet_options = (
                             'parallel:/dev/lp0' => " -o Port=ParPort1",
                             'parallel:/dev/lp1' => " -o Port=ParPort2",
                             'parallel:/dev/lp2' => " -o Port=ParPort3",
                             'usb:/dev/usb/lp0' => " -o Port=USB1",
                             'usb:/dev/usb/lp1' => " -o Port=USB2",
                             'usb:/dev/usb/lp2' => " -o Port=USB3",
                             'file:/dev/lp0' => " -o Port=ParPort1",
                             'file:/dev/lp1' => " -o Port=ParPort2",
                             'file:/dev/lp2' => " -o Port=ParPort3",
                             'file:/dev/usb/lp0' => " -o Port=USB1",
                             'file:/dev/usb/lp1' => " -o Port=USB2",
                             'file:/dev/usb/lp2' => " -o Port=USB3",
                             );

my %drv_x125_options = (
                             'usb:/dev/usb/lp0' => " -o Device=usb_lp1",
                             'usb:/dev/usb/lp1' => " -o Device=usb_lp2",
                             'usb:/dev/usb/lp2' => " -o Device=usb_lp3",
                             'usb:/dev/usb/lp3' => " -o Device=usb_lp3",
                             'file:/dev/usb/lp0' => " -o Device=usb_lp1",
                             'file:/dev/usb/lp1' => " -o Device=usb_lp2",
                             'file:/dev/usb/lp2' => " -o Device=usb_lp3",
                             'file:/dev/usb/lp3' => " -o Device=usb_lp3",
                             );

sub get_printer_info {
    my ($printer, $in) = @_;
    my $queue = $printer->{OLD_QUEUE};
    my $oldchoice = $printer->{OLD_CHOICE};
    my $newdriver = 0;
    if (!$printer->{configured}{$queue} ||    # New queue  or
	($oldchoice && $printer->{DBENTRY} && # make/model/driver changed
	 ($oldchoice ne $printer->{DBENTRY} ||
	  $printer->{currentqueue}{driver} ne 
	   $printer::main::thedb{$printer->{DBENTRY}}{driver}))) {
	delete($printer->{currentqueue}{printer});
	delete($printer->{currentqueue}{ppd});
	$printer->{currentqueue}{foomatic} = 0;
	# Read info from printer database
	foreach (qw(printer ppd driver make model)) { #- copy some parameter, shorter that way...
	    $printer->{currentqueue}{$_} = $printer::main::thedb{$printer->{DBENTRY}}{$_};
	}
	$newdriver = 1;
    }
    # Use the "printer" and not the "foomatic" field to identify a Foomatic
    # queue because in a new queue "foomatic" is not set yet.
    if ($printer->{currentqueue}{printer} || # We have a Foomatic queue
	$printer->{currentqueue}{ppd}) { # We have a PPD queue
	if ($printer->{currentqueue}{printer}) { # Foomatic queue?
	    # In case of a new queue "foomatic" was not set yet
	    $printer->{currentqueue}{foomatic} = 1;
	    $printer->{currentqueue}{ppd} = undef;
	} elsif ($printer->{currentqueue}{ppd}) { # PPD queue?
	    # If we had a Foomatic queue before, unmark the flag and
	    # initialize the "printer" and "driver" fields
	    $printer->{currentqueue}{foomatic} = 0;
	    $printer->{currentqueue}{printer} = undef;
	    $printer->{currentqueue}{driver} = "PPD";
	}
	# Now get the options for this printer/driver combo
	if ($printer->{configured}{$queue} && 
	    ($printer->{configured}{$queue}{queuedata}{foomatic} ||
	     $printer->{configured}{$queue}{queuedata}{ppd})) {
	    if (!$newdriver) {
		# The user did not change the printer/driver
		$printer->{ARGS} = $printer->{configured}{$queue}{args};
	    } elsif ($printer->{currentqueue}{foomatic}) {
		# The queue was already configured with Foomatic ...
		# ... and the user has chosen another printer/driver
		$printer->{ARGS} = 
		    printer::main::read_foomatic_options($printer);
	    } elsif ($printer->{currentqueue}{ppd}) {
		# ... and the user has chosen another printer/driver
		$printer->{ARGS} = 
		    printer::main::read_ppd_options($printer);
	    }
	} else {
	    # The queue was not configured with Foomatic before
	    # Set some special options
	    $printer->{SPECIAL_OPTIONS} = '';
	    # Default page size depending on the country/language
	    # (US/Canada -> Letter, Others -> A4)
	    my $pagesize;
	    if ($printer->{PAPERSIZE}) {
		$printer->{SPECIAL_OPTIONS} .= 
		    " -o PageSize=$printer->{PAPERSIZE}";
	    } elsif (($pagesize = $in->{lang}) ||
		     ($pagesize = $ENV{LC_PAPER}) ||
		     ($pagesize = $ENV{LANG}) ||
		     ($pagesize = $ENV{LANGUAGE}) ||
		     ($pagesize = $ENV{LC_ALL})) {
		if ($pagesize =~ /^en_CA/ ||
		    $pagesize =~ /^fr_CA/ || 
		    $pagesize =~ /^en_US/) {
		    $pagesize = "Letter";
		} else {
		    $pagesize = "A4";
		}
		$printer->{SPECIAL_OPTIONS} .= 
		    " -o PageSize=$pagesize";
	    }
	    # Do not embed the following messages in the add-printer
	    # wizard.
	    local $::isWizard = 0;
	    # oki4w driver -> OKI winprinter which needs the
	    # oki4daemon to work
	    if ($printer->{currentqueue}{driver} eq 'oki4w') {
		if ($printer->{currentqueue}{connect} !~ 
		    m!^(parallel|file):/dev/lp0$!) {
		    $::noX || 
			$in->ask_warn(N("OKI winprinter configuration"),
				      N("You are configuring an OKI laser winprinter. These printers\nuse a very special communication protocol and therefore they work only when connected to the first parallel port. When your printer is connected to another port or to a print server box please connect the printer to the first parallel port before you print a test page. Otherwise the printer will not work. Your connection type setting will be ignored by the driver."));
		}
		$printer->{currentqueue}{connect} = 'file:/dev/null';
		# Start the oki4daemon
		services::start_service_on_boot('oki4daemon');
		printer::services::start('oki4daemon');
		# Set permissions
		
		my $h = {
		    cups => sub { set_permissions('/dev/oki4drv', '660', 
						  'lp', 'sys') },
		    pdq  => sub { set_permissions('/dev/oki4drv', '666') }
		};
		my $s = $h->{$printer->{SPOOLER}} ||= 
		    sub { set_permissions('/dev/oki4drv', '660',
					  'lp', 'lp') };
		&$s;
	    } elsif ($printer->{currentqueue}{driver} eq 'lexmarkinkjet') {
		# Set "Port" option
		my $opt =
		    $lexmarkinkjet_options{$printer->{currentqueue}{connect}};
		if ($opt) {
		    $printer->{SPECIAL_OPTIONS} .= $opt;
		} else {
		    $::noX || 
			$in->ask_warn(N("Lexmark inkjet configuration"),
				      N("The inkjet printer drivers provided by Lexmark only support local printers, no printers on remote machines or print server boxes. Please connect your printer to a local port or configure it on the machine where it is connected to."));
		    return 0;
		}
		# Set device permissions
		if ($printer->{currentqueue}{connect} =~ 
		    /^\s*(file|parallel|usb):(\S*)\s*$/) {
              if ($printer->{SPOOLER} eq 'cups') {
                  set_permissions($2, '660', 'lp', 'sys');
              } elsif ($printer->{SPOOLER} eq 'pdq') {
                  set_permissions($2, '666');
              } else {
                  set_permissions($2, '660', 'lp', 'lp');
              }
		}
		# This is needed to have the device not blocked by the
		# spooler backend.
		$printer->{currentqueue}{connect} = 'file:/dev/null';
		#install packages
		my $drivertype = $printer->{currentqueue}{model};
		if ($drivertype eq 'Z22') { $drivertype = 'Z32' }
		if ($drivertype eq 'Z23') { $drivertype = 'Z33' }
		$drivertype = lc($drivertype);
		if (!files_exist("/usr/local/lexmark/$drivertype/$drivertype")) {
		    eval { $::noX or $in->do_pkgs->install("lexmark-drivers-$drivertype") };
		}
		if (!files_exist("/usr/local/lexmark/$drivertype/$drivertype")) {
		    # Driver installation failed, probably we do not have
		    # the commercial CDs
		    $::noX || 
			$in->ask_warn(N("Lexmark inkjet configuration"),
				      N("To be able to print with your Lexmark inkjet and this configuration, you need the inkjet printer drivers provided by Lexmark (http://www.lexmark.com/). Click on the \"Drivers\" link. Then choose your model and afterwards \"Linux\" as operating system. The drivers come as RPM packages or shell scripts with interactive graphical installation. You do not need to do this configuration by the graphical frontends. Cancel directly after the license agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and adjust the head alignment settings with this program."));
		}
	    } elsif ($printer->{currentqueue}{driver} eq 'drv_x125') {
		# Set "Device" option
		my $opt =
		    $drv_x125_options{$printer->{currentqueue}{connect}};
		if ($opt) {
		    $printer->{SPECIAL_OPTIONS} .= $opt;
		} else {
		    $::noX || 
			$in->ask_warn(N("Lexmark X125 configuration"),
				      N("The driver for this printer only supports printers locally connected via USB, no printers on remote machines or print server boxes. Please connect your printer to a local USB port or configure it on the machine where it is connected to."));
		    return 0;
		}
		# Set device permissions
		if ($printer->{currentqueue}{connect} =~ 
		    /^\s*(file|parallel|usb):(\S*)\s*$/) {
              if ($printer->{SPOOLER} eq 'cups') {
                  set_permissions($2, '660', 'lp', 'sys');
              } elsif ($printer->{SPOOLER} eq 'pdq') {
                  set_permissions($2, '666');
              } else {
                  set_permissions($2, '660', 'lp', 'lp');
              }
		}
		# This is needed to have the device not blocked by the
		# spooler backend.
		$printer->{currentqueue}{connect} = 'file:/dev/null';
	    } elsif ($printer->{currentqueue}{driver} eq 'ml85p') {
		# Check whether printer is on first parallel port
		if ($printer->{currentqueue}{connect} !~
		    m!^\s*(parallel|file):/dev/(lp|printers/)0\s*$!) {
		    $::noX || 
			$in->ask_warn(N("Samsung ML/QL-85G configuration"),
				      N("The driver for this printer only supports printers locally connected on the first parallel port, no printers on remote machines or print server boxes or on other parallel ports. Please connect your printer to the first parallel port or configure it on the machine where it is connected to."));
		    return 0;
		}
		# Set driver executable permissions
		if ($printer->{SPOOLER} eq 'cups') {
		    set_permissions('/usr/bin/ml85p', 
				    '4750', 'root', 'sys');
		} elsif ($printer->{SPOOLER} eq 'pdq') {
		    set_permissions('/usr/bin/ml85p', 
				    '4755', 'root', 'sys');
		} else {
		    set_permissions('/usr/bin/ml85p', 
				    '4750', 'root', 'lp');
		}
		# This is needed to have the device not blocked by the
		# spooler backend.
		$printer->{currentqueue}{connect} = 'file:/dev/null';
	    } elsif (($printer->{currentqueue}{driver} =~
		      m!^\s*lbp[46]60\s*$!) || 
		     ($printer->{currentqueue}{ppd} && 
		      ($printer->{currentqueue}{ppd} =~ 
		       m!Canon-LBP-[46]60-lbp[46]60.ppd!))) {
		# Check whether printer is on first parallel port
		if ($printer->{currentqueue}{connect} !~
		    m!^\s*(parallel|file):/dev/(lp|printers/)0\s*$!) {
		    $::noX || 
			$in->ask_warn(N("Canon LBP-460/660 configuration"),
				      N("The driver for this printer only supports printers locally connected on the first parallel port, no printers on remote machines or print server boxes or on other parallel ports. Please connect your printer to the first parallel port or configure it on the machine where it is connected to."));
		    return 0;
		}
		# Set driver executable permissions
		if ($printer->{SPOOLER} eq 'cups') {
		    set_permissions('/usr/bin/lbp660', 
				    '4750', 'root', 'sys');
		} elsif ($printer->{SPOOLER} eq 'pdq') {
		    set_permissions('/usr/bin/lbp660', 
				    '4755', 'root', 'sys');
		} else {
		    set_permissions('/usr/bin/lbp660', 
				    '4750', 'root', 'lp');
		}
		# This is needed to have the device not blocked by the
		# spooler backend.
		$printer->{currentqueue}{connect} = 'file:/dev/null';
	    } elsif ($printer->{currentqueue}{printer} eq 'HP-LaserJet_1000') {
		$in->ask_warn(N("Firmware-Upload for HP LaserJet 1000"),
			      $hp1000fwtext);
	    }
	    if ($printer->{currentqueue}{foomatic}) { # Foomatic queue?
		$printer->{ARGS} = 
		    printer::main::read_foomatic_options($printer);
	    }  elsif ($printer->{currentqueue}{ppd}) { # PPD queue?
		$printer->{ARGS} =
		    printer::main::read_ppd_options($printer);
	    }
	    delete($printer->{SPECIAL_OPTIONS});
	}
    }
    1;
}

sub setup_options {
    my ($printer, $in) = @_;
    my @simple_options = 
	("PageSize",        # Media properties
	 "MediaType",
	 "Form",
	 "InputSlot",       # Trays
	 "Tray",
	 "OutBin",
	 "OutputBin",
	 "FaceUp",
	 "FaceDown",
	 "Collate",
	 "Manual",
	 "ManualFeed",
	 "Manualfeed",
	 "ManualFeeder",
	 "Feeder",
	 "Duplex",          # Double-sided printing
	 "Binding",
	 "Tumble",
	 "DoubleSided",
	 "Resolution",      # Resolution/Quality
	 "GSResolution",
	 "HWResolution",
	 "JCLResolution",
	 "Quality",
	 "PrintQuality",
	 "PrintoutQuality",
	 "QualityType",
	 "ImageType",
	 "stpImageType",
	 "EconoMode",
	 "JCLEconoMode",
	 "FastRes",
	 "JCLFastRes",
	 "InkType",         # Colour/Gray/BW, 4-ink/6-ink
	 "stpInkType",
	 "Mode",
	 "OutputMode",
	 "OutputType",
	 "ColorMode",
	 "ColorModel",
	 "PrintingMode",
	 "Monochrome",
	 "BlackOnly",
	 "Grayscale",
	 "GrayScale",
	 "Colour",
	 "Color",
	 "Gamma",           # Lighter/Darker
	 "GammaCorrection",
	 "GammaGeneral",
	 "MasterGamma",
	 "StpGamma",
	 "stpGamma",
	 "EconoMode",       # Ink/Toner saving
	 "Economode",
	 "TonerSaving",
	 "JCLEconomode",
	 "HPNup",           # Other useful options
	 "InstalledMemory", # Laser printer hardware config
	 "Option1",
	 "Option2",
	 "Option3",
	 "Option4",
	 "Option5",
	 "Option6",
	 "Option7",
	 "Option8",
	 "Option9",
	 "Option10",
	 "Option11",
	 "Option12",
	 "Option13",
	 "Option14",
	 "Option15",
	 "Option16",
	 "Option17",
	 "Option18",
	 "Option19",
	 "Option20",
	 "Option21",
	 "Option22",
	 "Option23",
	 "Option24",
	 "Option25",
	 "Option26",
	 "Option27",
	 "Option28",
	 "Option29",
	 "Option30"
	 );
#    $in->set_help('setupOptions') if $::isInstall;
    if ($printer->{currentqueue}{printer} || # We have a Foomatic queue
	$printer->{currentqueue}{ppd}) { # We have a CUPS+PPD queue
	# Set up the widgets for the option dialog
	my $helptext = N("Printer default settings

You should make sure that the page size and the ink type/printing mode (if available) and also the hardware configuration of laser printers (memory, duplex unit, extra trays) are set correctly. Note that with a very high printout quality/resolution printing can get substantially slower.");
	my @widgets;
	my @userinputs;
	my @choicelists;
	my @shortchoicelists;
	my $i;
	my @oldgroup = ("", "");
	for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
	    # Do not show hidden options (member options of a forced
	    # composite option)
	    next if $printer->{ARGS}[$i]{hidden};
	    my $optshortdefault = $printer->{ARGS}[$i]{default};
	    # Should the option only show when the "Advanced" button was
	    # clicked?
	    my $advanced = ((defined($printer->{ARGS}[$i]{group}) &&
			     $printer->{ARGS}[$i]{group} !~
			      /^(|General|.*install.*)$/i) ||
			    (!($printer->{ARGS}[$i]{group}) &&
			     !member($printer->{ARGS}[$i]{name},
				     @simple_options)) ? 1 : 0);
	    # Group header
	    if ($printer->{ARGS}[$i]{group} ne $oldgroup[$advanced]) {
		my $_level = $#{$printer->{ARGS}[$i]{grouptrans}};
		$oldgroup[$advanced] = $printer->{ARGS}[$i]{group};
		if ($printer->{ARGS}[$i]{group}) {
		    push(@widgets,
			 { val => 
			   join(" / ", @{$printer->{ARGS}[$i]{grouptrans}}),
			   advanced => $advanced });
		}
	    }
	    if ($printer->{ARGS}[$i]{type} eq 'enum') {
		# enumerated option
		$choicelists[$i] = [];
		$shortchoicelists[$i] = [];
		foreach my $choice (@{$printer->{ARGS}[$i]{vals}}) {
		    push(@{$choicelists[$i]}, $choice->{comment});
		    push(@{$shortchoicelists[$i]}, $choice->{value});
		    if ($choice->{value} eq $optshortdefault) {
			$userinputs[$i] = $choice->{comment};
		    }
		}
		push(@widgets,
		     { label => $printer->{ARGS}[$i]{comment}, 
		       val => \$userinputs[$i], 
		       not_edit => 1,
		       list => \@{$choicelists[$i]},
		       sort => 0,
		       advanced => $advanced,
		       help => $helptext })
		    if $printer->{ARGS}[$i]{name} ne 'PageRegion';
	    } elsif ($printer->{ARGS}[$i]{type} eq 'bool') {
		# boolean option
		$choicelists[$i] = [($printer->{ARGS}[$i]{comment_true} ||
				     $printer->{ARGS}[$i]{name} || "Yes"),
				    ($printer->{ARGS}[$i]{comment_false} ||
				     $printer->{ARGS}[$i]{name_false} ||
				     "No")];
		$shortchoicelists[$i] = [];
		my $numdefault = 
		    ($optshortdefault =~ m!^\s*(true|on|yes|1)\s*$! ? 
		     "1" : "0");
		$userinputs[$i] = $choicelists[$i][1-$numdefault];
		push(@widgets,
		     { label => $printer->{ARGS}[$i]{comment},
		       val => \$userinputs[$i],
		       not_edit => 1,
		       list => \@{$choicelists[$i]},
		       sort => 0,
		       advanced => $advanced,
		       help => $helptext });
	    } else {
		# numerical option
		$choicelists[$i] = [];
		$shortchoicelists[$i] = [];
		$userinputs[$i] = $optshortdefault;
		push(@widgets,
		     { label => $printer->{ARGS}[$i]{comment} . 
			   " ($printer->{ARGS}[$i]{min}... " .
			       "$printer->{ARGS}[$i]{max})",
			   #type => 'range',
			   #min => $printer->{ARGS}[$i]{min},
			   #max => $printer->{ARGS}[$i]{max},
			   val => \$userinputs[$i],
			   advanced => $advanced,
			   help => $helptext });
	    }
	}
	# Show the options dialog. The call-back function does a
	# range check of the numerical options.
	my $windowtitle = "$printer->{currentqueue}{make} $printer->{currentqueue}{model}";
	if ($printer->{expert}) {
	    my $driver;
	    if ($driver = $printer->{currentqueue}{driver}) {
		if ($printer->{currentqueue}{foomatic}) {
		    if ($driver eq 'Postscript') {
			$driver = "PostScript";
		    } else {
			$driver = "GhostScript + $driver";
		    }
		} elsif ($printer->{currentqueue}{ppd}) {
		    if ($printer->{DBENTRY}) {
			$driver = $1 if $printer->{DBENTRY} =~ /^[^\|]*\|[^\|]*\|(.*)$/;
		    } else {
			$driver = printer::main::get_descr_from_ppd($printer);
			if ($driver =~ /^[^\|]*\|[^\|]*$/) { # No driver info
			    $driver = "PPD";
			} else {
			    $driver = $1 if $driver =~ /^[^\|]*\|[^\|]*\|(.*)$/;
			}
		    }
		}
	    } 
	    if ($driver) {
		$windowtitle .= ", $driver";
	    }
	}
	# Do not show the options setup dialog when installing a new printer
	# in recommended mode without "Manual configuration" turned on.
	if ((!$printer->{NEW} || $printer->{expert} || $printer->{MANUAL}) &&
	    !$printer->{noninteractive}) {
	    return 0 if !$in->ask_from(
		 $windowtitle,
		 N("Printer default settings"),
		 \@widgets,
		 complete => sub {
		     my $i;
		     for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
			 if ($printer->{ARGS}[$i]{type} eq 'int' || $printer->{ARGS}[$i]{type} eq 'float') {
			     if ($printer->{ARGS}[$i]{type} eq 'int' && $userinputs[$i] !~ /^[\-\+]?[0-9]+$/) {
				 $in->ask_warn(N("Error"), N("Option %s must be an integer number!", $printer->{ARGS}[$i]{comment}));
				 return 1, $i;
			     }
			     if ($printer->{ARGS}[$i]{type} eq 'float' && $userinputs[$i] !~ /^[\-\+]?[0-9\.]+$/) {
				 $in->ask_warn(N("Error"), N("Option %s must be a number!", $printer->{ARGS}[$i]{comment}));
				 return 1, $i;
			     }
			     if ($userinputs[$i] < $printer->{ARGS}[$i]{min} || $userinputs[$i] > $printer->{ARGS}[$i]{max}) {
				 $in->ask_warn(N("Error"), N("Option %s out of range!", $printer->{ARGS}[$i]{comment}));
				 return 1, $i;
			     }
			 }
		     }
		     return 0;
		 });
	}
	# Read out the user's choices and generate the appropriate command
	# line arguments
	@{$printer->{currentqueue}{options}} = ();
	for ($i = 0; $i <= $#{$printer->{ARGS}}; $i++) {
	    # We did not show hidden options, so we do not have user input 
	    # to add to the option list
	    next if $printer->{ARGS}[$i]{hidden};
	    push(@{$printer->{currentqueue}{options}}, "-o");
	    if ($printer->{ARGS}[$i]{type} eq 'enum') {
		# enumerated option
		my $j;
		for ($j = 0; $j <= $#{$choicelists[$i]}; $j++) {
		    if ($choicelists[$i][$j] eq $userinputs[$i]) {
			$printer->{ARGS}[$i]{default} =
			    $shortchoicelists[$i][$j];
			push(@{$printer->{currentqueue}{options}},
			     $printer->{ARGS}[$i]{name} . "=" .
			     $shortchoicelists[$i][$j]);
		    }
		}
	    } elsif ($printer->{ARGS}[$i]{type} eq 'bool') {
		# boolean option
		my $v = 
		    ($choicelists[$i][0] eq $userinputs[$i] ? "1" : "0");
		$printer->{ARGS}[$i]{default} = $v;
		push(@{$printer->{currentqueue}{options}},
		     $printer->{ARGS}[$i]{name} . "=" . $v);
	    } else {
		# numerical option
		$printer->{ARGS}[$i]{default} = $userinputs[$i];
		push(@{$printer->{currentqueue}{options}},
		     $printer->{ARGS}[$i]{name} . "=" . $userinputs[$i]);
	    }
	}
    }
    1;
}

sub setasdefault {
    my ($printer, $in) = @_;
#    $in->set_help('setupAsDefault') if $::isInstall;
    if ($printer->{DEFAULT} eq '' || # We have no default printer,
	                             # so set the current one as default
	$in->ask_yesorno(N("Printerdrake"), N("Do you want to set this printer (\"%s\")\nas the default printer?", $printer->{QUEUE}), 0)) { # Ask the user
	$printer->{DEFAULT} = $printer->{QUEUE};
        printer::default::set_printer($printer);
    }
}
	
sub print_testpages {
    my ($printer, $in, $upNetwork) = @_;
#    $in->set_help('printTestPages') if $::isInstall;
    # print test pages
    my $res2 = 0;
    my %options = (alta4 => 0, altletter => 0, ascii => 0, photo => 0, standard => 1);
    my %old_options = (alta4 => 0, altletter => 0, ascii => 0, photo => 0, standard => 1);
    my $oldres2 = 0;
    my $res1 = $in->ask_from_(
	 { title => N("Test pages"),
	   messages => N("Please select the test pages you want to print.
Note: the photo test page can take a rather long time to get printed and on laser printers with too low memory it can even not come out. In most cases it is enough to print the standard test page."),
	   cancel => (!$printer->{NEW} ?
		       N("Cancel") : ($::isWizard ? N("Previous") : 
				      N("No test pages"))),
	   ok => ($::isWizard ? N("Next") : N("Print")),
	   callbacks => {
	       changed => sub {
		   if ($oldres2 ne $res2) {
		       if ($res2) {
				 foreach my $opt (keys %options) {
					$options{$opt} = 0;
					$old_options{$opt} = 0;
				 }
		       }
		       $oldres2 = $res2;
		   }
		   foreach my $opt (keys %options) {
			  if ($old_options{$opt} ne $options{$opt}) {
				 if ($options{$opt}) {
					$res2 = 0;
					$oldres2 = 0;
				 }
				 $old_options{standard} = $options{standard};
			  }
		   }
		   return 0;
	       }
	   } },
	 [
	  { text => N("Standard test page"), type => 'bool',
	    val => \$options{standard} },
	  if_($printer->{expert},
	   { text => N("Alternative test page (Letter)"), type => 'bool', 
	     val => \$options{altletter} }),
	  if_($printer->{expert},
	   { text => N("Alternative test page (A4)"), type => 'bool', 
	     val => \$options{alta4} }), 
	  { text => N("Photo test page"), type => 'bool', val => \$options{photo} },
	  #{ text => N("Plain text test page"), type => 'bool',
	  #  val => \$options{ascii} }
	  if_($::isWizard,
	   { text => N("Do not print any test page"), type => 'bool', 
	     val => \$res2 })
	  ]);
    $res2 = 1 if !($options{standard} || $options{altletter} || $options{alta4} || $options{photo} || $options{ascii});
    if ($res1 && !$res2) {
	my @lpq_output;
	{
	    my $_w = $in->wait_message(N("Printerdrake"),
				      N("Printing test page(s)..."));
	    
	    $upNetwork and do { &$upNetwork(); undef $upNetwork; sleep(1) };
	    my $stdtestpage = "/usr/share/printer-testpages/testprint.ps";
	    my $altlttestpage = "/usr/share/printer-testpages/testpage.ps";
	    my $alta4testpage = "/usr/share/printer-testpages/testpage-a4.ps";
	    my $phototestpage = "/usr/share/printer-testpages/photo-testpage.jpg";
	    my $asciitestpage = "/usr/share/printer-testpages/testpage.asc";
	    my @testpages;
	    # Install the filter to convert the photo test page to PS
	    if ($printer->{SPOOLER} ne "cups" && $options{photo} && !$::testing &&
		!files_exist('/usr/bin/convert')) {
		$in->do_pkgs->install('ImageMagick')
		    or do {
			# Do not embed this message in the add-printer
			# wizard.
			local $::isWizard = 0;
			$in->ask_warn(N("Warning"),
				      N("Could not install the %s package!",
					"ImageMagick") . " " .
				      N("Skipping photo test page."));
			$options{photo} = 0;
		    };
	    }
	    # set up list of pages to print
	    $options{standard} and push @testpages, $stdtestpage;
	    $options{altletter} and push @testpages, $altlttestpage;
	    $options{alta4} and push @testpages, $alta4testpage;
	    $options{photo} and push @testpages, $phototestpage;
	    $options{ascii} and push @testpages, $asciitestpage;
	    # Nothing to print
	    return 1 if $#testpages < 0;
	    # print the stuff
	    @lpq_output = printer::main::print_pages($printer, @testpages);
	}
	my $dialogtext;
	if (@lpq_output) {
	    $dialogtext = N("Test page(s) have been sent to the printer.
It may take some time before the printer starts.
Printing status:\n%s\n\n", @lpq_output);
	} else {
	    $dialogtext = N("Test page(s) have been sent to the printer.
It may take some time before the printer starts.\n");
	}
	if ($printer->{NEW} == 0) {
	    # Do not embed the following messages in the add-printer
	    # wizard.
	    local $::isWizard = 0;
	    $in->ask_warn(N("Printerdrake"),$dialogtext);
	    return 1;
	} else {
	    $in->ask_yesorno(N("Printerdrake"), $dialogtext . N("Did it work properly?"), 1) 
		and return 1;
	}
    } else {
	return($::isWizard ? $res1 : 1);
    }
    return 2;
}

sub printer_help {
    my ($printer, $in) = @_;
    my $spooler = $printer->{SPOOLER};
    $spooler = "cups" if $spooler eq "rcups";
    my $queue = $printer->{QUEUE};
    my $default = $printer->{DEFAULT};
    my $raw = 0;
    my $cupsremote = 0;
    my $scanning = "";
    my $photocard = "";
    my $hp11000fw = "";
    if ($printer->{configured}{$queue}) {
	if ($printer->{configured}{$queue}{queuedata}{model} eq "Unknown model" ||
	    $printer->{configured}{$queue}{queuedata}{model} eq N("Raw printer")) {
	    $raw = 1;
	}
	# Information about scanning with HP's multi-function devices
	$scanning = scanner_help(
	     $printer->{configured}{$queue}{queuedata}{make} . " " .
	     $printer->{configured}{$queue}{queuedata}{model}, 
	     $printer->{configured}{$queue}{queuedata}{connect});
	if ($scanning) {
	    $scanning = "\n\n$scanning\n\n";
	}
	# Information about photo card access with HP's multi-function devices
	$photocard = photocard_help(
	     $printer->{configured}{$queue}{queuedata}{make} . " " .
	     $printer->{configured}{$queue}{queuedata}{model}, 
	     $printer->{configured}{$queue}{queuedata}{connect});
	if ($photocard) {
	    $photocard = "\n\n$photocard\n\n";
	}
	if ($printer->{configured}{$queue}{queuedata}{printer} eq
	    'HP-LaserJet_1000') {
	    $hp11000fw = "\n\n$hp1000fwtext\n";
	}
    } else {
	$cupsremote = 1;
    }

    my $dialogtext;
    if ($spooler eq "cups") {
	$dialogtext =
N("To print a file from the command line (terminal window) you can either use the command \"%s <file>\" or a graphical printing tool: \"xpp <file>\" or \"kprinter <file>\". The graphical tools allow you to choose the printer and to modify the option settings easily.
", ($queue ne $default ? "lpr -P $queue" : "lpr")) .
N("These commands you can also use in the \"Printing command\" field of the printing dialogs of many applications, but here do not supply the file name because the file to print is provided by the application.
") .
(!$raw ?
N("
The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -o option=setting -o switch" : "lpr -o option=setting -o switch")) .
(!$cupsremote ?
 N("To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s%s

", $scanning, $photocard, $hp11000fw) . printer::main::help_output($printer, 'cups') : 
 $scanning . $photocard . $hp11000fw .
 N("Here is a list of the available printing options for the current printer:

") . printer::main::help_output($printer, 'cups')) : $scanning . $photocard . $hp11000fw);
    } elsif ($spooler eq "lprng") {
	$dialogtext =
N("To print a file from the command line (terminal window) use the command \"%s <file>\".
", ($queue ne $default ? "lpr -P $queue" : "lpr")) . 
N("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application.
") .
(!$raw ?
N("
The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -Z option=setting -Z switch" : "lpr -Z option=setting -Z switch")) .
N("To get a list of the options available for the current printer click on the \"Print option list\" button.") . $scanning . $photocard . $hp11000fw : $scanning . $photocard . $hp11000fw);
    } elsif ($spooler eq "lpd") {
	$dialogtext =
N("To print a file from the command line (terminal window) use the command \"%s <file>\".
", ($queue ne $default ? "lpr -P $queue" : "lpr")) .
N("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application.
") .
(!$raw ?
N("
The \"%s\" command also allows to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\". ", "lpr", ($queue ne $default ? "lpr -P $queue -o option=setting -o switch" : "lpr -o option=setting -o switch")) .
N("To get a list of the options available for the current printer click on the \"Print option list\" button.") . $scanning . $photocard . $hp11000fw : $scanning . $photocard . $hp11000fw);
    } elsif ($spooler eq "pdq") {
	$dialogtext =
N("To print a file from the command line (terminal window) use the command \"%s <file>\" or \"%s <file>\".
", ($queue ne $default ? "pdq -P $queue" : "pdq"), ($queue ne $default ? "lpr -P $queue" : "lpr")) .
N("This command you can also use in the \"Printing command\" field of the printing dialogs of many applications. But here do not supply the file name because the file to print is provided by the application.
") .
N("You can also use the graphical interface \"xpdq\" for setting options and handling printing jobs.
If you are using KDE as desktop environment you have a \"panic button\", an icon on the desktop, labeled with \"STOP Printer!\", which stops all print jobs immediately when you click it. This is for example useful for paper jams.
") .
(!$raw ?
N("
The \"%s\" and \"%s\" commands also allow to modify the option settings for a particular printing job. Simply add the desired settings to the command line, e. g. \"%s <file>\".
", "pdq", "lpr", ($queue ne $default ? "pdq -P $queue -aoption=setting -oswitch" : "pdq -aoption=setting -oswitch")) .
N("To know about the options available for the current printer read either the list shown below or click on the \"Print option list\" button.%s%s%s

", $scanning, $photocard, $hp11000fw) . printer::main::help_output($printer, 'pdq') :
 $scanning . $photocard . $hp11000fw);
    }
    my $windowtitle = ($scanning ?
                       ($photocard ?
			N("Printing/Scanning/Photo Cards on \"%s\"", $queue) :
			N("Printing/Scanning on \"%s\"", $queue)) :
                       ($photocard ?
			N("Printing/Photo Card Access on \"%s\"", $queue) :
			N("Printing on the printer \"%s\"", $queue)));
    if (!$raw && !$cupsremote) {
        my $choice;
        while ($choice ne N("Close")) {
	    $choice = $in->ask_from_list_(
	         $windowtitle, $dialogtext,
		 [ N("Print option list"), N("Close") ],
		 N("Close"));
	    if ($choice ne N("Close")) {
		my $_w = $in->wait_message(N("Printerdrake"),
					  N("Printing test page(s)..."));
	        printer::main::print_optionlist($printer);
	    }
	}
    } else {
	$in->ask_warn($windowtitle, $dialogtext);
    }
}

sub scanner_help {
    my ($makemodel, $deviceuri) = @_;
    if ($deviceuri =~ m!^ptal://?(.*?)$!) {
	my $ptaldevice = $1;
	if ($makemodel !~ /HP\s+PhotoSmart/i &&
	    $makemodel !~ /HP\s+LaserJet\s+2200/i &&
	    $makemodel !~ /HP\s+(DeskJet|dj)\s*450/i) {
	    # Models with built-in scanner
	    return N("Your multi-function device was configured automatically to be able to scan. Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify the scanner when you have more than one) from the command line or with the graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, you can also scan by choosing the appropriate point in the \"File\"/\"Acquire\" menu. Call also \"man scanimage\" on the command line to get more information.

You do not need to run \"scannerdrake\" for setting up scanning on this device, you only need to use \"scannerdrake\" if you want to share the scanner on the network.",
		     $ptaldevice);
	} else {
	    # Scanner-less models
	    return "";
	}
    }
}

sub photocard_help {
    my ($makemodel, $deviceuri) = @_;
    if ($deviceuri =~ m!^ptal://?(.*?)$!) {
	my $ptaldevice = $1;
	if (($makemodel =~ /HP\s+PhotoSmart/i ||
	     $makemodel =~ /HP\s+PSC\s*9[05]0/i ||
	     $makemodel =~ /HP\s+PSC\s*135\d/i ||
	     $makemodel =~ /HP\s+PSC\s*21[57]\d/i ||
	     $makemodel =~ /HP\s+PSC\s*22\d\d/i ||
	     $makemodel =~ /HP\s+PSC\s*2[45]\d\d/i ||
	     $makemodel =~ /HP\s+OfficeJet\s+D\s*1[45]5/i ||
	     $makemodel =~ /HP\s+OfficeJet\s+71[34]0/i ||
	     $makemodel =~ /HP\s+(DeskJet|dj)\s*450/i) &&
	    $makemodel !~ /HP\s+PhotoSmart\s+7150/i) {
	    # Models with built-in photo card drives
	    return N("Your printer was configured automatically to give you access to the photo card drives from your PC. Now you can access your photo cards using the graphical program \"MtoolsFM\" (Menu: \"Applications\" -> \"File tools\" -> \"MTools File Manager\") or the command line utilities \"mtools\" (enter \"man mtools\" on the command line for more info). You find the card's file system under the drive letter \"p:\", or subsequent drive letters when you have more than one HP printer with photo card drives. In \"MtoolsFM\" you can switch between drive letters with the field at the upper-right corners of the file lists.",
		     $ptaldevice);
	} else {
	    # Photo-card-drive-less models
	    return "";
	}
    }
}

sub copy_queues_from {
    my ($printer, $in, $oldspooler) = @_;

#    $in->set_help('copyQueues') if $::isInstall;
    my $newspooler = $printer->{SPOOLER};
    my @oldqueues;
    my @queueentries;
    my @queuesselected;
    my $newspoolerstr;
    my $oldspoolerstr;
    my $noninteractive = 0;
    {
	my $_w = $in->wait_message(N("Printerdrake"),
				  N("Reading printer data..."));
	@oldqueues = printer::main::get_copiable_queues($oldspooler, $newspooler);
	@oldqueues = sort(@oldqueues);
	$newspoolerstr = $printer::data::spoolers{$newspooler}{short_name};
	$oldspoolerstr = $printer::data::spoolers{$oldspooler}{short_name};
	foreach (@oldqueues) {
	    push @queuesselected, 1;
	    push @queueentries, { text => $_, type => 'bool', 
				   val => \$queuesselected[-1] };
	}
	# LPRng and LPD use the same config files, therefore one sees the 
	# queues of LPD when one uses LPRng and vice versa, but these queues
	# do not work. So automatically transfer all queues when switching
	# between LPD and LPRng.
	if ($oldspooler =~ /^lp/ && $newspooler =~ /^lp/) {
	    $noninteractive = 1;
	}
    }
    if ($noninteractive ||
	$in->ask_from_(
	 { title => N("Transfer printer configuration"),
	   messages => N("You can copy the printer configuration which you have done for the spooler %s to %s, your current spooler. All the configuration data (printer name, description, location, connection type, and default option settings) is overtaken, but jobs will not be transferred.
Not all queues can be transferred due to the following reasons:
", $oldspoolerstr, $newspoolerstr) .
($newspooler eq "cups" ? N("CUPS does not support printers on Novell servers or printers sending the data into a free-formed command.
") :
 ($newspooler eq "pdq" ? N("PDQ only supports local printers, remote LPD printers, and Socket/TCP printers.
") :
  N("LPD and LPRng do not support IPP printers.
"))) .
N("In addition, queues not created with this program or \"foomatic-configure\" cannot be transferred.") .
if_($oldspooler eq "cups", N("
Also printers configured with the PPD files provided by their manufacturers or with native CUPS drivers cannot be transferred.")) . N("
Mark the printers which you want to transfer and click 
\"Transfer\"."),
	   cancel => N("Do not transfer printers"),
           ok => N("Transfer")
	 },
         \@queueentries
      )) {
	my $queuecopied = 0;
	foreach (@oldqueues) {
	    if (shift(@queuesselected)) {
                my $oldqueue = $_;
                my $newqueue = $_;
                if (!$printer->{configured}{$newqueue} || $noninteractive ||
		    $in->ask_from_(
	              { title => N("Transfer printer configuration"),
	                messages => N("A printer named \"%s\" already exists under %s. 
Click \"Transfer\" to overwrite it.
You can also type a new name or skip this printer.", 
				      $newqueue, $newspoolerstr),
                        ok => N("Transfer"),
                        cancel => N("Skip"),
		        callbacks => { complete => sub {
	                    unless ($newqueue =~ /^\w+$/) {
				$in->ask_warn(N("Error"), N("Name of printer should contain only letters, numbers and the underscore"));
				return 1, 0;
			    }
			    if ($printer->{configured}{$newqueue}
				&& $newqueue ne $oldqueue && 
				!$in->ask_yesorno(N("Warning"), N("The printer \"%s\" already exists,\ndo you really want to overwrite its configuration?",
							 $newqueue),
						   0)) {
				return 1, 0; # Let the user correct the name
			    }
			    return 0;
			} }
		    },
		      [{label => N("New printer name"),val => \$newqueue }])) {
		    {
			my $_w = $in->wait_message(N("Printerdrake"), 
			   N("Transferring %s...", $oldqueue));
		        printer::main::copy_foomatic_queue($printer, $oldqueue,
						   $oldspooler, $newqueue) and
							 $queuecopied = 1;
		    }
		    if ($oldqueue eq $printer->{DEFAULT}) {
			# Make the former default printer the new default
			# printer if the user does not reject
			if ($noninteractive ||
			    $in->ask_yesorno(
			      N("Transfer printer configuration"),
			      N("You have transferred your former default printer (\"%s\"), Should it be also the default printer under the new printing system %s?", $oldqueue, $newspoolerstr), 1)) {
			    $printer->{DEFAULT} = $newqueue;
			    printer::default::set_printer($printer);
			}
		    }
		}
            }
	}
        if ($queuecopied) {
	    my $_w = $in->wait_message(N("Printerdrake"),
                                      N("Refreshing printer data..."));
	    printer::main::read_configured_queues($printer);
        }
    }
}

sub start_network {
    my ($in, $upNetwork) = @_;
    my $_w = $in->wait_message(N("Printerdrake"), 
			      N("Starting network..."));
    if ($::isInstall) {
	my $ret;
	if ($upNetwork) {
            $ret = &$upNetwork();
            undef $upNetwork;
            sleep(1);
        }
        return $ret;
    } else { return printer::services::start("network") }
}

sub network_configured() {
    # Do configured networks (/etc/sysconfig/network-scripts/ifcfg*) exist?
    my @netscripts =
	cat_("ls -1 $::prefix/etc/sysconfig/network-scripts/ |");
    my $netconfigured = 0;
    (/ifcfg-/ and !/(ifcfg-lo|:|rpmsave|rpmorig|rpmnew)/ and
      !/(~|\.bak)$/ and $netconfigured = 1) foreach @netscripts;
    return $netconfigured;
}

sub check_network {

    # This routine is called whenever the user tries to configure a remote
    # printer. It checks the state of the network functionality to assure
    # that the network is up and running so that the remote printer is
    # reachable.

    my ($printer, $in, $upNetwork, $b_dontconfigure) = @_;

    # Any additional dialogs caused by this subroutine should appear as
    # extra windows and not embedded in the "Add printer" wizard.
    local $::isWizard = 0;

#    $in->set_help('checkNetwork') if $::isInstall;

    # First check: Do configured networks
    # (/etc/sysconfig/network-scripts/ifcfg*) exist?

    if (!$b_dontconfigure && !network_configured()) {
	my $go_on = 0;
	while (!$go_on) {
	    my $choice = N("Configure the network now");
	    if ($in->ask_from(N("Network functionality not configured"),
			      N("You are going to configure a remote printer. This needs working network access, but your network is not configured yet. If you go on without network configuration, you will not be able to use the printer which you are configuring now. How do you want to proceed?"),
			      [ { val => \$choice, type => 'list',
				  list => [ N("Configure the network now"),
					    N("Go on without configuring the network") ] } ])) {
		if ($choice eq N("Configure the network now")) {
		    if ($::isInstall) {
			my $o = $in;
			require network::netconnect;
		        network::netconnect::main(
			     $o->{netcnx} ||= {}, 
			     $in, $o->{modules_conf}, $o->{netc}, $o->{mouse}, 
			     $o->{intf});
#    my ($prefix, $netcnx, $in, $o_netc, $o_mouse, $o_intf, $o_first_time, $o_noauto) = @_;
		    } else {
			system("/usr/sbin/drakconnect");
		    }
		    $go_on = network_configured();
		} else {
		    return 1;
		}
	    } else {
		return 0;
	    }
	}
    }

    # Do not try to start the network if it is not configured
    if (!network_configured()) { return 0 }

    # Second check: Is the network running?

    if (printer::detect::network_running()) { return 1 }

    # The network is configured now, start it.
    if (!start_network($in, $upNetwork) && 
	(!$b_dontconfigure || $::isInstall)) {
	$in->ask_warn(N("Warning"), 
($::isInstall ?
N("The network configuration done during the installation cannot be started now. Please check whether the network is accessible after booting your system and correct the configuration using the %s Control Center, section \"Network & Internet\"/\"Connection\", and afterwards set up the printer, also using the %s Control Center, section \"Hardware\"/\"Printer\"", $shortdistroname, $shortdistroname) :
N("The network access was not running and could not be started. Please check your configuration and your hardware. Then try to configure your remote printer again.")));
	return 0;
    }

    # Give a SIGHUP to the daemon and in case of CUPS do also the
    # automatic configuration of broadcasting/access permissions
    # The daemon is not really restarted but only SIGHUPped to not
    # interrupt print jobs.

    my $_w = $in->wait_message(N("Printerdrake"), 
                               N("Restarting printing system..."));

    return printer::main::SIGHUP_daemon($printer->{SPOOLER});

}

sub security_check {
    # Check the security mode and when in "high" or "paranoid" mode ask the
    # user whether he really wants to configure printing.
    my ($spooler, $security, $o_in) = @_;

    # Any additional dialogs caused by this subroutine should appear as
    # extra windows and not embedded in the "Add printer" wizard.
    local $::isWizard = 0;

#    $in->set_help('securityCheck') if $::isInstall;

    # Exit silently if the spooler is PDQ
    if ($spooler eq "pdq") { return 1 }

    # Exit silently in medium or lower security levels
    if (!$security || $security < 4) { return 1 }
    
    # Exit silently if the current spooler is already activated for the current
    # security level
    if (printer::main::spooler_in_security_level($spooler, $security)) { return 1 }

    # Tell user in which security mode he is and ask him whether he really
    # wants to activate the spooler in the given security mode. Stop the
    # operation of installing the spooler if he disagrees.
    my $securitystr = ($security == 4 ? N("high") : N("paranoid"));
    if ($o_in &&
	$o_in->ask_yesorno(N("Installing a printing system in the %s security level", $securitystr),
			 N("You are about to install the printing system %s on a system running in the %s security level.

This printing system runs a daemon (background process) which waits for print jobs and handles them. This daemon is also accessible by remote machines through the network and so it is a possible point for attacks. Therefore only a few selected daemons are started by default in this security level.

Do you really want to configure printing on this machine?",
			   $printer::data::spoolers{$spooler}{short_name},
			   $securitystr))) {
        printer::main::add_spooler_to_security_level($spooler, $security);
	my $service;
	if ($spooler eq "lpr" || $spooler eq "lprng") {
	    $service = "lpd";
	} else {
	    $service = $spooler;
	}
        services::start_service_on_boot($service); #TV
	return 1;
    } else {
	return 0;
    }
}

sub start_spooler_on_boot {
    # Checks whether the spooler will be started at boot time and if not,
    # ask the user whether he wants to start the spooler at boot time.
    my ($printer, $o_in, $b_service, $b_silentspooleronboot) = @_;
    # PDQ has no daemon, so nothing needs to be started :
    return unless $b_service;

    # Any additional dialogs caused by this subroutine should appear as
    # extra windows and not embedded in the "Add printer" wizard.
    local $::isWizard = 0;

#    $in->set_help('startSpoolerOnBoot') if $::isInstall;
    if (!services::starts_on_boot($b_service)) {
	if ($b_silentspooleronboot ||
	    $o_in && $o_in->ask_yesorno(N("Starting the printing system at boot time"),
			     N("The printing system (%s) will not be started automatically when the machine is booted.

It is possible that the automatic starting was turned off by changing to a higher security level, because the printing system is a potential point for attacks.

Do you want to have the automatic starting of the printing system turned on again?",
		       $printer::data::spoolers{$printer->{SPOOLER}}{short_name}))) {
	    services::start_service_on_boot($b_service);
	}
    }
    1;
}

sub install_spooler {
    # installs the default spooler and start its daemon
    my ($printer, $security, $do_pkgs, $o_in, $o_upNetwork, $b_silentspooleronboot) = @_;