#!/usr/bin/perl -w

# Control-center
# $Id$
# 
# Copyright (C) 2001-2002 MandrakeSoft
# Yves Duret <yduret at mandrakesoft.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
# MA 02111-1307, USA.


use strict;
use diagnostics;
use lib qw(/usr/lib/libDrakX);

use standalone;     #- warning, standalone must be loaded very first, for 'explanations'

use common;
use my_gtk qw(:helpers);
use ugtk qw(:helpers);

#- languages that can't be displayed with gtk1, so we unset translations
#- for them until this tool is ported to gtk2
if ($ENV{LANGUAGE} =~ /\b(ar|he|hi|ta)/) { $ENV{LANGUAGE} = "C" };

require_root_capability();

my $expert_mode = 0;
# we have put here the list in order to do $list->clear() when we have to do
my $fixed_font = Gtk::Gdk::Font->fontset_load(N("-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"));
my $list = new_with_titles Gtk::CList(N("Module name"), N("Size"));

my $window = my_gtk->new('drakfloppy');
unless ($::isEmbedded) {
    $window->{rwindow}->signal_connect(delete_event => sub { my_gtk->exit(0) });
    $window->{rwindow}->set_title(N("drakfloppy"));
    $window->{rwindow}->set_policy(1, 1, 1);
    $window->{rwindow}->border_width(5);
}

### menus definition
# the menus are not shown
# but they provides shiny shortcut like C-q
my @menu_items = ( 
		  { path => N("/_File"), type => '<Branch>' },
		  { path => N("/File/_Quit"), accelerator => N("<control>Q"), callback => sub { my_gtk->exit(0) } },
		 );
ugtk::create_factory_menu($window->{rwindow}, @menu_items) unless $::isEmbedded;

######### menus end

my $global_vbox = new Gtk::VBox();

$global_vbox->pack_start(new Gtk::Label(N("boot disk creation")), 0, 0, 0) unless $::isEmbedded;

######## up part
my $up_vbox  = new Gtk::VBox(0, 0);

# device part
my $dev_hbox = new Gtk::HBox(1, 0);
my $device_combo = new Gtk::Combo();
my $device_button = new Gtk::Button(N("default"));

$device_combo->set_popdown_strings("/dev/fd0", "/dev/fd1");
$device_button->signal_connect(clicked => sub { $device_combo->entry->set_text("/dev/fd0") });

$dev_hbox->pack_start(new Gtk::Label(N("device")), 0, 0, 0);
$dev_hbox->pack_start($device_combo, 0, 0, 0);
$dev_hbox->pack_start($device_button, 0, 0, 0);
$up_vbox->pack_start($dev_hbox, 0, 0, 0);

# kernel part
my $ker_hbox = new Gtk::HBox(1, 0);
my $kernel_combo = new Gtk::Combo();
my $kernel_button = new Gtk::Button(N("default"));
$kernel_combo->disable_activate();
$kernel_combo->set_popdown_strings(do {
    opendir YREP, "/lib/modules" or die N("DrakFloppy Error: %s", $!);
    my @files_modules = grep !/^\.\.?$/, readdir YREP;
    closedir YREP;
    @files_modules;
});
#$kernel_combo->entry->set_text(`uname -r`);
$kernel_combo->entry->signal_connect(changed => sub { change_tree($kernel_combo->entry->get_text()); $list->clear() });
my $aaaa = `uname -r`;
chomp($aaaa);
$kernel_button->signal_connect(clicked => sub { $kernel_combo->entry->set_text($aaaa); $list->clear() });

$ker_hbox->pack_start(new Gtk::Label(N("kernel version")), 0, 0, 0);
$ker_hbox->pack_start($kernel_combo, 0, 0, 0);
$ker_hbox->pack_start($kernel_button, 0, 0, 0);
$up_vbox->pack_start($ker_hbox, 0, 0, 5);

# vbox part
my $up_frame = new Gtk::Frame(N("General"));
$up_frame->add($up_vbox);
$global_vbox->pack_start($up_frame, 1, 1, 0);

### expert mode
my $expert_main_frame = new Gtk::Frame(N("Expert Area"));
my $expert_dedans = new Gtk::VBox(0, 5);
$expert_dedans->border_width(5);
my $expert_button_frame = new Gtk::Frame(N("mkinitrd optional arguments"));
my $expert_mod_frame = new Gtk::Frame(N("Add a module"));
my $expert_pane = new Gtk::HPaned();
$expert_pane->set_handle_size(10);
$expert_pane->set_gutter_size(8);

my $expert_button = new Gtk::Button(N("Expert Mode"));
$expert_button->signal_connect(clicked => sub {
				  if ($expert_mode) {
				    $expert_mod_frame->hide();
				    $expert_button_frame->hide()
				  } else {
				    $expert_mod_frame->show();
				    $expert_button_frame->show();
				  }
				    $expert_mode = !$expert_mode;
				});

my $expert_button_vbox = new Gtk::VBox(0, 5);
my $expert_button_hbox = new Gtk::HBox(0, 5);
my $expert_button_hbox2 = new Gtk::HBox(0, 5);
my $force_button = new Gtk::ToggleButton(N("force"));
my $needed_button = new Gtk::ToggleButton(N("if needed"));
my $scsi_button = new Gtk::ToggleButton(N("omit scsi modules"));
my $raid_button = new Gtk::ToggleButton(N("omit raid modules"));
$expert_button_hbox->pack_start($force_button, 0, 0, 0);
$expert_button_hbox->pack_start($raid_button, 0, 0, 0);

$expert_button_hbox2->pack_start($needed_button, 0, 0, 0);
$expert_button_hbox2->pack_start($scsi_button, 0, 0, 0);

$expert_button_vbox->pack_start($expert_button_hbox, 0, 0, 0);
$expert_button_vbox->pack_start($expert_button_hbox2, 0, 0, 0);
$expert_button_frame->add($expert_button_vbox);
$expert_dedans->pack_start($expert_button_frame, 0, 0, 0);
$expert_mod_frame->add($expert_pane);
$expert_dedans->pack_start($expert_mod_frame, 1, 1, 0);
$expert_main_frame->add($expert_dedans);
$global_vbox->pack_start($expert_main_frame, 1, 1, 0);

### the tree

# Create a ScrolledWindow for the tree
my $tree_scrolled_win = new Gtk::ScrolledWindow();
$tree_scrolled_win->set_usize(200, $::isEmbedded ? 0 : 175);
$expert_pane->add1($tree_scrolled_win);
$tree_scrolled_win->set_policy('automatic', 'automatic');

# Create root tree
my $tree = new Gtk::Tree();
my $leaf;
my $root_dir;
$tree_scrolled_win->add_with_viewport($tree);
$tree->set_selection_mode('single');
$tree->set_view_mode('item');

fill_tree($kernel_combo->entry->get_text());

# Create a ScrolledWindow for the list
my $list_scrolled_win = new Gtk::ScrolledWindow(undef, undef);
my $rmmod_button = new Gtk::Button(N("Remove a module"));
my $expert_inside_pane2 = new Gtk::VBox(0, 0);
my $list_selected_row;

$expert_inside_pane2->pack_start($list_scrolled_win, 1, 1, 0);
$expert_inside_pane2->pack_start($rmmod_button, 0, 0, 0);
$expert_pane->add2($expert_inside_pane2);
$list_scrolled_win->set_policy('automatic', 'automatic');
$rmmod_button->signal_connect(clicked => sub { $list->remove($list_selected_row) });

