summaryrefslogtreecommitdiffstats
path: root/make_boot_img
blob: f4ddb756f41c243daa95a4e2c2012741188276f9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
#!/usr/bin/perl

@ARGV >= 2 or die "usage: $0 <image> cdrom|hd|network|blank|pcmcia|live|tftp|tftprd\n";

use Config;
Config->import;
my ($arch) = $Config{archname} =~ /(.*)-/;
my $corporate = $ENV{CORPORATE} && " corporate"; #- use this for building a corporate version.

($img, $type) = @ARGV;

$instdir = "install";
$mnt = "/tmp/drakx_mnt";
$mke2fs = "/sbin/mke2fs -q -m 0 -F -s 1";

if ($>) {
    $sudo = "sudo";
    $ENV{PATH} = "/sbin:/usr/sbin:$ENV{PATH}";
}

sub __ { print @_, "\n"; system(@_); }
sub _ { __ @_; $? and die; }

_ "$sudo mkdir $mnt" unless -e $mnt;
_ "$sudo mkdir ${mnt}2" unless -e "${mnt}2";

$install = $ {{
    blank => "full-install",
    live => "full-install",
    tftp => "full-install",
    tftprd => "full-install",
    pcmcia => "full-install",
    network => "install",
    cdrom => "local-install",
    hd => "local-install",
    live64 => "full-install",
    tftp64 => "full-install",
    tftprd64 => "full-install",
    pcmcia64 => "full-install",
    network64 => "install",
    cdrom64 => "local-install",
    hd64 => "local-install",
}}{$type} or die;

$img =~ /rdz$/ ? initrd($mnt, $img) : $::{"boot_img_$arch"}->($mnt, $img);

sub install_s { _ "strip $_[0]"; _ "$sudo install $_[0] $_[1]" }

sub initrd {
    my ($mnt, $img) = @_;
    my ($ltype, $I) = $type =~ /(.*?)(64)/; $ltype ||= $type;
    my $tmp = "$ENV{HOME}/tmp/initrd";
    my $tar = "$instdir/install1_$type.$arch.tar.bz2";
    -e $tar or $tar = "$instdir/install1.$arch.tar.bz2";

    __ "$sudo umount $tmp $mnt 2>/dev/null";
    _ "dd if=/dev/zero of=$tmp bs=1k count=2000";
    _ "$mke2fs $tmp";
    _ "$sudo mount -t ext2 $tmp $mnt -o loop";

    _ "$sudo tar xyC $mnt -f $tar";
    install_s("$instdir/installinit/init", "$mnt/sbin");
    install_s("$instdir/$install", "$mnt/sbin/install");

    _ "$sudo cp -f install_${type}_modules/* $mnt/modules/" if -d "install_${type}_modules";
    _ "$sudo cp -f modules$I/${ltype}_modules.cgz $mnt/modules/modules$I.cgz" if $type !~ /blank/;
    _ "$sudo cp -f modules$I/modules.dep $mnt/modules/";
    _ "$sudo umount $mnt";

# Workaround for vfat-loop bug (quite touchy)
    _ "gzip -9f $tmp";
    _ "cp -f $tmp.gz $img";
    _ "rm -f $tmp.gz";
#    _ "gzip -9 -c $tmp > $img";
#    _ "rm -f $tmp";
}

