aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/develop/utf_normalizer_test.php
blob: 27ff786db7106120c60009b0743cb2145e12f082 (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
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/

if (php_sapi_name() != 'cli')
{
	die("This program must be run from the command line.\n");
}

//
// Security message:
//
// This script is potentially dangerous.
// Remove or comment the next line (die(".... ) to enable this script.
// Do NOT FORGET to either remove this script or disable it after you have used it.
//
die("Please read the first lines of this script for instructions on how to enable it");

set_time_limit(0);
error_reporting(E_ALL);

define('IN_PHPBB', true);
$phpbb_root_path = '../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);


/**
* Let's download some files we need
*/
download('http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt');
download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt');

/**
* Those are the tests we run
*/
$test_suite = array(
	/**
	* NFC
	*   c2 ==  NFC(c1) ==  NFC(c2) ==  NFC(c3)
	*   c4 ==  NFC(c4) ==  NFC(c5)
	*/
	'NFC'	=>	array(
		'c2'	=>	array('c1', 'c2', 'c3'),
		'c4'	=>	array('c4', 'c5')
	),

	/**
	* NFD
	*   c3 ==  NFD(c1) ==  NFD(c2) ==  NFD(c3)
	*   c5 ==  NFD(c4) ==  NFD(c5)
	*/
	'NFD'	=>	array(
		'c3'	=>	array('c1', 'c2', 'c3'),
		'c5'	=>	array('c4', 'c5')
	),

	/**
	* NFKC
	*   c4 == NFKC(c1) == NFKC(c2) == NFKC(c3) == NFKC(c4) == NFKC(c5)
	*/
	'NFKC'	=>	array(
		'c4'	=>	array('c1', 'c2', 'c3', 'c4', 'c5')
	),

	/**
	* NFKD
	*   c5 == NFKD(c1) == NFKD(c2) == NFKD(c3) == NFKD(c4) == NFKD(c5)
	*/
	'NFKD'	=>	array(
		'c5'	=>	array('c1', 'c2', 'c3', 'c4', 'c5')
	)
);

require_once($phpbb_root_path . 'includes/utf/utf_normalizer.' . $phpEx);

$i = $n = 0;
$failed = false;
$tested_chars = array();

$fp = fopen($phpbb_root_path . 'develop/NormalizationTest.txt', 'rb');
while (!feof($fp))
{
	$line = fgets($fp);
	++$n;

	if ($line[0] == '@')
	{
		if ($i)
		{
			echo "done\n";
		}

		$i = 0;
		echo "\n", substr($line, 1), "\n\n";
		continue;
	}

	if (!strpos(' 0123456789ABCDEF', $line[0]))
	{
		continue;
	}

	if (++$i % 100 == 0)
	{
		echo $i, ' ';
	}

	list($c1, $c2, $c3, $c4, $c5) = explode(';', $line);

	if (!strpos($c1, ' '))
	{
		/**
		* We are currently testing a single character, we add it to the list of
		* characters we have processed so that we can exclude it when testing
		* for invariants
		*/
		$tested_chars[$c1] = 1;
	}

	foreach ($test_suite as $form => $serie)
	{
		foreach ($serie as $expected => $tests)
		{
			$hex_expected = ${$expected};
			$utf_expected = hexseq_to_utf($hex_expected);

			foreach ($tests as $test)
			{
				$utf_result = $utf_expected;
				call_user_func(array('utf_normalizer', $form), $utf_result);

				if (strcmp($utf_expected, $utf_result))
				{
					$failed = true;
					$hex_result = utf_to_hexseq($utf_result);

					echo "\nFAILED $expected == $form($test) ($hex_expected != $hex_result)";
				}
			}
		}

		if ($failed)
		{
			die("\n\nFailed at line $n\n");
		}
	}
}
fclose($fp);

/**
* Test for invariants
*/
echo "\n\nTesting for invariants...\n\n";

$fp = fopen($phpbb_root_path . 'develop/UnicodeData.txt', 'rt');

$n = 0;
while (!feof($fp))
{
	if (++$n % 100 == 0)
	{
		echo $n, ' ';
	}

	$line = fgets($fp, 1024);

	if (!$pos = strpos($line, ';'))
	{
		continue;
	}

	$hex_tested = $hex_expected = substr($line, 0, $pos);

	if (isset($tested_chars[$hex_tested]))
	{
		continue;
	}

	$utf_expected = hex_to_utf($hex_expected);

	if ($utf_expected >= UTF8_SURROGATE_FIRST
	 && $utf_expected <= UTF8_SURROGATE_LAST)
	{
		/**
		* Surrogates are illegal on their own, we expect the normalizer
		* to return a replacement char
		*/
		$utf_expected = UTF8_REPLACEMENT;
		$hex_expected = utf_to_hexseq($utf_expected);
	}

	foreach (array('nfc', 'nfkc', 'nfd', 'nfkd') as $form)
	{
		$utf_result = $utf_expected;
		utf_normalizer::$form($utf_result);
		$hex_result = utf_to_hexseq($utf_result);
//		echo "$form($utf_expected) == $utf_result\n";

		if (strcmp($utf_expected, $utf_result))
		{
			$failed = 1;

			echo "\nFAILED $hex_expected == $form($hex_tested) ($hex_expected != $hex_result)";
		}
	}

	if ($failed)
	{
		die("\n\nFailed at line $n\n");
	}
}
fclose($fp);

die("\n\nALL TESTS PASSED SUCCESSFULLY\n");

/**
* Download a file to the develop/ dir
*
* @param	string	$url		URL of the file to download
* @return	null
*/
function download($url)
{
	global $phpbb_root_path;

	if (file_exists($phpbb_root_path . 'develop/' . basename($url)))
	{
		return;
	}

	echo 'Downloading from ', $url, ' ';

	if (!$fpr = fopen($url, 'rb'))
	{
		die("Can't download from $url\nPlease download it yourself and put it in the develop/ dir, kthxbai");
	}

	if (!$fpw = fopen($phpbb_root_path . 'develop/' . basename($url), 'wb'))
	{
		die("Can't open develop/" . basename($url) . " for output... please check your permissions or something");
	}

	$i = 0;
	$chunk = 32768;
	$done = '';

	while (!feof($fpr))
	{
		$i += fwrite($fpw, fread($fpr, $chunk));
		echo str_repeat("\x08", strlen($done));

		$done = ($i >> 10) . ' KiB';
		echo $done;
	}
	fclose($fpr);
	fclose($fpw);

	echo "\n";
}

/**
* Convert a UTF string to a sequence of codepoints in hexadecimal
*
* @param	string	$utf	UTF string
* @return	integer			Unicode codepoints in hex
*/
function utf_to_hexseq($str)
{
	$pos = 0;
	$len = strlen($str);
	$ret = array();

	while ($pos < $len)
	{
		$c = $str[$pos];
		switch ($c & "\xF0")
		{
			case "\xC0":
			case "\xD0":
				$utf_char = substr($str, $pos, 2);
				$pos += 2;
				break;

			case "\xE0":
				$utf_char = substr($str, $pos, 3);
				$pos += 3;
				break;

			case "\xF0":
				$utf_char = substr($str, $pos, 4);
				$pos += 4;
				break;

			default:
				$utf_char = $c;
				++$pos;
		}

		$hex = dechex(utf_to_cp($utf_char));

		if (!isset($hex[3]))
		{
			$hex = substr('000' . $hex, -4);
		}

		$ret[] = $hex;
	}

	return strtr(implode(' ', $ret), 'abcdef', 'ABCDEF');
}

/**
* Convert a UTF-8 char to its codepoint
*
* @param	string	$utf_char	UTF-8 char
* @return	integer				Unicode codepoint
*/
function utf_to_cp($utf_char)
{
	switch (strlen($utf_char))
	{
		case 1:
			return ord($utf_char);

		case 2:
			return ((ord($utf_char[0]) & 0x1F) << 6) | (ord($utf_char[1]) & 0x3F);

		case 3:
			return ((ord($utf_char[0]) & 0x0F) << 12) | ((ord($utf_char[1]) & 0x3F) << 6) | (ord($utf_char[2]) & 0x3F);

		case 4:
			return ((ord($utf_char[0]) & 0x07) << 18) | ((ord($utf_char[1]) & 0x3F) << 12) | ((ord($utf_char[2]) & 0x3F) << 6) | (ord($utf_char[3]) & 0x3F);

		default:
			die('UTF-8 chars can only be 1-4 bytes long');
	}
}

/**
* Return a UTF string formed from a sequence of codepoints in hexadecimal
*
* @param	string	$seq		Sequence of codepoints, separated with a space
* @return	string				UTF-8 string
*/
function hexseq_to_utf($seq)
{
	return implode('', array_map('hex_to_utf', explode(' ', $seq)));
}

/**
* Convert a codepoint in hexadecimal to a UTF-8 char
*
* @param	string	$hex		Codepoint, in hexadecimal
* @return	string				UTF-8 char
*/
function hex_to_utf($hex)
{
	return cp_to_utf(hexdec($hex));
}

/**
* Convert a codepoint to a UTF-8 char
*
* @param	integer	$cp			Unicode codepoint
* @return	string				UTF-8 string
*/
function cp_to_utf($cp)
{
	if ($cp > 0xFFFF)
	{
		return chr(0xF0 | ($cp >> 18)) . chr(0x80 | (($cp >> 12) & 0x3F)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
	}
	else if ($cp > 0x7FF)
	{
		return chr(0xE0 | ($cp >> 12)) . chr(0x80 | (($cp >> 6) & 0x3F)) . chr(0x80 | ($cp & 0x3F));
	}
	else if ($cp > 0x7F)
	{
		return chr(0xC0 | ($cp >> 6)) . chr(0x80 | ($cp & 0x3F));
	}
	else
	{
		return chr($cp);
	}
}
tr ""
-
-#: ../../install_steps_interactive.pm_.c:131
-msgid "Development"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:132
-msgid "Server"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:136
-msgid "Which usage is your system used for ?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:150
-msgid "Please, choose the type of your mouse."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:157 ../../standalone/mousedrake_.c:38
-msgid "Mouse Port"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:158
-msgid "Please choose on which serial port your mouse is connected to."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:176
-msgid "Configuring IDE"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:176
-msgid "IDE"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:187
-msgid "no available partitions"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:194
-msgid "Choose the mount points"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:211
-#, c-format
-msgid ""
-"I can't read your partition table, it's too corrupted for me :(\n"
-"I'll try to go on blanking bad partitions and ALL DATA will be lost\n"
-"(%s)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:220
-msgid ""
-"DiskDrake failed to read correctly the partition table.\n"
-"Continue at your own risk!"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:228
-msgid "Root Partition"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:229
-msgid "What is the root partition (/) of your system?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:242
-msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:245
-#, c-format
-msgid "Partitioning failed: %s"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:253
-msgid "You need to reboot for the partition table modifications to take place"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:279
-msgid "Choose the partitions you want to format"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:283
-msgid "Check bad blocks?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:291
-msgid "Formatting partitions"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:295
-#, c-format
-msgid "Creating and formatting file %s"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:298
-msgid "Not enough swap to fulfill installation, please add some"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:304
-msgid "Looking for available packages"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:310
-msgid "Finding packages to upgrade"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:327
-msgid "Your system has not enough space left for installation or upgrade"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:342
-#, c-format
-msgid "Full (%dMB)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:342
-#, c-format
-msgid "Normal (%dMB)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:342
-#, c-format
-msgid "Small(%dMB)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:365
-msgid "Package Group Selection"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:368
-msgid "Individual package selection"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:414
-msgid ""
-"If you have all the CDs in the list below, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:417
-#, c-format
-msgid "Cd-Rom labeled \"%s\""
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:445
-msgid ""
-"Installing package %s\n"
-"%d%%"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:454
-msgid "Post-install configuration"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:464
-msgid "Keep the current IP configuration"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:465
-msgid "Reconfigure network now"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:466
-msgid "Do not set up networking"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:469
-#: ../../install_steps_interactive.pm_.c:474
-msgid "Network Configuration"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:470
-msgid "Local networking has already been configured. Do you want to:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:475
-msgid "Do you want to configure a local network for your system?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:481
-msgid "no network card found"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:499
-#: ../../install_steps_interactive.pm_.c:561
-msgid "Configuring network"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:500
-msgid ""
-"Please enter your host name if you know it.\n"
-"Some DHCP servers require the hostname to work.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:504
-#: ../../install_steps_interactive.pm_.c:566
-msgid "Host name:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:513
-#: ../../install_steps_interactive.pm_.c:518
-msgid "Modem Configuration"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:514
-msgid ""
-"Do you want to configure a dialup connection with modem for your system?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:519
-msgid "Do you want to configure a ISDN connection for your system?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:531
-#: ../../install_steps_interactive.pm_.c:532
-#, c-format
-msgid "Configuring network device %s"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:533
-msgid ""
-"Please enter the IP configuration for this machine.\n"
-"Each item should be entered as an IP address in dotted-decimal\n"
-"notation (for example, 1.2.3.4)."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Automatic IP"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "IP address:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:536
-msgid "Netmask:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:537
-msgid "(bootp/dhcp)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:543 ../../printerdrake.pm_.c:89
-msgid "IP address should be in format 1.2.3.4"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:562
-msgid ""
-"Please enter your host name.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''.\n"
-"You may also enter the IP address of the gateway if you have one"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:566
-msgid "DNS server:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:566
-msgid "Gateway device:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:566
-msgid "Gateway:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:577
-msgid "Try to find a modem?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:587
-msgid "Please choose which serial port your modem is connected to."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:593
-msgid "Dialup options"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:594
-msgid "Connection name"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:595
-msgid "Phone number"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:596
-msgid "Login ID"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:598
-msgid "Authentication"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:598
-msgid "CHAP"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:598
-msgid "PAP"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:598
-msgid "Script-based"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:598
-msgid "Terminal-based"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:599
-msgid "Domain name"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:601
-msgid "First DNS Server"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:602
-msgid "Second DNS Server"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:615
-msgid ""
-"You have now the possibility to download software aimed for encryption.\n"
-"\n"
-"WARNING:\n"
-"\n"
-"Due to different general requirements applicable to these software and "
-"imposed\n"
-"by various jurisdictions, customer and/or end user of theses software "
-"should\n"
-"ensure that the laws of his/their jurisdiction allow him/them to download, "
-"stock\n"
-"and/or use these software.\n"
-"\n"
-"In addition customer and/or end user shall particularly be aware to not "
-"infringe\n"
-"the laws of his/their jurisdiction. Should customer and/or end user not\n"
-"respect the provision of these applicable laws, he/they will incure serious\n"
-"sanctions.\n"
-"\n"
-"In no event shall Mandrakesoft nor its manufacturers and/or suppliers be "
-"liable\n"
-"for special, indirect or incidental damages whatsoever (including, but not\n"
-"limited to loss of profits, business interruption, loss of commercial data "
-"and\n"
-"other pecuniary losses, and eventual liabilities and indemnification to be "
-"paid\n"
-"pursuant to a court decision) arising out of use, possession, or the sole\n"
-"downloading of these software, to which customer and/or end user could\n"
-"eventually have access after having sign up the present agreement.\n"
-"\n"
-"\n"
-"For any queries relating to these agreement, please contact \n"
-"Mandrakesoft, Inc.\n"
-"2400 N. Lincoln Avenue Suite 243\n"
-"Altadena California 91001\n"
-"USA"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:646
-msgid "Choose a mirror from which to get the packages"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:654
-msgid "Contacting the mirror to get the list of available packages"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:658
-msgid "Please choose the packages you want to install."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:671
-msgid "Which is your timezone?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:672
-msgid "Is your hardware clock set to GMT?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:719
-msgid "No password"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:724
-msgid "Use shadow file"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:724
-msgid "shadow"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:725
-msgid "MD5"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:725
-msgid "Use MD5 passwords"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:727
-msgid "Use NIS"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:727
-msgid "yellow pages"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:733
-#, c-format
-msgid "This password is too simple (must be at least %d characters long)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:740
-msgid "Authentification NIS"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:741
-msgid "NIS Domain"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:741
-msgid "NIS Server"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:766
-#: ../../standalone/adduserdrake_.c:36
-msgid "Accept user"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:766
-#: ../../standalone/adduserdrake_.c:36
-msgid "Add user"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:767
-#: ../../standalone/adduserdrake_.c:37
-#, c-format
-msgid "(already added %s)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:767
-#: ../../standalone/adduserdrake_.c:37
-#, c-format
-msgid ""
-"Enter a user\n"
-"%s"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:769
-#: ../../standalone/adduserdrake_.c:39
-msgid "Real name"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:770 ../../printerdrake.pm_.c:84
-#: ../../printerdrake.pm_.c:109 ../../standalone/adduserdrake_.c:40
-msgid "User name"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:775
-#: ../../standalone/adduserdrake_.c:45
-msgid "Shell"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:777
-#: ../../standalone/adduserdrake_.c:47
-msgid "Icon"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:787
-#: ../../standalone/adduserdrake_.c:57
-msgid "This password is too simple"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:788
-#: ../../standalone/adduserdrake_.c:58
-msgid "Please give a user name"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:789
-#: ../../standalone/adduserdrake_.c:59
-msgid ""
-"The user name must contain only lower cased letters, numbers, `-' and `_'"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:790
-#: ../../standalone/adduserdrake_.c:60
-msgid "This user name is already added"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:815
-msgid ""
-"A custom bootdisk provides a way of booting into your Linux system without\n"
-"depending on the normal bootloader. This is useful if you don't want to "
-"install\n"
-"SILO on your system, or another operating system removes SILO, or SILO "
-"doesn't\n"
-"work with your hardware configuration. A custom bootdisk can also be used "
-"with\n"
-"the Mandrake rescue image, making it much easier to recover from severe "
-"system\n"
-"failures.\n"
-"\n"
-"If you want to create a bootdisk for your system, insert a floppy in the "
-"first\n"
-"drive and press \"Ok\"."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:831
-msgid "First floppy drive"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:832
-msgid "Second floppy drive"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:833
-msgid "Skip"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:838
-msgid ""
-"A custom bootdisk provides a way of booting into your Linux system without\n"
-"depending on the normal bootloader. This is useful if you don't want to "
-"install\n"
-"LILO (or grub) on your system, or another operating system removes LILO, or "
-"LILO doesn't\n"
-"work with your hardware configuration. A custom bootdisk can also be used "
-"with\n"
-"the Mandrake rescue image, making it much easier to recover from severe "
-"system\n"
-"failures. Would you like to create a bootdisk for your system?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:847
-msgid "Sorry, no floppy drive available"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:850
-msgid "Choose the floppy drive you want to use to make the bootdisk"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:856
-#, c-format
-msgid "Insert a floppy in drive %s"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:859
-msgid "Creating bootdisk"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:866
-msgid "Preparing bootloader"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:874
-msgid "Do you want to use aboot?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:877
-msgid ""
-"Error installing aboot, \n"
-"try to force installation even if that destroys the first partition?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:886
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:901
-msgid "Proxies configuration"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:902
-msgid "HTTP proxy"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:903
-msgid "FTP proxy"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:909
-msgid "Proxy should be http://..."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:910
-msgid "Proxy should be ftp://..."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:920 ../../standalone/draksec_.c:20
-msgid "Welcome To Crackers"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:921 ../../standalone/draksec_.c:21
-msgid "Poor"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:922 ../../standalone/draksec_.c:22
-msgid "Low"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:923 ../../standalone/draksec_.c:23
-msgid "Medium"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:924 ../../standalone/draksec_.c:24
-msgid "High"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:925 ../../standalone/draksec_.c:25
-msgid "Paranoid"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:938
-msgid "Miscellaneous questions"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "(may cause data corruption)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:939
-msgid "Use hard drive optimisations?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:940 ../../standalone/draksec_.c:46
-msgid "Choose security level"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:941
-#, c-format
-msgid "Precise RAM size if needed (found %d MB)"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:943
-msgid "Removable media automounting"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:945
-msgid "Clean /tmp at each boot"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:948
-msgid "Enable multi profiles"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:950
-msgid "Enable num lock at startup"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:953
-msgid "Give the ram size in MB"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:955
-msgid "Can't use supermount in high security level"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:957
-msgid ""
-"beware: IN THIS SECURITY LEVEL, ROOT LOGIN AT CONSOLE IS NOT ALLOWED!\n"
-"If you want to be root, you have to login as a user and then use \"su\".\n"
-"More generally, do not expect to use your machine for anything but as a "
-"server.\n"
-"You have been warned."
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:962
-msgid ""
-"Be carefull, having numlock enabled causes a lot of keystrokes to\n"
-"give digits instead of normal letters (eg: pressing `p' gives `6')"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:983
-msgid ""
-"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
-"By default, the 4.0 server is used unless your card is not supported.\n"
-"\n"
-"Do you want to keep XFree 3.3?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:996
-msgid "Try to find PCI devices?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1016
-msgid "Do you want to generate an auto install floppy for linux replication?"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1018
-#, c-format
-msgid "Insert a blank floppy in drive %s"
-msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1032
-msgid "Creating auto install floppy"
-msgstr ""
-
-#: ../../install_steps_newt.pm_.c:21
+#: ../../install_steps_newt.pm_.c:22
#, c-format
msgid "Linux-Mandrake Installation %s"
msgstr ""
-#: ../../install_steps_newt.pm_.c:32
+#: ../../install_steps_newt.pm_.c:33
msgid ""
" <Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen "
msgstr ""
@@ -3151,227 +2428,239 @@ msgstr ""
msgid "Your choice? (default %s enter `none' for none) "
msgstr ""
-#: ../../keyboard.pm_.c:102 ../../keyboard.pm_.c:130
+#: ../../keyboard.pm_.c:104 ../../keyboard.pm_.c:134
msgid "Czech"
msgstr ""
-#: ../../keyboard.pm_.c:103 ../../keyboard.pm_.c:116 ../../keyboard.pm_.c:131
+#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:118 ../../keyboard.pm_.c:135
msgid "German"
msgstr ""
-#: ../../keyboard.pm_.c:104
+#: ../../keyboard.pm_.c:106
msgid "Dvorak"
msgstr ""
-#: ../../keyboard.pm_.c:105 ../../keyboard.pm_.c:137
+#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:141
msgid "Spanish"
msgstr ""
-#: ../../keyboard.pm_.c:106 ../../keyboard.pm_.c:138
+#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:142
msgid "Finnish"
msgstr ""
-#: ../../keyboard.pm_.c:107 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:139
+#: ../../keyboard.pm_.c:109 ../../keyboard.pm_.c:119 ../../keyboard.pm_.c:143
msgid "French"
msgstr ""
-#: ../../keyboard.pm_.c:108 ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:162
msgid "Norwegian"
msgstr ""
-#: ../../keyboard.pm_.c:109
+#: ../../keyboard.pm_.c:111
msgid "Polish"
msgstr ""
-#: ../../keyboard.pm_.c:110 ../../keyboard.pm_.c:164
+#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:167
msgid "Russian"
msgstr ""
-#: ../../keyboard.pm_.c:111 ../../keyboard.pm_.c:173
+#: ../../keyboard.pm_.c:113 ../../keyboard.pm_.c:176
msgid "UK keyboard"
msgstr ""
-#: ../../keyboard.pm_.c:112 ../../keyboard.pm_.c:115 ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:114 ../../keyboard.pm_.c:117 ../../keyboard.pm_.c:177
msgid "US keyboard"
msgstr ""
-#: ../../keyboard.pm_.c:119
+#: ../../keyboard.pm_.c:121
msgid "Armenian (old)"
msgstr ""
-#: ../../keyboard.pm_.c:120
+#: ../../keyboard.pm_.c:122
msgid "Armenian (typewriter)"
msgstr ""
-#: ../../keyboard.pm_.c:121
+#: ../../keyboard.pm_.c:123
msgid "Armenian (phonetic)"
msgstr ""
-#: ../../keyboard.pm_.c:124
+#: ../../keyboard.pm_.c:126
+msgid "Azerbaidjani (latin)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:127
+msgid "Azerbaidjani (cyrillic)"
+msgstr ""
+
+#: ../../keyboard.pm_.c:128
msgid "Belgian"
msgstr ""
-#: ../../keyboard.pm_.c:125
+#: ../../keyboard.pm_.c:129
msgid "Bulgarian"
msgstr ""
-#: ../../keyboard.pm_.c:126
+#: ../../keyboard.pm_.c:130
msgid "Brazilian (ABNT-2)"
msgstr ""
-#: ../../keyboard.pm_.c:127
+#: ../../keyboard.pm_.c:131
msgid "Belarusian"
msgstr ""
-#: ../../keyboard.pm_.c:128
+#: ../../keyboard.pm_.c:132
msgid "Swiss (German layout)"
msgstr ""
-#: ../../keyboard.pm_.c:129
+#: ../../keyboard.pm_.c:133
msgid "Swiss (French layout)"
msgstr ""
-#: ../../keyboard.pm_.c:132
+#: ../../keyboard.pm_.c:136
msgid "German (no dead keys)"
msgstr ""
-#: ../../keyboard.pm_.c:133
+#: ../../keyboard.pm_.c:137
msgid "Danish"
msgstr ""
-#: ../../keyboard.pm_.c:134
+#: ../../keyboard.pm_.c:138
msgid "Dvorak (US)"
msgstr ""
-#: ../../keyboard.pm_.c:135
+#: ../../keyboard.pm_.c:139
msgid "Dvorak (Norwegian)"
msgstr ""
-#: ../../keyboard.pm_.c:136
+#: ../../keyboard.pm_.c:140
msgid "Estonian"
msgstr ""
-#: ../../keyboard.pm_.c:140
+#: ../../keyboard.pm_.c:144
msgid "Georgian (\"Russian\" layout)"
msgstr ""
-#: ../../keyboard.pm_.c:141
+#: ../../keyboard.pm_.c:145
msgid "Georgian (\"Latin\" layout)"
msgstr ""
-#: ../../keyboard.pm_.c:142
+#: ../../keyboard.pm_.c:146
msgid "Greek"
msgstr ""
-#: ../../keyboard.pm_.c:143
+#: ../../keyboard.pm_.c:147
msgid "Hungarian"
msgstr ""
-#: ../../keyboard.pm_.c:144
+#: ../../keyboard.pm_.c:148
msgid "Croatian"
msgstr ""
-#: ../../keyboard.pm_.c:145
+#: ../../keyboard.pm_.c:149
msgid "Israeli"
msgstr ""
-#: ../../keyboard.pm_.c:146
+#: ../../keyboard.pm_.c:150
msgid "Israeli (Phonetic)"
msgstr ""
-#: ../../keyboard.pm_.c:149
+#: ../../keyboard.pm_.c:151
+msgid "Iranian"
+msgstr ""
+
+#: ../../keyboard.pm_.c:152
msgid "Icelandic"
msgstr ""
-#: ../../keyboard.pm_.c:150
+#: ../../keyboard.pm_.c:153
msgid "Italian"
msgstr ""
-#: ../../keyboard.pm_.c:151
+#: ../../keyboard.pm_.c:154
msgid "Japanese 106 keys"
msgstr ""
-#: ../../keyboard.pm_.c:152
+#: ../../keyboard.pm_.c:155
msgid "Latin American"
msgstr ""
-#: ../../keyboard.pm_.c:153
+#: ../../keyboard.pm_.c:156
msgid "Dutch"
msgstr ""
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:157
msgid "Lithuanian AZERTY (old)"
msgstr ""
-#: ../../keyboard.pm_.c:156
+#: ../../keyboard.pm_.c:159
msgid "Lithuanian AZERTY (new)"
msgstr ""
-#: ../../keyboard.pm_.c:157
+#: ../../keyboard.pm_.c:160
msgid "Lithuanian \"number row\" QWERTY"
msgstr ""
-#: ../../keyboard.pm_.c:158
+#: ../../keyboard.pm_.c:161
msgid "Lithuanian \"phonetic\" QWERTY"
msgstr ""
-#: ../../keyboard.pm_.c:160
+#: ../../keyboard.pm_.c:163
msgid "Polish (qwerty layout)"
msgstr ""
-#: ../../keyboard.pm_.c:161
+#: ../../keyboard.pm_.c:164
msgid "Polish (qwertz layout)"
msgstr ""
-#: ../../keyboard.pm_.c:162
+#: ../../keyboard.pm_.c:165
msgid "Portuguese"
msgstr ""
-#: ../../keyboard.pm_.c:163
+#: ../../keyboard.pm_.c:166
msgid "Canadian (Quebec)"
msgstr ""
-#: ../../keyboard.pm_.c:165
+#: ../../keyboard.pm_.c:168
msgid "Russian (Yawerty)"
msgstr ""
-#: ../../keyboard.pm_.c:166
+#: ../../keyboard.pm_.c:169
msgid "Swedish"
msgstr ""
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:170
msgid "Slovenian"
msgstr ""
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:171
msgid "Slovakian"
msgstr ""
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:172
msgid "Thai keyboard"
msgstr ""
-#: ../../keyboard.pm_.c:170
+#: ../../keyboard.pm_.c:173
msgid "Turkish (traditional \"F\" model)"
msgstr ""
-#: ../../keyboard.pm_.c:171
+#: ../../keyboard.pm_.c:174
msgid "Turkish (modern \"Q\" model)"
msgstr ""
-#: ../../keyboard.pm_.c:172
+#: ../../keyboard.pm_.c:175
msgid "Ukrainian"
msgstr ""
-#: ../../keyboard.pm_.c:175
+#: ../../keyboard.pm_.c:178
msgid "US keyboard (international)"
msgstr ""
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:179
msgid "Vietnamese \"numeric row\" QWERTY"
msgstr ""
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:180
msgid "Yugoslavian (latin layout)"
msgstr ""
@@ -3535,20 +2824,299 @@ msgstr ""
msgid "Is this correct?"
msgstr ""
-#: ../../netconnect.pm_.c:186
-msgid "I have founded an ISDN Card:\n"
+#: ../../netconnect.pm_.c:88
+msgid "Internet configuration"
+msgstr ""
+
+#: ../../netconnect.pm_.c:89
+msgid "Do you want to try to connect to the internet now?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:123 ../../netconnect.pm_.c:143
+#: ../../netconnect.pm_.c:197 ../../netconnect.pm_.c:217
+#: ../../netconnect.pm_.c:229 ../../netconnect.pm_.c:241
+msgid "ISDN Configuration"
+msgstr ""
+
+#: ../../netconnect.pm_.c:124
+msgid ""
+"Select your provider.\n"
+" If it's not in the list, choose Unlisted"
+msgstr ""
+
+#: ../../netconnect.pm_.c:144
+msgid "Please fill or check the field below"
+msgstr ""
+
+#: ../../netconnect.pm_.c:146
+msgid "Card IRQ"
+msgstr ""
+
+#: ../../netconnect.pm_.c:147
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:148
+msgid "Card IO"
+msgstr ""
+
+#: ../../netconnect.pm_.c:149
+msgid "Card IO_0"
+msgstr ""
+
+#: ../../netconnect.pm_.c:150
+msgid "Card IO_1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:151 ../../netconnect.pm_.c:479
+msgid "Connection name"
+msgstr ""
+
+#: ../../netconnect.pm_.c:152
+msgid "Your personnal phone number"
+msgstr ""
+
+#: ../../netconnect.pm_.c:153
+msgid "Provider name (ex provider.net)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:154
+msgid "Provider phone number"
+msgstr ""
+
+#: ../../netconnect.pm_.c:155
+msgid "Provider dns 1"
+msgstr ""
+
+#: ../../netconnect.pm_.c:156
+msgid "Provider dns 2"
+msgstr ""
+
+#: ../../netconnect.pm_.c:157
+msgid "Dialing mode"
+msgstr ""
+
+#: ../../netconnect.pm_.c:158
+msgid "Account Login"
+msgstr ""
+
+#: ../../netconnect.pm_.c:159
+msgid "Account Password"
+msgstr ""
+
+#: ../../netconnect.pm_.c:160
+msgid "Confirm Password"
+msgstr ""
+
+#: ../../netconnect.pm_.c:190
+msgid "Germany (1TR6)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:192
+msgid "Europe (EDSS1)"
msgstr ""
#: ../../netconnect.pm_.c:194
+msgid "Rest of the world - no D-Channel (leased lines)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:198
+msgid "Which protocol do you want to use ?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:209
+msgid "ISA / PCMCIA"
+msgstr ""
+
+#: ../../netconnect.pm_.c:211
+msgid "PCI"
+msgstr ""
+
+#: ../../netconnect.pm_.c:213
+msgid "I don't know"
+msgstr ""
+
+#: ../../netconnect.pm_.c:218
+msgid "What kind of card do you have?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:224
+msgid "Continue"
+msgstr ""
+
+#: ../../netconnect.pm_.c:226
+msgid "Abort"
+msgstr ""
+
+#: ../../netconnect.pm_.c:230
+msgid ""
+"\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
+"\n"
+"If you have a PCMCIA card, you have to know the irq and io of your card.\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:242
+msgid "Which is your ISDN card ?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:280
+msgid "I have found an ISDN Card:\n"
+msgstr ""
+
+#: ../../netconnect.pm_.c:288
msgid ""
"I have detected an ISDN PCI Card, but I don't know the type. Please select "
"one PCI card on the next screen."
msgstr ""
-#: ../../netconnect.pm_.c:201
+#: ../../netconnect.pm_.c:295
msgid "No ISDN PCI card found. Please select one on the next screen."
msgstr ""
+#: ../../netconnect.pm_.c:407
+msgid "ISDN configuration"
+msgstr ""
+
+#: ../../netconnect.pm_.c:408
+msgid "Do you want to start your connection at boot?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:462
+msgid "Try to find a modem?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:472
+msgid "Please choose which serial port your modem is connected to."
+msgstr ""
+
+#: ../../netconnect.pm_.c:478
+msgid "Dialup options"
+msgstr ""
+
+#: ../../netconnect.pm_.c:480
+msgid "Phone number"
+msgstr ""
+
+#: ../../netconnect.pm_.c:481
+msgid "Login ID"
+msgstr ""
+
+#: ../../netconnect.pm_.c:483
+msgid "Authentication"
+msgstr ""
+
+#: ../../netconnect.pm_.c:483
+msgid "CHAP"
+msgstr ""
+
+#: ../../netconnect.pm_.c:483
+msgid "PAP"
+msgstr ""
+
+#: ../../netconnect.pm_.c:483
+msgid "Script-based"
+msgstr ""
+
+#: ../../netconnect.pm_.c:483
+msgid "Terminal-based"
+msgstr ""
+
+#: ../../netconnect.pm_.c:484
+msgid "Domain name"
+msgstr ""
+
+#: ../../netconnect.pm_.c:486
+msgid "First DNS Server"
+msgstr ""
+
+#: ../../netconnect.pm_.c:487
+msgid "Second DNS Server"
+msgstr ""
+
+#: ../../netconnect.pm_.c:497
+msgid "Connect to internet"
+msgstr ""
+
+#: ../../netconnect.pm_.c:499
+msgid "Disconnect from internet"
+msgstr ""
+
+#: ../../netconnect.pm_.c:501
+msgid "Configure internet connexion"
+msgstr ""
+
+#: ../../netconnect.pm_.c:504
+msgid "Internet connection & configuration"
+msgstr ""
+
+#: ../../netconnect.pm_.c:505
+msgid "What do you wish to do?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:520
+msgid "Connect to internet with a normal modem"
+msgstr ""
+
+#: ../../netconnect.pm_.c:522
+msgid "Connect to internet using ISDN"
+msgstr ""
+
+#: ../../netconnect.pm_.c:524
+msgid "Connect to internet using DSL (or ADSL)"
+msgstr ""
+
+#: ../../netconnect.pm_.c:526
+msgid "Connect to internet using Cable"
+msgstr ""
+
+#: ../../netconnect.pm_.c:528
+msgid "Do not connect to internet"
+msgstr ""
+
+#: ../../netconnect.pm_.c:531 ../../netconnect.pm_.c:554
+#: ../../netconnect.pm_.c:573 ../../netconnect.pm_.c:591
+#: ../../netconnect.pm_.c:602
+msgid "Connect to the Internet"
+msgstr ""
+
+#: ../../netconnect.pm_.c:532
+msgid "How do you want to connect to the Internet?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:549
+msgid "Internal ISDN card"
+msgstr ""
+
+#: ../../netconnect.pm_.c:551
+msgid "External modem"
+msgstr ""
+
+#: ../../netconnect.pm_.c:555
+msgid "What kind is your ISDN connection?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:574
+msgid "Have you been provided with a hostname?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:586
+msgid "France"
+msgstr ""
+
+#: ../../netconnect.pm_.c:588
+msgid "Other countries"
+msgstr ""
+
+#: ../../netconnect.pm_.c:592
+msgid "On which country are you located ?"
+msgstr ""
+
+#: ../../netconnect.pm_.c:603
+msgid ""
+"If your adsl modem is an alcatel one, choose pptp alcatel. Otherwise, pppoe."
+msgstr ""
+
#: ../../partition_table.pm_.c:542
msgid "Extended partition not supported on this platform"
msgstr ""
@@ -3715,10 +3283,19 @@ msgstr ""
msgid "Share name"
msgstr ""
+#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:109
+#: ../../standalone/adduserdrake_.c:40
+msgid "User name"
+msgstr ""
+
#: ../../printerdrake.pm_.c:86
msgid "Workgroup"
msgstr ""
+#: ../../printerdrake.pm_.c:89
+msgid "IP address should be in format 1.2.3.4"
+msgstr ""
+
#: ../../printerdrake.pm_.c:102
msgid "NetWare Printer Options"
msgstr ""
@@ -3751,75 +3328,75 @@ msgstr ""
msgid "Yes, print both test pages"
msgstr ""
-#: ../../printerdrake.pm_.c:130
+#: ../../printerdrake.pm_.c:131
msgid "Configure Printer"
msgstr ""
-#: ../../printerdrake.pm_.c:131
+#: ../../printerdrake.pm_.c:132
msgid "What type of printer do you have?"
msgstr ""
-#: ../../printerdrake.pm_.c:163
+#: ../../printerdrake.pm_.c:164
msgid "Printer options"
msgstr ""
-#: ../../printerdrake.pm_.c:164
+#: ../../printerdrake.pm_.c:165
msgid "Paper Size"
msgstr ""
-#: ../../printerdrake.pm_.c:165
+#: ../../printerdrake.pm_.c:166
msgid "Eject page after job?"
msgstr ""
-#: ../../printerdrake.pm_.c:170
+#: ../../printerdrake.pm_.c:171
msgid "Uniprint driver options"
msgstr ""
-#: ../../printerdrake.pm_.c:171
+#: ../../printerdrake.pm_.c:172
msgid "Color depth options"
msgstr ""
-#: ../../printerdrake.pm_.c:173
+#: ../../printerdrake.pm_.c:174
msgid "Print text as PostScript?"
msgstr ""
-#: ../../printerdrake.pm_.c:174
+#: ../../printerdrake.pm_.c:175
msgid "Reverse page order"
msgstr ""
-#: ../../printerdrake.pm_.c:176
+#: ../../printerdrake.pm_.c:177
msgid "Fix stair-stepping text?"
msgstr ""
-#: ../../printerdrake.pm_.c:179
+#: ../../printerdrake.pm_.c:180
msgid "Number of pages per output pages"
msgstr ""
-#: ../../printerdrake.pm_.c:180
+#: ../../printerdrake.pm_.c:181
msgid "Right/Left margins in points (1/72 of inch)"
msgstr ""
-#: ../../printerdrake.pm_.c:181
+#: ../../printerdrake.pm_.c:182
msgid "Top/Bottom margins in points (1/72 of inch)"
msgstr ""
-#: ../../printerdrake.pm_.c:184
+#: ../../printerdrake.pm_.c:185
msgid "Extra GhostScript options"
msgstr ""
-#: ../../printerdrake.pm_.c:187
+#: ../../printerdrake.pm_.c:188
msgid "Extra Text options"
msgstr ""
-#: ../../printerdrake.pm_.c:198
+#: ../../printerdrake.pm_.c:199
msgid "Do you want to test printing?"
msgstr ""
-#: ../../printerdrake.pm_.c:209
+#: ../../printerdrake.pm_.c:210
msgid "Printing test page(s)..."
msgstr ""
-#: ../../printerdrake.pm_.c:217
+#: ../../printerdrake.pm_.c:218
#, c-format
msgid ""
"Test page(s) have been sent to the printer daemon.\n"
@@ -3830,40 +3407,40 @@ msgid ""
"Does it work properly?"
msgstr ""
-#: ../../printerdrake.pm_.c:221
+#: ../../printerdrake.pm_.c:222
msgid ""
"Test page(s) have been sent to the printer daemon.\n"
"This may take a little time before printer start.\n"
"Does it work properly?"
msgstr ""
-#: ../../printerdrake.pm_.c:237
+#: ../../printerdrake.pm_.c:238
msgid "Printer"
msgstr ""
-#: ../../printerdrake.pm_.c:238
+#: ../../printerdrake.pm_.c:239
msgid "Would you like to configure a printer?"
msgstr ""
-#: ../../printerdrake.pm_.c:242
+#: ../../printerdrake.pm_.c:243
msgid ""
"Here are the following print queues.\n"
"You can add some more or change the existing ones."
msgstr ""
-#: ../../printerdrake.pm_.c:265 ../../printerdrake.pm_.c:271
+#: ../../printerdrake.pm_.c:266 ../../printerdrake.pm_.c:272
msgid "Select Printer Connection"
msgstr ""
-#: ../../printerdrake.pm_.c:266
+#: ../../printerdrake.pm_.c:267
msgid "How is the printer connected?"
msgstr ""
-#: ../../printerdrake.pm_.c:271
+#: ../../printerdrake.pm_.c:272
msgid "Remove queue"
msgstr ""
-#: ../../printerdrake.pm_.c:272
+#: ../../printerdrake.pm_.c:273
msgid ""
"Every print queue (which print jobs are directed to) needs a\n"
"name (often lp) and a spool directory associated with it. What\n"
@@ -3871,15 +3448,15 @@ msgid ""
"connected?"
msgstr ""
-#: ../../printerdrake.pm_.c:275
+#: ../../printerdrake.pm_.c:276
msgid "Name of queue"
msgstr ""
-#: ../../printerdrake.pm_.c:276
+#: ../../printerdrake.pm_.c:277
msgid "Spool directory"
msgstr ""
-#: ../../printerdrake.pm_.c:277
+#: ../../printerdrake.pm_.c:278
msgid "Printer Connection"
msgstr ""
@@ -4068,6 +3645,55 @@ msgstr ""
msgid "Choose which services should be automatically started at boot time"
msgstr ""
+#: ../../standalone/adduserdrake_.c:36
+msgid "Accept user"
+msgstr ""
+
+#: ../../standalone/adduserdrake_.c:36
+msgid "Add user"
+msgstr ""
+
+#: ../../standalone/adduserdrake_.c:37
+#, c-format
+msgid "(already added %s)"
+msgstr ""
+
+#: ../../standalone/adduserdrake_.c:37
+#, c-format
+msgid ""
+"Enter a user\n"
+"%s"
+msgstr ""
+
+#: ../../standalone/adduserdrake_.c:39
+msgid "Real name"
+msgstr ""
+
+#: ../../standalone/adduserdrake_.c:45
+msgid "Shell"
+msgstr ""
+
+#: ../../standalone/adduserdrake_.c:47
+msgid "Icon"
+msgstr ""
+
+#: ../../standalone/adduserdrake_.c:57
+msgid "This password is too simple"
+msgstr ""
+
+#: ../../standalone/adduserdrake_.c:58
+msgid "Please give a user name"
+msgstr ""
+
+#: ../../standalone/adduserdrake_.c:59
+msgid ""
+"The user name must contain only lower cased letters, numbers, `-' and `_'"
+msgstr ""
+
+#: ../../standalone/adduserdrake_.c:60
+msgid "This user name is already added"
+msgstr ""
+
#: ../../standalone/diskdrake_.c:61
msgid ""
"I can't read your partition table, it's too corrupted for me :(\n"
@@ -4221,6 +3847,30 @@ msgstr ""
msgid "Everything has been configured.\n"
msgstr ""
+#: ../../standalone/draksec_.c:20
+msgid "Welcome To Crackers"
+msgstr ""
+
+#: ../../standalone/draksec_.c:21
+msgid "Poor"
+msgstr ""
+
+#: ../../standalone/draksec_.c:22
+msgid "Low"
+msgstr ""
+
+#: ../../standalone/draksec_.c:23
+msgid "Medium"
+msgstr ""
+
+#: ../../standalone/draksec_.c:24
+msgid "High"
+msgstr ""
+
+#: ../../standalone/draksec_.c:25
+msgid "Paranoid"
+msgstr ""
+
#: ../../standalone/draksec_.c:28
msgid ""
"This level is to be used with care. It makes your system more easy to use,\n"
@@ -4260,6 +3910,10 @@ msgid ""
"Security features are at their maximum."
msgstr ""
+#: ../../standalone/draksec_.c:46
+msgid "Choose security level"
+msgstr ""
+
#: ../../standalone/draksec_.c:49
msgid "Setting security level"
msgstr ""
@@ -4268,6 +3922,10 @@ msgstr ""
msgid "Choose the tool you want to use"
msgstr ""
+#: ../../standalone/keyboarddrake_.c:22
+msgid "Keyboard"
+msgstr ""
+
#: ../../standalone/keyboarddrake_.c:23
msgid "What is your keyboard layout?"
msgstr ""
@@ -4284,6 +3942,10 @@ msgstr ""
msgid "Emulate third button?"
msgstr ""
+#: ../../standalone/mousedrake_.c:38
+msgid "Mouse Port"
+msgstr ""
+
#: ../../standalone/mousedrake_.c:39
msgid "Which serial port is your mouse connected to?"
msgstr ""
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index b664224e4..0ff21ef03 100644
--- a/perl-install/share/po/no.po
+++ b/perl-install/share/po/no.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-08-22 22:22+0200\n"
+"POT-Creation-Date: 2000-08-29 21:14+0200\n"
"PO-Revision-Date: 1999-08-25 11:07+0200\n"
"Last-Translator: Terje Bjerkelia <terje@bjerkelia.com>\n"
"Language-Team: norwegian\n"
@@ -13,31 +13,31 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../Xconfigurator.pm_.c:122 ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:123 ../../Xconfigurator.pm_.c:288
msgid "Generic"
msgstr "Generisk"
-#: ../../Xconfigurator.pm_.c:178
+#: ../../Xconfigurator.pm_.c:179
msgid "Graphic card"
msgstr "Grafikk-kort"
-#: ../../Xconfigurator.pm_.c:178
+#: ../../Xconfigurator.pm_.c:179
msgid "Select a graphic card"
msgstr "Velg et grafikk-kort"
-#: ../../Xconfigurator.pm_.c:179
+#: ../../Xconfigurator.pm_.c:180
msgid "Choose a X server"
msgstr "Velg en X-tjener"
-#: ../../Xconfigurator.pm_.c:179
+#: ../../Xconfigurator.pm_.c:180
msgid "X server"
msgstr "X-tjener"
-#: ../../Xconfigurator.pm_.c:202
+#: ../../Xconfigurator.pm_.c:203
msgid "Do you want support for hardware 3D acceleration?"
msgstr "Ønsker du støtte for maskinvare 3D akselerasjon"
-#: ../../Xconfigurator.pm_.c:210
+#: ../../Xconfigurator.pm_.c:211
msgid ""
"Your card can have 3D acceleration but only with XFree 3.3.\n"
"Do You want to use XFree 3.3 instead of XFree 4.0?"
@@ -45,23 +45,23 @@ msgstr ""
"Kortet ditt kan ha 3D akselerasjon, men bare med XFree 3.3.\n"
"Ønsker du å bruke XFree 3.3 istedet for XFree 4.0?"
-#: ../../Xconfigurator.pm_.c:234
+#: ../../Xconfigurator.pm_.c:235
msgid "Select the memory size of your graphic card"
msgstr "Velg minnestørrelsen til grafikk-kortet ditt"
-#: ../../Xconfigurator.pm_.c:275
+#: ../../Xconfigurator.pm_.c:277
msgid "Choose options for server"
msgstr "Velg opsjoner for tjener"
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:288
msgid "Choose a monitor"
msgstr "Velg en monitor"
-#: ../../Xconfigurator.pm_.c:286
+#: ../../Xconfigurator.pm_.c:288
msgid "Monitor"
msgstr "Monitor"
-#: ../../Xconfigurator.pm_.c:289
+#: ../../Xconfigurator.pm_.c:291
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -85,39 +85,39 @@ msgstr ""
"skjermen din.\n"
"Hvis du er usikker, velg en konservativ innstilling."
-#: ../../Xconfigurator.pm_.c:296
+#: ../../Xconfigurator.pm_.c:298
msgid "Horizontal refresh rate"
msgstr "Horisontal oppfrisknings-rate"
-#: ../../Xconfigurator.pm_.c:296
+#: ../../Xconfigurator.pm_.c:298
msgid "Vertical refresh rate"
msgstr "Vertikal oppfrisknings-rate"
-#: ../../Xconfigurator.pm_.c:335
+#: ../../Xconfigurator.pm_.c:337
msgid "Monitor not configured"
msgstr "Monitor er ikke konfigurert"
-#: ../../Xconfigurator.pm_.c:338
+#: ../../Xconfigurator.pm_.c:340
msgid "Graphic card not configured yet"
msgstr "Grafikk-kort er ikke konfigurert ennå"
-#: ../../Xconfigurator.pm_.c:341
+#: ../../Xconfigurator.pm_.c:343
msgid "Resolutions not chosen yet"
msgstr "Oppløsninger er ikke valgt ennå"
-#: ../../Xconfigurator.pm_.c:354
+#: ../../Xconfigurator.pm_.c:356
msgid "Do you want to test the configuration?"
msgstr "Vil du teste konfigurasjonen?"
-#: ../../Xconfigurator.pm_.c:358
+#: ../../Xconfigurator.pm_.c:360
msgid "Warning: testing is dangerous on this graphic card"
msgstr "Advarsel: testing er farlig med dette grafikk-kortet"
-#: ../../Xconfigurator.pm_.c:361
+#: ../../Xconfigurator.pm_.c:363
msgid "Test of the configuration"
msgstr "Test konfigurasjon"
-#: ../../Xconfigurator.pm_.c:400
+#: ../../Xconfigurator.pm_.c:402
msgid ""
"\n"
"try to change some parameters"
@@ -125,28 +125,28 @@ msgstr ""
"\n"
"prøv å endre noen parametere"
-#: ../../Xconfigurator.pm_.c:400
+#: ../../Xconfigurator.pm_.c:402
msgid "An error has occurred:"
msgstr "En feil oppsto:"
-#: ../../Xconfigurator.pm_.c:423
+#: ../../Xconfigurator.pm_.c:425
#, c-format
msgid "Leaving in %d seconds"
msgstr "Slutter om %d sekunder"
-#: ../../Xconfigurator.pm_.c:427
+#: ../../Xconfigurator.pm_.c:429
msgid "Is this the correct setting?"
msgstr "Er dette den riktige innstillingen?"
-#: ../../Xconfigurator.pm_.c:435
+#: ../../Xconfigurator.pm_.c:437
msgid "An error has occurred, try to change some parameters"
msgstr "En feil oppsto, prøv å endre noen parametere"
-#: ../../Xconfigurator.pm_.c:443 ../../Xconfigurator.pm_.c:626
+#: ../../Xconfigurator.pm_.c:445 ../../Xconfigurator.pm_.c:628
msgid "Automatic resolutions"
msgstr "Automatiske oppløsninger"
-#: ../../Xconfigurator.pm_.c:444
+#: ../../Xconfigurator.pm_.c:446
msgid ""
"To find the available resolutions I will try different ones.\n"
"Your screen will blink...\n"
@@ -156,33 +156,33 @@ msgstr ""
"Skjermen din vil blinke...\n"
"Du kan slå av hvis du vil, du vil høre et bipp når det er ferdig"
-#: ../../Xconfigurator.pm_.c:502 ../../printerdrake.pm_.c:167
+#: ../../Xconfigurator.pm_.c:504 ../../printerdrake.pm_.c:168
msgid "Resolution"
msgstr "Oppløsning"
-#: ../../Xconfigurator.pm_.c:537
+#: ../../Xconfigurator.pm_.c:539
msgid "Choose the resolution and the color depth"
msgstr "Velg oppløsning og fargedybde"
-#: ../../Xconfigurator.pm_.c:539
+#: ../../Xconfigurator.pm_.c:541
#, c-format
msgid "Graphic card: %s"
msgstr "Grafikk-kort: %s"
-#: ../../Xconfigurator.pm_.c:540
+#: ../../Xconfigurator.pm_.c:542
#, c-format
msgid "XFree86 server: %s"
msgstr "XFree86-tjener: %s"
-#: ../../Xconfigurator.pm_.c:549
+#: ../../Xconfigurator.pm_.c:551
msgid "Show all"
msgstr "Vis alle"
-#: ../../Xconfigurator.pm_.c:573
+#: ../../Xconfigurator.pm_.c:575
msgid "Resolutions"
msgstr "Oppløsninger"
-#: ../../Xconfigurator.pm_.c:627
+#: ../../Xconfigurator.pm_.c:629
msgid ""
"I can try to find the available resolutions (eg: 800x600).\n"
"Sometimes, though, it may hang the machine.\n"
@@ -192,7 +192,7 @@ msgstr ""
"Noen ganger kan dette forårsake at maskinen stopper opp.\n"
"Ønsker du å prøve?"
-#: ../../Xconfigurator.pm_.c:632
+#: ../../Xconfigurator.pm_.c:634
msgid ""
"No valid modes found\n"
"Try with another video card or monitor"
@@ -200,109 +200,109 @@ msgstr ""
"Ingen gyldige modus funnet\n"
"Prøv med et annet skjermkort eller monitor"
-#: ../../Xconfigurator.pm_.c:1002
+#: ../../Xconfigurator.pm_.c:1004
#, c-format
msgid "Keyboard layout: %s\n"
msgstr "Tastatur-oppsett: %s\n"
-#: ../../Xconfigurator.pm_.c:1003
+#: ../../Xconfigurator.pm_.c:1005
#, c-format
msgid "Mouse type: %s\n"
msgstr "Type mus: %s\n"
-#: ../../Xconfigurator.pm_.c:1004
+#: ../../Xconfigurator.pm_.c:1006
#, c-format
msgid "Mouse device: %s\n"
msgstr "Enhet mus: %s\n"
-#: ../../Xconfigurator.pm_.c:1005
+#: ../../Xconfigurator.pm_.c:1007
#, c-format
msgid "Monitor: %s\n"
msgstr "Monitor: %s\n"
-#: ../../Xconfigurator.pm_.c:1006
+#: ../../Xconfigurator.pm_.c:1008
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "Monitor HorizSync: %s\n"
-#: ../../Xconfigurator.pm_.c:1007
+#: ../../Xconfigurator.pm_.c:1009
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "Monitor VertRefresh: %s\n"
-#: ../../Xconfigurator.pm_.c:1008
+#: ../../Xconfigurator.pm_.c:1010
#, c-format
msgid "Graphic card: %s\n"
msgstr "Grafikk-kort: %s\n"
-#: ../../Xconfigurator.pm_.c:1009
+#: ../../Xconfigurator.pm_.c:1011
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr "Minne grafikk: %s kB\n"
-#: ../../Xconfigurator.pm_.c:1010
+#: ../../Xconfigurator.pm_.c:1012
#, c-format
msgid "XFree86 server: %s\n"
msgstr "XFree86-tjener: %s\n"
-#: ../../Xconfigurator.pm_.c:1025
+#: ../../Xconfigurator.pm_.c:1027
msgid "Preparing X-Window configuration"
msgstr "Forbereder X-Window konfigurasjon"
-#: ../../Xconfigurator.pm_.c:1039
+#: ../../Xconfigurator.pm_.c:1041
msgid "Change Monitor"
msgstr "Endre monitor"
-#: ../../Xconfigurator.pm_.c:1040
+#: ../../Xconfigurator.pm_.c:1042
msgid "Change Graphic card"
msgstr "Endre grafikk-kort"
-#: ../../Xconfigurator.pm_.c:1041
+#: ../../Xconfigurator.pm_.c:1043
msgid "Change Server options"
msgstr "Endre opsjoner for tjener"
-#: ../../Xconfigurator.pm_.c:1042
+#: ../../Xconfigurator.pm_.c:1044
msgid "Change Resolution"
msgstr "Endre oppløsning"
-#: ../../Xconfigurator.pm_.c:1043
+#: ../../Xconfigurator.pm_.c:1045
msgid "Automatical resolutions search"
msgstr "Automatisk oppløsningssøk"
-#: ../../Xconfigurator.pm_.c:1047
+#: ../../Xconfigurator.pm_.c:1049
msgid "Show information"
msgstr "Vis informasjon"
-#: ../../Xconfigurator.pm_.c:1048
+#: ../../Xconfigurator.pm_.c:1050
msgid "Test again"
msgstr "Test igjen"
-#: ../../Xconfigurator.pm_.c:1049 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:1051 ../../standalone/rpmdrake_.c:46
msgid "Quit"
msgstr "Avslutt"
-#: ../../Xconfigurator.pm_.c:1053 ../../standalone/drakboot_.c:39
+#: ../../Xconfigurator.pm_.c:1055 ../../standalone/drakboot_.c:39
msgid "What do you want to do?"
msgstr "Hva ønsker du å gjøre?"
-#: ../../Xconfigurator.pm_.c:1060
+#: ../../Xconfigurator.pm_.c:1062
msgid "Forget the changes?"
msgstr "Glem endringene?"
-#: ../../Xconfigurator.pm_.c:1078
+#: ../../Xconfigurator.pm_.c:1080
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr "Vennligst logg inn i %s på nytt for å aktivere endringene"
-#: ../../Xconfigurator.pm_.c:1094
+#: ../../Xconfigurator.pm_.c:1096
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "Vennligst logg ut og bruk så Ctrl-Alt-BackSpace"
-#: ../../Xconfigurator.pm_.c:1097
+#: ../../Xconfigurator.pm_.c:1099
msgid "X at startup"
msgstr "X ved oppstart"
-#: ../../Xconfigurator.pm_.c:1098
+#: ../../Xconfigurator.pm_.c:1100
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -310,11 +310,11 @@ msgstr ""
"Jeg kan sette opp maskinen din til å automatisk starte X ved oppstart.\n"
"Vil du at X skal starte når du starter maskinen på nytt?"
-#: ../../Xconfigurator.pm_.c:1109
+#: ../../Xconfigurator.pm_.c:1112
msgid "Autologin"
msgstr "Autoinnlogg"
-#: ../../Xconfigurator.pm_.c:1110
+#: ../../Xconfigurator.pm_.c:1113
msgid ""
"I can set up your computer to automatically log on one user.\n"
"If you don't want to use this feature, click on the cancel button."
@@ -322,7 +322,7 @@ msgstr ""
"Jeg kan sette opp maskinen din til å automatisk logge på en bruker.\n"
"Ønsker du å bruke denne funksjonen?"
-#: ../../Xconfigurator.pm_.c:1112
+#: ../../Xconfigurator.pm_.c:1115
msgid "Choose the default user:"
msgstr "Velg standard bruker :"
@@ -507,16 +507,12 @@ msgstr "Skjermmodus"
msgid "Delay before booting default image"
msgstr "Forsinkelse før oppstart av standard bilde"
-#: ../../any.pm_.c:128 ../../install_steps_interactive.pm_.c:597
-#: ../../install_steps_interactive.pm_.c:721
-#: ../../install_steps_interactive.pm_.c:772 ../../printerdrake.pm_.c:85
+#: ../../any.pm_.c:128 ../../netconnect.pm_.c:482 ../../printerdrake.pm_.c:85
#: ../../printerdrake.pm_.c:110 ../../standalone/adduserdrake_.c:42
msgid "Password"
msgstr "Passord"
-#: ../../any.pm_.c:129 ../../install_steps_interactive.pm_.c:722
-#: ../../install_steps_interactive.pm_.c:773
-#: ../../standalone/adduserdrake_.c:43
+#: ../../any.pm_.c:129 ../../standalone/adduserdrake_.c:43
msgid "Password (again)"
msgstr "Passord (igjen)"
@@ -538,15 +534,11 @@ msgid ""
msgstr ""
"Opsjon ``Begrense kommandolinje-opsjoner'' kan ikke brukes uten et passord"
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:731
-#: ../../install_steps_interactive.pm_.c:786
-#: ../../standalone/adduserdrake_.c:56
+#: ../../any.pm_.c:140 ../../standalone/adduserdrake_.c:56
msgid "Please try again"
msgstr "Vennligst prøv igjen"
-#: ../../any.pm_.c:140 ../../install_steps_interactive.pm_.c:731
-#: ../../install_steps_interactive.pm_.c:786
-#: ../../standalone/adduserdrake_.c:56
+#: ../../any.pm_.c:140 ../../standalone/adduserdrake_.c:56
msgid "The passwords do not match"
msgstr "Passordene stemmer ikke overens"
@@ -558,13 +550,12 @@ msgstr ""
"Her er de forskjellige oppføringene.\n"
"Du kan legge til flere eller endre de eksisterende."
-#: ../../any.pm_.c:159 ../../printerdrake.pm_.c:244
+#: ../../any.pm_.c:159 ../../printerdrake.pm_.c:245
#: ../../standalone/rpmdrake_.c:302
msgid "Add"
msgstr "Legg til"
-#: ../../any.pm_.c:159 ../../diskdrake.pm_.c:44
-#: ../../install_steps_interactive.pm_.c:766 ../../printerdrake.pm_.c:244
+#: ../../any.pm_.c:159 ../../diskdrake.pm_.c:44 ../../printerdrake.pm_.c:245
#: ../../standalone/adduserdrake_.c:36
msgid "Done"
msgstr "Ferdig"
@@ -621,12 +612,12 @@ msgstr "Etikett"
msgid "Default"
msgstr "Standard"
-#: ../../any.pm_.c:213 ../../install_steps_gtk.pm_.c:577
-#: ../../install_steps_interactive.pm_.c:719 ../../interactive.pm_.c:74
-#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:234
-#: ../../interactive_newt.pm_.c:49 ../../interactive_newt.pm_.c:98
-#: ../../interactive_stdio.pm_.c:27 ../../my_gtk.pm_.c:204
-#: ../../my_gtk.pm_.c:463 ../../my_gtk.pm_.c:638 ../../printerdrake.pm_.c:271
+#: ../../any.pm_.c:213 ../../install_steps_gtk.pm_.c:580
+#: ../../interactive.pm_.c:74 ../../interactive.pm_.c:84
+#: ../../interactive.pm_.c:234 ../../interactive_newt.pm_.c:49
+#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
+#: ../../my_gtk.pm_.c:204 ../../my_gtk.pm_.c:463 ../../my_gtk.pm_.c:638
+#: ../../printerdrake.pm_.c:272
msgid "Ok"
msgstr "Ok"
@@ -920,9 +911,8 @@ msgstr "Vær forsiktig: denne operasjonen er farlig."
# #: ../install_steps_interactive.pm_.c:37
#: ../../diskdrake.pm_.c:200 ../../install_steps.pm_.c:75
-#: ../../install_steps_interactive.pm_.c:42
-#: ../../install_steps_interactive.pm_.c:210 ../../standalone/diskdrake_.c:60
-#: ../../standalone/rpmdrake_.c:294 ../../standalone/rpmdrake_.c:304
+#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
+#: ../../standalone/rpmdrake_.c:304
msgid "Error"
msgstr "Feil"
@@ -1176,7 +1166,7 @@ msgstr "Formatering"
msgid "Formatting loopback file %s"
msgstr "Formaterer loopback-fil %s"
-#: ../../diskdrake.pm_.c:516 ../../install_steps_interactive.pm_.c:296
+#: ../../diskdrake.pm_.c:516
#, c-format
msgid "Formatting partition %s"
msgstr "Formaterer partisjon %s"
@@ -1222,12 +1212,12 @@ msgstr "Partisjonstabellen på disk %s blir nå skrevet til disk!"
msgid "You'll need to reboot before the modification can take place"
msgstr "Du må starte maskinen på nytt for at modifiseringene skal tre i kraft"
-#: ../../diskdrake.pm_.c:566 ../../install_interactive.pm_.c:67
+#: ../../diskdrake.pm_.c:566 ../../install_interactive.pm_.c:68
msgid "Computing FAT filesystem bounds"
msgstr "Beregner fat filsystemgrense"
#: ../../diskdrake.pm_.c:566 ../../diskdrake.pm_.c:620
-#: ../../install_interactive.pm_.c:67
+#: ../../install_interactive.pm_.c:68
msgid "Resizing"
msgstr "Endrer størrelse"
@@ -2344,7 +2334,7 @@ msgstr "Konfigurer mus"
msgid "Choose your keyboard"
msgstr "Velg tastatur"
-#: ../../install2.pm_.c:48 ../../install_steps_interactive.pm_.c:366
+#: ../../install2.pm_.c:48
msgid "Miscellaneous"
msgstr "Forskjellig"
@@ -2384,8 +2374,7 @@ msgstr "Konfigurer tjenester"
msgid "Configure printer"
msgstr "Konfigurer skriver"
-#: ../../install2.pm_.c:58 ../../install_steps_interactive.pm_.c:719
-#: ../../install_steps_interactive.pm_.c:720
+#: ../../install2.pm_.c:58
msgid "Set root password"
msgstr "Sett root-passord"
@@ -2413,55 +2402,55 @@ msgstr "Diskett autoinstallering"
msgid "Exit install"
msgstr "Avslutt installering"
-#: ../../install_any.pm_.c:567
+#: ../../install_any.pm_.c:568
msgid "Error reading file $f"
msgstr "Feil ved lesing av fil $f"
-#: ../../install_interactive.pm_.c:33
+#: ../../install_interactive.pm_.c:34
msgid "Use free space"
msgstr "Bruk ledig plass"
-#: ../../install_interactive.pm_.c:35
+#: ../../install_interactive.pm_.c:36
msgid "Not enough free space to allocate new partitions"
msgstr "Ikke nok plass til å allokere en ny partisjon"
-#: ../../install_interactive.pm_.c:41
+#: ../../install_interactive.pm_.c:42
msgid "Use existing partition"
msgstr "Bruk eksisterende partisjon"
-#: ../../install_interactive.pm_.c:43
+#: ../../install_interactive.pm_.c:44
msgid "There is no existing partition to use"
msgstr "Det finnes ingen eksisterende partisjon som kan brukes"
-#: ../../install_interactive.pm_.c:50
+#: ../../install_interactive.pm_.c:51
msgid "Use the FAT partition for loopback"
msgstr "Bruk FAT partisjonen for loopback"
-#: ../../install_interactive.pm_.c:53
+#: ../../install_interactive.pm_.c:54
msgid "Which partition do you want to use to put Linux4Win?"
msgstr "Hvilken partisjon vil du bruke til å plassere Linux4Win?"
-#: ../../install_interactive.pm_.c:54
+#: ../../install_interactive.pm_.c:55
msgid "Choose the sizes"
msgstr "Velg størrelsene"
-#: ../../install_interactive.pm_.c:55
+#: ../../install_interactive.pm_.c:56
msgid "Root partition size in MB: "
msgstr "Root-partisjonsstørrelse i MB: "
-#: ../../install_interactive.pm_.c:56
+#: ../../install_interactive.pm_.c:57
msgid "Swap partition size in MB: "
msgstr "Veksel-partisjonsstørrelse i MB: "
-#: ../../install_interactive.pm_.c:64
+#: ../../install_interactive.pm_.c:65
msgid "Use the free space on the FAT partition"
msgstr "Bruk den ledige plassen på FAT partisjonen"
-#: ../../install_interactive.pm_.c:66
+#: ../../install_interactive.pm_.c:67
msgid "Which partition do you want to resize?"
msgstr "Hvilken partisjonstype ønsker du å forandre størrelse på?"
-#: ../../install_interactive.pm_.c:69
+#: ../../install_interactive.pm_.c:70
#, c-format
msgid ""
"The FAT resizer is unable to handle your partition, \n"
@@ -2470,12 +2459,12 @@ msgstr ""
"Størrelsesendreren for FAT greide ikke å håndtere din partisjon, \n"
"følgende feil oppsto: %s"
-#: ../../install_interactive.pm_.c:72
+#: ../../install_interactive.pm_.c:73
msgid "Your windows partition is too fragmented, please run ``defrag'' first"
msgstr ""
"Windows-partisjonen din er for fragmentert, vennligst kjør ``defrag'' først"
-#: ../../install_interactive.pm_.c:73
+#: ../../install_interactive.pm_.c:74
msgid ""
"WARNING!\n"
"\n"
@@ -2495,21 +2484,21 @@ msgstr ""
"dine data.\n"
"Når du er sikker, trykk Ok."
-#: ../../install_interactive.pm_.c:82
+#: ../../install_interactive.pm_.c:83
msgid "Which size do you want to keep for windows on"
msgstr "Hvilken størrelse ønsker du å beholde vinduer på?"
-#: ../../install_interactive.pm_.c:83
+#: ../../install_interactive.pm_.c:84
#, c-format
msgid "partition %s"
msgstr "partisjon %s"
-#: ../../install_interactive.pm_.c:89
+#: ../../install_interactive.pm_.c:90
#, c-format
msgid "FAT resizing failed: %s"
msgstr "Krymping/forstørring av FAT feilet: %s"
-#: ../../install_interactive.pm_.c:104
+#: ../../install_interactive.pm_.c:105
msgid ""
"There is no FAT partitions to resize or to use as loopback (or not enough "
"space left)"
@@ -2517,28 +2506,28 @@ msgstr ""
"Det finnes ingen FAT partisjon å forandre størrelsen på eller å brukes som "
"loopback (ikke nok plass igjen)"
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:111
msgid "Remove Windows(TM)"
msgstr "Fjern Windows(TM)"
-#: ../../install_interactive.pm_.c:110
+#: ../../install_interactive.pm_.c:111
msgid "Take over the hard drive"
msgstr "Ta over harddisken"
-#: ../../install_interactive.pm_.c:112
+#: ../../install_interactive.pm_.c:113
msgid "You have more than one hard drive, which one do you install linux on?"
msgstr "Du har mer enn en harddisk, hvilken ønsker du å installere linux på?"
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:115
#, c-format
msgid "All existing partitions and their data will be lost on drive %s"
msgstr "Alle eksisterende partisjoner og deres data vil være tapt på disk %s"
-#: ../../install_interactive.pm_.c:123
+#: ../../install_interactive.pm_.c:124
msgid "Use diskdrake"
msgstr "Bruk diskdrake"
-#: ../../install_interactive.pm_.c:131
+#: ../../install_interactive.pm_.c:132
msgid ""
"You must have a root partition.\n"
"For this, create a partition (or click on an existing one).\n"
@@ -2548,11 +2537,11 @@ msgstr ""
"Opprett en partisjon for dette (eller klikk på en eksisterende).\n"
"Velg så ``Monteringspunkt'' og sett dette til `/'"
-#: ../../install_interactive.pm_.c:136 ../../install_steps_graphical.pm_.c:259
+#: ../../install_interactive.pm_.c:137 ../../install_steps_graphical.pm_.c:259
msgid "You must have a swap partition"
msgstr "Du må ha en vekslingspartisjon"
-#: ../../install_interactive.pm_.c:137 ../../install_steps_graphical.pm_.c:261
+#: ../../install_interactive.pm_.c:138 ../../install_steps_graphical.pm_.c:261
msgid ""
"You don't have a swap partition\n"
"\n"
@@ -2562,11 +2551,11 @@ msgstr ""
"\n"
"Fortsette likevel?"
-#: ../../install_interactive.pm_.c:145
+#: ../../install_interactive.pm_.c:146
msgid "Use fdisk"
msgstr "Bruk fdisk"
-#: ../../install_interactive.pm_.c:148
+#: ../../install_interactive.pm_.c:149
#, c-format
msgid ""
"You can now partition %s.\n"
@@ -2575,51 +2564,123 @@ msgstr ""
"Du kan nå partisjonere din %s harddisk\n"
"Når du er ferdig glem ikke å lagre med `w'"
+#: ../../install_interactive.pm_.c:167
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Installerer driver for %s kort %s"
+
#: ../../install_interactive.pm_.c:168
-msgid "Try to find PCMCIA cards?"
-msgstr "Prøve å finne PCMCIA kort?"
+#, c-format
+msgid "(module %s)"
+msgstr "(modul %s)"
+
+#: ../../install_interactive.pm_.c:178
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Hvilken %s driver skal jeg prøve?"
+
+#: ../../install_interactive.pm_.c:186
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"I noen tilfeller trenger %s driveren å ha ekstra informasjon for å virke\n"
+"ordentlig, selv om den normalt virker fint foruten. Ønsker du å spesifisere "
+"ekstra\n"
+"opsjoner for den eller tillate driveren å sondere maskinen din for\n"
+"informasjonen den trenger? Av og til vil sondering stoppe maskinen, men "
+"burde\n"
+"ikke forårsake noen skader."
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:191
+msgid "Autoprobe"
+msgstr "Automatisk sondering"
+
+#: ../../install_interactive.pm_.c:191
+msgid "Specify options"
+msgstr "Spesifiser opsjoner"
+
+#: ../../install_interactive.pm_.c:195
+#, c-format
+msgid "You may now provide its options to module %s."
+msgstr "Du kan nå gi dens opsjoner til modul %s."
+
+#: ../../install_interactive.pm_.c:201
+#, c-format
+msgid ""
+"You may now provide its options to module %s.\n"
+"Options are in format ``name=value name2=value2 ...''.\n"
+"For instance, ``io=0x300 irq=7''"
+msgstr ""
+"Du kan nå oppgi dens opsjoner for modul %s.\n"
+"Opsjonene er i format ``name=value name2=value2 ...''.\n"
+"F.eks., ``io=0x300 irq=7''"
+
+#: ../../install_interactive.pm_.c:204
+msgid "Module options:"
+msgstr "Modulopsjoner:"
+
+#: ../../install_interactive.pm_.c:214
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Lasting av modul %s feilet.\n"
+"Ønsker du å prøve igjen med andre parametere?"
+
+#: ../../install_interactive.pm_.c:225
msgid "Configuring PCMCIA cards..."
msgstr "Konfigurerer PCMCIA kort..."
-#: ../../install_interactive.pm_.c:169
+#: ../../install_interactive.pm_.c:225
msgid "PCMCIA"
msgstr "PCMCIA"
-#: ../../install_interactive.pm_.c:181
-#, c-format
-msgid "Try to find %s devices?"
-msgstr "Prøve å finne %s enheter?"
-
-#: ../../install_interactive.pm_.c:193
+#: ../../install_interactive.pm_.c:247
#, c-format
msgid "Found %s %s interfaces"
msgstr "Fant %s %s grensesnitt"
-#: ../../install_interactive.pm_.c:194
+#: ../../install_interactive.pm_.c:248
msgid "Do you have another one?"
msgstr "Har du enda ett?"
-#: ../../install_interactive.pm_.c:195
+#: ../../install_interactive.pm_.c:249
#, c-format
msgid "Do you have any %s interfaces?"
msgstr "Har du noen %s grensesnitt?"