# Create list box
########################################################## from here my $list
$list->signal_connect(select_row => sub { (undef, $list_selected_row) = @_ });
$list_scrolled_win->add($list);
$list->set_column_justification(1, 'right');
$list->set_column_width(0, 200);
$list->set_column_width(1, 50);
$list->set_selection_mode('single');
$list->set_shadow_type('none');
$list->show();

### output
my $output_frame = new Gtk::Frame(N("Output"));
my $output = new Gtk::Text(undef, undef);
my $vscrollbar = new Gtk::VScrollbar($output->vadj);
my $output_hbox = new Gtk::HBox(0, 0);
$output_hbox->border_width(5);
$output_hbox->set_usize(30, 75);
$output_hbox->pack_start($output, 1, 1, 0);
$output_hbox->pack_start($vscrollbar, 0, 0, 0);
$output_frame->add($output_hbox);
$global_vbox->pack_start($output_frame, 0, 0, 0);

### final buttons
my $build_button = new Gtk::Button(N("Build the disk"));
my $cancel_button = new Gtk::Button(N("Cancel"));
my $fin_hbox = new Gtk::HBox(0, 0);
$cancel_button->signal_connect(clicked => sub { my_gtk->exit(0) });
$build_button->signal_connect(clicked => \&build_it);
$fin_hbox->pack_end($cancel_button, 0, 0, 0);
$fin_hbox->pack_end($build_button,  0, 0, 10);
$fin_hbox->pack_end($expert_button, 0, 0, 10);
$global_vbox->pack_start($fin_hbox, 0, 0, 0);

### back to window
$window->{window}->add($global_vbox);

$window->{rwindow}->show_all();
$expert_mod_frame->hide();
$expert_button_frame->hide();

$window->main;
my_gtk->exit(0);


#-------------------------------------------------------------
# tree functions
#-------------------------------------------------------------
### Subroutines

sub fill_tree {
  ($root_dir) = @_;
  $root_dir = "/lib/modules/" . $root_dir;
  # Create root tree item widget
  $leaf = new_with_label Gtk::TreeItem($root_dir);
  $tree->append($leaf);
  $leaf->signal_connect('select', \&select_item, $root_dir);
  $leaf->set_user_data($root_dir);

  # Create the subtree
  if (has_sub_trees($root_dir)) {
    my $subtree = new Gtk::Tree();
    $leaf->set_subtree($subtree);
    $leaf->signal_connect('expand', \&expand_tree, $subtree);
    $leaf->signal_connect('collapse', \&collapse_tree);
    $leaf->expand();
  }
}

sub change_tree {
  $leaf->destroy();
  fill_tree(@_);
  $leaf->show();
}

# Callback for expanding a tree - find subdirectories, files and add them to tree
sub expand_tree {
    my ($item, $subtree) = @_;

    my $path;
    my $item_new;
    my $new_subtree;

    my $dir = $item->get_user_data();

    chdir($dir);

    foreach my $dir_entry (all(".")) {
      if (-d $dir_entry or $dir_entry =~ /\.o(\.gz)?$/) {
	$path = $dir . "/" . $dir_entry;
	$path =~ s|//|/|g;
	$item_new = new_with_label Gtk::TreeItem($dir_entry);
	$item_new->set_user_data($path);
	$item_new->signal_connect('select', \&select_item, $path);
	$subtree->append($item_new);
	$item_new->show();

	if (has_sub_trees($path)) {
	  $new_subtree = new Gtk::Tree();
	  $item_new->set_subtree($new_subtree);
	  $item_new->signal_connect('expand', \&expand_tree, $new_subtree);
	  $item_new->signal_connect('collapse', \&collapse_tree);
	}
      }
    }
    chdir("..");
  }


# Callback for collapsing a tree -- removes the subtree
sub collapse_tree {
    my ($item) = @_;
    my $subtree = new Gtk::Tree();

    $item->remove_subtree();
    $item->set_subtree($subtree);
    $item->signal_connect('expand', \&expand_tree, $subtree);
  }

# Called whenever an item is clicked on the tree widget.
sub select_item  {
  my ($widget, $file) = @_;
  return if -d $file;
  my  $size = (lstat($file))[7];
  my $lr = $list->rows();
  my $i;
  $file =~ s|/lib/modules/.*?/||g;
  for ($i = 0; $i < $lr; $i++) {
    last if $file eq $list->get_text($i, 0);
  }
  print $file, "\n";
  
  $list->append($file, $size) if $i == $lr or $lr == 0;
}

#-------------------------------------------------------------
# the function
#-------------------------------------------------------------
sub build_it {
  my $y;
  my $co = "/sbin/mkbootdisk --noprompt --verbose --device " . $device_combo->entry->get_text();
  if ($expert_mode) {
    $co .= " --mkinitrdargs -f" if $force_button->get_active;
    $co .= " --mkinitrdargs --ifneeded" if $needed_button->get_active;
    $co .= " --mkinitrdargs --omit-scsi-modules" if $scsi_button->get_active;
    $co .= " --mkinitrdargs --omit-raid-modules" if $raid_button->get_active;
    for (my $i = 0; $i < $list->rows(); $i++) {
      $y = $list->get_text($i, 0);
      $y =~ s|.*?/||g;
      $co .= " --mkinitrdargs --with=" . $y; #. "/usr/lib/" . $kernel_combo->entry->get_text() . "/" . $y;
    }
  }
  $co .= " " . $kernel_combo->entry->get_text();
  $co .= " 2>&1 |";
  create_dialog(N("Be sure a media is present for the device %s",  $device_combo->entry->get_text()), 1) or return;
# we test if the media is present
 test:
  my $a = "dd count=1 if=/dev/null of=" . $device_combo->entry->get_text() . " 2>&1";
  my $b = `$a`;
  if ($b =~ /dd/) { create_dialog(N("There is no medium or it is write-protected for device %s.\nPlease insert one.", $device_combo->entry->get_text()), 1) ? goto test : return 0 }
  
  local *STATUS;
  open STATUS, $co or do { create_dialog(N("Unable to fork: %s", $!), 0); return };
  local $_;
  while (<STATUS>) {
      $output->insert($fixed_font, undef, undef, $_);
  }
  close STATUS or create_dialog(N("Unable to properly close mkbootdisk: \n %s \n %s", $!, $?), 0);
  
  return (0);
}

####
# This is put at the end of the file because any translatable string
# appearing after this will not be found by xgettext, and so wont end in
# the pot file...
####

# Test whether a directory has subdirectories
sub has_sub_trees {
    my ($dir) = @_;
    
    foreach my $file (glob_("$dir/*")) {
        return 1 if -d $file or $file =~ /\.o(\.gz)?$/;
    }
    
    return (0);
}