sub boot_img_i386 {
    my ($mnt, $img) = @_;

    __ "$sudo umount $mnt 2>/dev/null";
    if ($type eq "hd") {
	_ "bunzip2 -c $instdir/installinit/msgboot.img.bz2 > $img";
    } else {
	_ "bunzip2 -c $instdir/installinit/msgboot-graphicallogo.img.bz2 > $img";
    }
    _ "$sudo mount -t msdos -o umask=0 $img $mnt -o loop";
    _ "cat vmlinuz > $mnt/vmlinuz" if $type !~ /blank/;
    -f "$type.rdz" ? _ "cp -f $type.rdz $mnt" : initrd("${mnt}2", "$mnt/$type.rdz");
    
    my $timeout = 72;
    output("$mnt/syslinux.cfg", "
default linux
prompt 1
timeout $timeout
display boot.msg
F1 help.msg
F2 boot.msg
label linux
  kernel vmlinuz
  append ramdisk_size=32000 initrd=$type.rdz $type vga=788
label vgalo
  kernel vmlinuz
  append ramdisk_size=32000 initrd=$type.rdz $type vga=785
label vgahi
  kernel vmlinuz
  append ramdisk_size=32000 initrd=$type.rdz $type vga=791
label vga16
  kernel vmlinuz
  append ramdisk_size=32000 initrd=$type.rdz $type vga16
label text
  kernel vmlinuz
  append ramdisk_size=32000 initrd=$type.rdz $type text
label patch
  kernel vmlinuz
  append ramdisk_size=32000 initrd=$type.rdz $type patch vga=788
label expert
  kernel vmlinuz
  append ramdisk_size=32000 initrd=$type.rdz $type expert vga=788
label rescue
  kernel vmlinuz
  append ramdisk_size=32000 initrd=$type.rdz $type rescue rw
label oem
  kernel vmlinuz
  append ramdisk_size=32000 initrd=cdrom.rdz cdrom rescue oem rw
label auto
  kernel vmlinuz
  append ramdisk_size=32000 initrd=$type.rdz $type auto_install=auto_inst.cfg.pl
");
    _ "cp -f $instdir/installinit/ks.cfg $mnt 2>/dev/null";
    _ "sync";
    _ "df $mnt";
}

sub boot_img_alpha {
    my ($mnt, $img) = @_;

    __ "$sudo umount $mnt 2>/dev/null";
    _ "dd if=/dev/zero of=$img bs=1k count=1440";
    _ "$mke2fs $img";
    _ "/sbin/e2writeboot $img /boot/bootlx";
    _ "$sudo mount -t ext2 $img $mnt -o loop";
    _ "cp -f vmlinux.gz $mnt";
    -f "$type.rdz" ? _ "cp -f $type.rdz $mnt" : initrd("${mnt}2", "$mnt/$type.rdz");

    mkdir "$mnt/etc", 0777;
    output("$mnt/etc/aboot.conf", 
"0:vmlinux.gz initrd=$type.rdz rw ramdisk_size=32000 $type
1:vmlinux.gz initrd=$type.rdz rw ramdisk_size=32000 text $type
");
    _ "sync";
    _ "df $mnt";
}

sub boot_img_sparc {
    my ($mnt, $img) = @_;
    if ($type =~ /^live(.*)/) {
	#- hack to produce directly into /export the needed file for cdrom boot.
	my $dir = "/export";
	my $boot = "boot"; #- non-absolute pathname only!

	_ "mkdir -p $dir/$boot";
	_ "cp -f /boot/cd.b /boot/second.b $dir/$boot";
	_ "cp -f vmlinux$1 $dir/$boot/vmlinux$1";
	-f "live$1.rdz" ? _ "cp -f live$1.rdz $dir/$boot" : initrd("${mnt}2", "$dir/$boot/live$1.rdz");

	output("$dir/$boot/silo.conf", "
partition=1
default=linux
timeout=100
read-write
message=/$boot/boot.msg
image=\"cat /$boot/boot.msg\"
  label=1
  single-key
image=\"cat /$boot/general.msg\"
  label=2
  single-key
image=\"cat /$boot/expert.msg\"
  label=3
  single-key
image=\"cat /$boot/rescue.msg\"
  label=4
  single-key
image=\"cat /$boot/kickit.msg\"
  label=5
  single-key
image=\"cat /$boot/param.msg\"
  label=6
  single-key
image[sun4c,sun4d,sun4m]=/$boot/vmlinux
  label=linux
  alias=install
  initrd=/$boot/live.rdz
  append=\"ramdisk_size=32000$corporate\"
image[sun4c,sun4d,sun4m]=/$boot/vmlinux
  label=text
  initrd=/$boot/live.rdz
  append=\"ramdisk_size=32000 text$corporate\"
image[sun4c,sun4d,sun4m]=/$boot/vmlinux
  label=expert
  initrd=/$boot/live.rdz
  append=\"ramdisk_size=32000 expert$corporate\"
image[sun4c,sun4d,sun4m]=/$boot/vmlinux
  label=ks
  initrd=/$boot/live.rdz
  append=\"ramdisk_size=32000 ks$corporate\"
image[sun4c,sun4d,sun4m]=/$boot/vmlinux
  label=rescue
  initrd=/$boot/live.rdz
  append=\"ramdisk_size=32000 rescue rw root=/dev/ram3$corporate\"
image[sun4u]=/$boot/vmlinux64
  label=linux
  alias=install
  initrd=/$boot/live64.rdz
  append=\"ramdisk_size=32000$corporate\"
image[sun4u]=/$boot/vmlinux64
  label=text
  initrd=/$boot/live64.rdz
  append=\"ramdisk_size=32000 text$corporate\"
image[sun4u]=/$boot/vmlinux64
  label=expert
  initrd=/$boot/live64.rdz
  append=\"ramdisk_size=32000 expert$corporate\"
image[sun4u]=/$boot/vmlinux64
  label=ks
  initrd=/$boot/live64.rdz
  append=\"ramdisk_size=32000 ks$corporate\"
image[sun4u]=/$boot/vmlinux64
  label=rescue
  initrd=/$boot/live64.rdz
  append=\"ramdisk_size=32000 rescue rw root=/dev/ram3$corporate\"
");

	output("$dir/$boot/README", "
To Build a Bootable CD-ROM, try:
  mkisofs -R -o t.iso -s /$boot/silo.conf /export
");
    } elsif ($type =~ /^tftprd(.*)/) {
	my $dir = "/export";
	my $boot = "images";
	my $setarch = $1 ? "sparc64" : "sparc32";

	_ "mkdir -p $dir/$boot";
	-f "$type.rdz" or initrd("${mnt}2", "$type.rdz");
	_ "cp -f vmlinux$1.aout $dir/$boot/$type.img";
	_ "$setarch kernel$1/src/arch/sparc$1/boot/piggyback $dir/$boot/$type.img kernel$1/boot/System.map $type.rdz";
    } elsif ($type =~ /^tftp(.*)/) {
	my $dir = "/export";
	my $boot = "images";

	_ "mkdir -p $dir/$boot";
	_ "cp -f vmlinux$1.aout $dir/$boot/$type.img";
    } else {
	my $dir = "floppy";
	my ($ltype, $I) = $type =~ /(.*?)(64)/; $ltype ||= $type;

	__ "$sudo umount $mnt 2>/dev/null";
	_ "rm -rf $dir";
	_ "mkdir -p $dir";
	_ "cp -f /boot/fd.b /boot/second.b $dir";
	_ "cp -f vmlinuz$I $dir/vmlinux$I.gz" if $type !~ /blank/;
	-f "$type.rdz" ? _ "cp -f $type.rdz $dir" : initrd("${mnt}2", "$dir/$type.rdz");

	output("$dir/boot.msg", "
Welcome to Linux-Mandrake 7.1

Press <Enter> to install or upgrade a system 7mLinux-Mandrake7m
");

	output("$dir/silo.conf", "
partition=1
default=linux
timeout=100
read-write
message=/boot.msg
image=/vmlinux$I.gz
  label=linux
  initrd=/$type.rdz
  append=\"ramdisk_size=32000 $ltype$corporate\"
");
	_ "genromfs -d $dir -f /dev/ram -A 2048,/.. -a 512 -V \'DrakX boot disk\'";
	_ "$sudo mount -t romfs /dev/ram $mnt";
	_ "silo -r $mnt -F -i /fd.b -b /second.b -C /silo.conf";
	_ "$sudo umount $mnt";
	_ "dd if=/dev/ram of=$type.img bs=1440k count=1";
	_ "sync";
	_ "$sudo mount -t romfs /dev/ram $mnt";
	_ "df $mnt";
    }
}

sub boot_img_ppc {
    my ($mnt, $img) = @_;
    # Here's a quick hack...  just to give the script somethign to do. :)
    # We do not yet have a set way of making bootable images.
    _ "cp $type.rdz $img";
}

sub output {
    my $f = shift;
    local *F;
    open F, "> $f" or die "error writing to $f";
    print F join '', @_;
}
po/ltg.po1
-rw-r--r--perl-install/share/po/lv.po1
-rw-r--r--perl-install/share/po/mk.po9
-rw-r--r--perl-install/share/po/mn.po1
-rw-r--r--perl-install/share/po/ms.po1
-rw-r--r--perl-install/share/po/mt.po5
-rw-r--r--perl-install/share/po/nb.po59
-rw-r--r--perl-install/share/po/nl.po5
-rw-r--r--perl-install/share/po/nn.po45
-rw-r--r--perl-install/share/po/pa_IN.po5
-rw-r--r--perl-install/share/po/pl.po1
-rw-r--r--perl-install/share/po/pt.po1
-rw-r--r--perl-install/share/po/pt_BR.po5
-rw-r--r--perl-install/share/po/ro.po5
-rw-r--r--perl-install/share/po/ru.po8
-rw-r--r--perl-install/share/po/sc.po1
-rw-r--r--perl-install/share/po/sk.po5
-rw-r--r--perl-install/share/po/sl.po26
-rw-r--r--perl-install/share/po/sq.po1
-rw-r--r--perl-install/share/po/sr.po5
-rw-r--r--perl-install/share/po/sr@Latn.po5
-rw-r--r--perl-install/share/po/sv.po1
-rw-r--r--perl-install/share/po/ta.po1
-rw-r--r--perl-install/share/po/tg.po1
-rw-r--r--perl-install/share/po/th.po1
-rw-r--r--perl-install/share/po/tl.po1
-rw-r--r--perl-install/share/po/tr.po1
-rw-r--r--perl-install/share/po/uk.po9
-rw-r--r--perl-install/share/po/uz.po1
-rw-r--r--perl-install/share/po/uz@cyrillic.po1
-rw-r--r--perl-install/share/po/vi.po5
-rw-r--r--perl-install/share/po/wa.po25
-rw-r--r--perl-install/share/po/zh_CN.po1
-rw-r--r--perl-install/share/po/zh_TW.po1
71 files changed, 239 insertions, 151 deletions
diff --git a/perl-install/share/po/af.po b/perl-install/share/po/af.po
index 743de2999..3435592f1 100644
--- a/perl-install/share/po/af.po
+++ b/perl-install/share/po/af.po
@@ -14,6 +14,7 @@ msgstr ""
"PO-Revision-Date: 2005-04-21 17:33+0200\n"
"Last-Translator: Dirk van der Walt <dirkvanderwalt@webmail.co.za>\n"
"Language-Team: Afrikaans\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -3205,8 +3206,8 @@ msgid ""
msgstr ""
"\n"
"\n"
-"U kaart gebruik tans die %s\"%s\" drywer ( die kaart se verstek drywer is \"%"
-"s\")"
+"U kaart gebruik tans die %s\"%s\" drywer ( die kaart se verstek drywer is "
+"\"%s\")"
#: harddrake/sound.pm:414
#, c-format
@@ -7239,8 +7240,8 @@ msgstr "Installasie het gefaal!"
#~ "hierdie masjien aan te sluit by die Windows(TM)-domein.\n"
#~ "Indien die netwerk nog nie opgestel is nie, sal Drakx poog om by die "
#~ "domein aan te sluit, as die netwerk reg is.\n"
-#~ "Sou dit nie werk nie, kan u later 'smbpasswd -j DOMEIN -U GEBRUIKER%%"
-#~ "WAGWOORD' op die instruksielyn as die supergebruiker intik. Die Windows"
+#~ "Sou dit nie werk nie, kan u later 'smbpasswd -j DOMEIN -U GEBRUIKER%"
+#~ "%WAGWOORD' op die instruksielyn as die supergebruiker intik. Die Windows"
#~ "(tm) Domein, en Admin gebruiker/wagwoord moet gebruik word.\n"
#~ "Die opdrag 'wbinfo -t' sal u 'authentication secrets' ondersoek."
diff --git a/perl-install/share/po/am.po b/perl-install/share/po/am.po
index ac1220f5b..2c8644aae 100644
--- a/perl-install/share/po/am.po
+++ b/perl-install/share/po/am.po
@@ -9,6 +9,7 @@ msgstr ""
"PO-Revision-Date: 2004-06-01 03:36+0100\n"
"Last-Translator: Alemayehu <alemayehu@gmx.at>\n"
"Language-Team: Amharic <am-translate@geez.org>\n"
+"Language: am\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/perl-install/share/po/ar.po b/perl-install/share/po/ar.po
index 9a8652cf5..4502e3660 100644
--- a/perl-install/share/po/ar.po
+++ b/perl-install/share/po/ar.po
@@ -13,6 +13,7 @@ msgstr ""
"PO-Revision-Date: 2005-03-03 01:06+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
+"Language: ar\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/perl-install/share/po/az.po b/perl-install/share/po/az.po
index 7a7bcecdf..494ddb84b 100644
--- a/perl-install/share/po/az.po
+++ b/perl-install/share/po/az.po
@@ -13,6 +13,7 @@ msgstr ""
"PO-Revision-Date: 2005-03-31 14:21+0200\n"
"Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
+"Language: az\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -7359,8 +7360,8 @@ msgstr "Qurulum bacarılmadı"
#~ "domenə calama üçün cəhd edəcək.\n"
#~ "Əgər bu qurğu ya da domen səlahiyyətləndirilməsi işləməzsə, sistemin "
#~ "yenidən başladılmasından sonra Windows(tm) Domeninizi və İdarəçi "
-#~ "istifadəçi adı/şifrəsini işlədərək'smbpasswd -j DOMEN -U İSTİFADƏÇİ%%"
-#~ "ŞİFRƏ' əmrini icra edin.\n"
+#~ "istifadəçi adı/şifrəsini işlədərək'smbpasswd -j DOMEN -U İSTİFADƏÇİ%"
+#~ "%ŞİFRƏ' əmrini icra edin.\n"
#~ "'wbinfo -t' əmri səlahiyyət sirrlərinin düzgün olub olmamasını yoxlayacaq."
#~ msgid "Authentication Windows Domain"
diff --git a/perl-install/share/po/be.po b/perl-install/share/po/be.po
index 65414fdca..5d4771a5c 100644
--- a/perl-install/share/po/be.po
+++ b/perl-install/share/po/be.po
@@ -9,6 +9,7 @@ msgstr ""
"PO-Revision-Date: 2000-09-24 12:30 +0100\n"
"Last-Translator: Alexander Bokovoy <ab@avilink.net>\n"
"Language-Team: be\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -6380,8 +6381,8 @@ msgstr ""
"\n"
"А копію ліцэнзыі вы павінны былі атрымаць\n"
"разам зь гэтай прогай; калі не, дык напішыце пра гэта па адрасу (дашлем)\n"
-"Free Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
-"1301, USA.\n"
+"Free Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-1301, USA.\n"
#: standalone.pm:44
#, c-format
diff --git a/perl-install/share/po/bg.po b/perl-install/share/po/bg.po
index 4eea016e2..2308c363c 100644
--- a/perl-install/share/po/bg.po
+++ b/perl-install/share/po/bg.po
@@ -16,6 +16,7 @@ msgstr ""
"Last-Translator: Kolio Kolev <kolio_kolev@biotronica.net>\n"
"Language-Team: Bulgarian <Mageia User Group - Bulgaria <mandriva-"
"bg@googlegroups.com>>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/perl-install/share/po/bn.po b/perl-install/share/po/bn.po
index c63339f48..2a90cf352 100644
--- a/perl-install/share/po/bn.po
+++ b/perl-install/share/po/bn.po
@@ -12,6 +12,7 @@ msgstr ""
"PO-Revision-Date: 2005-03-19 23:18+0600\n"
"Last-Translator: Samia <mailsamia2001@yahoo.com>\n"
"Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff --git a/perl-install/share/po/br.po b/perl-install/share/po/br.po
index 3f0a67760..06c8b9134 100644
--- a/perl-install/share/po/br.po
+++ b/perl-install/share/po/br.po
@@ -10,6 +10,7 @@ msgstr ""
"PO-Revision-Date: 2009-11-06 17:22+0100\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
"Language-Team: Brezhoneg <ofisk@wanadoo.fr>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -3140,8 +3141,8 @@ msgid ""
"Here you can select an alternative driver (either OSS or ALSA) for your "
"sound card (%s)."
msgstr ""
-"Amañ e c'hellit dibab ur sturier all (OSS pe ALSA) evit ho kartenn kwelet (%"
-"s)."
+"Amañ e c'hellit dibab ur sturier all (OSS pe ALSA) evit ho kartenn kwelet "
+"(%s)."
#. -PO: here the first %s is either "OSS" or "ALSA",
#. -PO: the second %s is the name of the current driver
@@ -6703,7 +6704,8 @@ msgstr "Sac'het eo ar staliadur"
#~ msgid ""
#~ "Option ``Restrict command line options'' is of no use without a password"
-#~ msgstr "Didalvout eo « Strishaat dibarzhoù al linenn urzhiañ » hep tremenger"
+#~ msgstr ""
+#~ "Didalvout eo « Strishaat dibarzhoù al linenn urzhiañ » hep tremenger"
#~ msgid "Use an encrypted file system"
#~ msgstr "Implijit ur reizhiad restroù enrineget"
diff --git a/perl-install/share/po/bs.po b/perl-install/share/po/bs.po
index 8cefdf9fb..8367e186c 100644
--- a/perl-install/share/po/bs.po
+++ b/perl-install/share/po/bs.po
@@ -13,6 +13,7 @@ msgstr ""
"PO-Revision-Date: 2006-09-13 19:15+0200\n"
"Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
"Language-Team: Bosnian <lokal@linux.org.ba>\n"
+"Language: bs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -3233,8 +3234,8 @@ msgid ""
"There's no known OSS/ALSA alternative driver for your sound card (%s) which "
"currently uses \"%s\""
msgstr ""
-"Nema nijedan poznat OSS/ALSA alternativni drajver za vašu zvučnu karticu (%"
-"s) koja trenutno koristi \"%s\""
+"Nema nijedan poznat OSS/ALSA alternativni drajver za vašu zvučnu karticu "
+"(%s) koja trenutno koristi \"%s\""
#: harddrake/sound.pm:405
#, c-format
diff --git a/perl-install/share/po/ca.po b/perl-install/share/po/ca.po
index 4b9fb7d78..3e5feaeea 100644
--- a/perl-install/share/po/ca.po
+++ b/perl-install/share/po/ca.po
@@ -12,6 +12,7 @@ msgstr ""
"PO-Revision-Date: 2005-09-13 23:24+0200\n"
"Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
+"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -5848,8 +5849,8 @@ msgstr "si és \"sí\", informa dels resultats de la comprovació a tty."
#, c-format
msgid "Set shell commands history size. A value of -1 means unlimited."
msgstr ""
-"Defineix la mida de l'historial d'ordres de l'intèrpret d'ordres. El valor -"
-"1 indica il·limitada."
+"Defineix la mida de l'historial d'ordres de l'intèrpret d'ordres. El valor "
+"-1 indica il·limitada."
#: security/help.pm:136
#, c-format
diff --git a/perl-install/share/po/cs.po b/perl-install/share/po/cs.po
index 468519f71..900c092b3 100644
--- a/perl-install/share/po/cs.po
+++ b/perl-install/share/po/cs.po
@@ -10,11 +10,12 @@ msgstr ""
"PO-Revision-Date: 2010-06-08 21:50+0200\n"
"Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.0\n"
#: any.pm:252 any.pm:947 diskdrake/interactive.pm:647
diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index a0b5d9806..4699aeb63 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -9,6 +9,7 @@ msgstr ""
"PO-Revision-Date: 2009-10-01 20:12-0000\n"
"Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
"Language-Team: Cymraeg <post@meddal.com>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -6939,8 +6940,8 @@ msgstr ""
"\n"
" Dylech fod wedi derbyn copi o Drwydded Gyhoeddus Gyffredinol GNU\n"
" gyda'r rhaglen; os nad, ysgrifennwch at:\n"
-" Free Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
-"1301, USA.\n"
+" Free Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-1301, USA.\n"
#: standalone.pm:44
#, c-format
diff --git a/perl-install/share/po/da.po b/perl-install/share/po/da.po
index ca6db736f..af5c1433b 100644
--- a/perl-install/share/po/da.po
+++ b/perl-install/share/po/da.po
@@ -14,6 +14,7 @@ msgstr ""
"PO-Revision-Date: 2010-06-06 12:39+0200\n"
"Last-Translator: Keld Simonsen <keld@keldix.com>\n"
"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"Language: da\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -1506,8 +1507,8 @@ msgid ""
"Quit anyway?"
msgstr ""
"Du bør formatere partition %s.\n"
-"Ellers vil der ikke blive skrevet noget indgangspunkt for monteringspunktet %"
-"s i fstab.\n"
+"Ellers vil der ikke blive skrevet noget indgangspunkt for monteringspunktet "
+"%s i fstab.\n"
"Afslut alligevel?"
#: diskdrake/interactive.pm:319
diff --git a/perl-install/share/po/de.po b/perl-install/share/po/de.po
index d2835cecd..a50def4be 100644
--- a/perl-install/share/po/de.po
+++ b/perl-install/share/po/de.po