diff options
| author | Florent Villard <warly@mandriva.com> | 2004-02-10 15:54:36 +0000 |
|---|---|---|
| committer | Florent Villard <warly@mandriva.com> | 2004-02-10 15:54:36 +0000 |
| commit | 69b8bba47ab3c7f13820ba32804264941a2835fc (patch) | |
| tree | 2572c3b7141016f0966825894f13aff1f9c0afe3 | |
| parent | 63d728c7ef6ffbf042d4e97f93a8b24df5076897 (diff) | |
| download | drakwizard-69b8bba47ab3c7f13820ba32804264941a2835fc.tar drakwizard-69b8bba47ab3c7f13820ba32804264941a2835fc.tar.gz drakwizard-69b8bba47ab3c7f13820ba32804264941a2835fc.tar.bz2 drakwizard-69b8bba47ab3c7f13820ba32804264941a2835fc.tar.xz drakwizard-69b8bba47ab3c7f13820ba32804264941a2835fc.zip | |
fix list_printers function
readd ENV{__WIZ_HOME__} variable to be able to test directly from the CVS tree
change "choose a country" to "choose a city"
| -rwxr-xr-x | drakwizard.pl | 1 | ||||
| -rw-r--r-- | drakwizard.spec | 9 | ||||
| -rw-r--r-- | po/ar.po | 2 | ||||
| -rw-r--r-- | po/az.po | 2 | ||||
| -rw-r--r-- | po/bg.po | 2 | ||||
| -rw-r--r-- | po/bs.po | 2 | ||||
| -rw-r--r-- | po/ca.po | 2 | ||||
| -rw-r--r-- | po/cs.po | 2 | ||||
| -rw-r--r-- | po/cy.po | 2 | ||||
| -rw-r--r-- | po/da.po | 2 | ||||
| -rw-r--r-- | po/de.po | 2 | ||||
| -rw-r--r-- | po/drakwizard.pot | 20 | ||||
| -rw-r--r-- | po/el.po | 2 | ||||
| -rw-r--r-- | po/eo.po | 2 | ||||
| -rw-r--r-- | po/es.po | 2 | ||||
| -rw-r--r-- | po/et.po | 2 | ||||
| -rw-r--r-- | po/eu.po | 2 | ||||
| -rw-r--r-- | po/fa.po | 2 | ||||
| -rw-r--r-- | po/fi.po | 2 | ||||
| -rw-r--r-- | po/fr.po | 4 | ||||
| -rw-r--r-- | po/he.po | 2 | ||||
| -rw-r--r-- | po/hi.po | 2 | ||||
| -rw-r--r-- | po/hu.po | 2 | ||||
| -rw-r--r-- | po/id.po | 2 | ||||
| -rw-r--r-- | po/is.po | 2 | ||||
| -rw-r--r-- | po/it.po | 2 | ||||
| -rw-r--r-- | po/ja.po | 2 | ||||
| -rw-r--r-- | po/ko.po | 2 | ||||
| -rw-r--r-- | po/lv.po | 2 | ||||
| -rw-r--r-- | po/mk.po | 2 | ||||
| -rw-r--r-- | po/ms.po | 2 | ||||
| -rw-r--r-- | po/mt.po | 2 | ||||
| -rw-r--r-- | po/nb.po | 2 | ||||
| -rw-r--r-- | po/nl.po | 2 | ||||
| -rw-r--r-- | po/pl.po | 2 | ||||
| -rw-r--r-- | po/pt.po | 2 | ||||
| -rw-r--r-- | po/pt_BR.po | 2 | ||||
| -rw-r--r-- | po/ro.po | 2 | ||||
| -rw-r--r-- | po/ru.po | 2 | ||||
| -rw-r--r-- | po/sk.po | 2 | ||||
| -rw-r--r-- | po/sl.po | 2 | ||||
| -rw-r--r-- | po/sq.po | 2 | ||||
| -rw-r--r-- | po/sr.po | 2 | ||||
| -rw-r--r-- | po/sr@Latn.po | 2 | ||||
| -rw-r--r-- | po/sv.po | 2 | ||||
| -rw-r--r-- | po/ta.po | 2 | ||||
| -rw-r--r-- | po/tg.po | 2 | ||||
| -rw-r--r-- | po/tr.po | 2 | ||||
| -rw-r--r-- | po/uk.po | 2 | ||||
| -rw-r--r-- | po/uz.po | 2 | ||||
| -rw-r--r-- | po/uz@Latn.po | 2 | ||||
| -rw-r--r-- | po/vi.po | 2 | ||||
| -rw-r--r-- | po/wa.po | 2 | ||||
| -rw-r--r-- | po/zh_CN.po | 2 | ||||
| -rw-r--r-- | po/zh_TW.po | 2 | ||||
| -rwxr-xr-x | samba_wizard/Samba.pm | 70 | ||||
| -rw-r--r-- | time_wizard/Ntp.pm | 2 |
57 files changed, 107 insertions, 101 deletions
diff --git a/drakwizard.pl b/drakwizard.pl index 153c28a8..46854b0c 100755 --- a/drakwizard.pl +++ b/drakwizard.pl @@ -53,6 +53,7 @@ my %wiz = ( pxe => ['Pxe', N("PXE server")], ); +@ARGV = grep { ! /^--/ } @ARGV; if (!defined($wiz{$ARGV[0]})) { $in->ask_from( N("Drakwizard wizard selection"), diff --git a/drakwizard.spec b/drakwizard.spec index 94709407..ef61bb36 100644 --- a/drakwizard.spec +++ b/drakwizard.spec @@ -1,6 +1,6 @@ %define name drakwizard -%define version 2.9 -%define release 5mdk +%define version 2.10 +%define release 1mdk Name: %{name} Version: %{version} @@ -49,6 +49,11 @@ rm -rf $RPM_BUILD_DIR/$RPM_PACKAGE_NAME %{perl_vendorlib}/MDK/ %changelog +* Tue Feb 10 2004 Warly <warly@mandrakesoft.com> 2.10-1mdk +- fix list_printers function +- readd ENV{__WIZ_HOME__} variable to be able to test directly from the CVS tree +- change "choose a country" to "choose a city" + * Mon Feb 2 2004 guibo <guibo@xp2400.guibland.com> 2.9-5mdk - typo fixes - Samba wizard now working (no more printers share for the moment) @@ -2240,7 +2240,7 @@ msgstr "اختر منطقة زمنية" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "اختر منطقة زمنية" #: ../time_wizard/Ntp.pm:124 @@ -2291,7 +2291,7 @@ msgid "Choose a region:" msgstr "Rayonu seç:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Ölkəni seç:" #: ../time_wizard/Ntp.pm:124 @@ -2226,7 +2226,7 @@ msgid "Choose a region:" msgstr "" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "" #: ../time_wizard/Ntp.pm:124 @@ -2308,7 +2308,7 @@ msgstr "Izaberite vremensku zonu:" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Izaberite vremensku zonu:" #: ../time_wizard/Ntp.pm:124 @@ -2227,7 +2227,7 @@ msgid "Choose a region:" msgstr "Trieu una regió:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Trieu un país:" #: ../time_wizard/Ntp.pm:124 @@ -2295,7 +2295,7 @@ msgid "Choose a region:" msgstr "Vyberte oblast:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Vyberte zemi:" #: ../time_wizard/Ntp.pm:124 @@ -2302,7 +2302,7 @@ msgid "Choose a region:" msgstr "Dewis ardal:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Dewis gwlad:" #: ../time_wizard/Ntp.pm:124 @@ -2290,7 +2290,7 @@ msgid "Choose a region:" msgstr "Vælg en region:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Vælg et land:" #: ../time_wizard/Ntp.pm:124 @@ -2307,7 +2307,7 @@ msgid "Choose a region:" msgstr "Wählen Sie eine Region:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Wählen Sie eine Land:" #: ../time_wizard/Ntp.pm:124 diff --git a/po/drakwizard.pot b/po/drakwizard.pot index 310f29eb..1c975822 100644 --- a/po/drakwizard.pot +++ b/po/drakwizard.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2004-02-10 09:06+0100\n" +"POT-Creation-Date: 2004-02-10 16:22+0100\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" @@ -119,8 +119,8 @@ msgid "You are in dhcp, server may not work with your configuration." msgstr "" #: ../client_wizard/Bind_client.pm:78 ../client_wizard/Bind_client.pm:83 -#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:70 -#: ../drakwizard.pl:89 ../drakwizard.pl:138 ../drakwizard.pl:142 +#: ../dhcp_wizard/Dhcp.pm:94 ../dhcp_wizard/Dhcp.pm:104 ../drakwizard.pl:71 +#: ../drakwizard.pl:90 ../drakwizard.pl:139 ../drakwizard.pl:143 #: ../ldap_wizard/ldap.pm:171 msgid "Error" msgstr "" @@ -521,7 +521,7 @@ msgstr "" msgid "FTP server" msgstr "" -#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:481 +#: ../drakwizard.pl:47 ../samba_wizard/Samba.pm:474 msgid "Samba server" msgstr "" @@ -549,22 +549,22 @@ msgstr "" msgid "PXE server" msgstr "" -#: ../drakwizard.pl:58 +#: ../drakwizard.pl:59 msgid "Drakwizard wizard selection" msgstr "" -#: ../drakwizard.pl:59 +#: ../drakwizard.pl:60 msgid "Please select a wizard" msgstr "" -#: ../drakwizard.pl:138 +#: ../drakwizard.pl:139 #, perl-format msgid "" "%s is not installed\n" "Click \"Next\" to install or \"Cancel\" to quit" msgstr "" -#: ../drakwizard.pl:142 +#: ../drakwizard.pl:143 msgid "Installation failed" msgstr "" @@ -2007,7 +2007,7 @@ msgstr "" msgid "The wizard successfully configured your Samba server." msgstr "" -#: ../samba_wizard/Samba.pm:481 +#: ../samba_wizard/Samba.pm:474 msgid "Configuring your Samba server..." msgstr "" @@ -2068,7 +2068,7 @@ msgid "Choose a region:" msgstr "" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "" #: ../time_wizard/Ntp.pm:124 @@ -2334,7 +2334,7 @@ msgstr "Επιλέξτε ζώνη ώρας:" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Επιλέξτε ζώνη ώρας:" #: ../time_wizard/Ntp.pm:124 @@ -2302,7 +2302,7 @@ msgstr "Elekti horzonon:" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Elekti horzonon:" #: ../time_wizard/Ntp.pm:124 @@ -2296,7 +2296,7 @@ msgid "Choose a region:" msgstr "Seleccione una regin:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Seleccione un pas:" #: ../time_wizard/Ntp.pm:124 @@ -2248,7 +2248,7 @@ msgid "Choose a region:" msgstr "Valige piirkond:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Valige riik:" #: ../time_wizard/Ntp.pm:124 @@ -2303,7 +2303,7 @@ msgid "Choose a region:" msgstr "Aukeratu lurraldea:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Aukeratu herrialdea:" #: ../time_wizard/Ntp.pm:124 @@ -2270,7 +2270,7 @@ msgid "Choose a region:" msgstr "انتخاب یک منطقه:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "انتخاب یک کشور:" #: ../time_wizard/Ntp.pm:124 @@ -2275,7 +2275,7 @@ msgid "Choose a region:" msgstr "Valitse alue:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Valitse maa:" #: ../time_wizard/Ntp.pm:124 @@ -2312,8 +2312,8 @@ msgid "Choose a region:" msgstr "Choisissez une rgion:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" -msgstr "Choisissez un pays:" +msgid "Choose a city:" +msgstr "Choisissez une ville:" #: ../time_wizard/Ntp.pm:124 msgid "" @@ -2240,7 +2240,7 @@ msgid "Choose a region:" msgstr "יש לבחור אזור גיאוגרפי:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "יש לבחור מדינה:" #: ../time_wizard/Ntp.pm:124 @@ -2274,7 +2274,7 @@ msgid "Choose a region:" msgstr "एक क्षेत्र का चयन करें:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "एक देश का चयन करें:" #: ../time_wizard/Ntp.pm:124 @@ -2342,7 +2342,7 @@ msgstr "Vlasszon egy idznt:" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Vlasszon egy idznt:" #: ../time_wizard/Ntp.pm:124 @@ -2272,7 +2272,7 @@ msgstr "Pilih zona waktu:" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Pilih zona waktu:" #: ../time_wizard/Ntp.pm:124 @@ -2124,7 +2124,7 @@ msgid "Choose a region:" msgstr "" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "" #: ../time_wizard/Ntp.pm:124 @@ -2322,7 +2322,7 @@ msgid "Choose a region:" msgstr "Scegli una zona:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Scegli una localit:" #: ../time_wizard/Ntp.pm:124 @@ -2259,7 +2259,7 @@ msgid "Choose a region:" msgstr "地域を選んでください:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "国を選んでください:" #: ../time_wizard/Ntp.pm:124 @@ -2262,7 +2262,7 @@ msgstr "ð :" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "ð :" #: ../time_wizard/Ntp.pm:124 @@ -2230,7 +2230,7 @@ msgstr "Izvlieties laika zonu:" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Izvlieties laika zonu:" #: ../time_wizard/Ntp.pm:124 @@ -2317,7 +2317,7 @@ msgstr "Изберете часовна зона:" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Изберете часовна зона:" #: ../time_wizard/Ntp.pm:124 @@ -2279,7 +2279,7 @@ msgid "Choose a region:" msgstr "" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "" #: ../time_wizard/Ntp.pm:124 @@ -2317,7 +2317,7 @@ msgstr "Agħżel żona orarja:" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Agħżel żona orarja:" #: ../time_wizard/Ntp.pm:124 @@ -2299,7 +2299,7 @@ msgid "Choose a region:" msgstr "Velg en region:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Velg et land:" #: ../time_wizard/Ntp.pm:124 @@ -2326,7 +2326,7 @@ msgstr "Kies een tijdzone:" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Kies een tijdzone:" #: ../time_wizard/Ntp.pm:124 @@ -2290,7 +2290,7 @@ msgid "Choose a region:" msgstr "Wybierz region:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Wybierz kraj:" #: ../time_wizard/Ntp.pm:124 @@ -2300,7 +2300,7 @@ msgid "Choose a region:" msgstr "Escolha uma região:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Escolha um país:" #: ../time_wizard/Ntp.pm:124 diff --git a/po/pt_BR.po b/po/pt_BR.po index 02e0c140..7dcef07e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -2246,7 +2246,7 @@ msgid "Choose a region:" msgstr "Escolha uma região:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Escolha um país:" #: ../time_wizard/Ntp.pm:124 @@ -2306,7 +2306,7 @@ msgid "Choose a region:" msgstr "Alegeţi o regiune:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Alegeţi o ţară:" #: ../time_wizard/Ntp.pm:124 @@ -2292,7 +2292,7 @@ msgid "Choose a region:" msgstr "Выберите регион:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Выберите страну:" #: ../time_wizard/Ntp.pm:124 @@ -2131,7 +2131,7 @@ msgstr "Zvoľte si časovú zónu:" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Zvoľte si časovú zónu:" #: ../time_wizard/Ntp.pm:124 @@ -2254,7 +2254,7 @@ msgid "Choose a region:" msgstr "Izberite časovno cono:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Izberite državo:" #: ../time_wizard/Ntp.pm:124 @@ -2335,7 +2335,7 @@ msgstr "Zgjedheni kohn orara:" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Zgjedheni kohn orara:" #: ../time_wizard/Ntp.pm:124 @@ -2298,7 +2298,7 @@ msgstr "Изаберите временску зону:" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Изаберите временску зону:" #: ../time_wizard/Ntp.pm:124 diff --git a/po/sr@Latn.po b/po/sr@Latn.po index 2b4eca18..ce774a8b 100644 --- a/po/sr@Latn.po +++ b/po/sr@Latn.po @@ -2303,7 +2303,7 @@ msgstr "Izaberite vremensku zonu:" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Izaberite vremensku zonu:" #: ../time_wizard/Ntp.pm:124 @@ -2264,7 +2264,7 @@ msgid "Choose a region:" msgstr "Välj en tidszon:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Välj ett land:" #: ../time_wizard/Ntp.pm:124 @@ -2285,7 +2285,7 @@ msgstr "உங்கள் கால மண்டலத்ைத தேர்வ #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "உங்கள் கால மண்டலத்ைத தேர்வு செய்யுங்கள்" #: ../time_wizard/Ntp.pm:124 @@ -2299,7 +2299,7 @@ msgid "Choose a region:" msgstr "Минтақаро интихоб намудан:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Мамлакатро интихоб намудан:" #: ../time_wizard/Ntp.pm:124 @@ -2295,7 +2295,7 @@ msgstr "Bir zaman dilimi seçin:" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Bir zaman dilimi seçin:" #: ../time_wizard/Ntp.pm:124 @@ -2303,7 +2303,7 @@ msgstr "Ҧ :" #: ../time_wizard/Ntp.pm:119 #, fuzzy -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Ҧ :" #: ../time_wizard/Ntp.pm:124 @@ -2222,7 +2222,7 @@ msgid "Choose a region:" msgstr "" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "" #: ../time_wizard/Ntp.pm:124 diff --git a/po/uz@Latn.po b/po/uz@Latn.po index ae516030..3212314b 100644 --- a/po/uz@Latn.po +++ b/po/uz@Latn.po @@ -2234,7 +2234,7 @@ msgid "Choose a region:" msgstr "" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "" #: ../time_wizard/Ntp.pm:124 @@ -2235,7 +2235,7 @@ msgid "Choose a region:" msgstr "Chọn vùng:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Chọn quốc gia:" #: ../time_wizard/Ntp.pm:124 @@ -2209,7 +2209,7 @@ msgid "Choose a region:" msgstr "Tchoezixhoz ene redjon:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "Tchoezixhoz on payis:" #: ../time_wizard/Ntp.pm:124 diff --git a/po/zh_CN.po b/po/zh_CN.po index 03d9a78d..743060c4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2161,7 +2161,7 @@ msgid "Choose a region:" msgstr "选择一个区域:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "选择一个国家/地区:" #: ../time_wizard/Ntp.pm:124 diff --git a/po/zh_TW.po b/po/zh_TW.po index 536fb941..72f810d3 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2131,7 +2131,7 @@ msgid "Choose a region:" msgstr "ܦa:" #: ../time_wizard/Ntp.pm:119 -msgid "Choose a country:" +msgid "Choose a city:" msgstr "ܰa:" #: ../time_wizard/Ntp.pm:124 diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm index 0c8ee6e3..2e0edcbc 100755 --- a/samba_wizard/Samba.pm +++ b/samba_wizard/Samba.pm @@ -38,8 +38,8 @@ my $o = { wiz_do_file_sharing => '', wiz_all_printers => '', wiz_level => '', -# wiz_printers => '', -# wiz_do_printer_sharing => '', + wiz_printers => '', + wiz_do_printer_sharing => '', wiz_do_homes => '', wiz_workgroup => '', wiz_dir => '', @@ -47,10 +47,10 @@ my $o = { wiz_write_list => '', wiz_read_list => '', wiz_hosts_deny => '', -# list_printers => '' + list_printers => '' }, needed_rpm => [ 'samba-server' ], - defaultimage => "/usr/share/wizards/samba_wizard/images/samba.png", + defaultimage => "$ENV{__WIZ_HOME__}/samba_wizard/images/samba.png", init => sub { my $file = "/etc/samba/smb.conf"; if (-f $file) { @@ -132,13 +132,13 @@ $o->{pages} = { name => N("Enabled Samba Services") . "\n\n" . N("Samba can provide a common file sharing area to your Windows workstation, and can also provide printer sharing for the printers connected to your server."), pre => sub { $o->{var}{wiz_do_file_sharing} ||= get_file_sharing(); -# $o->{var}{wiz_do_printer_sharing} ||= 1; + $o->{var}{wiz_do_printer_sharing} ||= 1; $o->{var}{wiz_do_homes} ||= get_home_sharing() }, post => \&check_services, data => [ { text => N("Enable file sharing area"), type => 'bool', val => \$o->{var}{wiz_do_file_sharing} }, -# { text => N("Enable Server Printer Sharing"), type => 'bool', val => \$o->{var}{wiz_do_printer_sharing} }, + { text => N("Enable Server Printer Sharing"), type => 'bool', val => \$o->{var}{wiz_do_printer_sharing} }, { text => N("Make home directories available for their owners"), type => 'bool', val => \$o->{var}{wiz_do_homes} }, ], next => 'ask_dir' @@ -176,19 +176,19 @@ $o->{pages} = { { label => N("read list:"), help => N("root, fred, \@users, \@wheel"), val => \$o->{var}{wiz_read_list} }, { label => N("write list:"), help => N("root, fred, \@users, \@wheel"), val => \$o->{var}{wiz_write_list} }, ], -# next => 'ask_printers' -# }, -# ask_printers => { -# name => N("Select which printers you want to be accessible from known users"), -# pre => sub { -# $o->{var}{list_printers} ||= [ list_printers() ]; -# $o->{var}{wiz_box_list} ||= get_previous_printers($o->{var}{list_printers}) - # }, - # post => \&check, - # data => [ - # { text => N("Enable all printers"), type => 'bool', val => \$o->{var}{wiz_all_printers} }, - # { val => \$o->{var}{wiz_box_list}, boolean_list => \$o->{var}{list_printers}, disabled => sub { $o->{var}{wiz_all_printers} and return 1; 0 } }, - # ], + next => 'ask_printers' + }, + ask_printers => { + name => N("Select which printers you want to be accessible from known users"), + pre => sub { + $o->{var}{list_printers} ||= [ list_printers() ]; + $o->{var}{wiz_box_list} ||= get_previous_printers($o->{var}{list_printers}) + }, + post => \&check, + data => [ + { text => N("Enable all printers"), type => 'bool', val => \$o->{var}{wiz_all_printers} }, + { val => \$o->{var}{wiz_box_list}, boolean_list => \$o->{var}{list_printers}, disabled => sub { $o->{var}{wiz_all_printers} and return 1; 0 } }, + ], next => 'summary' }, warning => { @@ -207,9 +207,9 @@ $o->{pages} = { name => N("Configuring Samba") . "\n\n" . N("The wizard collected the following parameters configure Samba.") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them."), pre => sub { -# $o->{var}{printers} = get_printers(); + $o->{var}{printers} = get_printers(); $o->{var}{file_sharing} = $o->{var}{wiz_do_file_sharing} ? N("enabled") : N("disabled"); -# $o->{var}{printer_sharing} = $o->{var}{wiz_do_printer_sharing} ? N("enabled") : N("disabled"); + $o->{var}{printer_sharing} = $o->{var}{wiz_do_printer_sharing} ? N("enabled") : N("disabled"); $o->{var}{shared_homes} = $o->{var}{wiz_do_homes} ? N("enabled") : N("disabled") }, data => [ @@ -217,9 +217,9 @@ configure Samba.") . "\n\n" . N("To accept these values, and configure your serv { label => N("Server Banner:"), fixed_val => \$o->{var}{wiz_banner} }, { label => N("File Sharing:"), fixed_val => \$o->{var}{file_sharing} }, { label => N("Shared directory:"), fixed_val => \$o->{var}{wiz_dir} }, -# { label => N("Print Server:"), fixed_val => \$o->{var}{printer_sharing} }, + { label => N("Print Server:"), fixed_val => \$o->{var}{printer_sharing} }, { label => N("Home:"), fixed_val => \$o->{var}{shared_homes} }, -# { label => N("Printers:"), fixed_val => \$o->{var}{printers} }, + { label => N("Printers:"), fixed_val => \$o->{var}{printers} }, ], post => \&do_it, next => 'end' @@ -254,7 +254,7 @@ sub check { sub check_services { $o->{var}{wiz_do_homes} and return 'warn_smbpasswd'; $o->{var}{wiz_do_file_sharing} and return 'ask_dir'; -# $o->{var}{wiz_do_printer_sharing} and return 'ask_printers'; + $o->{var}{wiz_do_printer_sharing} and return 'ask_printers'; } sub check_dir { @@ -334,7 +334,7 @@ sub list_printers { my @list if 0; return @list if @list; - sort grep { ! /^#/ } map { /([^:]*):/ and $1 } cat_("/etc/printcap"); + sort grep { /^(?!#)./ } map { /([^:]*):/ and $1 } cat_("/etc/printcap"); } @@ -501,16 +501,16 @@ sub do_it { $conf->chg_var("global", "hosts deny", $o->{var}{wiz_hosts_deny}); $conf->chg_var("global", "hosts allow", $o->{var}{wiz_hosts_allow}); -# if ($o->{var}{wiz_do_printer_sharing}) { -# standalone->explanations("Enabling printer sharing"); -# $conf->printer_sharing; -# } else { -# standalone->explanations("Disabling printer sharing"); -# for (my $i = 0; $i < @{$o->{var}{wiz_box_list}}; $i++) { -# $conf->comment_menu($o->{var}{list_printers}[$i], ";"); -# } -# $conf->comment_menu("printers", ";"); -# } + if ($o->{var}{wiz_do_printer_sharing}) { + standalone->explanations("Enabling printer sharing"); + $conf->printer_sharing; + } else { + standalone->explanations("Disabling printer sharing"); + for (my $i = 0; $i < @{$o->{var}{wiz_box_list}}; $i++) { + $conf->comment_menu($o->{var}{list_printers}[$i], ";"); + } + $conf->comment_menu("printers", ";"); + } $conf->write_conf("/etc/samba/smb.conf"); if (services::is_service_running('smb')) { services::restart('smb') diff --git a/time_wizard/Ntp.pm b/time_wizard/Ntp.pm index 4d31f979..a4fc4ca9 100644 --- a/time_wizard/Ntp.pm +++ b/time_wizard/Ntp.pm @@ -116,7 +116,7 @@ $o->{pages} = { @country = ref $country{$o->{var}{wiz_region}} ? @{$country{$o->{var}{wiz_region}}} : () }, data => [ - { label => N("Choose a country:"), val => \$o->{var}{wiz_country}, fixed_list => \@country }, + { label => N("Choose a city:"), val => \$o->{var}{wiz_country}, fixed_list => \@country }, ], next => 'test_server' }, |