summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPablo Saratxaga <pablo@mandriva.com>2003-07-12 10:34:16 +0000
committerPablo Saratxaga <pablo@mandriva.com>2003-07-12 10:34:16 +0000
commit237b145f26fbd66625511236e85fb7b44c5e3ec3 (patch)
treed081dfc1bcf7855ab1f8b1a34666b429d3321d23
parent8a3e096d102835a269d8fffc5b2c340344b80fd6 (diff)
downloaddrakx-237b145f26fbd66625511236e85fb7b44c5e3ec3.tar
drakx-237b145f26fbd66625511236e85fb7b44c5e3ec3.tar.gz
drakx-237b145f26fbd66625511236e85fb7b44c5e3ec3.tar.bz2
drakx-237b145f26fbd66625511236e85fb7b44c5e3ec3.tar.xz
drakx-237b145f26fbd66625511236e85fb7b44c5e3ec3.zip
changed "Country" . " / Region" to "Country / Region" and fixed Chinese po's
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/help.pm4
-rw-r--r--perl-install/install_steps_interactive.pm2
-rw-r--r--perl-install/share/po/DrakX.pot19
4 files changed, 11 insertions, 16 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 7134d5e16..14d7872df 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -691,7 +691,7 @@ sub selectCountry {
my ($other, $ext_country);
member($country, @best) or ($ext_country, $country) = ($country, $ext_country);
$o->ask_from_(
- { title => N("Country") . N(" / Region"),
+ { title => N("Country / Region"),
messages => N("Please choose your country."),
interactive_help_id => 'selectCountry',
advanced_messages => N("Here is the full list of available countries"),
diff --git a/perl-install/help.pm b/perl-install/help.pm
index a0f043a60..847718a2b 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -568,7 +568,7 @@ sub selectCountry() {
N("\"%s\": check the current country selection. If you are not in this
country, click on the \"%s\" button and choose another one. If your country
is not in the first list shown, click the \"%s\" button to get the complete
-country list.", N("Country") . N(" / Region"), N("Configure"), N("More"));
+country list.", N("Country / Region"), N("Configure"), N("More"));
}
sub selectInstallClass() {
N("This step is activated only if an old GNU/Linux partition has been found on
@@ -948,7 +948,7 @@ button. This should be reserved to advanced users.
* \"%s\": here you'll be able to fine control which services will be run
on your machine. If you plan to use this machine as a server it's a good
-idea to review this setup.", N("Configure"), N("Keyboard"), N("Country") . N(" / Region"), N("Configure"), N("More"), N("Timezone"), N("Configure"), N("Mouse"), N("Printer"), N("Configure"), N("Sound card"), N("Graphical Interface"), N("Configure"), N("TV card"), N("Configure"), N("ISDN card"), N("Configure"), N("Network"), N("Security Level"), N("Firewall"), N("Bootloader"), N("Services"));
+idea to review this setup.", N("Configure"), N("Keyboard"), N("Country / Region"), N("Configure"), N("More"), N("Timezone"), N("Configure"), N("Mouse"), N("Printer"), N("Configure"), N("Sound card"), N("Graphical Interface"), N("Configure"), N("TV card"), N("Configure"), N("ISDN card"), N("Configure"), N("Network"), N("Security Level"), N("Firewall"), N("Bootloader"), N("Services"));
}
sub takeOverHdChoose() {
N("Choose the hard drive you want to erase in order to install your new
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 42bfcfb22..baeffaa5f 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -896,7 +896,7 @@ sub summary {
my $timezone_manually_set;
push @l, {
group => N("System"),
- label => N("Country") . N(" / Region"),
+ label => N("Country / Region"),
val => sub { lang::c2name($o->{locale}{country}) },
clicked => sub {
any::selectCountry($o, $o->{locale}) or return;
diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 48a159480..6b30fd169 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: 2003-07-10 18:48+0200\n"
+"POT-Creation-Date: 2003-07-12 11:55+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"
@@ -1650,11 +1650,6 @@ msgstr ""
msgid "Trouble shooting"
msgstr ""
-#: ../../any.pm:1 ../../help.pm:1 ../../help.pm:1 ../../install_steps_interactive.pm:1
-#, c-format
-msgid " / Region"
-msgstr ""
-
#: ../../printer/printerdrake.pm:1
#, c-format
msgid ""
@@ -4015,11 +4010,6 @@ msgstr ""
msgid "Please choose which serial port your modem is connected to."
msgstr ""
-#: ../../any.pm:1 ../../help.pm:1 ../../help.pm:1 ../../install_steps_interactive.pm:1
-#, c-format
-msgid "Country"
-msgstr ""
-
#: ../../standalone/drakperm:1
#, c-format
msgid "Property"
@@ -5217,6 +5207,11 @@ msgstr ""
msgid "The change is done, but to be effective you must logout"
msgstr ""
+#: ../../any.pm:1 ../../help.pm:1 ../../help.pm:1 ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Country / Region"
+msgstr ""
+
#: ../../standalone/drakbackup:1
#, c-format
msgid ""
@@ -8555,7 +8550,7 @@ msgstr ""
msgid "Unselect fonts installed"
msgstr ""
-#: ../../any.pm:1 ../../help.pm:1 ../../help.pm:1 ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1 ../../interactive.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1 ../../my_gtk.pm:1 ../../my_gtk.pm:1 ../../ugtk.pm:1 ../../diskdrake/smbnfs_gtk.pm:1 ../../interactive/http.pm:1 ../../interactive/stdio.pm:1 ../../interactive/stdio.pm:1 ../../printer/printerdrake.pm:1 ../../standalone/drakautoinst:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakfloppy:1 ../../standalone/drakfont:1 ../../standalone/draksec:1 ../../standalone/net_monitor:1
+#: ../../any.pm:1 ../../help.pm:1 ../../help.pm:1 ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1 ../../interactive.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1 ../../my_gtk.pm:1 ../../my_gtk.pm:1 ../../ugtk.pm:1 ../../diskdrake/smbnfs_gtk.pm:1 ../../interactive/http.pm:1 ../../interactive/stdio.pm:1 ../../interactive/stdio.pm:1 ../../printer/printerdrake.pm:1 ../../standalone/drakautoinst:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakconnect:1 ../../standalone/drakfloppy:1 ../../standalone/drakfont:1 ../../standalone/net_monitor:1
#, c-format
msgid "Cancel"
msgstr ""