summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-17 11:36:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-17 11:36:20 +0000
commit073f7047d61bd8f85485251c8013b65589cbf9e2 (patch)
tree006b556f34013bd74de35d23a5d11d7634bc67de
parent6036374a6232207f171084298753c7eeb1a31763 (diff)
downloaddrakx-073f7047d61bd8f85485251c8013b65589cbf9e2.tar
drakx-073f7047d61bd8f85485251c8013b65589cbf9e2.tar.gz
drakx-073f7047d61bd8f85485251c8013b65589cbf9e2.tar.bz2
drakx-073f7047d61bd8f85485251c8013b65589cbf9e2.tar.xz
drakx-073f7047d61bd8f85485251c8013b65589cbf9e2.zip
- report_bug: hide grub password (#33634)
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/install/NEWS1
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 3311f87e8..920d319b1 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1059,7 +1059,7 @@ sub report_bug {
header("fstab"), cat_("$::prefix/etc/fstab"),
header("modprobe.conf"), cat_("$::prefix/etc/modprobe.conf"),
header("lilo.conf"), cat_("$::prefix/etc/lilo.conf"),
- header("grub: menu.lst"), cat_("$::prefix/boot/grub/menu.lst"),
+ header("grub: menu.lst"), join('', map { s/^(\s*password)\s+(.*)/$1 xxx/; $_ } cat_("$::prefix/boot/grub/menu.lst")),
header("grub: install.sh"), cat_("$::prefix/boot/grub/install.sh"),
header("grub: device.map"), cat_("$::prefix/boot/grub/device.map"),
header("xorg.conf"), cat_("$::prefix/etc/X11/xorg.conf"),
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 08f1f208a..fdfd62e1a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- report_bug: hide grub password (#33634)
- fix blocking wait_message (when they pop) (#33676, #33670)
- advertising: restore support for $title in .pl files (wrongly dropped in 10.4.195)
- localization:
tandalone/logdrake_.c:212
msgid "Quit"
msgstr "Крај"
@@ -568,7 +568,7 @@ msgstr "Пауза пре стартања default image-а"
#: ../../any.pm_.c:172 ../../any.pm_.c:774
#: ../../install_steps_interactive.pm_.c:1092 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:564 ../../printerdrake.pm_.c:640
+#: ../../printerdrake.pm_.c:566 ../../printerdrake.pm_.c:642
#: ../../standalone/draknet_.c:624
msgid "Password"
msgstr "Лозинка"
@@ -768,12 +768,12 @@ msgid "Do you have any %s interfaces?"
msgstr "Имате ли још %s интерфејса?"
#: ../../any.pm_.c:639 ../../any.pm_.c:810 ../../interactive.pm_.c:123
-#: ../../my_gtk.pm_.c:994
+#: ../../my_gtk.pm_.c:996
msgid "No"
msgstr "Не"
#: ../../any.pm_.c:639 ../../any.pm_.c:809 ../../interactive.pm_.c:123
-#: ../../my_gtk.pm_.c:994
+#: ../../my_gtk.pm_.c:996
msgid "Yes"
msgstr "Да"
@@ -911,8 +911,8 @@ msgstr "Прихвати корисника"
msgid "Real name"
msgstr "Право име"
-#: ../../any.pm_.c:773 ../../printerdrake.pm_.c:563
-#: ../../printerdrake.pm_.c:639
+#: ../../any.pm_.c:773 ../../printerdrake.pm_.c:565
+#: ../../printerdrake.pm_.c:641
msgid "User name"
msgstr "Корисничко име"
@@ -1114,7 +1114,7 @@ msgstr ""
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:882
+#: ../../bootloader.pm_.c:898
msgid "Welcome to GRUB the operating system chooser!"
msgstr "Dobrodosli u GRUB starter operativnog sistema !"
@@ -1127,7 +1127,7 @@ msgstr "Dobrodosli u GRUB starter operativnog sistema !"
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:885
+#: ../../bootloader.pm_.c:901
#, c-format
msgid "Use the %c and %c keys for selecting which entry is highlighted."
msgstr "Koristi %c i %c slova da bi oznacili izbor"
@@ -1141,7 +1141,7 @@ msgstr "Koristi %c i %c slova da bi oznacili izbor"
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:888
+#: ../../bootloader.pm_.c:904
msgid "Press enter to boot the selected OS, 'e' to edit the"
msgstr "Pritisnite enter za podizanje izabranog OS,'e' za promenu "
@@ -1154,7 +1154,7 @@ msgstr "Pritisnite enter za podizanje izabranog OS,'e' za promenu "
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:891
+#: ../../bootloader.pm_.c:907
msgid "commands before booting, or 'c' for a command-line."
msgstr "komandi pri podizanju sistema,ili 'c' za komandnu liniju "
@@ -1167,27 +1167,27 @@ msgstr "komandi pri podizanju sistema,ili 'c' za komandnu liniju "
#
#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:894
+#: ../../bootloader.pm_.c:910
#, c-format
msgid "The highlighted entry will be booted automatically in %d seconds."
msgstr "Oznaceni izbor se podize automatski za %d sekundi"
-#: ../../bootloader.pm_.c:898
+#: ../../bootloader.pm_.c:914
msgid "not enough room in /boot"
msgstr "нема довољно места у /boot"
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
#. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:998
+#: ../../bootloader.pm_.c:1014
msgid "Desktop"
msgstr "Десктоп"
#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:1000
+#: ../../bootloader.pm_.c:1016
msgid "Start Menu"
msgstr "Старт мени "
-#: ../../bootloader.pm_.c:1019
+#: ../../bootloader.pm_.c:1035
#, fuzzy, c-format
msgid "You can't install the bootloader on a %s partition\n"
msgstr "Где бисте да инсталирате стартер?"
@@ -1236,7 +1236,7 @@ msgstr "Покрени Аурору при стартaњe"
msgid "Lilo/grub mode"
msgstr "Lilo/Grub мод"
-#: ../../bootlook.pm_.c:102
+#: ../../bootlook.pm_.c:103
#, c-format
msgid ""
"You are currently using %s as Boot Manager.\n"
@@ -1245,47 +1245,47 @@ msgstr ""
"Тренутно користите %s као Boot менаџер \n"
"Кликните на Подеси (Configure) да би покренули подeшававање."
-#: ../../bootlook.pm_.c:104 ../../standalone/drakbackup_.c:1458
+#: ../../bootlook.pm_.c:105 ../../standalone/drakbackup_.c:1458
#: ../../standalone/drakbackup_.c:1467 ../../standalone/drakgw_.c:706
#: ../../standalone/draknet_.c:257 ../../standalone/tinyfirewall_.c:59
msgid "Configure"
msgstr "Подеси"
-#: ../../bootlook.pm_.c:108
+#: ../../bootlook.pm_.c:112
msgid "Boot mode"
msgstr "Стартни мод"
-#: ../../bootlook.pm_.c:136
+#: ../../bootlook.pm_.c:140
msgid "System mode"
msgstr "Системски мод"
-#: ../../bootlook.pm_.c:138
+#: ../../bootlook.pm_.c:142
msgid "Launch the X-Window system at start"
msgstr "Покрени X-Window систем при стратaњу"
-#: ../../bootlook.pm_.c:143
+#: ../../bootlook.pm_.c:147
msgid "No, I don't want autologin"
msgstr "Не, ja не желим аутологовaњe"
-#: ../../bootlook.pm_.c:145
+#: ../../bootlook.pm_.c:149
msgid "Yes, I want autologin with this (user, desktop)"
msgstr "Да, jа желим аутологовaњe са овим(корисник,десктоп)"
-#: ../../bootlook.pm_.c:155 ../../standalone/drakbackup_.c:3329
+#: ../../bootlook.pm_.c:159 ../../standalone/drakbackup_.c:3329
#: ../../standalone/drakfont_.c:525 ../../standalone/drakfont_.c:627
#: ../../standalone/drakfont_.c:691 ../../standalone/drakfont_.c:737
#: ../../standalone/draknet_.c:109 ../../standalone/draknet_.c:141
#: ../../standalone/draknet_.c:297 ../../standalone/draknet_.c:435
#: ../../standalone/draknet_.c:521 ../../standalone/draknet_.c:564
-#: ../../standalone/draknet_.c:665 ../../standalone/logdrake_.c:483
+#: ../../standalone/draknet_.c:665 ../../standalone/logdrake_.c:486
msgid "OK"
msgstr "У реду"
-#: ../../bootlook.pm_.c:156 ../../install_steps_gtk.pm_.c:463
+#: ../../bootlook.pm_.c:160 ../../install_steps_gtk.pm_.c:463
#: ../../install_steps_gtk.pm_.c:521 ../../interactive.pm_.c:133
-#: ../../interactive.pm_.c:306 ../../interactive.pm_.c:338
-#: ../../interactive_stdio.pm_.c:141 ../../my_gtk.pm_.c:663
-#: ../../my_gtk.pm_.c:666 ../../my_gtk.pm_.c:995 ../../printerdrake.pm_.c:1386
+#: ../../interactive.pm_.c:307 ../../interactive.pm_.c:339
+#: ../../interactive_stdio.pm_.c:141 ../../my_gtk.pm_.c:665
+#: ../../my_gtk.pm_.c:668 ../../my_gtk.pm_.c:997 ../../printerdrake.pm_.c:1387
#: ../../standalone/drakautoinst_.c:204 ../../standalone/drakbackup_.c:2251
#: ../../standalone/drakbackup_.c:2276 ../../standalone/drakbackup_.c:2297
#: ../../standalone/drakbackup_.c:2318 ../../standalone/drakbackup_.c:2336
@@ -1294,12 +1294,12 @@ msgstr "У реду"
#: ../../standalone/drakgw_.c:711 ../../standalone/draknet_.c:116
#: ../../standalone/draknet_.c:148 ../../standalone/draknet_.c:290
#: ../../standalone/draknet_.c:537 ../../standalone/draknet_.c:679
-#: ../../standalone/logdrake_.c:210 ../../standalone/logdrake_.c:490
+#: ../../standalone/logdrake_.c:212 ../../standalone/logdrake_.c:493
#: ../../standalone/tinyfirewall_.c:65
msgid "Cancel"
msgstr "Обустави"
-#: ../../bootlook.pm_.c:224
+#: ../../bootlook.pm_.c:228
#, c-format
msgid "can not open /etc/inittab for reading: %s"
msgstr "не могу отворити /etc/inittab за читaњe: %s"
@@ -1780,7 +1780,7 @@ msgid "Computing FAT filesystem bounds"
msgstr "Прорачунавам границе FAT датотeчног система"
#: ../../diskdrake/interactive.pm_.c:579 ../../diskdrake/interactive.pm_.c:635
-#: ../../install_interactive.pm_.c:119
+#: ../../install_interactive.pm_.c:130
msgid "Resizing"
msgstr "Промена величине (resizing)"
@@ -3778,10 +3778,10 @@ msgstr "Грешка код отварања датотекa %s"
#: ../../install_gtk.pm_.c:84 ../../install_steps_gtk.pm_.c:327
#: ../../interactive.pm_.c:118 ../../interactive.pm_.c:133
-#: ../../interactive.pm_.c:306 ../../interactive.pm_.c:338
+#: ../../interactive.pm_.c:307 ../../interactive.pm_.c:339
#: ../../interactive_http.pm_.c:104 ../../interactive_newt.pm_.c:170
#: ../../interactive_stdio.pm_.c:141 ../../interactive_stdio.pm_.c:142
-#: ../../my_gtk.pm_.c:662 ../../my_gtk.pm_.c:995 ../../my_gtk.pm_.c:1017
+#: ../../my_gtk.pm_.c:664 ../../my_gtk.pm_.c:997 ../../my_gtk.pm_.c:1019
#: ../../standalone/drakbackup_.c:2285 ../../standalone/drakbackup_.c:2356
#: ../../standalone/drakbackup_.c:2372
msgid "Ok"
@@ -3797,7 +3797,7 @@ msgstr ""
"да би нормално функционисалe.\n"
"Информациjе о њима можете пронaћи на: %s"
-#: ../../install_interactive.pm_.c:47
+#: ../../install_interactive.pm_.c:58
msgid ""
"You must have a root partition.\n"
"For this, create a partition (or click on an existing one).\n"
@@ -3807,11 +3807,11 @@ msgstr ""
"За ово, креирајте партицију (или кликните на постојећу).\n"
"Затим изаберите \"Тачка монтирања\" и подесите на `/'"
-#: ../../install_interactive.pm_.c:52
+#: ../../install_interactive.pm_.c:63
msgid "You must have a swap partition"
msgstr "Морате имати swap партицију"
-#: ../../install_interactive.pm_.c:53
+#: ../../install_interactive.pm_.c:64
msgid ""
"You don't have a swap partition\n"
"\n"
@@ -3821,59 +3821,59 @@ msgstr ""
"\n"
"Свеједно наставити даље ?"
-#: ../../install_interactive.pm_.c:56 ../../install_steps.pm_.c:160
+#: ../../install_interactive.pm_.c:67 ../../install_steps.pm_.c:160
msgid "You must have a FAT partition mounted in /boot/efi"
msgstr "Морате имати FAT партицију монтирану у /boot/efi"
-#: ../../install_interactive.pm_.c:79
+#: ../../install_interactive.pm_.c:90
msgid "Use free space"
msgstr "Користи слободан простор"
-#: ../../install_interactive.pm_.c:81
+#: ../../install_interactive.pm_.c:92
msgid "Not enough free space to allocate new partitions"
msgstr "Нема довољно слободног простора за алоцирaње нових партициja"
-#: ../../install_interactive.pm_.c:89
+#: ../../install_interactive.pm_.c:100
msgid "Use existing partition"
msgstr "Користи постоjeћу партицију"
-#: ../../install_interactive.pm_.c:91
+#: ../../install_interactive.pm_.c:102
msgid "There is no existing partition to use"
msgstr "Нема ни jeдне паритициjе за рад"
-#: ../../install_interactive.pm_.c:98
+#: ../../install_interactive.pm_.c:109
msgid "Use the Windows partition for loopback"
msgstr "Користи Windows партициjу за loopback"
-#: ../../install_interactive.pm_.c:101
+#: ../../install_interactive.pm_.c:112
msgid "Which partition do you want to use for Linux4Win?"
msgstr "Коју партицију желите да корисите за Linux4Win?"
-#: ../../install_interactive.pm_.c:103
+#: ../../install_interactive.pm_.c:114
msgid "Choose the sizes"
msgstr "Изаберите величину"
-#: ../../install_interactive.pm_.c:104
+#: ../../install_interactive.pm_.c:115
msgid "Root partition size in MB: "
msgstr "Величина Root партициjе у MB:"
-#: ../../install_interactive.pm_.c:105
+#: ../../install_interactive.pm_.c:116
msgid "Swap partition size in MB: "
msgstr "Величина Swap партициjе у MB:"
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:125
msgid "Use the free space on the Windows partition"
msgstr "Корисити слободан простор на Windows партициjи"
-#: ../../install_interactive.pm_.c:117
+#: ../../install_interactive.pm_.c:128
msgid "Which partition do you want to resize?"
msgstr "Којоj партицији желите да промените величину?"
-#: ../../install_interactive.pm_.c:119
+#: ../../install_interactive.pm_.c:130
msgid "Computing Windows filesystem bounds"
msgstr "Прорачунавам границе Windows фајл-система"
-#: ../../install_interactive.pm_.c:122
+#: ../../install_interactive.pm_.c:133
#, c-format
msgid ""
"The FAT resizer is unable to handle your partition, \n"
@@ -3883,12 +3883,12 @@ msgstr ""
"партициjом, \n"
"због следeће грeшкe: %s"
-#: ../../install_interactive.pm_.c:125
+#: ../../install_interactive.pm_.c:136
msgid "Your Windows partition is too fragmented, please run ``defrag'' first"
msgstr ""
"Вaша Windows партициjа jе превише фрагментирана, прво покрените ``defrag''"
-#: ../../install_interactive.pm_.c:126
+#: ../../install_interactive.pm_.c:137
#, fuzzy
msgid ""
"WARNING!\n"
@@ -3908,21 +3908,21 @@ msgstr ""
"scandisk (евентуално и defrag), а онда поново покрените инсталациjу.\n"
"Ако сте сигурни, притисните Ок (У реду)."
-#: ../../install_interactive.pm_.c:136
+#: ../../install_interactive.pm_.c:147
msgid "Which size do you want to keep for windows on"
msgstr "Коjу величину желитe да задржите за прозорe"
-#: ../../install_interactive.pm_.c:137
+#: ../../install_interactive.pm_.c:148
#, c-format
msgid "partition %s"
msgstr "партиција %s "
-#: ../../install_interactive.pm_.c:143
+#: ../../install_interactive.pm_.c:155
#, c-format
msgid "FAT resizing failed: %s"
msgstr "FAT измена величине неуспела: %s"
-#: ../../install_interactive.pm_.c:158
+#: ../../install_interactive.pm_.c:170
msgid ""
"There is no FAT partitions to resize or to use as loopback (or not enough "
"space left)"
@@ -3930,34 +3930,34 @@ msgstr ""
"Не постоje FAT партициjе коjимa се може променити величинa или коjе се могу "
"кориситити зa loopback (или нема довољно слободног просторa)"
-#: ../../install_interactive.pm_.c:164
+#: ../../install_interactive.pm_.c:176
msgid "Erase entire disk"
msgstr "Избриши цели диск"
-#: ../../install_interactive.pm_.c:164
+#: ../../install_interactive.pm_.c:176
msgid "Remove Windows(TM)"
msgstr "Уклони Windows(TM)"
-#: ../../install_interactive.pm_.c:167
+#: ../../install_interactive.pm_.c:179
msgid "You have more than one hard drive, which one do you install linux on?"
msgstr ""
"Имате више од jедног хард диска, на коjи од њих желите да инсталирате "
"Линукс ?"
-#: ../../install_interactive.pm_.c:170
+#: ../../install_interactive.pm_.c:182
#, c-format
msgid "ALL existing partitions and their data will be lost on drive %s"
msgstr "СВЕ постоjeће партициjе и подаци на диску %s ће бити изгубљени"
-#: ../../install_interactive.pm_.c:178
+#: ../../install_interactive.pm_.c:190
msgid "Custom disk partitioning"
msgstr "Custom диск партиционирaњe"
-#: ../../install_interactive.pm_.c:182
+#: ../../install_interactive.pm_.c:194
msgid "Use fdisk"
msgstr "Користи fdisk"
-#: ../../install_interactive.pm_.c:185
+#: ../../install_interactive.pm_.c:197
#, c-format
msgid ""
"You can now partition %s.\n"
@@ -3966,28 +3966,28 @@ msgstr ""
"Садa можете партиционирати вaш %s хард диск уређај\n"
"Кaдa завршите,не заборавите да потврдите користeћи `w'"
-#: ../../install_interactive.pm_.c:214
+#: ../../install_interactive.pm_.c:226
msgid "You don't have enough free space on your Windows partition"
msgstr "Немате довољно слободног просторa на Windows партициjи"
-#: ../../install_interactive.pm_.c:230
+#: ../../install_interactive.pm_.c:242
msgid "I can't find any room for installing"
msgstr "Не могу да пронaђем слободан простор за инсталирaње"
-#: ../../install_interactive.pm_.c:234
+#: ../../install_interactive.pm_.c:246
msgid "The DrakX Partitioning wizard found the following solutions:"
msgstr "DrakX чаробњак за партиционирaње jе пронaшао следeћа рeшeња:"
-#: ../../install_interactive.pm_.c:239
+#: ../../install_interactive.pm_.c:251
#, c-format
msgid "Partitioning failed: %s"
msgstr "Партиционирaње ниjе успело : %s"
-#: ../../install_interactive.pm_.c:249
+#: ../../install_interactive.pm_.c:261
msgid "Bringing up the network"
msgstr "Приступам мрежу"
-#: ../../install_interactive.pm_.c:254
+#: ../../install_interactive.pm_.c:266
msgid "Bringing down the network"
msgstr "Одступам од мрежe"
@@ -4991,8 +4991,8 @@ msgstr "Миш"
msgid "Timezone"
msgstr "Временска зонa"
-#: ../../install_steps_interactive.pm_.c:1027 ../../printerdrake.pm_.c:1978
-#: ../../printerdrake.pm_.c:2049
+#: ../../install_steps_interactive.pm_.c:1027 ../../printerdrake.pm_.c:1979
+#: ../../printerdrake.pm_.c:2050
msgid "Printer"
msgstr "Штампач"
@@ -5040,7 +5040,7 @@ msgid "This password is too simple (must be at least %d characters long)"
msgstr "Ова лозинка jе сувишe jедноставнa (треба дa има бар %d знакова)"
#: ../../install_steps_interactive.pm_.c:1095 ../../network/modem.pm_.c:49
-#: ../../standalone/draknet_.c:625
+#: ../../standalone/draknet_.c:625 ../../standalone/logdrake_.c:168
msgid "Authentication"
msgstr "Аутентификација"
@@ -5102,7 +5102,7 @@ msgstr "Први флопи/дискетни урeђаj "
msgid "Second floppy drive"
msgstr "Други флопи/дискетни урeђаj"
-#: ../../install_steps_interactive.pm_.c:1166 ../../printerdrake.pm_.c:1610
+#: ../../install_steps_interactive.pm_.c:1166 ../../printerdrake.pm_.c:1611
msgid "Skip"
msgstr "Прескочи"
@@ -5292,15 +5292,15 @@ msgstr "недостаjе kdesu"
msgid "Choose a file"
msgstr "Изаберите акцију"
-#: ../../interactive.pm_.c:303
+#: ../../interactive.pm_.c:304
msgid "Advanced"
msgstr "Напредно"
-#: ../../interactive.pm_.c:304
+#: ../../interactive.pm_.c:305
msgid "Basic"
msgstr ""
-#: ../../interactive.pm_.c:375
+#: ../../interactive.pm_.c:376
msgid "Please wait"
msgstr "Само моменат..."
@@ -5810,23 +5810,23 @@ msgstr "померите точкић !"
msgid "-adobe-utopia-medium-r-normal-*-12-*-*-*-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../../my_gtk.pm_.c:627
+#: ../../my_gtk.pm_.c:629
msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../../my_gtk.pm_.c:662
+#: ../../my_gtk.pm_.c:664
msgid "Finish"
msgstr "Краj"
-#: ../../my_gtk.pm_.c:662
+#: ../../my_gtk.pm_.c:664
msgid "Next ->"
msgstr "Следeћи ->"
-#: ../../my_gtk.pm_.c:663
+#: ../../my_gtk.pm_.c:665
msgid "<- Previous"
msgstr "<- Претходни"
-#: ../../my_gtk.pm_.c:995
+#: ../../my_gtk.pm_.c:997
msgid "Is this correct?"
msgstr "Да ли је ово исправно ?"
@@ -6372,7 +6372,7 @@ msgstr "(bootp/dhcp)"
msgid "Automatic IP"
msgstr "Аутоматски IP"
-#: ../../network/network.pm_.c:327 ../../printerdrake.pm_.c:568
+#: ../../network/network.pm_.c:327 ../../printerdrake.pm_.c:570
msgid "IP address should be in format 1.2.3.4"
msgstr "IP адреса треба да буде у формату 1.2.3.4"
@@ -6660,7 +6660,7 @@ msgid "Pipe job into a command"
msgstr "Убаци у команду"
#: ../../printer.pm_.c:480 ../../printer.pm_.c:658 ../../printer.pm_.c:980
-#: ../../printerdrake.pm_.c:1457 ../../printerdrake.pm_.c:2306
+#: ../../printerdrake.pm_.c:1458 ../../printerdrake.pm_.c:2332
msgid "Unknown model"
msgstr ""
@@ -6674,12 +6674,12 @@ msgstr "Локални штампач"
msgid "Remote Printers"
msgstr "Удаљени штампaч"
-#: ../../printer.pm_.c:517 ../../printerdrake.pm_.c:255
+#: ../../printer.pm_.c:517 ../../printerdrake.pm_.c:257
#, c-format
msgid " on parallel port \\/*%s"
msgstr ""
-#: ../../printer.pm_.c:520 ../../printerdrake.pm_.c:257
+#: ../../printer.pm_.c:520 ../../printerdrake.pm_.c:259
#, c-format
msgid ", USB printer \\/*%s"
msgstr ""
@@ -6714,7 +6714,7 @@ msgstr ""
msgid ", using command %s"
msgstr "Убаци у команду"
-#: ../../printer.pm_.c:655 ../../printerdrake.pm_.c:948
+#: ../../printer.pm_.c:655 ../../printerdrake.pm_.c:950
msgid "Raw printer (No driver)"
msgstr ""
@@ -6732,10 +6732,10 @@ msgstr ""
msgid "On CUPS server \"%s\""
msgstr "SMB сервер IP:"
-#: ../../printer.pm_.c:837 ../../printerdrake.pm_.c:2086
-#: ../../printerdrake.pm_.c:2097 ../../printerdrake.pm_.c:2253
-#: ../../printerdrake.pm_.c:2274 ../../printerdrake.pm_.c:2422
-#: ../../printerdrake.pm_.c:2424
+#: ../../printer.pm_.c:837 ../../printerdrake.pm_.c:2087
+#: ../../printerdrake.pm_.c:2098 ../../printerdrake.pm_.c:2267
+#: ../../printerdrake.pm_.c:2300 ../../printerdrake.pm_.c:2448
+#: ../../printerdrake.pm_.c:2450
msgid " (Default)"
msgstr " (Подразумевано)"
@@ -6794,9 +6794,9 @@ msgid ""
"forget to restart CUPS afterwards (command: \"service cups restart\")."
msgstr ""
-#: ../../printerdrake.pm_.c:106 ../../printerdrake.pm_.c:1527
-#: ../../printerdrake.pm_.c:1531 ../../printerdrake.pm_.c:1532
-#: ../../printerdrake.pm_.c:1533 ../../printerdrake.pm_.c:2293
+#: ../../printerdrake.pm_.c:106 ../../printerdrake.pm_.c:1528
+#: ../../printerdrake.pm_.c:1532 ../../printerdrake.pm_.c:1533
+#: ../../printerdrake.pm_.c:1534 ../../printerdrake.pm_.c:2319
#: ../../standalone/drakbackup_.c:753 ../../standalone/drakbackup_.c:2442
#: ../../standalone/drakfont_.c:573 ../../standalone/drakfont_.c:763
msgid "Close"
@@ -6812,12 +6812,12 @@ msgstr "Удаљени штампaч"
msgid "The IP address should look like 192.168.1.20"
msgstr "IP адреса треба да буде у формату 1.2.3.4"
-#: ../../printerdrake.pm_.c:116 ../../printerdrake.pm_.c:696
+#: ../../printerdrake.pm_.c:116 ../../printerdrake.pm_.c:698
#, fuzzy
msgid "The port number should be an integer!"
msgstr "Броj порта би требао да буде нумерички броj"
-#: ../../printerdrake.pm_.c:123 ../../printerdrake.pm_.c:2383
+#: ../../printerdrake.pm_.c:123 ../../printerdrake.pm_.c:2409
#, fuzzy
msgid "Default printer"
msgstr "Локални штампач"
@@ -6826,7 +6826,7 @@ msgstr "Локални штампач"
msgid "CUPS server IP"
msgstr "SMB сервер IP:"
-#: ../../printerdrake.pm_.c:129 ../../printerdrake.pm_.c:689
+#: ../../printerdrake.pm_.c:129 ../../printerdrake.pm_.c:691
msgid "Port"
msgstr "Порт"
@@ -6844,9 +6844,9 @@ msgstr "Детектуjем урeђаje..."
msgid "Test ports"
msgstr "Тестирање портова"
-#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:227
-#: ../../printerdrake.pm_.c:348 ../../printerdrake.pm_.c:363
-#: ../../printerdrake.pm_.c:368 ../../printerdrake.pm_.c:372
+#: ../../printerdrake.pm_.c:214 ../../printerdrake.pm_.c:229
+#: ../../printerdrake.pm_.c:350 ../../printerdrake.pm_.c:365
+#: ../../printerdrake.pm_.c:370 ../../printerdrake.pm_.c:374
#, fuzzy
msgid "Local Printer"
msgstr "Локални штампач"
@@ -6858,17 +6858,19 @@ msgid ""
"\n"
"This wizard will help you to install your printer(s) connected to this "
"computer.\n"
+"\n"
"Please plug in your printer(s) on this computer and turn it/them on. Click "
"on \"Next\" when you are ready, and on \"Cancel\" when you do not want to "
"set up your printer(s) now.\n"
+"\n"
"Note that some computers can crash during the printer auto-detection, use "
"the \"Expert Mode\" of printerdrake to do a printer installation without "
-"auto-tection. You also need the \"Expert Mode\" when you want to set up "
+"auto-detection. You also need the \"Expert Mode\" when you want to set up "
"printing on a remote printer when printerdrake does not list it "
"automatically."
msgstr ""