summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2000-04-29 20:30:02 +0000
committerPablo Saratxaga <pablo@mandriva.com>2000-04-29 20:30:02 +0000
commit78f64fcca97f13790d819de197c79dd7411b4eb5 (patch)
treedf2ef5abe6ddc3bb7174617a9f87c234f23da775 /perl-install
parentab28ec65a32b4d238e489b5061578d900ace5d66 (diff)
downloaddrakx-backup-do-not-use-78f64fcca97f13790d819de197c79dd7411b4eb5.tar
drakx-backup-do-not-use-78f64fcca97f13790d819de197c79dd7411b4eb5.tar.gz
drakx-backup-do-not-use-78f64fcca97f13790d819de197c79dd7411b4eb5.tar.bz2
drakx-backup-do-not-use-78f64fcca97f13790d819de197c79dd7411b4eb5.tar.xz
drakx-backup-do-not-use-78f64fcca97f13790d819de197c79dd7411b4eb5.zip
Updated po files with pot.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/share/po/DrakX.pot419
-rw-r--r--perl-install/share/po/no.po508
-rw-r--r--perl-install/share/po/sp.po441
3 files changed, 716 insertions, 652 deletions
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index a072afd79..49713a121 100644
--- a/perl-install/share/po/DrakX.pot
+++ b/perl-install/share/po/DrakX.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-04-27 12:04+0200\n"
+"POT-Creation-Date: 2000-04-29 20:57+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: ENCODING\n"
-#: ../../Xconfigurator.pm_.c:116 ../../Xconfigurator.pm_.c:229
+#: ../../Xconfigurator.pm_.c:116 ../../Xconfigurator.pm_.c:234
msgid "Generic"
msgstr ""
@@ -38,19 +38,19 @@ msgstr ""
msgid "Select the memory size of your graphic card"
msgstr ""
-#: ../../Xconfigurator.pm_.c:211
+#: ../../Xconfigurator.pm_.c:216
msgid "Choose options for server"
msgstr ""
-#: ../../Xconfigurator.pm_.c:229
+#: ../../Xconfigurator.pm_.c:234
msgid "Choose a monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:229
+#: ../../Xconfigurator.pm_.c:234
msgid "Monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:232
+#: ../../Xconfigurator.pm_.c:237
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -64,214 +64,214 @@ msgid ""
" If in doubt, choose a conservative setting."
msgstr ""
-#: ../../Xconfigurator.pm_.c:239 ../../t.pm_.c:41
+#: ../../Xconfigurator.pm_.c:244
msgid "Horizontal refresh rate"
msgstr ""
-#: ../../Xconfigurator.pm_.c:239 ../../t.pm_.c:41
+#: ../../Xconfigurator.pm_.c:244
msgid "Vertical refresh rate"
msgstr ""
-#: ../../Xconfigurator.pm_.c:281
+#: ../../Xconfigurator.pm_.c:286
msgid "Monitor not configured"
msgstr ""
-#: ../../Xconfigurator.pm_.c:284
+#: ../../Xconfigurator.pm_.c:289
msgid "Graphic card not configured yet"
msgstr ""
-#: ../../Xconfigurator.pm_.c:287
+#: ../../Xconfigurator.pm_.c:292
msgid "Resolutions not chosen yet"
msgstr ""
-#: ../../Xconfigurator.pm_.c:298
+#: ../../Xconfigurator.pm_.c:303
msgid "Do you want to test the configuration?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:302
+#: ../../Xconfigurator.pm_.c:307
msgid "Warning: testing is dangerous on this graphic card"
msgstr ""
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:310
msgid "Test of the configuration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:344
+#: ../../Xconfigurator.pm_.c:349
msgid ""
"\n"
"try to change some parameters"
msgstr ""
-#: ../../Xconfigurator.pm_.c:344
+#: ../../Xconfigurator.pm_.c:349
msgid "An error has occurred:"
msgstr ""
-#: ../../Xconfigurator.pm_.c:367
+#: ../../Xconfigurator.pm_.c:372
#, c-format
msgid "Leaving in %d seconds"
msgstr ""
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:376
msgid "Is this the correct setting?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:379
+#: ../../Xconfigurator.pm_.c:384
msgid "An error has occurred, try to change some parameters"
msgstr ""
-#: ../../Xconfigurator.pm_.c:387 ../../Xconfigurator.pm_.c:560
+#: ../../Xconfigurator.pm_.c:392 ../../Xconfigurator.pm_.c:565
msgid "Automatic resolutions"
msgstr ""
-#: ../../Xconfigurator.pm_.c:388
+#: ../../Xconfigurator.pm_.c:393
msgid ""
"To find the available resolutions I will try different ones.\n"
"Your screen will blink...\n"
"You can switch if off if you want, you'll hear a beep when it's over"
msgstr ""
-#: ../../Xconfigurator.pm_.c:443 ../../printerdrake.pm_.c:165
+#: ../../Xconfigurator.pm_.c:448 ../../printerdrake.pm_.c:165
msgid "Resolution"
msgstr ""
-#: ../../Xconfigurator.pm_.c:478
+#: ../../Xconfigurator.pm_.c:483
msgid "Choose the resolution and the color depth"
msgstr ""
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:485
#, c-format
msgid "Graphic card: %s"
msgstr ""
-#: ../../Xconfigurator.pm_.c:481
+#: ../../Xconfigurator.pm_.c:486
#, c-format
msgid "XFree86 server: %s"
msgstr ""
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:495
msgid "Show all"
msgstr ""
-#: ../../Xconfigurator.pm_.c:514
+#: ../../Xconfigurator.pm_.c:519
msgid "Resolutions"
msgstr ""
-#: ../../Xconfigurator.pm_.c:561
+#: ../../Xconfigurator.pm_.c:566
msgid ""
"I can try to find the available resolutions (eg: 800x600).\n"
"Sometimes, though, it may hang the machine.\n"
"Do you want to try?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:566
+#: ../../Xconfigurator.pm_.c:571
msgid ""
"No valid modes found\n"
"Try with another video card or monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:906
+#: ../../Xconfigurator.pm_.c:911
#, c-format
msgid "Keyboard layout: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:907
+#: ../../Xconfigurator.pm_.c:912
#, c-format
msgid "Mouse type: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:908
+#: ../../Xconfigurator.pm_.c:913
#, c-format
msgid "Mouse device: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:909
+#: ../../Xconfigurator.pm_.c:914
#, c-format
msgid "Monitor: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:910
+#: ../../Xconfigurator.pm_.c:915
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:911
+#: ../../Xconfigurator.pm_.c:916
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:912
+#: ../../Xconfigurator.pm_.c:917
#, c-format
msgid "Graphic card: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:913
+#: ../../Xconfigurator.pm_.c:918
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:914
+#: ../../Xconfigurator.pm_.c:919
#, c-format
msgid "XFree86 server: %s\n"
msgstr ""
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:934
msgid "Preparing X-Window configuration"
msgstr ""
-#: ../../Xconfigurator.pm_.c:943
+#: ../../Xconfigurator.pm_.c:948
msgid "Change Monitor"
msgstr ""
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:949
msgid "Change Graphic card"
msgstr ""
-#: ../../Xconfigurator.pm_.c:945
+#: ../../Xconfigurator.pm_.c:950
msgid "Change Server options"
msgstr ""
-#: ../../Xconfigurator.pm_.c:946
+#: ../../Xconfigurator.pm_.c:951
msgid "Change Resolution"
msgstr ""
-#: ../../Xconfigurator.pm_.c:947
+#: ../../Xconfigurator.pm_.c:952
msgid "Automatical resolutions search"
msgstr ""
-#: ../../Xconfigurator.pm_.c:951
+#: ../../Xconfigurator.pm_.c:956
msgid "Show information"
msgstr ""
-#: ../../Xconfigurator.pm_.c:952
+#: ../../Xconfigurator.pm_.c:957
msgid "Test again"
msgstr ""
-#: ../../Xconfigurator.pm_.c:953 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:958 ../../standalone/rpmdrake_.c:46
msgid "Quit"
msgstr ""
-#: ../../Xconfigurator.pm_.c:957 ../../standalone/drakboot_.c:30
+#: ../../Xconfigurator.pm_.c:962 ../../standalone/drakboot_.c:30
msgid "What do you want to do?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:964
+#: ../../Xconfigurator.pm_.c:969
msgid "Forget the changes?"
msgstr ""
-#: ../../Xconfigurator.pm_.c:982
+#: ../../Xconfigurator.pm_.c:987
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr ""
-#: ../../Xconfigurator.pm_.c:998
+#: ../../Xconfigurator.pm_.c:1003
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1001
+#: ../../Xconfigurator.pm_.c:1006
msgid "X at startup"
msgstr ""
-#: ../../Xconfigurator.pm_.c:1002
+#: ../../Xconfigurator.pm_.c:1007
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -297,79 +297,79 @@ msgstr ""
msgid "4 billion colors (32 bits)"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:95
+#: ../../Xconfigurator_consts.pm_.c:103
msgid "256 kB"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:96
+#: ../../Xconfigurator_consts.pm_.c:104
msgid "512 kB"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:97
+#: ../../Xconfigurator_consts.pm_.c:105
msgid "1 MB"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:98
+#: ../../Xconfigurator_consts.pm_.c:106
msgid "2 MB"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:99
+#: ../../Xconfigurator_consts.pm_.c:107
msgid "4 MB"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:100
+#: ../../Xconfigurator_consts.pm_.c:108
msgid "8 MB"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:101
+#: ../../Xconfigurator_consts.pm_.c:109
msgid "16 MB or more"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:106 ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
msgid "Standard VGA, 640x480 at 60 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:116
msgid "Super VGA, 800x600 at 56 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:117
msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:110
+#: ../../Xconfigurator_consts.pm_.c:118
msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:111
+#: ../../Xconfigurator_consts.pm_.c:119
msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:112
+#: ../../Xconfigurator_consts.pm_.c:120
msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:113
+#: ../../Xconfigurator_consts.pm_.c:121
msgid "High Frequency SVGA, 1024x768 at 70 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:114
+#: ../../Xconfigurator_consts.pm_.c:122
msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:123
msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:124
msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:125
msgid "Monitor that can do 1600x1200 at 70 Hz"
msgstr ""
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:126
msgid "Monitor that can do 1600x1200 at 76 Hz"
msgstr ""
@@ -470,7 +470,7 @@ msgid "restrict"
msgstr ""
#: ../../any.pm_.c:93
-msgid "LILO main options"
+msgid "Bootloader main options"
msgstr ""
#: ../../any.pm_.c:96 ../../install_steps_interactive.pm_.c:798
@@ -494,7 +494,7 @@ msgstr ""
#: ../../any.pm_.c:107
msgid ""
-"Here are the following entries in LILO.\n"
+"Here are the different entries.\n"
"You can add some more or change the existing ones."
msgstr ""
@@ -559,7 +559,7 @@ msgstr ""
msgid "Default"
msgstr ""
-#: ../../any.pm_.c:158 ../../install_steps_gtk.pm_.c:654
+#: ../../any.pm_.c:158 ../../install_steps_gtk.pm_.c:664
#: ../../install_steps_interactive.pm_.c:629
#: ../../install_steps_interactive.pm_.c:852 ../../interactive.pm_.c:74
#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
@@ -741,8 +741,8 @@ msgstr ""
msgid "Be careful: this operation is dangerous."
msgstr ""
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:311
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
+#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:312
+#: ../../install_steps.pm_.c:75 ../../install_steps_interactive.pm_.c:40
#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
#: ../../standalone/rpmdrake_.c:304
msgid "Error"
@@ -1012,12 +1012,12 @@ msgstr ""
msgid "You'll need to reboot before the modification can take place"
msgstr ""
-#: ../../diskdrake.pm_.c:561 ../../install_steps_gtk.pm_.c:206
+#: ../../diskdrake.pm_.c:561 ../../install_steps_gtk.pm_.c:208
msgid "Computing FAT filesystem bounds"
msgstr ""
#: ../../diskdrake.pm_.c:561 ../../diskdrake.pm_.c:610
-#: ../../install_steps_gtk.pm_.c:206
+#: ../../install_steps_gtk.pm_.c:208
msgid "Resizing"
msgstr ""
@@ -1034,7 +1034,8 @@ msgstr ""
msgid "Choose the new size"
msgstr ""
-#: ../../diskdrake.pm_.c:589
+#: ../../diskdrake.pm_.c:589 ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
msgid "MB"
msgstr ""
@@ -1058,7 +1059,7 @@ msgstr ""
msgid "Preference: "
msgstr ""
-#: ../../diskdrake.pm_.c:721 ../../install_steps.pm_.c:130
+#: ../../diskdrake.pm_.c:721 ../../install_steps.pm_.c:131
msgid "This partition can't be used for loopback"
msgstr ""
@@ -1780,60 +1781,60 @@ msgid ""
"Then choose action ``Mount point'' and set it to `/'"
msgstr ""
-#: ../../install_any.pm_.c:312 ../../standalone/diskdrake_.c:61
+#: ../../install_any.pm_.c:313 ../../standalone/diskdrake_.c:61
msgid ""
"I can't read your partition table, it's too corrupted for me :(\n"
"I'll try to go on blanking bad partitions"
msgstr ""
-#: ../../install_any.pm_.c:329
+#: ../../install_any.pm_.c:330
msgid ""
"DiskDrake failed to read correctly the partition table.\n"
"Continue at your own risk!"
msgstr ""
-#: ../../install_any.pm_.c:346
+#: ../../install_any.pm_.c:352
msgid "Searching root partition."
msgstr ""
-#: ../../install_any.pm_.c:375
+#: ../../install_any.pm_.c:381
msgid "Information"
msgstr ""
-#: ../../install_any.pm_.c:376
+#: ../../install_any.pm_.c:382
#, c-format
msgid "%s: This is not a root partition, please select another one."
msgstr ""
-#: ../../install_any.pm_.c:378
+#: ../../install_any.pm_.c:384
msgid "No root partition found"
msgstr ""
-#: ../../install_any.pm_.c:416
+#: ../../install_any.pm_.c:422
msgid "Can't use broadcast with no NIS domain"
msgstr ""
-#: ../../install_any.pm_.c:578
+#: ../../install_any.pm_.c:584
msgid "Error reading file $f"
msgstr ""
-#: ../../install_steps.pm_.c:75
+#: ../../install_steps.pm_.c:76
msgid ""
"An error occurred, but I don't know how to handle it nicely.\n"
"Continue at your own risk."
msgstr ""
-#: ../../install_steps.pm_.c:171
+#: ../../install_steps.pm_.c:173
#, c-format
msgid "Duplicate mount point %s"
msgstr ""
-#: ../../install_steps.pm_.c:371
+#: ../../install_steps.pm_.c:378
#, c-format
msgid "Welcome to %s"
msgstr ""
-#: ../../install_steps.pm_.c:715
+#: ../../install_steps.pm_.c:720
msgid "No floppy drive available"
msgstr ""
@@ -1843,19 +1844,104 @@ msgstr ""
msgid "Entering step `%s'\n"
msgstr ""
+#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:249
+msgid "You must have a swap partition"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:251
+msgid ""
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:287
+msgid "Choose the size you want to install"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:334
+msgid "Total size: "
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:447
+#: ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:448
+#: ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:360
+msgid "Choose the packages you want to install"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:363
+msgid "Info"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:368
+#: ../../install_steps_interactive.pm_.c:124 ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:526
+#: ../../install_steps_interactive.pm_.c:361
+msgid "Installing"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:532
+msgid "Please wait, "
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:534
+msgid "Time remaining "
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:535
+msgid "Total time "
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:544
+#: ../../install_steps_interactive.pm_.c:361
+msgid "Preparing installation"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:559
+#, c-format
+msgid "Installing package %s"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:597
+#: ../../install_steps_gtk.pm_.c:601
+msgid "Go on anyway?"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:597
+msgid "There was an error ordering packages:"
+msgstr ""
+
+#: ../../install_steps_graphical.pm_.c:577
+#: ../../install_steps_interactive.pm_.c:975
+msgid "Use existing configuration for X11?"
+msgstr ""
+
#: ../../install_steps_gtk.pm_.c:154
msgid "Please, choose one of the following classes of installation:"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:193
+#: ../../install_steps_gtk.pm_.c:195
msgid "You don't have any windows partitions!"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:195
+#: ../../install_steps_gtk.pm_.c:197
msgid "You don't have any enough room for Lnx4win"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:211
+#: ../../install_steps_gtk.pm_.c:213
msgid ""
"WARNING!\n"
"\n"
@@ -1867,44 +1953,33 @@ msgid ""
"When sure, press Ok."
msgstr ""
-#: ../../install_steps_gtk.pm_.c:230
+#: ../../install_steps_gtk.pm_.c:232
msgid "Automatic resizing failed"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:247
-msgid "You must have a swap partition"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:249
-msgid ""
-"You don't have a swap partition\n"
-"\n"
-"Continue anyway?"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:259
+#: ../../install_steps_gtk.pm_.c:261
msgid "Which partition do you want to use to put Linux4Win?"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:278
+#: ../../install_steps_gtk.pm_.c:280
msgid "Choose the sizes"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:280
+#: ../../install_steps_gtk.pm_.c:282
msgid "Root partition size in MB: "
msgstr ""
-#: ../../install_steps_gtk.pm_.c:282
+#: ../../install_steps_gtk.pm_.c:284
msgid "Swap partition size in MB: "
msgstr ""
-#: ../../install_steps_gtk.pm_.c:314
+#: ../../install_steps_gtk.pm_.c:316
#, c-format
msgid ""
"The total size for the groups you have selected is approximately %d MB.\n"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:316
+#: ../../install_steps_gtk.pm_.c:318
msgid ""
"If you wish to install less than this size,\n"
"select the percentage of packages that you want to install.\n"
@@ -1913,7 +1988,7 @@ msgid ""
"a percentage of 100%% will install all selected packages."
msgstr ""
-#: ../../install_steps_gtk.pm_.c:321
+#: ../../install_steps_gtk.pm_.c:323
msgid ""
"You have space on your disk for only %d%% of these packages.\n"
"\n"
@@ -1923,134 +1998,96 @@ msgid ""
"a percentage of %d%% will install as many packages as possible."
msgstr ""
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:329
msgid "You will be able to choose them more specifically in the next step."
msgstr ""
-#: ../../install_steps_gtk.pm_.c:329
+#: ../../install_steps_gtk.pm_.c:331
msgid "Percentage of packages to install"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:358
-msgid "Choose the packages you want to install"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:361
-msgid "Info"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:366 ../../install_steps_interactive.pm_.c:124
-#: ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:370
+#: ../../install_steps_gtk.pm_.c:372
msgid "Automatic dependencies"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:423 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:425 ../../standalone/rpmdrake_.c:101
msgid "Expand Tree"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:424 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:426 ../../standalone/rpmdrake_.c:102
msgid "Collapse Tree"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:425
+#: ../../install_steps_gtk.pm_.c:427
msgid "Toggle between flat and group sorted"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:443
+#: ../../install_steps_gtk.pm_.c:445
msgid "Bad package"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:444
+#: ../../install_steps_gtk.pm_.c:446
#, c-format
msgid "Name: %s\n"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:445 ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:446 ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:447
+#: ../../install_steps_gtk.pm_.c:449
#, c-format
msgid "Importance: %s\n"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:458
+#: ../../install_steps_gtk.pm_.c:460
#, c-format
msgid "Total size: %d / %d MB"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:469
+#: ../../install_steps_gtk.pm_.c:471
msgid "This is a mandatory package, it can't be unselected"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:473
msgid "You can't unselect this package. It is already installed"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:475
-msgid "The following packages are going to be installed/removed"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:484
-msgid "You can't select/unselect this package"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:516 ../../install_steps_interactive.pm_.c:361
-msgid "Installing"
+#: ../../install_steps_gtk.pm_.c:477
+msgid ""
+"This package must be upgraded\n"
+"Are you sure you want to deselect it?"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:519
-msgid "Estimating"
+#: ../../install_steps_gtk.pm_.c:480
+msgid "You can't unselect this package. It must be upgraded"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:522
-msgid "Please wait, "
+#: ../../install_steps_gtk.pm_.c:485
+msgid "The following packages are going to be installed/removed"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:524
-msgid "Time remaining "
+#: ../../install_steps_gtk.pm_.c:494
+msgid "You can't select/unselect this package"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:525
-msgid "Total time "
+#: ../../install_steps_gtk.pm_.c:529
+msgid "Estimating"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:531 ../../interactive.pm_.c:84
+#: ../../install_steps_gtk.pm_.c:541 ../../interactive.pm_.c:84
#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
#: ../../my_gtk.pm_.c:199 ../../my_gtk.pm_.c:457
msgid "Cancel"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:534 ../../install_steps_interactive.pm_.c:361
-msgid "Preparing installation"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:544
+#: ../../install_steps_gtk.pm_.c:554
#, c-format
msgid "%d packages"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:544
+#: ../../install_steps_gtk.pm_.c:554
msgid ", %U MB"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:549
-#, c-format
-msgid "Installing package %s"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:575
+#: ../../install_steps_gtk.pm_.c:585
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -2060,15 +2097,7 @@ msgid ""
"If you don't have it, press Cancel to avoid installation from this Cd-Rom."
msgstr ""
-#: ../../install_steps_gtk.pm_.c:587 ../../install_steps_gtk.pm_.c:591
-msgid "Go on anyway?"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:587
-msgid "There was an error ordering packages:"
-msgstr ""
-
-#: ../../install_steps_gtk.pm_.c:591
+#: ../../install_steps_gtk.pm_.c:601
msgid "There was an error installing packages:"
msgstr ""
@@ -2228,6 +2257,10 @@ msgstr ""
msgid "Finding packages to upgrade"
msgstr ""
+#: ../../install_steps_interactive.pm_.c:279
+msgid "Your system has not enough space left for installation or upgrade"
+msgstr ""
+
#: ../../install_steps_interactive.pm_.c:312
msgid "Package Group Selection"
msgstr ""
@@ -2557,7 +2590,7 @@ msgid "Shell"
msgstr ""
#: ../../install_steps_interactive.pm_.c:688
-#: ../../standalone/adduserdrake_.c:47 ../../t.pm_.c:41
+#: ../../standalone/adduserdrake_.c:47
msgid "Icon"
msgstr ""
@@ -2758,10 +2791,6 @@ msgstr ""
msgid "Can't use supermount in high security level"
msgstr ""
-#: ../../install_steps_interactive.pm_.c:975
-msgid "Use existing configuration for X11?"
-msgstr ""
-
#: ../../install_steps_interactive.pm_.c:980
msgid ""
"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
diff --git a/perl-install/share/po/no.po b/perl-install/share/po/no.po
index f550fa839..e82207222 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-04-27 12:04+0200\n"
+"POT-Creation-Date: 2000-04-29 20:57+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,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../Xconfigurator.pm_.c:116 ../../Xconfigurator.pm_.c:229
+#: ../../Xconfigurator.pm_.c:116 ../../Xconfigurator.pm_.c:234
msgid "Generic"
msgstr "Generisk"
@@ -37,19 +37,19 @@ msgstr "X-tjener"
msgid "Select the memory size of your graphic card"
msgstr "Velg minnestјrrelsen til grafikk-kortet ditt"
-#: ../../Xconfigurator.pm_.c:211
+#: ../../Xconfigurator.pm_.c:216
msgid "Choose options for server"
msgstr "Velg opsjoner for tjener"
-#: ../../Xconfigurator.pm_.c:229
+#: ../../Xconfigurator.pm_.c:234
msgid "Choose a monitor"
msgstr "Velg en monitor"
-#: ../../Xconfigurator.pm_.c:229
+#: ../../Xconfigurator.pm_.c:234
msgid "Monitor"
msgstr "Monitor"
-#: ../../Xconfigurator.pm_.c:232
+#: ../../Xconfigurator.pm_.c:237
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -73,39 +73,39 @@ msgstr ""
"skjermen din.\n"
"Hvis du er usikker, velg en konservativ innstilling."
-#: ../../Xconfigurator.pm_.c:239 ../../t.pm_.c:41
+#: ../../Xconfigurator.pm_.c:244
msgid "Horizontal refresh rate"
msgstr "Horisontal oppfrisknings-rate"
-#: ../../Xconfigurator.pm_.c:239 ../../t.pm_.c:41
+#: ../../Xconfigurator.pm_.c:244
msgid "Vertical refresh rate"
msgstr "Vertikal oppfrisknings-rate"
-#: ../../Xconfigurator.pm_.c:281
+#: ../../Xconfigurator.pm_.c:286
msgid "Monitor not configured"
msgstr "Monitor er ikke konfigurert"
-#: ../../Xconfigurator.pm_.c:284
+#: ../../Xconfigurator.pm_.c:289
msgid "Graphic card not configured yet"
msgstr "Grafikk-kort er ikke konfigurert ennх"
-#: ../../Xconfigurator.pm_.c:287
+#: ../../Xconfigurator.pm_.c:292
msgid "Resolutions not chosen yet"
msgstr "Opplјsninger er ikke valgt ennх"
-#: ../../Xconfigurator.pm_.c:298
+#: ../../Xconfigurator.pm_.c:303
msgid "Do you want to test the configuration?"
msgstr "Vil du teste konfigurasjonen?"
-#: ../../Xconfigurator.pm_.c:302
+#: ../../Xconfigurator.pm_.c:307
msgid "Warning: testing is dangerous on this graphic card"
msgstr "Advarsel: testing er farlig med dette grafikk-kortet"
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:310
msgid "Test of the configuration"
msgstr "Test konfigurasjon"
-#: ../../Xconfigurator.pm_.c:344
+#: ../../Xconfigurator.pm_.c:349
msgid ""
"\n"
"try to change some parameters"
@@ -113,28 +113,28 @@ msgstr ""
"\n"
"prјv х endre noen parametere"
-#: ../../Xconfigurator.pm_.c:344
+#: ../../Xconfigurator.pm_.c:349
msgid "An error has occurred:"
msgstr "En feil oppsto:"
-#: ../../Xconfigurator.pm_.c:367
+#: ../../Xconfigurator.pm_.c:372
#, c-format
msgid "Leaving in %d seconds"
msgstr "Slutter om %d sekunder"
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:376
msgid "Is this the correct setting?"
msgstr "Er dette den riktige innstillingen?"
-#: ../../Xconfigurator.pm_.c:379
+#: ../../Xconfigurator.pm_.c:384
msgid "An error has occurred, try to change some parameters"
msgstr "En feil oppsto, prјv х endre noen parametere"
-#: ../../Xconfigurator.pm_.c:387 ../../Xconfigurator.pm_.c:560
+#: ../../Xconfigurator.pm_.c:392 ../../Xconfigurator.pm_.c:565
msgid "Automatic resolutions"
msgstr "Automatiske opplјsninger"
-#: ../../Xconfigurator.pm_.c:388
+#: ../../Xconfigurator.pm_.c:393
msgid ""
"To find the available resolutions I will try different ones.\n"
"Your screen will blink...\n"
@@ -144,33 +144,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:443 ../../printerdrake.pm_.c:165
+#: ../../Xconfigurator.pm_.c:448 ../../printerdrake.pm_.c:165
msgid "Resolution"
msgstr "Opplјsning"
-#: ../../Xconfigurator.pm_.c:478
+#: ../../Xconfigurator.pm_.c:483
msgid "Choose the resolution and the color depth"
msgstr "Velg opplјsning og fargedybde"
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:485
#, c-format
msgid "Graphic card: %s"
msgstr "Grafikk-kort: %s"
-#: ../../Xconfigurator.pm_.c:481
+#: ../../Xconfigurator.pm_.c:486
#, c-format
msgid "XFree86 server: %s"
msgstr "XFree86-tjener: %s"
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:495
msgid "Show all"
msgstr "Vis alle"
-#: ../../Xconfigurator.pm_.c:514
+#: ../../Xconfigurator.pm_.c:519
msgid "Resolutions"
msgstr "Opplјsninger"
-#: ../../Xconfigurator.pm_.c:561
+#: ../../Xconfigurator.pm_.c:566
msgid ""
"I can try to find the available resolutions (eg: 800x600).\n"
"Sometimes, though, it may hang the machine.\n"
@@ -180,7 +180,7 @@ msgstr ""
"Noen ganger kan dette forхrsake at maskinen stopper opp.\n"
"иnsker du х prјve?"
-#: ../../Xconfigurator.pm_.c:566
+#: ../../Xconfigurator.pm_.c:571
msgid ""
"No valid modes found\n"
"Try with another video card or monitor"
@@ -188,109 +188,109 @@ msgstr ""
"Ingen gyldige modus funnet\n"
"Prјv med et annet skjermkort eller monitor"
-#: ../../Xconfigurator.pm_.c:906
+#: ../../Xconfigurator.pm_.c:911
#, c-format
msgid "Keyboard layout: %s\n"
msgstr "Tastatur-oppsett: %s\n"
-#: ../../Xconfigurator.pm_.c:907
+#: ../../Xconfigurator.pm_.c:912
#, c-format
msgid "Mouse type: %s\n"
msgstr "Type mus: %s\n"
-#: ../../Xconfigurator.pm_.c:908
+#: ../../Xconfigurator.pm_.c:913
#, c-format
msgid "Mouse device: %s\n"
msgstr "Enhet mus: %s\n"
-#: ../../Xconfigurator.pm_.c:909
+#: ../../Xconfigurator.pm_.c:914
#, c-format
msgid "Monitor: %s\n"
msgstr "Monitor: %s\n"
-#: ../../Xconfigurator.pm_.c:910
+#: ../../Xconfigurator.pm_.c:915
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "Monitor HorizSync: %s\n"
-#: ../../Xconfigurator.pm_.c:911
+#: ../../Xconfigurator.pm_.c:916
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "Monitor VertRefresh: %s\n"
-#: ../../Xconfigurator.pm_.c:912
+#: ../../Xconfigurator.pm_.c:917
#, c-format
msgid "Graphic card: %s\n"
msgstr "Grafikk-kort: %s\n"
-#: ../../Xconfigurator.pm_.c:913
+#: ../../Xconfigurator.pm_.c:918
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr "Minne grafikk: %s kB\n"
-#: ../../Xconfigurator.pm_.c:914
+#: ../../Xconfigurator.pm_.c:919
#, c-format
msgid "XFree86 server: %s\n"
msgstr "XFree86-tjener: %s\n"
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:934
msgid "Preparing X-Window configuration"
msgstr "Forbereder X-Window konfigurasjon"
-#: ../../Xconfigurator.pm_.c:943
+#: ../../Xconfigurator.pm_.c:948
msgid "Change Monitor"
msgstr "Endre monitor"
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:949
msgid "Change Graphic card"
msgstr "Endre grafikk-kort"
-#: ../../Xconfigurator.pm_.c:945
+#: ../../Xconfigurator.pm_.c:950
msgid "Change Server options"
msgstr "Endre opsjoner for tjener"
-#: ../../Xconfigurator.pm_.c:946
+#: ../../Xconfigurator.pm_.c:951
msgid "Change Resolution"
msgstr "Endre opplјsning"
-#: ../../Xconfigurator.pm_.c:947
+#: ../../Xconfigurator.pm_.c:952
msgid "Automatical resolutions search"
msgstr "Automatisk opplјsningssјk"
-#: ../../Xconfigurator.pm_.c:951
+#: ../../Xconfigurator.pm_.c:956
msgid "Show information"
msgstr "Vis informasjon"
-#: ../../Xconfigurator.pm_.c:952
+#: ../../Xconfigurator.pm_.c:957
msgid "Test again"
msgstr "Test igjen"
-#: ../../Xconfigurator.pm_.c:953 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:958 ../../standalone/rpmdrake_.c:46
msgid "Quit"
msgstr "Avslutt"
-#: ../../Xconfigurator.pm_.c:957 ../../standalone/drakboot_.c:30
+#: ../../Xconfigurator.pm_.c:962 ../../standalone/drakboot_.c:30
msgid "What do you want to do?"
msgstr "Hva јnsker du х gjјre?"
-#: ../../Xconfigurator.pm_.c:964
+#: ../../Xconfigurator.pm_.c:969
msgid "Forget the changes?"
msgstr "Glem endringene?"
-#: ../../Xconfigurator.pm_.c:982
+#: ../../Xconfigurator.pm_.c:987
#, 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:998
+#: ../../Xconfigurator.pm_.c:1003
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "Vennligst logg ut og bruk sх Ctrl-Alt-BackSpace"
-#: ../../Xconfigurator.pm_.c:1001
+#: ../../Xconfigurator.pm_.c:1006
msgid "X at startup"
msgstr "X ved oppstart"
-#: ../../Xconfigurator.pm_.c:1002
+#: ../../Xconfigurator.pm_.c:1007
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -318,79 +318,79 @@ msgstr "16 millioner farger (24 bits)"
msgid "4 billion colors (32 bits)"
msgstr "4 milliarder farger (32 bits)"
-#: ../../Xconfigurator_consts.pm_.c:95
+#: ../../Xconfigurator_consts.pm_.c:103
msgid "256 kB"
msgstr "256 kB"
-#: ../../Xconfigurator_consts.pm_.c:96
+#: ../../Xconfigurator_consts.pm_.c:104
msgid "512 kB"
msgstr "512 kB"
-#: ../../Xconfigurator_consts.pm_.c:97
+#: ../../Xconfigurator_consts.pm_.c:105
msgid "1 MB"
msgstr "1 MB"
-#: ../../Xconfigurator_consts.pm_.c:98
+#: ../../Xconfigurator_consts.pm_.c:106
msgid "2 MB"
msgstr "2 MB"
-#: ../../Xconfigurator_consts.pm_.c:99
+#: ../../Xconfigurator_consts.pm_.c:107
msgid "4 MB"
msgstr "4 MB"
-#: ../../Xconfigurator_consts.pm_.c:100
+#: ../../Xconfigurator_consts.pm_.c:108
msgid "8 MB"
msgstr "8 MB"
-#: ../../Xconfigurator_consts.pm_.c:101
+#: ../../Xconfigurator_consts.pm_.c:109
msgid "16 MB or more"
msgstr "16 MB eller mer"
-#: ../../Xconfigurator_consts.pm_.c:106 ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
msgid "Standard VGA, 640x480 at 60 Hz"
msgstr "Standard VGA, 640x480 ved 60 Hz"
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:116
msgid "Super VGA, 800x600 at 56 Hz"
msgstr "Super VGA 800x600 ved 56 Hz"
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:117
msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
msgstr "8514 kompatibel, 1024x768 ved 87 Hz interlaced (ikke 800x600)"
-#: ../../Xconfigurator_consts.pm_.c:110
+#: ../../Xconfigurator_consts.pm_.c:118
msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
msgstr "Super VGA, 1024x768 ved 87 Hz interlaced, 800x600 ved 56 Hz"
-#: ../../Xconfigurator_consts.pm_.c:111
+#: ../../Xconfigurator_consts.pm_.c:119
msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
msgstr "Utvidet Super VGA, 800x600 ved 60 Hz, 640x480 ved 72 Hz"
-#: ../../Xconfigurator_consts.pm_.c:112
+#: ../../Xconfigurator_consts.pm_.c:120
msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
msgstr "Ikke-interlaced SVGA, 1024x768 ved 60 Hz, 800x600 ved 72 Hz"
-#: ../../Xconfigurator_consts.pm_.c:113
+#: ../../Xconfigurator_consts.pm_.c:121
msgid "High Frequency SVGA, 1024x768 at 70 Hz"
msgstr "Hјyfrekvens SVGA, 1024x768 ved 70 Hz"
-#: ../../Xconfigurator_consts.pm_.c:114
+#: ../../Xconfigurator_consts.pm_.c:122
msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
msgstr "Flerfrekvens som kan klare 1280x1024 ved 60 Hz"
-#: ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:123
msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
msgstr "Flerfrekvens som kan klare 1280x1024 ved 74 Hz"
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:124
msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
msgstr "Flerfrekvens som kan klare 1280x1024 ved 76 Hz"
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:125
msgid "Monitor that can do 1600x1200 at 70 Hz"
msgstr "Monitor som kan klare 1600x1200 ved 70 Hz"
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:126
msgid "Monitor that can do 1600x1200 at 76 Hz"
msgstr "Monitor som kan klare 1600x1200 ved 76 Hz"
@@ -491,7 +491,8 @@ msgid "restrict"
msgstr "begrense"
#: ../../any.pm_.c:93
-msgid "LILO main options"
+#, fuzzy
+msgid "Bootloader main options"
msgstr "LILO hovedopsjoner"
#: ../../any.pm_.c:96 ../../install_steps_interactive.pm_.c:798
@@ -515,8 +516,9 @@ msgid "The passwords do not match"
msgstr "Passordene stemmer ikke overens"
#: ../../any.pm_.c:107
+#, fuzzy
msgid ""
-"Here are the following entries in LILO.\n"
+"Here are the different entries.\n"
"You can add some more or change the existing ones."
msgstr ""
"Her er fјlgende oppfјringer i LILO.\n"
@@ -583,7 +585,7 @@ msgstr "Etikett"
msgid "Default"
msgstr "Standard"
-#: ../../any.pm_.c:158 ../../install_steps_gtk.pm_.c:654
+#: ../../any.pm_.c:158 ../../install_steps_gtk.pm_.c:664
#: ../../install_steps_interactive.pm_.c:629
#: ../../install_steps_interactive.pm_.c:852 ../../interactive.pm_.c:74
#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
@@ -775,8 +777,8 @@ msgid "Be careful: this operation is dangerous."
msgstr "Vцr forsiktig: denne operasjonen er farlig."
# #: ../install_steps_interactive.pm_.c:37
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:311
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
+#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:312
+#: ../../install_steps.pm_.c:75 ../../install_steps_interactive.pm_.c:40
#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
#: ../../standalone/rpmdrake_.c:304
msgid "Error"
@@ -1064,12 +1066,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:561 ../../install_steps_gtk.pm_.c:206
+#: ../../diskdrake.pm_.c:561 ../../install_steps_gtk.pm_.c:208
msgid "Computing FAT filesystem bounds"
msgstr "Beregner fat filsystemgrense"
#: ../../diskdrake.pm_.c:561 ../../diskdrake.pm_.c:610
-#: ../../install_steps_gtk.pm_.c:206
+#: ../../install_steps_gtk.pm_.c:208
msgid "Resizing"
msgstr "Endrer stјrrelse"
@@ -1088,7 +1090,8 @@ msgstr ""
msgid "Choose the new size"
msgstr "Velg den nye stјrrelsen"
-#: ../../diskdrake.pm_.c:589
+#: ../../diskdrake.pm_.c:589 ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
msgid "MB"
msgstr "MB"
@@ -1112,7 +1115,7 @@ msgstr "Filsystemtype: "
msgid "Preference: "
msgstr "Valg: "
-#: ../../diskdrake.pm_.c:721 ../../install_steps.pm_.c:130
+#: ../../diskdrake.pm_.c:721 ../../install_steps.pm_.c:131
msgid "This partition can't be used for loopback"
msgstr "Denne partisjonen kan ikke brukes for loopback"
@@ -1286,25 +1289,21 @@ msgid ""
msgstr ""
"Velg:\n"
"\n"
-" - Anbefalt: Hvis du ikke aldri har installert Linux fјr.\n"
-"\n"
-"\n"
-" - Egendefinert: Hvis du er kjent med Linux vil du for systemet som skal \n"
-"installeres kunne velge mellom normal, utvikling eller tjener. Velg\n"
-"\"Normal\" for installasjon til generelt bruk. Du kan velge \"Utvikling\"\n"
-"hvis du skal bruke maskinen primцrt til utvikling av programvare, eller "
-"velge\n"
-"\"Tjener\" hvis du јnsker х installere en tjener for generelt bruk (for "
-"post,\n"
-"utskrift...).\n"
+" - Anbefalt: Hvis du ikke aldri har installert Linux fјr, velg denne. "
+"MERK:\n"
+" nettverk vil ikke bli konfigurert under installasjonen, bruk "
+"\"LinuxConf\"\n"
+" til konfigurasjon etter at installasjonen er ferdig.\n"
"\n"
+" - Egendefinert: Hvis du er nok kjent med GNU/Linux, kan du velge\n"
+" primцrt bruk for maskinen din. Se nedenfor for detaljer.\n"
"\n"
-" - Ekspert: Hvis du allerede kjenner GNU/Linux godt og јnsker х gjјre en\n"
-"egendefinert installasjon sх er dette installasjonsvalget for deg. Du vil\n"
-"kunne velge bruk av systemet som skal installeres som med \"Egendefinert\"."
+" - Ekspert: Dette krever at du er kjent med GNU/Linux og јnsker х\n"
+" utfјre en meget egendefinert installasjon. Som for \"Egendefinert\"\n"
+" installasjonsklasse, vil du kunne velge bruk for systemet ditt.\n"
+" Men vцr sх snill, IKKE VELG DETTE HVIS DU IKKE VET HVA DU GJиR!\n"
#: ../../help.pm_.c:38
-#, fuzzy
msgid ""
"The different choices for your machine's usage (provided, hence, that you "
"have\n"
@@ -1330,40 +1329,24 @@ msgid ""
"As\n"
" such, do not expect any gimmicks (KDE, GNOME...) to be installed.\n"
msgstr ""
-"Velg:\n"
-"\n"
-" - Anbefalt: Hvis du aldri har installert Linux fјr, velg denne. MERK:\n"
-" nettverk vil ikke bli konfigurert under installasjonen, bruk "
-"\"LinuxConf\"\n"
-" til х konfigurere dette etter at installasjonen er ferdig.\n"
-"\n"
-" - Egendefinert: Hvis du er nok kjent med GNU/Linux, kan du velge\n"
-" primцrt bruk for maskinen din. Se nedenfor for detaljer.\n"
-"\n"
-" - Ekspert: Dette forutsetter at du er kjent med GNU/Linux og јnsker х\n"
-" utfјre en meget egendefinert installasjon. Som for en \"Egendefinert\"\n"
-" installasjonsklasse vil du kunne velge bruk for systemet ditt.\n"
-" Men vцr sх snill, IKKE VELG DETTE HVIS DU IKKE VET HVA DU GJиR!\n"
-"\n"
-"De forskjellige valgene for din maskin's bruk (hvis du har\n"
-"valgt enten \"Egendefinert\" eller \"Ekspert\" som en installasjonsklasse) "
-"er\n"
+"De forskjellige valgene for din maskin's bruk (hvis du har valgt enten "
+"\"Egendefinert\" eller \"Ekspert\" som en installasjonsklasse) er\n"
"fјlgende:\n"
"\n"
" - Normal: velg denne hvis du skal bruke maskinen din hovedsaklig til\n"
" hverdagsbruk (kontorarbeid, grafikkmanipulasjon osv.). Ikke forvent\n"
" at noen kompilatorer, utviklingsverktјy el. lign. blir installert.\n"
"\n"
-" - Utvikling: som navnet sier. Velg denne hvis du skal hovedsaklig skal "
-"bruke\n"
-" maskinen din til utvikling av programvare. Du vil da ha en komplett\n"
+" - Utvikling: som navnet sier. Velg denne hvis du skal hovedsaklig skal\n"
+" bruke maskinen din til utvikling av programvare. Du vil da ha en "
+"komplett\n"
" samling av programvare installert for х kompilere, debugge og formatere\n"
" kildekode, eller lage programvarepakker.\n"
"\n"
" - Tjener: velg denne hvis maskinen som du installerer Linux-Mandrake\n"
-" pх skal brukes som en tjener. Enten en filtjener (NFS eller SMB),\n"
-" en utskriftstjener (Unix' lp (Line Printer) protokoll eller Windows SMB "
-"stil\n"
+" pх skal brukes som en tjener. Enten en filtjener (NFS eller SMB), en "
+"utskriftstjener\n"
+" (Unix' lp (Line Printer) protokoll eller Windows SMB stil\n"
" utskrift), en autentifikasjonstjener (NIS), en databasetjener osv. Som\n"
" sх, ikke forvent at noe spesielt (KDE, GNOME...) vil bli installert.\n"
@@ -2227,7 +2210,7 @@ msgstr ""
"Opprett en partisjon for dette (eller klikk pх en eksisterende).\n"
"Velg sх ``Monteringspunkt'' og sett dette til `/'"
-#: ../../install_any.pm_.c:312 ../../standalone/diskdrake_.c:61
+#: ../../install_any.pm_.c:313 ../../standalone/diskdrake_.c:61
msgid ""
"I can't read your partition table, it's too corrupted for me :(\n"
"I'll try to go on blanking bad partitions"
@@ -2235,7 +2218,7 @@ msgstr ""
"Jeg kan ikke lese partisjonstabellen din, den er for јdelagt for meg :(\n"
"Jeg vil fјrsјke х blanke ut dхrlige partisjoner"
-#: ../../install_any.pm_.c:329
+#: ../../install_any.pm_.c:330
msgid ""
"DiskDrake failed to read correctly the partition table.\n"
"Continue at your own risk!"
@@ -2243,32 +2226,32 @@ msgstr ""
"DiskDrake klarte ikke х lese partisjonstabellen korrekt.\n"
"Fortsett pх eget ansvar!"
-#: ../../install_any.pm_.c:346
+#: ../../install_any.pm_.c:352
msgid "Searching root partition."
msgstr "Sјker root-partisjon."
-#: ../../install_any.pm_.c:375
+#: ../../install_any.pm_.c:381
msgid "Information"
msgstr "Informasjon"
-#: ../../install_any.pm_.c:376
+#: ../../install_any.pm_.c:382
#, c-format
msgid "%s: This is not a root partition, please select another one."
msgstr "%s: Dette er ikke en root-partisjon, vennligst velg en annen."
-#: ../../install_any.pm_.c:378
+#: ../../install_any.pm_.c:384
msgid "No root partition found"
msgstr "Ingen root-partisjon funnet"
-#: ../../install_any.pm_.c:416
+#: ../../install_any.pm_.c:422
msgid "Can't use broadcast with no NIS domain"
msgstr "Kan ikke bruke broadcast uten NIS-domene"
-#: ../../install_any.pm_.c:578
+#: ../../install_any.pm_.c:584
msgid "Error reading file $f"
msgstr "Feil ved lesing av fil $f"
-#: ../../install_steps.pm_.c:75
+#: ../../install_steps.pm_.c:76
msgid ""
"An error occurred, but I don't know how to handle it nicely.\n"
"Continue at your own risk."
@@ -2277,17 +2260,17 @@ msgstr ""
"pen mхte.\n"
"Fortsett pх eget ansvar."
-#: ../../install_steps.pm_.c:171
+#: ../../install_steps.pm_.c:173
#, c-format
msgid "Duplicate mount point %s"
msgstr "Dupliser monteringspunkt %s"
-#: ../../install_steps.pm_.c:371
+#: ../../install_steps.pm_.c:378
#, c-format
msgid "Welcome to %s"
msgstr "Velkommen til %s"
-#: ../../install_steps.pm_.c:715
+#: ../../install_steps.pm_.c:720
msgid "No floppy drive available"
msgstr "Ingen diskettstasjon tilgjengelig"
@@ -2297,19 +2280,107 @@ msgstr "Ingen diskettstasjon tilgjengelig"
msgid "Entering step `%s'\n"
msgstr "Entrer trinn `%s'\n"
+#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:249
+msgid "You must have a swap partition"
+msgstr "Du mх ha en vekslingspartisjon"
+
+#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:251
+msgid ""
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
+msgstr ""
+"Du har ingen vekslingspartisjon\n"
+"\n"
+"Fortsette likevel?"
+
+#: ../../install_steps_graphical.pm_.c:287
+msgid "Choose the size you want to install"
+msgstr "Velg stјrrelsen du јnsker х installere"
+
+#: ../../install_steps_graphical.pm_.c:334
+msgid "Total size: "
+msgstr "Total stјrrelse: "
+
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:447
+#: ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Versjon: %s\n"
+
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:448
+#: ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Stјrrelse: %d KB\n"
+
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:360
+msgid "Choose the packages you want to install"
+msgstr "Velg pakkene du јnsker х installere"
+
+#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:363
+msgid "Info"
+msgstr "Info"
+
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:368
+#: ../../install_steps_interactive.pm_.c:124 ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Installer"
+
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:526
+#: ../../install_steps_interactive.pm_.c:361
+msgid "Installing"
+msgstr "Installerer"
+
+#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:532
+msgid "Please wait, "
+msgstr "Vennligst vent, "
+
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:534
+msgid "Time remaining "
+msgstr "Tid som gjenstхr "
+
+#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:535
+msgid "Total time "
+msgstr "Total tid "
+
+#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:544
+#: ../../install_steps_interactive.pm_.c:361
+msgid "Preparing installation"
+msgstr "Forbereder installasjon"
+
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:559
+#, c-format
+msgid "Installing package %s"
+msgstr "Installerer pakke %s"
+
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:597
+#: ../../install_steps_gtk.pm_.c:601
+msgid "Go on anyway?"
+msgstr "Fortsette uansett?"
+
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:597
+msgid "There was an error ordering packages:"
+msgstr "Det var en feil ved endring av pakkenes rekkefјlge:"
+
+#: ../../install_steps_graphical.pm_.c:577
+#: ../../install_steps_interactive.pm_.c:975
+msgid "Use existing configuration for X11?"
+msgstr "Bruke eksisterende konfigurasjon for X11?"
+
#: ../../install_steps_gtk.pm_.c:154
msgid "Please, choose one of the following classes of installation:"
msgstr "Vennligst velg en av fјlgende installasjonsklasser:"
-#: ../../install_steps_gtk.pm_.c:193
+#: ../../install_steps_gtk.pm_.c:195
msgid "You don't have any windows partitions!"
msgstr "Du har ingen windows-partisjoner!"
-#: ../../install_steps_gtk.pm_.c:195
+#: ../../install_steps_gtk.pm_.c:197
msgid "You don't have any enough room for Lnx4win"
msgstr "Du har ikke nok plass for Lnx4win"
-#: ../../install_steps_gtk.pm_.c:211
+#: ../../install_steps_gtk.pm_.c:213
msgid ""
"WARNING!\n"
"\n"
@@ -2330,47 +2401,33 @@ msgstr ""
"dine data.\n"
"Nхr du er sikker, trykk Ok."
-#: ../../install_steps_gtk.pm_.c:230
+#: ../../install_steps_gtk.pm_.c:232
msgid "Automatic resizing failed"
msgstr "Automatisk endring av stјrrelse mislykket"
-#: ../../install_steps_gtk.pm_.c:247
-msgid "You must have a swap partition"
-msgstr "Du mх ha en vekslingspartisjon"
-
-#: ../../install_steps_gtk.pm_.c:249
-msgid ""
-"You don't have a swap partition\n"
-"\n"
-"Continue anyway?"
-msgstr ""
-"Du har ingen vekslingspartisjon\n"
-"\n"
-"Fortsette likevel?"
-
-#: ../../install_steps_gtk.pm_.c:259
+#: ../../install_steps_gtk.pm_.c:261
msgid "Which partition do you want to use to put Linux4Win?"
msgstr "Hvilken partisjon vil du bruke til х plassere Linux4Win?"
-#: ../../install_steps_gtk.pm_.c:278
+#: ../../install_steps_gtk.pm_.c:280
msgid "Choose the sizes"
msgstr "Velg stјrrelsene"
-#: ../../install_steps_gtk.pm_.c:280
+#: ../../install_steps_gtk.pm_.c:282
msgid "Root partition size in MB: "
msgstr "Root-partisjonsstјrrelse i MB: "
-#: ../../install_steps_gtk.pm_.c:282
+#: ../../install_steps_gtk.pm_.c:284
msgid "Swap partition size in MB: "
msgstr "Veksel-partisjonsstјrrelse i MB: "
-#: ../../install_steps_gtk.pm_.c:314
+#: ../../install_steps_gtk.pm_.c:316
#, c-format
msgid ""
"The total size for the groups you have selected is approximately %d MB.\n"
msgstr "Den totale stјrrelsen for gruppene du har valgt er omtrent %d MB.\n"
-#: ../../install_steps_gtk.pm_.c:316
+#: ../../install_steps_gtk.pm_.c:318
msgid ""
"If you wish to install less than this size,\n"
"select the percentage of packages that you want to install.\n"
@@ -2384,7 +2441,7 @@ msgstr ""
"En lav prosentdel vil installere bare de mest viktige pakkene;\n"
"en prosentdel pх 100%% vil installere alle valgte pakker."
-#: ../../install_steps_gtk.pm_.c:321
+#: ../../install_steps_gtk.pm_.c:323
msgid ""
"You have space on your disk for only %d%% of these packages.\n"
"\n"
@@ -2400,134 +2457,97 @@ msgstr ""
"En lav prosentdel vil installere bare de mest viktige pakkene;\n"
"en prosentdel pх %d%% vil installere sх mange pakker som mulig."
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:329
msgid "You will be able to choose them more specifically in the next step."
msgstr "Du vil kunne velge disse mere spesifisert i neste trinn."
-#: ../../install_steps_gtk.pm_.c:329
+#: ../../install_steps_gtk.pm_.c:331
msgid "Percentage of packages to install"
msgstr "Prosentdel av pakker х installere"
-#: ../../install_steps_gtk.pm_.c:358
-msgid "Choose the packages you want to install"
-msgstr "Velg pakkene du јnsker х installere"
-
-#: ../../install_steps_gtk.pm_.c:361
-msgid "Info"
-msgstr "Info"
-
-#: ../../install_steps_gtk.pm_.c:366 ../../install_steps_interactive.pm_.c:124
-#: ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Installer"
-
-#: ../../install_steps_gtk.pm_.c:370
+#: ../../install_steps_gtk.pm_.c:372
msgid "Automatic dependencies"
msgstr "Avhengigheter automatisk"
-#: ../../install_steps_gtk.pm_.c:423 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:425 ../../standalone/rpmdrake_.c:101
msgid "Expand Tree"
msgstr "Utvid tre"
-#: ../../install_steps_gtk.pm_.c:424 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:426 ../../standalone/rpmdrake_.c:102
msgid "Collapse Tree"
msgstr "Trekk sammen tre"
-#: ../../install_steps_gtk.pm_.c:425
+#: ../../install_steps_gtk.pm_.c:427
msgid "Toggle between flat and group sorted"
msgstr "Skift mellom flat og gruppesortert"
-#: ../../install_steps_gtk.pm_.c:443
+#: ../../install_steps_gtk.pm_.c:445
msgid "Bad package"
msgstr "Dхrlig pakke"
-#: ../../install_steps_gtk.pm_.c:444
+#: ../../install_steps_gtk.pm_.c:446
#, c-format
msgid "Name: %s\n"
-msgstr ""
+msgstr "Navn: %s\n"
-#: ../../install_steps_gtk.pm_.c:445 ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "Versjon: %s\n"
-
-#: ../../install_steps_gtk.pm_.c:446 ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "Stјrrelse: %d KB\n"
-
-#: ../../install_steps_gtk.pm_.c:447
+#: ../../install_steps_gtk.pm_.c:449
#, c-format
msgid "Importance: %s\n"
msgstr "Viktighet: %s\n"
-#: ../../install_steps_gtk.pm_.c:458
+#: ../../install_steps_gtk.pm_.c:460
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Total stјrrelse: %d / %d MB"
-#: ../../install_steps_gtk.pm_.c:469
+#: ../../install_steps_gtk.pm_.c:471
msgid "This is a mandatory package, it can't be unselected"
msgstr "Dette er en bestemt pakke, den kan ikke fjernes"
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:473
msgid "You can't unselect this package. It is already installed"
msgstr "Du kan ikke fjerne denne pakken, den er allerede installert"
-#: ../../install_steps_gtk.pm_.c:475
+#: ../../install_steps_gtk.pm_.c:477
+msgid ""
+"This package must be upgraded\n"
+"Are you sure you want to deselect it?"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:480
+#, fuzzy
+msgid "You can't unselect this package. It must be upgraded"
+msgstr "Du kan ikke fjerne denne pakken, den er allerede installert"
+
+#: ../../install_steps_gtk.pm_.c:485
msgid "The following packages are going to be installed/removed"
msgstr "Fјlgende pakker vil bli installert/fjernet"
-#: ../../install_steps_gtk.pm_.c:484
+#: ../../install_steps_gtk.pm_.c:494
msgid "You can't select/unselect this package"
msgstr "Du kan ikke velge/fjerne denne pakken"
-#: ../../install_steps_gtk.pm_.c:516 ../../install_steps_interactive.pm_.c:361
-msgid "Installing"
-msgstr "Installerer"
-
-#: ../../install_steps_gtk.pm_.c:519
+#: ../../install_steps_gtk.pm_.c:529
msgid "Estimating"
msgstr "Beregner"
-#: ../../install_steps_gtk.pm_.c:522
-msgid "Please wait, "
-msgstr "Vennligst vent, "
-
-#: ../../install_steps_gtk.pm_.c:524
-msgid "Time remaining "
-msgstr "Tid som gjenstхr "
-
-#: ../../install_steps_gtk.pm_.c:525
-msgid "Total time "
-msgstr "Total tid "
-
-#: ../../install_steps_gtk.pm_.c:531 ../../interactive.pm_.c:84
+#: ../../install_steps_gtk.pm_.c:541 ../../interactive.pm_.c:84
#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
#: ../../my_gtk.pm_.c:199 ../../my_gtk.pm_.c:457
msgid "Cancel"
msgstr "Avbryt"
-#: ../../install_steps_gtk.pm_.c:534 ../../install_steps_interactive.pm_.c:361
-msgid "Preparing installation"
-msgstr "Forbereder installasjon"
-
-#: ../../install_steps_gtk.pm_.c:544
+#: ../../install_steps_gtk.pm_.c:554
#, c-format
msgid "%d packages"
msgstr "%d pakker"
-#: ../../install_steps_gtk.pm_.c:544
+#: ../../install_steps_gtk.pm_.c:554
msgid ", %U MB"
msgstr ", %U MB"
-#: ../../install_steps_gtk.pm_.c:549
-#, c-format
-msgid "Installing package %s"
-msgstr "Installerer pakke %s"
-
-#: ../../install_steps_gtk.pm_.c:575
+#: ../../install_steps_gtk.pm_.c:585
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -2542,15 +2562,7 @@ msgstr ""
"ferdig.\n"
"Hvis du ikke har den trykk Avbryt for х unngх installasjon fra denne CD'en."
-#: ../../install_steps_gtk.pm_.c:587 ../../install_steps_gtk.pm_.c:591
-msgid "Go on anyway?"
-msgstr "Fortsette uansett?"
-
-#: ../../install_steps_gtk.pm_.c:587
-msgid "There was an error ordering packages:"
-msgstr "Det var en feil ved endring av pakkenes rekkefјlge:"
-
-#: ../../install_steps_gtk.pm_.c:591
+#: ../../install_steps_gtk.pm_.c:601
msgid "There was an error installing packages:"
msgstr "Det var en feil ved installering av pakkene:"
@@ -2698,9 +2710,9 @@ msgid "Formatting partitions"
msgstr "Formaterer partisjoner"
#: ../../install_steps_interactive.pm_.c:247
-#, fuzzy, c-format
+#, c-format
msgid "Creating and formatting file %s"
-msgstr "Oppretter og formaterer loopback-fil %s"
+msgstr "Oppretter og formaterer fil %s"
#: ../../install_steps_interactive.pm_.c:250
msgid "Not enough swap to fulfill installation, please add some"
@@ -2715,6 +2727,10 @@ msgstr "Ser etter tilgjengelige pakker"
msgid "Finding packages to upgrade"
msgstr "Finner pakker х oppgradere"
+#: ../../install_steps_interactive.pm_.c:279
+msgid "Your system has not enough space left for installation or upgrade"
+msgstr ""
+
#: ../../install_steps_interactive.pm_.c:312
msgid "Package Group Selection"
msgstr "Valg pakkegruppe"
@@ -3093,7 +3109,7 @@ msgid "Shell"
msgstr "Skall"
#: ../../install_steps_interactive.pm_.c:688
-#: ../../standalone/adduserdrake_.c:47 ../../t.pm_.c:41
+#: ../../standalone/adduserdrake_.c:47
msgid "Icon"
msgstr "Ikon"
@@ -3309,10 +3325,6 @@ msgstr "Oppgi ram-stјrrelsen i MB"
msgid "Can't use supermount in high security level"
msgstr "Kan ikke bruke supermount i hјyt sikkerhetsnivх"
-#: ../../install_steps_interactive.pm_.c:975
-msgid "Use existing configuration for X11?"
-msgstr "Bruke eksisterende konfigurasjon for X11?"
-
#: ../../install_steps_interactive.pm_.c:980
msgid ""
"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
@@ -3320,6 +3332,11 @@ msgid ""
"\n"
"Do you want to try XFree 4.0?"
msgstr ""
+"DrakX vil generere konfigurasjonsfiler for bхde XFree 3.3 og XFree 4.0.\n"
+"Som standard vil 3.3 tjeneren bli brukt fordi den virker med flere "
+"grafikk-kort.\n"
+"\n"
+"иnsker du х prјve XFree 4.0?"
#: ../../install_steps_interactive.pm_.c:993
#: ../../install_steps_interactive.pm_.c:1144
@@ -3487,9 +3504,8 @@ msgid "Bringing up the network"
msgstr "Henter opp nettverket"
#: ../../install_steps_interactive.pm_.c:1183
-#, fuzzy
msgid "Bringing down the network"
-msgstr "Henter opp nettverket"
+msgstr "Tar ned nettverket"
#: ../../install_steps_newt.pm_.c:21
#, c-format
@@ -4905,12 +4921,6 @@ msgstr "Finner tillatelser"
msgid "Finding leaves takes some time"
msgstr "Finne tillatelser vil ta litt tid"
-#~ msgid "Choose the size you want to install"
-#~ msgstr "Velg stјrrelsen du јnsker х installere"
-
-#~ msgid "Total size: "
-#~ msgstr "Total stјrrelse: "
-
#~ msgid ""
#~ "(a user ``mandrake'' with password ``mandrake'' has been automatically added)"
#~ msgstr ""
diff --git a/perl-install/share/po/sp.po b/perl-install/share/po/sp.po
index 65cb57bfa..a73bd211c 100644
--- a/perl-install/share/po/sp.po
+++ b/perl-install/share/po/sp.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2000-04-27 12:04+0200\n"
+"POT-Creation-Date: 2000-04-29 20:57+0200\n"
"PO-Revision-Date: 1999-08-09 16:39+0200\n"
"Last-Translator: Jankovic Tomislav <tomaja@net.yu>\n"
"Language-Team: Serbian (cyrillic)\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-5\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../Xconfigurator.pm_.c:116 ../../Xconfigurator.pm_.c:229
+#: ../../Xconfigurator.pm_.c:116 ../../Xconfigurator.pm_.c:234
msgid "Generic"
msgstr "Generic"
@@ -39,19 +39,19 @@ msgstr "X сервер"
msgid "Select the memory size of your graphic card"
msgstr "Количина меморије на графичкој картици"
-#: ../../Xconfigurator.pm_.c:211
+#: ../../Xconfigurator.pm_.c:216
msgid "Choose options for server"
msgstr "Опције за сервер"
-#: ../../Xconfigurator.pm_.c:229
+#: ../../Xconfigurator.pm_.c:234
msgid "Choose a monitor"
msgstr "Изаберите монитор"
-#: ../../Xconfigurator.pm_.c:229
+#: ../../Xconfigurator.pm_.c:234
msgid "Monitor"
msgstr "Монитор"
-#: ../../Xconfigurator.pm_.c:232
+#: ../../Xconfigurator.pm_.c:237
msgid ""
"The two critical parameters are the vertical refresh rate, which is the "
"rate\n"
@@ -71,39 +71,39 @@ msgstr ""
"ВЕОМА ЈЕ ВАЖНО да не наведете тип монитора који има овај опсег већи него\n"
"што га има ваш монитор. Ако нисте сигурни, одаберите мање вредности."
-#: ../../Xconfigurator.pm_.c:239 ../../t.pm_.c:41
+#: ../../Xconfigurator.pm_.c:244
msgid "Horizontal refresh rate"
msgstr "Хоризонтална фреквенциja"
-#: ../../Xconfigurator.pm_.c:239 ../../t.pm_.c:41
+#: ../../Xconfigurator.pm_.c:244
msgid "Vertical refresh rate"
msgstr "Вертикална фреквенциja"
-#: ../../Xconfigurator.pm_.c:281
+#: ../../Xconfigurator.pm_.c:286
msgid "Monitor not configured"
msgstr "Монитор није конфигурисан"
-#: ../../Xconfigurator.pm_.c:284
+#: ../../Xconfigurator.pm_.c:289
msgid "Graphic card not configured yet"
msgstr "Графичка карта још није конфигурисана"
-#: ../../Xconfigurator.pm_.c:287
+#: ../../Xconfigurator.pm_.c:292
msgid "Resolutions not chosen yet"
msgstr "Резолуциja још није изабрана"
-#: ../../Xconfigurator.pm_.c:298
+#: ../../Xconfigurator.pm_.c:303
msgid "Do you want to test the configuration?"
msgstr "Да ли хоћете да тестирате конфигурацију?"
-#: ../../Xconfigurator.pm_.c:302
+#: ../../Xconfigurator.pm_.c:307
msgid "Warning: testing is dangerous on this graphic card"
msgstr "Упозорење: тестирање може бити опасно по графичку картицу"
-#: ../../Xconfigurator.pm_.c:305
+#: ../../Xconfigurator.pm_.c:310
msgid "Test of the configuration"
msgstr "Тестирање конфигурације"
-#: ../../Xconfigurator.pm_.c:344
+#: ../../Xconfigurator.pm_.c:349
msgid ""
"\n"
"try to change some parameters"
@@ -111,29 +111,29 @@ msgstr ""
"\n"
"покушајте са променом параметара"
-#: ../../Xconfigurator.pm_.c:344
+#: ../../Xconfigurator.pm_.c:349
msgid "An error has occurred:"
msgstr "Хм, грешка:"
-#: ../../Xconfigurator.pm_.c:367
+#: ../../Xconfigurator.pm_.c:372
#, c-format
msgid "Leaving in %d seconds"
msgstr "Излаз за %d секунди"
-#: ../../Xconfigurator.pm_.c:371
+#: ../../Xconfigurator.pm_.c:376
#, fuzzy
msgid "Is this the correct setting?"
msgstr "Да ли је ово исправно ?"
-#: ../../Xconfigurator.pm_.c:379
+#: ../../Xconfigurator.pm_.c:384
msgid "An error has occurred, try to change some parameters"
msgstr "Хм, поjaвила се грешка, пробајте да променитe параметре"
-#: ../../Xconfigurator.pm_.c:387 ../../Xconfigurator.pm_.c:560
+#: ../../Xconfigurator.pm_.c:392 ../../Xconfigurator.pm_.c:565
msgid "Automatic resolutions"
msgstr "Аутоматско подешавање резолуције"
-#: ../../Xconfigurator.pm_.c:388
+#: ../../Xconfigurator.pm_.c:393
msgid ""
"To find the available resolutions I will try different ones.\n"
"Your screen will blink...\n"
@@ -143,33 +143,33 @@ msgstr ""
"Ваш екран ће блинкати...\n"
"Можете угасити монитор ако желите, крај ће бити означен звучним сигналом"
-#: ../../Xconfigurator.pm_.c:443 ../../printerdrake.pm_.c:165
+#: ../../Xconfigurator.pm_.c:448 ../../printerdrake.pm_.c:165
msgid "Resolution"
msgstr "Резолуциja"
-#: ../../Xconfigurator.pm_.c:478
+#: ../../Xconfigurator.pm_.c:483
msgid "Choose the resolution and the color depth"
msgstr "Изаберите резолуцију и број боja при прикaзу"
-#: ../../Xconfigurator.pm_.c:480
+#: ../../Xconfigurator.pm_.c:485
#, c-format
msgid "Graphic card: %s"
msgstr "Графичка картица: %s"
-#: ../../Xconfigurator.pm_.c:481
+#: ../../Xconfigurator.pm_.c:486
#, c-format
msgid "XFree86 server: %s"
msgstr "XFree86 сервер: %s"
-#: ../../Xconfigurator.pm_.c:490
+#: ../../Xconfigurator.pm_.c:495
msgid "Show all"
msgstr "Прикажи све"
-#: ../../Xconfigurator.pm_.c:514
+#: ../../Xconfigurator.pm_.c:519
msgid "Resolutions"
msgstr "Резолуциja"
-#: ../../Xconfigurator.pm_.c:561
+#: ../../Xconfigurator.pm_.c:566
msgid ""
"I can try to find the available resolutions (eg: 800x600).\n"
"Sometimes, though, it may hang the machine.\n"
@@ -179,7 +179,7 @@ msgstr ""
"Ипак, то може довести до блокирања рачунара.\n"
"Да ли желите покушати?"
-#: ../../Xconfigurator.pm_.c:566
+#: ../../Xconfigurator.pm_.c:571
msgid ""
"No valid modes found\n"
"Try with another video card or monitor"
@@ -187,109 +187,109 @@ msgstr ""
"Није пронађен одговарајући мод\n"
"Покушајте са другом графичком картицом или монитором"
-#: ../../Xconfigurator.pm_.c:906
+#: ../../Xconfigurator.pm_.c:911
#, c-format
msgid "Keyboard layout: %s\n"
msgstr "Тип тастатуре: %s\n"
-#: ../../Xconfigurator.pm_.c:907
+#: ../../Xconfigurator.pm_.c:912
#, c-format
msgid "Mouse type: %s\n"
msgstr "Тип миша: %s\n"
-#: ../../Xconfigurator.pm_.c:908
+#: ../../Xconfigurator.pm_.c:913
#, c-format
msgid "Mouse device: %s\n"
msgstr "Миш је постављен на уређај: %s\n"
-#: ../../Xconfigurator.pm_.c:909
+#: ../../Xconfigurator.pm_.c:914
#, c-format
msgid "Monitor: %s\n"
msgstr "Монитор: %s\n"
-#: ../../Xconfigurator.pm_.c:910
+#: ../../Xconfigurator.pm_.c:915
#, c-format
msgid "Monitor HorizSync: %s\n"
msgstr "Монитор - хоризонталнa фреквенциja: %s\n"
-#: ../../Xconfigurator.pm_.c:911
+#: ../../Xconfigurator.pm_.c:916
#, c-format
msgid "Monitor VertRefresh: %s\n"
msgstr "Монитор - вертикално освежавање: %s\n"
-#: ../../Xconfigurator.pm_.c:912
+#: ../../Xconfigurator.pm_.c:917
#, c-format
msgid "Graphic card: %s\n"
msgstr "Графичка картица: %s\n"
-#: ../../Xconfigurator.pm_.c:913
+#: ../../Xconfigurator.pm_.c:918
#, c-format
msgid "Graphic memory: %s kB\n"
msgstr "Мемориja на графичкој картици: %s kB\n"
-#: ../../Xconfigurator.pm_.c:914
+#: ../../Xconfigurator.pm_.c:919
#, c-format
msgid "XFree86 server: %s\n"
msgstr "XFree86 сервер: %s\n"
-#: ../../Xconfigurator.pm_.c:929
+#: ../../Xconfigurator.pm_.c:934
msgid "Preparing X-Window configuration"
msgstr "Провера конфигурације за X-Window систем"
-#: ../../Xconfigurator.pm_.c:943
+#: ../../Xconfigurator.pm_.c:948
msgid "Change Monitor"
msgstr "Промена монитора"
-#: ../../Xconfigurator.pm_.c:944
+#: ../../Xconfigurator.pm_.c:949
msgid "Change Graphic card"
msgstr "Промена графичке картице"
-#: ../../Xconfigurator.pm_.c:945
+#: ../../Xconfigurator.pm_.c:950
msgid "Change Server options"
msgstr "Промена Сервер опциja"
-#: ../../Xconfigurator.pm_.c:946
+#: ../../Xconfigurator.pm_.c:951
msgid "Change Resolution"
msgstr "Промена резолуције"
-#: ../../Xconfigurator.pm_.c:947
+#: ../../Xconfigurator.pm_.c:952
msgid "Automatical resolutions search"
msgstr "Аутоматско тражење резолуције"
-#: ../../Xconfigurator.pm_.c:951
+#: ../../Xconfigurator.pm_.c:956
msgid "Show information"
msgstr "Прикажи информације"
-#: ../../Xconfigurator.pm_.c:952
+#: ../../Xconfigurator.pm_.c:957
msgid "Test again"
msgstr "Тестирај поново"
-#: ../../Xconfigurator.pm_.c:953 ../../standalone/rpmdrake_.c:46
+#: ../../Xconfigurator.pm_.c:958 ../../standalone/rpmdrake_.c:46
msgid "Quit"
msgstr "Крај"
-#: ../../Xconfigurator.pm_.c:957 ../../standalone/drakboot_.c:30
+#: ../../Xconfigurator.pm_.c:962 ../../standalone/drakboot_.c:30
msgid "What do you want to do?"
msgstr "Шта желите да урадите?"
-#: ../../Xconfigurator.pm_.c:964
+#: ../../Xconfigurator.pm_.c:969
msgid "Forget the changes?"
msgstr "Не памтити промене?"
-#: ../../Xconfigurator.pm_.c:982
+#: ../../Xconfigurator.pm_.c:987
#, c-format
msgid "Please relog into %s to activate the changes"
msgstr "Молим, поново унесите %s ради активирања промена"
-#: ../../Xconfigurator.pm_.c:998
+#: ../../Xconfigurator.pm_.c:1003
msgid "Please log out and then use Ctrl-Alt-BackSpace"
msgstr "Молим ваш излогујте се и рестартујте (Ctrl-Alt-BackSpace) рачунар"
-#: ../../Xconfigurator.pm_.c:1001
+#: ../../Xconfigurator.pm_.c:1006
msgid "X at startup"
msgstr "X окружење на старту"
-#: ../../Xconfigurator.pm_.c:1002
+#: ../../Xconfigurator.pm_.c:1007
msgid ""
"I can set up your computer to automatically start X upon booting.\n"
"Would you like X to start when you reboot?"
@@ -317,79 +317,79 @@ msgstr "16 милиона боja (24-битна палета)"
msgid "4 billion colors (32 bits)"
msgstr "4 милиjaрде боja (32-битна палета)"
-#: ../../Xconfigurator_consts.pm_.c:95
+#: ../../Xconfigurator_consts.pm_.c:103
msgid "256 kB"
msgstr "256 kB"
-#: ../../Xconfigurator_consts.pm_.c:96
+#: ../../Xconfigurator_consts.pm_.c:104
msgid "512 kB"
msgstr "512 kB"
-#: ../../Xconfigurator_consts.pm_.c:97
+#: ../../Xconfigurator_consts.pm_.c:105
msgid "1 MB"
msgstr "1 MB"
-#: ../../Xconfigurator_consts.pm_.c:98
+#: ../../Xconfigurator_consts.pm_.c:106
msgid "2 MB"
msgstr "2 MB"
-#: ../../Xconfigurator_consts.pm_.c:99
+#: ../../Xconfigurator_consts.pm_.c:107
msgid "4 MB"
msgstr "4 MB"
-#: ../../Xconfigurator_consts.pm_.c:100
+#: ../../Xconfigurator_consts.pm_.c:108
msgid "8 MB"
msgstr "8 MB"
-#: ../../Xconfigurator_consts.pm_.c:101
+#: ../../Xconfigurator_consts.pm_.c:109
msgid "16 MB or more"
msgstr "16 MB или више"
-#: ../../Xconfigurator_consts.pm_.c:106 ../../Xconfigurator_consts.pm_.c:107
+#: ../../Xconfigurator_consts.pm_.c:114 ../../Xconfigurator_consts.pm_.c:115
msgid "Standard VGA, 640x480 at 60 Hz"
msgstr "Стандардни VGA, 640x480 на 60 Hz"
-#: ../../Xconfigurator_consts.pm_.c:108
+#: ../../Xconfigurator_consts.pm_.c:116
msgid "Super VGA, 800x600 at 56 Hz"
msgstr "Супер VGA, 800x600 на 56 Hz"
-#: ../../Xconfigurator_consts.pm_.c:109
+#: ../../Xconfigurator_consts.pm_.c:117
msgid "8514 Compatible, 1024x768 at 87 Hz interlaced (no 800x600)"
msgstr "8514 компат., 1024x768 на 87 Hz са преплитањем (не 800x600)"
-#: ../../Xconfigurator_consts.pm_.c:110
+#: ../../Xconfigurator_consts.pm_.c:118
msgid "Super VGA, 1024x768 at 87 Hz interlaced, 800x600 at 56 Hz"
msgstr "Супер VGA, 1024x768 на 87 Hz са преплитањем, 800x600 на 56 Hz"
-#: ../../Xconfigurator_consts.pm_.c:111
+#: ../../Xconfigurator_consts.pm_.c:119
msgid "Extended Super VGA, 800x600 at 60 Hz, 640x480 at 72 Hz"
msgstr "Extended Super VGA, 800x600 на 60 Hz, 640x480 на 72 Hz"
-#: ../../Xconfigurator_consts.pm_.c:112
+#: ../../Xconfigurator_consts.pm_.c:120
msgid "Non-Interlaced SVGA, 1024x768 at 60 Hz, 800x600 at 72 Hz"
msgstr "SVGA без преплитања, 1024x768 на 60 Hz, 800x600 на 72 Hz"
-#: ../../Xconfigurator_consts.pm_.c:113
+#: ../../Xconfigurator_consts.pm_.c:121
msgid "High Frequency SVGA, 1024x768 at 70 Hz"
msgstr "Високофреквентни SVGA, 1024x768 на 70 Hz"
-#: ../../Xconfigurator_consts.pm_.c:114
+#: ../../Xconfigurator_consts.pm_.c:122
msgid "Multi-frequency that can do 1280x1024 at 60 Hz"
msgstr "Монитор који ради са 1280x1024 на 60 Hz"
-#: ../../Xconfigurator_consts.pm_.c:115
+#: ../../Xconfigurator_consts.pm_.c:123
msgid "Multi-frequency that can do 1280x1024 at 74 Hz"
msgstr "Монитор који ради са 1280x1024 на 74 Hz"
-#: ../../Xconfigurator_consts.pm_.c:116
+#: ../../Xconfigurator_consts.pm_.c:124
msgid "Multi-frequency that can do 1280x1024 at 76 Hz"
msgstr "Монитор који ради са 1280x1024 на 76 Hz"
-#: ../../Xconfigurator_consts.pm_.c:117
+#: ../../Xconfigurator_consts.pm_.c:125
msgid "Monitor that can do 1600x1200 at 70 Hz"
msgstr "Монитор који ради са 1600x1200 на 70 Hz"
-#: ../../Xconfigurator_consts.pm_.c:118
+#: ../../Xconfigurator_consts.pm_.c:126
msgid "Monitor that can do 1600x1200 at 76 Hz"
msgstr "Монитор који ради са 1600x1200 на 76 Hz"
@@ -493,7 +493,8 @@ msgid "restrict"
msgstr "ограничено"
#: ../../any.pm_.c:93
-msgid "LILO main options"
+#, fuzzy
+msgid "Bootloader main options"
msgstr "LILO главне опције"
#: ../../any.pm_.c:96 ../../install_steps_interactive.pm_.c:798
@@ -517,8 +518,9 @@ msgid "The passwords do not match"
msgstr "Неподударност лозинки"
#: ../../any.pm_.c:107
+#, fuzzy
msgid ""
-"Here are the following entries in LILO.\n"
+"Here are the different entries.\n"
"You can add some more or change the existing ones."
msgstr ""
"Ово су постављне опције у LILO-у.\n"
@@ -585,7 +587,7 @@ msgstr "Ознака"
msgid "Default"
msgstr "Подразумевано"
-#: ../../any.pm_.c:158 ../../install_steps_gtk.pm_.c:654
+#: ../../any.pm_.c:158 ../../install_steps_gtk.pm_.c:664
#: ../../install_steps_interactive.pm_.c:629
#: ../../install_steps_interactive.pm_.c:852 ../../interactive.pm_.c:74
#: ../../interactive.pm_.c:84 ../../interactive.pm_.c:224
@@ -776,8 +778,8 @@ msgstr ""
msgid "Be careful: this operation is dangerous."
msgstr "ПАЖЉИВО,ова операциja jе опасна."
-#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:311
-#: ../../install_steps.pm_.c:74 ../../install_steps_interactive.pm_.c:40
+#: ../../diskdrake.pm_.c:197 ../../install_any.pm_.c:312
+#: ../../install_steps.pm_.c:75 ../../install_steps_interactive.pm_.c:40
#: ../../standalone/diskdrake_.c:60 ../../standalone/rpmdrake_.c:294
#: ../../standalone/rpmdrake_.c:304
msgid "Error"
@@ -1060,12 +1062,12 @@ msgstr "Табела партициja за драјв %s ће бити записана на диск!"
msgid "You'll need to reboot before the modification can take place"
msgstr "Морате рестартовати рачунар да би се измене извршиле"
-#: ../../diskdrake.pm_.c:561 ../../install_steps_gtk.pm_.c:206
+#: ../../diskdrake.pm_.c:561 ../../install_steps_gtk.pm_.c:208
msgid "Computing FAT filesystem bounds"
msgstr "Прорачунавам границе FAT фајл-система"
#: ../../diskdrake.pm_.c:561 ../../diskdrake.pm_.c:610
-#: ../../install_steps_gtk.pm_.c:206
+#: ../../install_steps_gtk.pm_.c:208
msgid "Resizing"
msgstr "Промена величине (resizing)"
@@ -1082,7 +1084,8 @@ msgstr "После промене величинe партициjе сви подаци ће бити избрисани"
msgid "Choose the new size"
msgstr "Изаберите нову величину"
-#: ../../diskdrake.pm_.c:589
+#: ../../diskdrake.pm_.c:589 ../../install_steps_graphical.pm_.c:287
+#: ../../install_steps_graphical.pm_.c:334
msgid "MB"
msgstr "MB"
@@ -1106,7 +1109,7 @@ msgstr "Врста фајл-система:"
msgid "Preference: "
msgstr "Карактеристике: "
-#: ../../diskdrake.pm_.c:721 ../../install_steps.pm_.c:130
+#: ../../diskdrake.pm_.c:721 ../../install_steps.pm_.c:131
msgid "This partition can't be used for loopback"
msgstr "Ова партициja не може бити коришћена за loopback "
@@ -1293,7 +1296,7 @@ msgstr ""
"\n"
" - Експерт: Уколико сте добро познајте GNU/Linux и желите изузетно\n"
"подесиву инсталацију онда је ово прави мод за вас. Моћи ћете изабрати\n"
-"коришћење система као \"Препоручено\"."
+"коришћење система као \"Препоручено\".\n"
#: ../../help.pm_.c:38
msgid ""
@@ -2134,7 +2137,7 @@ msgstr ""
"За ово, креирајте партицију (или кликните на постојећу).\n"
"Затим изаберите \"Тачка монтирања\" и подесите на `/'"
-#: ../../install_any.pm_.c:312 ../../standalone/diskdrake_.c:61
+#: ../../install_any.pm_.c:313 ../../standalone/diskdrake_.c:61
msgid ""
"I can't read your partition table, it's too corrupted for me :(\n"
"I'll try to go on blanking bad partitions"
@@ -2142,7 +2145,7 @@ msgstr ""
"Не могу прочитати табелу партициja, много је искварена за мене :(\n"
"Покушаћу даље заобилазећи лоше партиције"
-#: ../../install_any.pm_.c:329
+#: ../../install_any.pm_.c:330
msgid ""
"DiskDrake failed to read correctly the partition table.\n"
"Continue at your own risk!"
@@ -2150,32 +2153,32 @@ msgstr ""
"DiskDrake не може да исправно прочита табелу партициja.\n"
"Даљи наставак иде на ваш ризик !"
-#: ../../install_any.pm_.c:346
+#: ../../install_any.pm_.c:352
msgid "Searching root partition."
msgstr "Тражим root партицију."
-#: ../../install_any.pm_.c:375
+#: ../../install_any.pm_.c:381
msgid "Information"
msgstr "Информације"
-#: ../../install_any.pm_.c:376
+#: ../../install_any.pm_.c:382
#, c-format
msgid "%s: This is not a root partition, please select another one."
msgstr "%s: Ово није root партициja, изаберите неку другу."
-#: ../../install_any.pm_.c:378
+#: ../../install_any.pm_.c:384
msgid "No root partition found"
msgstr "Нема root партиције"
-#: ../../install_any.pm_.c:416
+#: ../../install_any.pm_.c:422
msgid "Can't use broadcast with no NIS domain"
msgstr "Није могућ пренос без NIS домена"
-#: ../../install_any.pm_.c:578
+#: ../../install_any.pm_.c:584
msgid "Error reading file $f"
msgstr "Грешка код отварања фајла $f"
-#: ../../install_steps.pm_.c:75
+#: ../../install_steps.pm_.c:76
msgid ""
"An error occurred, but I don't know how to handle it nicely.\n"
"Continue at your own risk."
@@ -2183,17 +2186,17 @@ msgstr ""
"Грешка, али незнам како да је разрешим.\n"
"Наставите на ваш ризик!"
-#: ../../install_steps.pm_.c:171
+#: ../../install_steps.pm_.c:173
#, c-format
msgid "Duplicate mount point %s"
msgstr "Дупла тачка монтирања %s"
-#: ../../install_steps.pm_.c:371
+#: ../../install_steps.pm_.c:378
#, c-format
msgid "Welcome to %s"
msgstr "Доброшли код %s"
-#: ../../install_steps.pm_.c:715
+#: ../../install_steps.pm_.c:720
msgid "No floppy drive available"
msgstr "Неприступачан floppy уређај"
@@ -2203,22 +2206,110 @@ msgstr "Неприступачан floppy уређај"
msgid "Entering step `%s'\n"
msgstr "Покрећем корак `%s'\n"
+#: ../../install_steps_graphical.pm_.c:259 ../../install_steps_gtk.pm_.c:249
+msgid "You must have a swap partition"
+msgstr "Морате имати swap партицију"
+
+#: ../../install_steps_graphical.pm_.c:261 ../../install_steps_gtk.pm_.c:251
+msgid ""
+"You don't have a swap partition\n"
+"\n"
+"Continue anyway?"
+msgstr ""
+"Хм, нема swap партиције\n"
+"\n"
+"Свеједно наставити даље ?"
+
+#: ../../install_steps_graphical.pm_.c:287
+msgid "Choose the size you want to install"
+msgstr "Изаберите величину компоненти за инсталацију"
+
+#: ../../install_steps_graphical.pm_.c:334
+msgid "Total size: "
+msgstr "Укупна величина: "
+
+#: ../../install_steps_graphical.pm_.c:346 ../../install_steps_gtk.pm_.c:447
+#: ../../standalone/rpmdrake_.c:136
+#, c-format
+msgid "Version: %s\n"
+msgstr "Верзиja: %s\n"
+
+#: ../../install_steps_graphical.pm_.c:347 ../../install_steps_gtk.pm_.c:448
+#: ../../standalone/rpmdrake_.c:137
+#, c-format
+msgid "Size: %d KB\n"
+msgstr "Величина: %d KB\n"
+
+#: ../../install_steps_graphical.pm_.c:462 ../../install_steps_gtk.pm_.c:360
+msgid "Choose the packages you want to install"
+msgstr "Изабери пакете за инсталацију"
+
+#: ../../install_steps_graphical.pm_.c:465 ../../install_steps_gtk.pm_.c:363
+msgid "Info"
+msgstr "Инфо"
+
+#: ../../install_steps_graphical.pm_.c:473 ../../install_steps_gtk.pm_.c:368
+#: ../../install_steps_interactive.pm_.c:124 ../../standalone/rpmdrake_.c:161
+msgid "Install"
+msgstr "Инсталирај"
+
+#: ../../install_steps_graphical.pm_.c:492 ../../install_steps_gtk.pm_.c:526
+#: ../../install_steps_interactive.pm_.c:361
+msgid "Installing"
+msgstr "Инсталирам"
+
+#: ../../install_steps_graphical.pm_.c:499 ../../install_steps_gtk.pm_.c:532
+msgid "Please wait, "
+msgstr "Молим сачекајте"
+
+#: ../../install_steps_graphical.pm_.c:501 ../../install_steps_gtk.pm_.c:534
+msgid "Time remaining "
+msgstr "Преостало време"
+
+#: ../../install_steps_graphical.pm_.c:502 ../../install_steps_gtk.pm_.c:535
+msgid "Total time "
+msgstr "Укупно време"
+
+#: ../../install_steps_graphical.pm_.c:507 ../../install_steps_gtk.pm_.c:544
+#: ../../install_steps_interactive.pm_.c:361
+msgid "Preparing installation"
+msgstr "Припремам инсталацију"
+
+#: ../../install_steps_graphical.pm_.c:528 ../../install_steps_gtk.pm_.c:559
+#, c-format
+msgid "Installing package %s"
+msgstr "Инсталирам пакет %s"
+
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:597
+#: ../../install_steps_gtk.pm_.c:601
+msgid "Go on anyway?"
+msgstr "Свеједно наставити даље ?"
+
+#: ../../install_steps_graphical.pm_.c:553 ../../install_steps_gtk.pm_.c:597
+msgid "There was an error ordering packages:"
+msgstr "Грешка у листи пакета:"
+
+#: ../../install_steps_graphical.pm_.c:577
+#: ../../install_steps_interactive.pm_.c:975
+msgid "Use existing configuration for X11?"
+msgstr "Да користим постојећу конфигурацију за X11 ?"
+
#: ../../install_steps_gtk.pm_.c:154
#, fuzzy
msgid "Please, choose one of the following classes of installation:"
msgstr "Молим увaжите следeћу информацију"
-#: ../../install_steps_gtk.pm_.c:193
+#: ../../install_steps_gtk.pm_.c:195
#, fuzzy
msgid "You don't have any windows partitions!"
msgstr "Немате ниједну партицију!"
-#: ../../install_steps_gtk.pm_.c:195
+#: ../../install_steps_gtk.pm_.c:197
#, fuzzy
msgid "You don't have any enough room for Lnx4win"
msgstr "Немате ниједну партицију!"
-#: ../../install_steps_gtk.pm_.c:211
+#: ../../install_steps_gtk.pm_.c:213
msgid ""
"WARNING!\n"
"\n"
@@ -2238,51 +2329,37 @@ msgstr ""
"података.\n"
"Ако сте сигурни, притисните \"У реду\"."
-#: ../../install_steps_gtk.pm_.c:230
+#: ../../install_steps_gtk.pm_.c:232
msgid "Automatic resizing failed"
msgstr "Аутоматска измена величине неуспела"
-#: ../../install_steps_gtk.pm_.c:247
-msgid "You must have a swap partition"
-msgstr "Морате имати swap партицију"
-
-#: ../../install_steps_gtk.pm_.c:249
-msgid ""
-"You don't have a swap partition\n"
-"\n"
-"Continue anyway?"
-msgstr ""
-"Хм, нема swap партиције\n"
-"\n"
-"Свеједно наставити даље ?"
-
-#: ../../install_steps_gtk.pm_.c:259
+#: ../../install_steps_gtk.pm_.c:261
#, fuzzy
msgid "Which partition do you want to use to put Linux4Win?"
msgstr "Коју партицију желите да корисите као root партицију"
-#: ../../install_steps_gtk.pm_.c:278
+#: ../../install_steps_gtk.pm_.c:280
#, fuzzy
msgid "Choose the sizes"
msgstr "Изаберите нову величину"
-#: ../../install_steps_gtk.pm_.c:280
+#: ../../install_steps_gtk.pm_.c:282
#, fuzzy
msgid "Root partition size in MB: "
msgstr "Root партициja"
-#: ../../install_steps_gtk.pm_.c:282
+#: ../../install_steps_gtk.pm_.c:284
#, fuzzy
msgid "Swap partition size in MB: "
msgstr "Величина у MB:"
-#: ../../install_steps_gtk.pm_.c:314
+#: ../../install_steps_gtk.pm_.c:316
#, c-format
msgid ""
"The total size for the groups you have selected is approximately %d MB.\n"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:316
+#: ../../install_steps_gtk.pm_.c:318
msgid ""
"If you wish to install less than this size,\n"
"select the percentage of packages that you want to install.\n"
@@ -2291,7 +2368,7 @@ msgid ""
"a percentage of 100%% will install all selected packages."
msgstr ""
-#: ../../install_steps_gtk.pm_.c:321
+#: ../../install_steps_gtk.pm_.c:323
msgid ""
"You have space on your disk for only %d%% of these packages.\n"
"\n"
@@ -2301,136 +2378,98 @@ msgid ""
"a percentage of %d%% will install as many packages as possible."
msgstr ""
-#: ../../install_steps_gtk.pm_.c:327
+#: ../../install_steps_gtk.pm_.c:329
#, fuzzy
msgid "You will be able to choose them more specifically in the next step."
msgstr "Моћи ћете да прецизније бирате у следеем кораку"
-#: ../../install_steps_gtk.pm_.c:329
+#: ../../install_steps_gtk.pm_.c:331
#, fuzzy
msgid "Percentage of packages to install"
msgstr "Пакети за инсталацију"
-#: ../../install_steps_gtk.pm_.c:358
-msgid "Choose the packages you want to install"
-msgstr "Изабери пакете за инсталацију"
-
-#: ../../install_steps_gtk.pm_.c:361
-msgid "Info"
-msgstr "Инфо"
-
-#: ../../install_steps_gtk.pm_.c:366 ../../install_steps_interactive.pm_.c:124
-#: ../../standalone/rpmdrake_.c:161
-msgid "Install"
-msgstr "Инсталирај"
-
-#: ../../install_steps_gtk.pm_.c:370
+#: ../../install_steps_gtk.pm_.c:372
msgid "Automatic dependencies"
msgstr "Аутоматскa зависност"
-#: ../../install_steps_gtk.pm_.c:423 ../../standalone/rpmdrake_.c:101
+#: ../../install_steps_gtk.pm_.c:425 ../../standalone/rpmdrake_.c:101
msgid "Expand Tree"
msgstr "Проширено стабло"
-#: ../../install_steps_gtk.pm_.c:424 ../../standalone/rpmdrake_.c:102
+#: ../../install_steps_gtk.pm_.c:426 ../../standalone/rpmdrake_.c:102
msgid "Collapse Tree"
msgstr "Сужено стабло"
-#: ../../install_steps_gtk.pm_.c:425
+#: ../../install_steps_gtk.pm_.c:427
msgid "Toggle between flat and group sorted"
msgstr "Бираjте: равно или групно сортирано"
-#: ../../install_steps_gtk.pm_.c:443
+#: ../../install_steps_gtk.pm_.c:445
msgid "Bad package"
msgstr "Лош пакет"
-#: ../../install_steps_gtk.pm_.c:444
+#: ../../install_steps_gtk.pm_.c:446
#, c-format
msgid "Name: %s\n"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:445 ../../standalone/rpmdrake_.c:136
-#, c-format
-msgid "Version: %s\n"
-msgstr "Верзиja: %s\n"
-
-#: ../../install_steps_gtk.pm_.c:446 ../../standalone/rpmdrake_.c:137
-#, c-format
-msgid "Size: %d KB\n"
-msgstr "Величина: %d KB\n"
-
-#: ../../install_steps_gtk.pm_.c:447
+#: ../../install_steps_gtk.pm_.c:449
#, c-format
msgid "Importance: %s\n"
msgstr "Вaжно: %s\n"
-#: ../../install_steps_gtk.pm_.c:458
+#: ../../install_steps_gtk.pm_.c:460
#, c-format
msgid "Total size: %d / %d MB"
msgstr "Укупна величина: %d / %d MB"
-#: ../../install_steps_gtk.pm_.c:469
+#: ../../install_steps_gtk.pm_.c:471
msgid "This is a mandatory package, it can't be unselected"
msgstr "Ово jе обавезни пакет,и не можe бити не селектован"
-#: ../../install_steps_gtk.pm_.c:471
+#: ../../install_steps_gtk.pm_.c:473
msgid "You can't unselect this package. It is already installed"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:475
+#: ../../install_steps_gtk.pm_.c:477
+msgid ""
+"This package must be upgraded\n"
+"Are you sure you want to deselect it?"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:480
+msgid "You can't unselect this package. It must be upgraded"
+msgstr ""
+
+#: ../../install_steps_gtk.pm_.c:485
msgid "The following packages are going to be installed/removed"
msgstr "Следeћи пакети ће бити инсталирани/избрисани"
-#: ../../install_steps_gtk.pm_.c:484
+#: ../../install_steps_gtk.pm_.c:494
msgid "You can't select/unselect this package"
msgstr ""
-#: ../../install_steps_gtk.pm_.c:516 ../../install_steps_interactive.pm_.c:361
-msgid "Installing"
-msgstr "Инсталирам"
-
-#: ../../install_steps_gtk.pm_.c:519
+#: ../../install_steps_gtk.pm_.c:529
msgid "Estimating"
msgstr "Процењујем"
-#: ../../install_steps_gtk.pm_.c:522
-msgid "Please wait, "
-msgstr "Молим сачекајте"
-
-#: ../../install_steps_gtk.pm_.c:524
-msgid "Time remaining "
-msgstr "Преостало време"
-
-#: ../../install_steps_gtk.pm_.c:525
-msgid "Total time "
-msgstr "Укупно време"
-
-#: ../../install_steps_gtk.pm_.c:531 ../../interactive.pm_.c:84
+#: ../../install_steps_gtk.pm_.c:541 ../../interactive.pm_.c:84
#: ../../interactive.pm_.c:223 ../../interactive_newt.pm_.c:49
#: ../../interactive_newt.pm_.c:98 ../../interactive_stdio.pm_.c:27
#: ../../my_gtk.pm_.c:199 ../../my_gtk.pm_.c:457
msgid "Cancel"
msgstr "Обустави"
-#: ../../install_steps_gtk.pm_.c:534 ../../install_steps_interactive.pm_.c:361
-msgid "Preparing installation"
-msgstr "Припремам инсталацију"
-
-#: ../../install_steps_gtk.pm_.c:544
+#: ../../install_steps_gtk.pm_.c:554
#, c-format
msgid "%d packages"
msgstr "%d пакета"
-#: ../../install_steps_gtk.pm_.c:544
+#: ../../install_steps_gtk.pm_.c:554
msgid ", %U MB"
msgstr ", %U MB"
-#: ../../install_steps_gtk.pm_.c:549
-#, c-format
-msgid "Installing package %s"
-msgstr "Инсталирам пакет %s"
-
-#: ../../install_steps_gtk.pm_.c:575
+#: ../../install_steps_gtk.pm_.c:585
#, c-format
msgid ""
"Change your Cd-Rom!\n"
@@ -2444,15 +2483,7 @@ msgstr ""
"Убацитe вaш Cd ознaчен са \"%s\" у погон и притисните Ok кадa сте спремни.\n"
"Уколико га немате притисните Cancel."
-#: ../../install_steps_gtk.pm_.c:587 ../../install_steps_gtk.pm_.c:591
-msgid "Go on anyway?"
-msgstr "Свеједно наставити даље ?"
-
-#: ../../install_steps_gtk.pm_.c:587
-msgid "There was an error ordering packages:"
-msgstr "Грешка у листи пакета:"
-
-#: ../../install_steps_gtk.pm_.c:591
+#: ../../install_steps_gtk.pm_.c:601
#, fuzzy
msgid "There was an error installing packages:"
msgstr "Грешка у листи пакета:"
@@ -2604,9 +2635,9 @@ msgid "Formatting partitions"
msgstr "Форматирање партицију"
#: ../../install_steps_interactive.pm_.c:247
-#, fuzzy, c-format
+#, c-format
msgid "Creating and formatting file %s"
-msgstr "Креирaње и форматирaње loopback фаjлa %s"
+msgstr "Креирaње и форматирaње фаjлa %s"
#: ../../install_steps_interactive.pm_.c:250
msgid "Not enough swap to fulfill installation, please add some"
@@ -2620,6 +2651,10 @@ msgstr "Тражим пакете"
msgid "Finding packages to upgrade"
msgstr "Тражим пакете за ажурирање..."
+#: ../../install_steps_interactive.pm_.c:279
+msgid "Your system has not enough space left for installation or upgrade"
+msgstr ""
+
#: ../../install_steps_interactive.pm_.c:312
msgid "Package Group Selection"
msgstr "Одабир група пакета"
@@ -2982,7 +3017,7 @@ msgid "Shell"
msgstr "Shell"
#: ../../install_steps_interactive.pm_.c:688
-#: ../../standalone/adduserdrake_.c:47 ../../t.pm_.c:41
+#: ../../standalone/adduserdrake_.c:47
msgid "Icon"
msgstr "Иконa"
@@ -3193,10 +3228,6 @@ msgstr "Прикажи величину RAM-а у Mb"
msgid "Can't use supermount in high security level"
msgstr "Ниjе могуће кориситити supermount код 'Велког' сигурносног нивоа"
-#: ../../install_steps_interactive.pm_.c:975
-msgid "Use existing configuration for X11?"
-msgstr "Да користим постојећу конфигурацију за X11 ?"
-
#: ../../install_steps_interactive.pm_.c:980
msgid ""
"DrakX will generate config files for both XFree 3.3 and XFree 4.0.\n"
@@ -4793,12 +4824,6 @@ msgstr "Пронaђи остављенe"
msgid "Finding leaves takes some time"
msgstr "Пронaђи остављених трaжи мало временa"
-#~ msgid "Choose the size you want to install"
-#~ msgstr "Изаберите величину компоненти за инсталацију"
-
-#~ msgid "Total size: "
-#~ msgstr "Укупна величина: "
-
#~ msgid ""
#~ "(a user ``mandrake'' with password ``mandrake'' has been automatically added)"
#~ msgstr ""