class='upd'><a href='/software/drakx/diff/perl-install/share/themes-savane.rc?h=15.38&amp;id=3edbeac41e23ee13ff3e0c9c815c4ab93b279fd2'>perl-install/share/themes-savane.rc</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 1.8%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 96.4%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>7 files changed, 166 insertions, 163 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/perl-install/share/compssList b/perl-install/share/compssList<br/>index 408f31c36..fc122e937 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/compssList?h=15.38&amp;id=5521ae98ce86e69166df6f72126bf0c300c069f4'>perl-install/share/compssList</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/compssList?h=15.38&amp;id=3edbeac41e23ee13ff3e0c9c815c4ab93b279fd2'>perl-install/share/compssList</a></div><div class='hunk'>@@ -4,7 +4,7 @@ packages</div><div class='ctx'> </div><div class='ctx'> adjtimex                                  0    99    95</div><div class='ctx'> AfterStep                                42     0     0</div><div class='del'>-afterstep-apps                            0     0     0</div><div class='add'>+AfterStep-APPS                            0     0     0</div><div class='ctx'> aktion                                   85     0    15</div><div class='ctx'> am-utils                                  0     0     0</div><div class='ctx'> anacron                                  70     0    98</div><div class='hunk'>@@ -57,12 +57,12 @@ cervisia                                  0     0     0</div><div class='ctx'> chkconfig                                22     0    10</div><div class='ctx'> chkfontpath                              44     0    50</div><div class='ctx'> chos                                      0     0     0</div><div class='del'>-chos-chos                                 0     0     0</div><div class='add'>+chos-vchos                                 0     0     0</div><div class='ctx'> cleanfeed                                 0    99     0</div><div class='ctx'> colorgcc                                  0     0    99</div><div class='ctx'> comanche                                  0    80     0</div><div class='ctx'> compat-glibc                              0     0    99</div><div class='del'>-comstat                                   0     0     0</div><div class='add'>+comsat                                   0     0     0</div><div class='ctx'> console-tools                            40    99    99</div><div class='ctx'> control-center                           78     0    10</div><div class='ctx'> control-center-devel                     25     0    10</div><div class='hunk'>@@ -72,6 +72,7 @@ cpp                                      50     0    98</div><div class='ctx'> cproto                                   50     0    90</div><div class='ctx'> cracklib                                 50    99    35</div><div class='ctx'> cracklib-dicts                           50    99    35</div><div class='add'>+cron					100	100	100</div><div class='ctx'> crontabs                                 75    98    98</div><div class='ctx'> ctags                                    50     0    90</div><div class='ctx'> cvs                                      50    99    80</div><div class='hunk'>@@ -140,7 +141,7 @@ ftp                                      75     0     0</div><div class='ctx'> fvwm                                     75     0     0</div><div class='ctx'> fvwm2                                    40     0     0</div><div class='ctx'> fvwm2-icons                              45     0     0</div><div class='del'>-fwois                                     0     0     0</div><div class='add'>+fwhois                                     0     0     0</div><div class='ctx'> gaddr                                    56     0     0</div><div class='ctx'> gated                                     0    99     0</div><div class='ctx'> gatos                                    65     0     0</div><div class='hunk'>@@ -216,7 +217,7 @@ g-print                                   0     0     0</div><div class='ctx'> gqview                                   65     0     0</div><div class='ctx'> grep                                     80     0    98</div><div class='ctx'> groff                                    60     0     0</div><div class='del'>-groff-gxeditview                          0     0     0</div><div class='add'>+groff-gxditview                          0     0     0</div><div class='ctx'> grpmi                                    35     0     0</div><div class='ctx'> gscript                                   0     0     0</div><div class='ctx'> gsl                                       0     0     0</div><div class='hunk'>@@ -225,7 +226,7 @@ gtk+                                     50     0    70</div><div class='ctx'> gtk+-devel                               25     0    70</div><div class='ctx'> gtk-engines                              40     0    70</div><div class='ctx'> gtkglarea                                 0     0     0</div><div class='del'>-gtkszip                                   0     0     0</div><div class='add'>+gtkzip                                   0     0     0</div><div class='ctx'> gtop                                     85     0     0</div><div class='ctx'> guavac                                    0     0    90</div><div class='ctx'> guile                                     0     0    85</div><div class='hunk'>@@ -236,8 +237,8 @@ gzip                                     70    99    98</div><div class='ctx'> hdparm                                   75    99    99</div><div class='ctx'> helptool                                 75     0     0</div><div class='ctx'> hexedit                                   0     0    95</div><div class='del'>-howot-croatian                            0     0     0</div><div class='ctx'> howto                                    75     0     0</div><div class='add'>+howot-croatian                            0     0     0</div><div class='ctx'> howto-chinese                             0     0     0</div><div class='ctx'> howto-french                              0     0     0</div><div class='ctx'> howto-german                              0     0     0</div><div class='hunk'>@@ -246,7 +247,7 @@ howto-html                                0     0     0</div><div class='ctx'> howto-indonesian                          0     0     0</div><div class='ctx'> howto-italian                             0     0     0</div><div class='ctx'> howto-japanese                            0     0     0</div><div class='del'>-howto-koeran                              0     0     0</div><div class='add'>+howto-korean                              0     0     0</div><div class='ctx'> howto-polish                              0     0     0</div><div class='ctx'> howto-serbian                             0     0     0</div><div class='ctx'> howto-sgml                                0     0     0</div><div class='hunk'>@@ -262,8 +263,8 @@ icewm-themes                             62     0     0</div><div class='ctx'> ImageMagick                               0     0    65</div><div class='ctx'> ImageMagick-devel                         0     0    65</div><div class='ctx'> imap                                      0    99     0</div><div class='del'>-imblib-cfgeditor                          0     0    75</div><div class='ctx'> imlib                                    50     0    75</div><div class='add'>+imbib-cfgeditor                          0     0    75</div><div class='ctx'> imlib-devel                              25     0    50</div><div class='ctx'> imwheel                                  85     0     0</div><div class='ctx'> indent                                   40     0    97</div><div class='hunk'>@@ -300,7 +301,7 @@ kcdwrite                                  0     0     0</div><div class='ctx'> kcmclock                                  0     0     0</div><div class='ctx'> kcmlaptop                                 1     0     0</div><div class='ctx'> kcpumon                                   0     0     0</div><div class='del'>-kdbconfig                                99    99    99</div><div class='add'>+kbdconfig                                99    99    99</div><div class='ctx'> kdbg                                      0     0     0</div><div class='ctx'> kdeadmin                                 70     0     0</div><div class='ctx'> kdebase                                  85     0     0</div><div class='hunk'>@@ -313,7 +314,7 @@ kdenetwork                               90     0     0</div><div class='ctx'> kderadio                                  0     0     0</div><div class='ctx'> kdesu                                    90     0     0</div><div class='ctx'> kdesupport                               75     0     0</div><div class='del'>-kdethemes                                 0     0     0</div><div class='add'>+kde-themes                                 0     0     0</div><div class='ctx'> kdetoys                                  57     0     0</div><div class='ctx'> kdeutils                                 85     0     0</div><div class='ctx'> kdevelop                                  0     0     0</div><div class='hunk'>@@ -323,16 +324,17 @@ kdiskcat                                  0     0     0</div><div class='ctx'> kdpms                                    78     0     0</div><div class='ctx'> keasycd                                   0     0     0</div><div class='ctx'> kencoder                                  0     0     0</div><div class='del'>-kernekcfg                                 0     0     0</div><div class='add'>+kernelcfg                                 0     0     0</div><div class='ctx'> kernel                                   99    99    99</div><div class='ctx'> kernel-BOOT                               0     0     0</div><div class='ctx'> kernel-doc                                0     0    75</div><div class='ctx'> kernel-headers                            0     0    99</div><div class='del'>-kernel-icbs                               0     0     0</div><div class='del'>-kernel-pcmci-cs                           0     0     0</div><div class='add'>+kernel-ibcs                               0     0     0</div><div class='add'>+kernel-pcmcia-cs                           0     0     0</div><div class='ctx'> kernel-smp                                0     0     0</div><div class='ctx'> kernel-smp-fb                             0     0     0</div><div class='ctx'> kernel-source                             0     0    99</div><div class='add'>+kernelcfg				100	100	100</div><div class='ctx'> kfortune                                 94     0     0</div><div class='ctx'> kfsstatus                                 0     0     0</div><div class='ctx'> kfun21                                    0     0     0</div><div class='hunk'>@@ -344,7 +346,7 @@ khylafax                                  0     0     0</div><div class='ctx'> killustrator                             89     0     0</div><div class='ctx'> kimon                                     0     0     0</div><div class='ctx'> kinterruptinfo                            0     0     0</div><div class='del'>-kisndload                                 0     0     0</div><div class='add'>+kisdnload                                 0     0     0</div><div class='ctx'> kjumpingcube                              0     0     0</div><div class='ctx'> kless                                     0     0     0</div><div class='ctx'> klibreta                                  0     0     0</div><div class='hunk'>@@ -353,6 +355,7 @@ klyx                                     80     0     0</div><div class='ctx'> kmag                                      0     0     0</div><div class='ctx'> kmemmon                                   0     0     0</div><div class='ctx'> kmol                                      0     0     0</div><div class='add'>+kmp3te-devel				100	100	100</div><div class='ctx'> kmpg                                     80     0     0</div><div class='ctx'> kmsgmodem                                 0     0     0</div><div class='ctx'> knc                                       0     0     0</div><div class='hunk'>@@ -366,8 +369,8 @@ kover                                     0     0     0</div><div class='ctx'> kpackage                                 79     0     0</div><div class='ctx'> kpacman                                   0     0     0</div><div class='ctx'> kpilot                                   50     0     0</div><div class='del'>-kmpg3te                                   0     0     0</div><div class='del'>-kmpg3te-devel                             0     0     0</div><div class='add'>+kmp3te                                   0     0     0</div><div class='add'>+kmp3te-devel                             0     0     0</div><div class='ctx'> kpppload                                 49     0     0</div><div class='ctx'> krubik                                   68     0     0</div><div class='ctx'> ksendfax                                 11     0     0</div><div class='hunk'>@@ -385,10 +388,11 @@ ktop                                      0     0     0</div><div class='ctx'> ktron                                     0     0     0</div><div class='ctx'> kuickshow                                 0     0     0</div><div class='ctx'> kvirc                                     0     0     0</div><div class='add'>+kvncviewer				100	100	100</div><div class='ctx'> kvoice                                   11     0     0</div><div class='ctx'> kweather                                  0     0     0</div><div class='ctx'> kwvdial                                   0     0     0</div><div class='del'>-lbtrace                                   0     0     0</div><div class='add'>+ltrace                                   0     0     0</div><div class='ctx'> ldconfig                                  0     0    98</div><div class='ctx'> ld.so                                    70     0    98</div><div class='ctx'> less                                     10     0    97</div><div class='hunk'>@@ -479,7 +483,6 @@ mgetty-voice                             10     0     0</div><div class='ctx'> mikmod                                   80     0     0</div><div class='ctx'> mingetty                                 24     0     0</div><div class='ctx'> minicom                                   0     0     0</div><div class='del'>-minigetty                                 0     0     0</div><div class='ctx'> mirrordir                                 0    99     0</div><div class='ctx'> mkbootdisk                               66     0     0</div><div class='ctx'> mkdosfs-ygg                               0     0     0</div><div class='hunk'>@@ -502,7 +505,8 @@ mt-st                                    65     0     0</div><div class='ctx'> multimedia                               75     0     0</div><div class='ctx'> mutt                                     60     0     0</div><div class='ctx'> mxp                                       0     0     0</div><div class='del'>-mysql-share                               0     0     0</div><div class='add'>+MySQL-shared-libs                          0     0     0</div><div class='add'>+MySQL_GPL-shared-libs			0	0	0</div><div class='ctx'> nag                                       0     0    25</div><div class='ctx'> nc                                        0     0     0</div><div class='ctx'> ncftp                                    75     0     0</div><div class='hunk'>@@ -512,9 +516,12 @@ ncurses                                  75     0    90</div><div class='ctx'> ncurses-devel                            25     0    90</div><div class='ctx'> netcfg                                   75     0     0</div><div class='ctx'> netkit-base                              80    99    80</div><div class='add'>+netscape-castellano</div><div class='ctx'> netscape-common                          90     0     0</div><div class='ctx'> netscape-communicator                    95     0     0</div><div class='add'>+netscape-francais			100	100	100</div><div class='ctx'> netscape-navigator                        0     0     0</div><div class='add'>+netscape-walon</div><div class='ctx'> net-tools                                50    99    90</div><div class='ctx'> newt                                     60     0    85</div><div class='ctx'> newt-devel                               25     0    85</div><div class='hunk'>@@ -533,7 +540,7 @@ patch                                    80     0    80</div><div class='ctx'> pciutils                                  0     0     0</div><div class='ctx'> pdksh                                     0     0     0</div><div class='ctx'> perl                                     60    99    90</div><div class='del'>-perlfitlib                                0     0     0</div><div class='add'>+perlftlib                                0     0     0</div><div class='ctx'> perl-GTK                                  0     0    80</div><div class='ctx'> perl-MD5                                  0    99    85</div><div class='ctx'> perl-Parse-RecDescent                     0     0    85</div><div class='hunk'>@@ -549,7 +556,7 @@ pine                                     60     0     0</div><div class='ctx'> playmidi                                 65     0     0</div><div class='ctx'> playmidi-X11                              0     0     0</div><div class='ctx'> pmake                                    10     0    85</div><div class='del'>-pmake-custom                              0     0    80</div><div class='add'>+pmake-customs                             0     0    80</div><div class='ctx'> popt                                     50     0    90</div><div class='ctx'> portmap                                  32    99     0</div><div class='ctx'> postfix                                   0     0     0</div><div class='hunk'>@@ -603,19 +610,19 @@ rwall                                     0     0     0</div><div class='ctx'> rwho                                     50     0     0</div><div class='ctx'> rxvt                                     09     0    99</div><div class='ctx'> sag                                      65     0    25</div><div class='del'>-sahsh                                     0     0     0</div><div class='add'>+sash                                     0     0     0</div><div class='ctx'> samba                                     0    99     0</div><div class='ctx'> sane                                     75     0     0</div><div class='ctx'> sane-devel                                0     0     0</div><div class='ctx'> screen                                    0     0     0</div><div class='ctx'> sed                                       5     0    98</div><div class='ctx'> sendmail                                  0    99     0</div><div class='del'>-sendmail.cf                               0    99     0</div><div class='add'>+sendmail-cf                               0    99     0</div><div class='ctx'> sendmail-doc                              0     0     0</div><div class='ctx'> setconsole                               58     0     0</div><div class='ctx'> setserial                                80     0     0</div><div class='ctx'> setup                                    80     0     0</div><div class='del'>-setuptoll                                 0     0     0</div><div class='add'>+setuptool                                 0     0     0</div><div class='ctx'> sgml-tools                                0     0    85</div><div class='ctx'> shadow-utils                              0    99     0</div><div class='ctx'> shapecfg                                  0     0     0</div><div class='hunk'>@@ -637,11 +644,11 @@ statserial                                0     0     0</div><div class='ctx'> strace                                   50     0    95</div><div class='ctx'> svgalib                                  94     0    75</div><div class='ctx'> svgalib-devel                            25     0    75</div><div class='del'>-svgatextmod                               0     0     0</div><div class='add'>+SVGATextMode                            0     0     0</div><div class='ctx'> swatch                                    0     0     0</div><div class='add'>+switchdesk                                0     0     0</div><div class='ctx'> switchdesk-gnome                          0     0     0</div><div class='ctx'> switchdesk-kde                           85     0     0</div><div class='del'>-sxitchdesk                                0     0     0</div><div class='ctx'> symlinks                                  0     0     0</div><div class='ctx'> sysklogd                                 50     0     0</div><div class='ctx'> SysVinit                                 99    99    99</div><div class='hunk'>@@ -662,14 +669,15 @@ tetex-afm                                15     0    40</div><div class='ctx'> tetex-dvilj                              15     0    40</div><div class='ctx'> tetex-dvips                              15     0    40</div><div class='ctx'> tetex-latex                              15     0    40</div><div class='add'>+tetex-xdvi				0	0	50</div><div class='ctx'> texinfo                                   0     0    50</div><div class='ctx'> textutils                                50    99    90</div><div class='del'>-text-xdvi                                 0     0    50</div><div class='ctx'> tftp                                     35     0     0</div><div class='ctx'> thud                                      0     0     0</div><div class='ctx'> time                                     50     0    95</div><div class='ctx'> timeconfig                               75     0     0</div><div class='ctx'> timed                                    50     0     0</div><div class='add'>+timex					  0	0     0</div><div class='ctx'> timetool                                 85     0     0</div><div class='ctx'> TiMidity++                                0     0     0</div><div class='ctx'> timidity-instruments                      0     0     0</div><div class='hunk'>@@ -691,13 +699,13 @@ ucd-snmp-devel                            0     0    85</div><div class='ctx'> ucd-snmp-utils                            0     0    85</div><div class='ctx'> umb-scheme                                0     0    85</div><div class='ctx'> unarj                                     0     0     0</div><div class='del'>-unit                                      0     0     0</div><div class='add'>+units                                      0     0     0</div><div class='ctx'> unzip                                    90    99    97</div><div class='ctx'> urlview                                   0     0     0</div><div class='ctx'> urw-fonts                                48     0     0</div><div class='ctx'> usermode                                 80     0     0</div><div class='ctx'> usernet                                  70     0     0</div><div class='del'>-utemper                                   0     0     0</div><div class='add'>+utempter                                   0     0     0</div><div class='ctx'> util-linux                               90    99    98</div><div class='ctx'> uucp                                      0    99     0</div><div class='ctx'> vigmeup                                   0     0     0</div><div class='hunk'>@@ -825,7 +833,6 @@ categories</div><div class='ctx'> administration:rpm:console		90	90	90</div><div class='ctx'> administration:rpm:x11			90	00	90</div><div class='ctx'> administration:system:console		00	00	90</div><div class='del'>-administration:system:x11		00	00	90</div><div class='ctx'> administration:utilities:console	90	90	90</div><div class='ctx'> administration:utilities:x11		90	00	90</div><div class='ctx'> amusement:console			00	00	90</div><div class='hunk'>@@ -835,32 +842,29 @@ archiving:x11				90	00	90</div><div class='ctx'> base					00	00	90</div><div class='ctx'> cd-burning:console			00	00	90</div><div class='ctx'> cd-burning:x11				00	00	90</div><div class='del'>-communications:fax:console		00	90	90</div><div class='del'>-communications:fax:x11			90	00	90</div><div class='ctx'> communications:modem:console		90	90	90</div><div class='ctx'> communications:modem:x11		90	90	90</div><div class='ctx'> communications:pilot:console		00	90	90</div><div class='ctx'> communications:pilot:x11		90	00	90</div><div class='ctx'> compression:console			10	20	30</div><div class='ctx'> compression:x11				40	50	60</div><div class='add'>+configuration:kernel:console		50	60	70</div><div class='add'>+configuration:kernel:x11		50	10	70</div><div class='add'>+configuration:keyboard:console		60	10	60</div><div class='ctx'> configuration:identification:console	70	80	90</div><div class='ctx'> configuration:identification:x11	90	01	10</div><div class='del'>-configuration:libs:console		20	20	30</div><div class='ctx'> configuration:libs:x11			40	50	60</div><div class='add'>+configuration:mail:console		50	80	60</div><div class='ctx'> configuration:network:firewall:console	70	80	90</div><div class='ctx'> configuration:network:firewall:x11	00	10	20</div><div class='del'>-configuration:network:ftp:console	30	40	50</div><div class='ctx'> configuration:network:ftp:x11		60	70	80</div><div class='del'>-configuration:network:http:console	90	10	10</div><div class='ctx'> configuration:network:http:x11		20	30	40</div><div class='ctx'> configuration:network:mail:console	50	60	70</div><div class='ctx'> configuration:network:mail:x11		80	90	10</div><div class='del'>-configuration:power:console		10	30	30</div><div class='ctx'> configuration:power:x11			40	60	60</div><div class='ctx'> configuration:time:console		70	90	90</div><div class='ctx'> configuration:time:x11			00	10	20</div><div class='ctx'> configuration:sound:console		30	40	50</div><div class='del'>-configuration:sound:x11			60	70	80</div><div class='ctx'> configuration:system:console		90	10	10</div><div class='ctx'> configuration:system:x11		20	30	40</div><div class='ctx'> configuration:xfree:console		50	60	70</div><div class='hunk'>@@ -895,18 +899,21 @@ daemons:security			00	00	00</div><div class='ctx'> daemons:sound				00	00	00</div><div class='ctx'> daemons:time				00	00	00</div><div class='ctx'> daemons:xfree86				00	00	00</div><div class='del'>-database:console			10	80	00</div><div class='del'>-database:x11				60	00	00</div><div class='del'>-developpment:debuggers			00	00	90</div><div class='add'>+database				10	80	00</div><div class='add'>+developpment:debuggers:console		00	00	90</div><div class='add'>+developpment:debuggers:x11		10	10	90</div><div class='ctx'> developpment:libs:cdrecord		00	00	90</div><div class='add'>+developpment:libs:compression		00	00	90</div><div class='ctx'> developpment:libs:database		00	00	90</div><div class='add'>+developpment:libs:fonts			00	00	90</div><div class='ctx'> developpment:libs:gnome			00	00	90</div><div class='ctx'> developpment:libs:graphics		00	00	90</div><div class='ctx'> developpment:libs:gtk			00	00	90</div><div class='del'>-developpment:libs:gtk			00	00	90</div><div class='ctx'> developpment:libs:filesystems		00	00	90</div><div class='ctx'> developpment:libs:kde			00	00	90</div><div class='add'>+developpment:libs:language		00	10	90</div><div class='ctx'> developpment:libs:misc			00	00	90</div><div class='add'>+developpment:libs:mouse			00	00	90</div><div class='ctx'> developpment:libs:network		00	00	90</div><div class='ctx'> developpment:libs:qt			00	00	90</div><div class='ctx'> developpment:libs:sound			00	00	90</div><div class='hunk'>@@ -929,6 +936,9 @@ documentation:languages:korean		90	90	90</div><div class='ctx'> documentation:languages:polish		90	90	90</div><div class='ctx'> documentation:languages:russian		90	90	90</div><div class='ctx'> documentation:languages:serbian		90	90	90</div><div class='add'>+documentation:languages:slovenian	90	90	90</div><div class='add'>+documentation:languages:spanish		90	90	90</div><div class='add'>+documentation:languages:swedish		90	90	90</div><div class='ctx'> documentation:languages:turkish		90	90	90</div><div class='ctx'> documentation:misc			90	90	90</div><div class='ctx'> documentation:tools:console		70	80	80</div><div class='hunk'>@@ -936,23 +946,20 @@ documentation:tools:x11			90	10	50</div><div class='ctx'> editors:console				30	80	80</div><div class='ctx'> editors:x11				80	10	80</div><div class='ctx'> emulators:console			50	10	50</div><div class='del'>-emulators:x11				80	10	50</div><div class='add'>+emulators				80	10	50</div><div class='ctx'> filemanagers:console			40	80	80</div><div class='ctx'> filemanagers:x11			70	00	70</div><div class='del'>-files					00	50	10</div><div class='del'>-finances:console			00	00	10</div><div class='del'>-finances:x11				50	10	50</div><div class='add'>+files:console				00	50	10</div><div class='add'>+files:x11				80	10	50</div><div class='add'>+finances				00	00	00</div><div class='ctx'> games:console				40	10	40</div><div class='ctx'> games:x11				60	10	60</div><div class='ctx'> gnome					80	10	40</div><div class='del'>-identification:console			10	50	20</div><div class='ctx'> identification:x11			10	40	30</div><div class='ctx'> info:console				40	90	90</div><div class='ctx'> info:x11				60	20	90</div><div class='ctx'> kde					90	10	90</div><div class='ctx'> kernel					00	50	90</div><div class='del'>-kernel:tools:console			10	50	90</div><div class='del'>-kernel:tools:x11			20	50	90</div><div class='ctx'> libs:application			00	10	90</div><div class='ctx'> libs:compression			00	10	90</div><div class='ctx'> libs:database				00	10	90</div><div class='hunk'>@@ -970,10 +977,7 @@ libs:qt					00	10	90</div><div class='ctx'> libs:sound				00	10	90</div><div class='ctx'> libs:user_interface			00	10	90</div><div class='ctx'> misc:console				50	80	80</div><div class='del'>-misc:x11				50	80	80</div><div class='del'>-monitoring:cpu:console			30	90	90</div><div class='ctx'> monitoring:cpu:x11			50	80	90</div><div class='del'>-monitoring:disks:console		30	90	90</div><div class='ctx'> monitoring:disks:x11			50	80	90</div><div class='ctx'> monitoring:misc:console			30	90	90</div><div class='ctx'> monitoring:misc:x11			50	80	90</div><div class='hunk'>@@ -981,18 +985,15 @@ monitoring:memory:console		30	90	90</div><div class='ctx'> monitoring:memory:x11			50	80	90</div><div class='ctx'> monitoring:network:console		30	90	90</div><div class='ctx'> monitoring:network:x11			50	80	90</div><div class='del'>-monitoring:power:console		30	90	90</div><div class='ctx'> monitoring:power:x11			50	80	90</div><div class='del'>-multimedia:graphic:acquisition:console	70	20	70</div><div class='del'>-multimedia:graphic:acquisition:x11	80	10	80</div><div class='add'>+multimedia:graphic:acquisition		70	20	70</div><div class='ctx'> multimedia:graphic:console		70	20	70</div><div class='ctx'> multimedia:graphic:image-viewer		90	10	80</div><div class='ctx'> multimedia:graphic:x11			90	10	80</div><div class='ctx'> multimedia:sound:players:console	80	10	70</div><div class='ctx'> multimedia:sound:players:x11		90	10	70</div><div class='del'>-multimedia:sounds			90	10	60</div><div class='del'>-multimedia:video:console		80	10	60</div><div class='del'>-multimedia:video:x11			90	10	60</div><div class='add'>+multimedia:sounds:sounds		90	10	60</div><div class='add'>+multimedia:video			90	10	60</div><div class='ctx'> network:ftp:console			70	60	70</div><div class='ctx'> network:ftp:x11				80	10	70</div><div class='ctx'> network:irc&amp;co:console			80	60	70</div><div class='hunk'>@@ -1002,20 +1003,22 @@ network:mail:x11			70	10	80</div><div class='ctx'> network:misc:console			50	90	80</div><div class='ctx'> network:misc:x11			60	10	80</div><div class='ctx'> network:netware:console			30	90	80</div><div class='del'>-network:netware:x11			40	10	80</div><div class='ctx'> network:nfs:console			30	90	80</div><div class='del'>-network:nfs:x11				40	10	80</div><div class='ctx'> network:nis:console			30	90	80</div><div class='del'>-network:nis:x11				40	10	80</div><div class='ctx'> network:tools:console			30	90	80</div><div class='ctx'> network:tools:x11			40	10	80</div><div class='ctx'> network:usenet:console			40	90	80</div><div class='ctx'> network:usenet:x11			80	10	80</div><div class='ctx'> network:web:console			10	90	80</div><div class='ctx'> network:web:x11				90	10	90</div><div class='add'>+office:dictionary:console		80	50	80</div><div class='add'>+office:textviewer:x11			80	10	80</div><div class='add'>+office:word_processor:console		50	50	80</div><div class='add'>+office:word_processor:x11		90	10	80</div><div class='add'>+print:console				60	90	60</div><div class='add'>+print:x11				70	10	70</div><div class='ctx'> productivity:console			60	50	50</div><div class='ctx'> productivity:x11			90	00	80</div><div class='del'>-science:chemistry:console		50	00	80</div><div class='ctx'> science:chemistry:x11			80	00	80</div><div class='ctx'> science:math:console			20	00	80</div><div class='ctx'> science:math:x11			80	00	80</div><div class='hunk'>@@ -1031,13 +1034,13 @@ time:x11				90	10	90</div><div class='ctx'> translations				90	90	90</div><div class='ctx'> updates:console				00	90	90</div><div class='ctx'> updates:x11				90	00	90</div><div class='del'>-utilities:console:files			20	90	90</div><div class='ctx'> utilities:console:kernel		00	80	90</div><div class='ctx'> utilities:console:misc			50	80	80</div><div class='ctx'> utilities:x11:misc			80	00	80</div><div class='del'>-window-managers:backgrounds		90	00	90</div><div class='del'>-window-managers:configuration		90	00	90</div><div class='add'>+window-managers:configuration:console	70	10	70</div><div class='add'>+window-managers:configuration:x11	90	00	90</div><div class='ctx'> window-managers:themes			90	00	90</div><div class='ctx'> window-managers:window-managers		90	00	90</div><div class='add'>+xfree86:backgrounds			90	10	90</div><div class='ctx'> xfree86:base				00	00	00</div><div class='ctx'> xfree86:fonts				00	00	00</div><div class='head'>diff --git a/perl-install/share/po/Changelog b/perl-install/share/po/Changelog<br/>index 51d5a0f21..4e024a298 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/Changelog?h=15.38&amp;id=5521ae98ce86e69166df6f72126bf0c300c069f4'>perl-install/share/po/Changelog</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/Changelog?h=15.38&amp;id=3edbeac41e23ee13ff3e0c9c815c4ab93b279fd2'>perl-install/share/po/Changelog</a></div><div class='hunk'>@@ -31,7 +31,7 @@</div><div class='ctx'> </div><div class='ctx'> 1999-08-25  Pablo Saratxaga &lt;pablo@mandrakesoft.com&gt;</div><div class='ctx'> 	* Makefile: corrected the msgmerge update (translations were</div><div class='del'>-	being deleted !). make it so panoramix.pot has a header</div><div class='add'>+	being deleted !). make it so DrakX.pot has a header</div><div class='ctx'> 	* *.po: get back all *.po files to the latest version including</div><div class='ctx'> 	translated strings. add headers</div><div class='ctx'> 	* id.po: update from indonesian team</div><div class='head'>diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot<br/>index 9ecc97e38..b5589df59 100644<br/>--- a/<a href='/software/drakx/tree/perl-install/share/po/DrakX.pot?h=15.38&amp;id=5521ae98ce86e69166df6f72126bf0c300c069f4'>perl-install/share/po/DrakX.pot</a><br/>+++ b/<a href='/software/drakx/tree/perl-install/share/po/DrakX.pot?h=15.38&amp;id=3edbeac41e23ee13ff3e0c9c815c4ab93b279fd2'>perl-install/share/po/DrakX.pot</a></div><div class='hunk'>@@ -6,7 +6,7 @@</div><div class='ctx'> msgid ""</div><div class='ctx'> msgstr ""</div><div class='ctx'> "Project-Id-Version: PACKAGE VERSION\n"</div><div class='del'>-"POT-Creation-Date: 1999-10-13 00:04+0200\n"</div><div class='add'>+"POT-Creation-Date: 1999-10-13 13:44+0200\n"</div><div class='ctx'> "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"</div><div class='ctx'> "Last-Translator: FULL NAME &lt;EMAIL@ADDRESS&gt;\n"</div><div class='ctx'> "Language-Team: LANGUAGE &lt;LL@li.org&gt;\n"</div><div class='hunk'>@@ -346,11 +346,11 @@ msgstr ""</div><div class='ctx'> msgid "Format"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:376</div><div class='add'>+#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:378</div><div class='ctx'> msgid "Move"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:434</div><div class='add'>+#: ../diskdrake.pm_.c:17 ../diskdrake.pm_.c:436</div><div class='ctx'> msgid "Resize"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -441,122 +441,122 @@ msgstr ""</div><div class='ctx'> msgid "Legend"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:100</div><div class='add'>+#: ../diskdrake.pm_.c:102</div><div class='ctx'> msgid "Empty"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:100</div><div class='add'>+#: ../diskdrake.pm_.c:102</div><div class='ctx'> msgid "Ext2"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:100</div><div class='add'>+#: ../diskdrake.pm_.c:102</div><div class='ctx'> msgid "FAT"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:100</div><div class='add'>+#: ../diskdrake.pm_.c:102</div><div class='ctx'> msgid "Other"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:100</div><div class='add'>+#: ../diskdrake.pm_.c:102</div><div class='ctx'> msgid "Swap"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:120</div><div class='add'>+#: ../diskdrake.pm_.c:122</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "After %s partition %s,"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:120 ../diskdrake.pm_.c:367 ../diskdrake.pm_.c:394</div><div class='add'>+#: ../diskdrake.pm_.c:122 ../diskdrake.pm_.c:369 ../diskdrake.pm_.c:396</div><div class='ctx'> msgid "Read carefully!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:120</div><div class='add'>+#: ../diskdrake.pm_.c:122</div><div class='ctx'> msgid "all data on this partition will be lost"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:138 ../install_any.pm_.c:177 ../install_steps.pm_.c:67</div><div class='add'>+#: ../diskdrake.pm_.c:140 ../install_any.pm_.c:177 ../install_steps.pm_.c:67</div><div class='ctx'> #: ../install_steps_interactive.pm_.c:37</div><div class='ctx'> msgid "Error"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:159 ../diskdrake.pm_.c:511</div><div class='add'>+#: ../diskdrake.pm_.c:161 ../diskdrake.pm_.c:513</div><div class='ctx'> msgid "Mount point: "</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:160 ../diskdrake.pm_.c:182</div><div class='add'>+#: ../diskdrake.pm_.c:162 ../diskdrake.pm_.c:184</div><div class='ctx'> msgid "Device: "</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:161</div><div class='add'>+#: ../diskdrake.pm_.c:163</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "DOS drive letter: %s (just a guess)\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:162 ../diskdrake.pm_.c:185</div><div class='add'>+#: ../diskdrake.pm_.c:164 ../diskdrake.pm_.c:187</div><div class='ctx'> msgid "Type: "</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:163</div><div class='add'>+#: ../diskdrake.pm_.c:165</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Start: sector /*%s\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:164</div><div class='add'>+#: ../diskdrake.pm_.c:166</div><div class='ctx'> msgid "Size: %s MB (%s%%)"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:165</div><div class='add'>+#: ../diskdrake.pm_.c:167</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ", %s sectors"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:167</div><div class='add'>+#: ../diskdrake.pm_.c:169</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Cylinder %d to cylinder %d\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:168</div><div class='add'>+#: ../diskdrake.pm_.c:170</div><div class='ctx'> msgid "Formatted\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:169</div><div class='add'>+#: ../diskdrake.pm_.c:171</div><div class='ctx'> msgid "Not formatted\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:170</div><div class='add'>+#: ../diskdrake.pm_.c:172</div><div class='ctx'> msgid "Mounted\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:171</div><div class='add'>+#: ../diskdrake.pm_.c:173</div><div class='ctx'> msgid ""</div><div class='ctx'> "Partition booted by default\n"</div><div class='ctx'> "    (for MS-DOS boot, not for lilo)\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:183</div><div class='add'>+#: ../diskdrake.pm_.c:185</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Size: %d MB\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:184</div><div class='add'>+#: ../diskdrake.pm_.c:186</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Geometry: %s cylinders, %s heads, %s sectors\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:186</div><div class='add'>+#: ../diskdrake.pm_.c:188</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "on bus %d id %d\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:198</div><div class='add'>+#: ../diskdrake.pm_.c:200</div><div class='ctx'> msgid "Mount"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:200</div><div class='add'>+#: ../diskdrake.pm_.c:202</div><div class='ctx'> msgid "Active"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:289</div><div class='add'>+#: ../diskdrake.pm_.c:291</div><div class='ctx'> msgid ""</div><div class='ctx'> "Sorry I won't accept to create /boot so far onto the drive (on a cylinder &gt; "</div><div class='ctx'> "1024).\n"</div><div class='hunk'>@@ -564,7 +564,7 @@ msgid ""</div><div class='ctx'> "need /boot"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:293</div><div class='add'>+#: ../diskdrake.pm_.c:295</div><div class='ctx'> msgid ""</div><div class='ctx'> "The partition you've selected to add as root (/) is physically located "</div><div class='ctx'> "beyond\n"</div><div class='hunk'>@@ -572,137 +572,137 @@ msgid ""</div><div class='ctx'> "If you plan to use the LILO boot manager, be careful to add a /boot partition"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:307</div><div class='add'>+#: ../diskdrake.pm_.c:309</div><div class='ctx'> msgid "Quit without saving"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:307</div><div class='add'>+#: ../diskdrake.pm_.c:309</div><div class='ctx'> msgid "Quit without writing the partition table?"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:322</div><div class='add'>+#: ../diskdrake.pm_.c:324</div><div class='ctx'> msgid "changing type of"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:324</div><div class='add'>+#: ../diskdrake.pm_.c:326</div><div class='ctx'> msgid "Change partition type"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:325</div><div class='add'>+#: ../diskdrake.pm_.c:327</div><div class='ctx'> msgid "Which partition type do you want?"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:339</div><div class='add'>+#: ../diskdrake.pm_.c:341</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Where do you want to mount device %s?"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:340</div><div class='add'>+#: ../diskdrake.pm_.c:342</div><div class='ctx'> msgid "Mount point"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:361</div><div class='add'>+#: ../diskdrake.pm_.c:363</div><div class='ctx'> msgid "formatting"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:367</div><div class='add'>+#: ../diskdrake.pm_.c:369</div><div class='ctx'> msgid "After formatting all partitions,"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:367</div><div class='add'>+#: ../diskdrake.pm_.c:369</div><div class='ctx'> msgid "all data on these partitions will be lost"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:377</div><div class='add'>+#: ../diskdrake.pm_.c:379</div><div class='ctx'> msgid "Which disk do you want to move to?"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:381</div><div class='add'>+#: ../diskdrake.pm_.c:383</div><div class='ctx'> msgid "Sector"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:382</div><div class='add'>+#: ../diskdrake.pm_.c:384</div><div class='ctx'> msgid "Which sector do you want to move to?"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:385</div><div class='add'>+#: ../diskdrake.pm_.c:387</div><div class='ctx'> msgid "Moving"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:385</div><div class='add'>+#: ../diskdrake.pm_.c:387</div><div class='ctx'> msgid "Moving partition..."</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:394</div><div class='add'>+#: ../diskdrake.pm_.c:396</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Partition table of drive %s is going to be written to disk!"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:396</div><div class='add'>+#: ../diskdrake.pm_.c:398</div><div class='ctx'> msgid "You'll need to reboot before the modification can take place"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:417</div><div class='add'>+#: ../diskdrake.pm_.c:419</div><div class='ctx'> msgid "Computing fat filesystem bounds"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:417 ../diskdrake.pm_.c:462</div><div class='add'>+#: ../diskdrake.pm_.c:419 ../diskdrake.pm_.c:464</div><div class='ctx'> msgid "Resizing"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:431</div><div class='add'>+#: ../diskdrake.pm_.c:433</div><div class='ctx'> msgid "resizing"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:441</div><div class='add'>+#: ../diskdrake.pm_.c:443</div><div class='ctx'> msgid "Choose the new size"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:441 ../install_steps_graphical.pm_.c:303</div><div class='add'>+#: ../diskdrake.pm_.c:443 ../install_steps_graphical.pm_.c:304</div><div class='ctx'> msgid "MB"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:488</div><div class='add'>+#: ../diskdrake.pm_.c:490</div><div class='ctx'> msgid "Create a new partition"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:504</div><div class='add'>+#: ../diskdrake.pm_.c:506</div><div class='ctx'> msgid "Start sector: "</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:507</div><div class='add'>+#: ../diskdrake.pm_.c:509</div><div class='ctx'> msgid "Size in MB: "</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:510</div><div class='add'>+#: ../diskdrake.pm_.c:512</div><div class='ctx'> msgid "Filesystem type: "</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:512</div><div class='add'>+#: ../diskdrake.pm_.c:514</div><div class='ctx'> msgid "Preference: "</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:554 ../diskdrake.pm_.c:570</div><div class='add'>+#: ../diskdrake.pm_.c:556 ../diskdrake.pm_.c:572</div><div class='ctx'> msgid "Select file"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:563</div><div class='add'>+#: ../diskdrake.pm_.c:565</div><div class='ctx'> msgid ""</div><div class='ctx'> "The backup partition table has not the same size\n"</div><div class='ctx'> "Still continue?"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:571</div><div class='add'>+#: ../diskdrake.pm_.c:573</div><div class='ctx'> msgid "Warning"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:572</div><div class='add'>+#: ../diskdrake.pm_.c:574</div><div class='ctx'> msgid ""</div><div class='ctx'> "Insert a floppy in drive\n"</div><div class='ctx'> "All data on this floppy will be lost"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../diskdrake.pm_.c:586</div><div class='add'>+#: ../diskdrake.pm_.c:588</div><div class='ctx'> msgid "Trying to rescue partition table"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='hunk'>@@ -1193,93 +1193,93 @@ msgid ""</div><div class='ctx'> "Continue anyway?"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:303</div><div class='add'>+#: ../install_steps_graphical.pm_.c:304</div><div class='ctx'> msgid "Total size: "</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:313</div><div class='add'>+#: ../install_steps_graphical.pm_.c:315</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Version: %s\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:314</div><div class='add'>+#: ../install_steps_graphical.pm_.c:316</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Size: %d KB\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:315</div><div class='add'>+#: ../install_steps_graphical.pm_.c:317</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid ""</div><div class='ctx'> "Summary: %s\n"</div><div class='ctx'> "\n"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:404</div><div class='add'>+#: ../install_steps_graphical.pm_.c:429</div><div class='ctx'> msgid "Choose the packages you want to install"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:407</div><div class='add'>+#: ../install_steps_graphical.pm_.c:432</div><div class='ctx'> msgid "Info"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:415</div><div class='add'>+#: ../install_steps_graphical.pm_.c:440</div><div class='ctx'> msgid "Go"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:416</div><div class='add'>+#: ../install_steps_graphical.pm_.c:441</div><div class='ctx'> msgid "Select less"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:417</div><div class='add'>+#: ../install_steps_graphical.pm_.c:442</div><div class='ctx'> msgid "Select more"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:418</div><div class='add'>+#: ../install_steps_graphical.pm_.c:443</div><div class='ctx'> msgid "Show less"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:419</div><div class='add'>+#: ../install_steps_graphical.pm_.c:444</div><div class='ctx'> msgid "Show more"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:437</div><div class='add'>+#: ../install_steps_graphical.pm_.c:462</div><div class='ctx'> msgid "Installing"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:443</div><div class='add'>+#: ../install_steps_graphical.pm_.c:468</div><div class='ctx'> msgid "Please wait, "</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:445</div><div class='add'>+#: ../install_steps_graphical.pm_.c:470</div><div class='ctx'> msgid "Time remaining "</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:446</div><div class='add'>+#: ../install_steps_graphical.pm_.c:471</div><div class='ctx'> msgid "Total time "</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:451</div><div class='add'>+#: ../install_steps_graphical.pm_.c:476</div><div class='ctx'> msgid "Preparing installation"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:472</div><div class='add'>+#: ../install_steps_graphical.pm_.c:497</div><div class='ctx'> #, c-format</div><div class='ctx'> msgid "Installing package %s"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:497</div><div class='add'>+#: ../install_steps_graphical.pm_.c:522</div><div class='ctx'> msgid "Go on anyway?"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:497</div><div class='add'>+#: ../install_steps_graphical.pm_.c:522</div><div class='ctx'> msgid "There was an error ordering packages:"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:521</div><div class='add'>+#: ../install_steps_graphical.pm_.c:546</div><div class='ctx'> msgid "Use existing configuration for X11?"</div><div class='ctx'> msgstr ""</div><div class='ctx'> </div><div class='del'>-#: ../install_steps_graphical.pm_.c:594 ../interactive.pm_.c:47</div><div class='add'>+#: ../install_steps_graphical.pm_.c:619 ../interactive.pm_.c:47</div><div class='ctx'> #: ../interactive.pm_.c:57 ../my_gtk.pm_.c:194 ../my_gtk.pm_.c:348</div><div class='ctx'> #: ../my_gtk.pm_.c:438</div><div class='ctx'> msgid "Ok"</div><div class='head'>diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile