updated German file; added choice of various quotes in help_xml2pm.pl

2 files changed, 25 insertions, 16 deletions

diff --git a/perl-install/share/po/DrakX.pot b/perl-install/share/po/DrakX.pot
index 5e825f40a..59776f3c7 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: 2001-09-10 07:14+0200\n"
+"POT-Creation-Date: 2001-09-10 20:37+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"
@@ -1867,7 +1867,8 @@ msgstr ""
 #: ../../help.pm_.c:7
 msgid ""
 "GNU/Linux is a multiuser system, and this means that each user can have his\n"
-"own preferences, his own files and so on. You can read the ``User Guide''\n"
+"own preferences, his own files and so on. You can read the `A<<`User "
+"Guide''\n"
 "to learn more. But unlike root, which is the administrator, the users you\n"
 "will add here will not be entitled to change anything except their own\n"
 "files and their own configuration. You will have to create at least one\n"
@@ -2290,7 +2291,8 @@ msgid ""
 "machine. As a rule of thumb, the more exposed the machine is, and the more\n"
 "the data stored in it is crucial, the higher the security level should be.\n"
 "However, a higher security level is generally obtained at the expenses of\n"
-"easiness of use. Refer to the MSEC chapter of the ``Reference Manual'' to\n"
+"easiness of use. Refer to the MSEC chapter of the `A<<`Reference Manual'' "
+"to\n"
 "get more information about the meaning of these levels.\n"
 "\n"
 "If you do not know what to choose, keep the default option."
@@ -2345,11 +2347,11 @@ msgid ""
 "\n"
 "When a partition is selected, you can use:\n"
 "\n"
-" * (*)(*) to create a new partition (when an empty partition is selected);\n"
+" * Ctrl-c to create a new partition (when an empty partition is selected);\n"
 "\n"
-" * (*)(*) to delete a partition;\n"
+" * Ctrl-d to delete a partition;\n"
 "\n"
-" * (*)(*) to set the mount point.\n"
+" * Ctrl-m to set the mount point.\n"
 "\n"
 "If you are installing on a PPC machine, you will want to create a small HFS\n"
 "\"bootstrap\" partition of at least 1MB which will be used by the yaboot\n"
@@ -2563,7 +2565,7 @@ msgid ""
 "\n"
 "If DrakX is not able to probe for the options that need to be passed, you\n"
 "will need to manually provide options to the driver. Please review the\n"
-"``User Guide'' (chapter 3, section \"Collecting information on your\n"
+"`A<<`User Guide'' (chapter 3, section \"Collecting information on your\n"
 "hardware\") for hints on retrieving the parameters required from hardware\n"
 "documentation, from the manufacturer's web site (if you have Internet\n"
 "access) or from Microsoft Windows (if you used this hardware with Windows\n"
diff --git a/perl-install/share/po/help_xml2pm.pl b/perl-install/share/po/help_xml2pm.pl
index de63bb436..86aba0292 100755
--- a/perl-install/share/po/help_xml2pm.pl
+++ b/perl-install/share/po/help_xml2pm.pl
@@ -21,7 +21,7 @@ save_help($base);
 foreach my $lang (keys %helps) {
     local *F;
     my ($charset) = cat_("$lang.po") =~ /charset=([^\\]+)/ or die "missing charset in $lang.po\n";
-    open F, "| iconv -f utf8 -t $charset > help-$lang.pot";
+    open F, "| iconv -f utf8 -t $charset//TRANSLIT > help-$lang.pot";
     print F "\n";
     foreach my $id (keys %{$helps{$lang}}) {
 	$base->{$id} or die "$lang:$id doesn't exist in english\n";
@@ -89,9 +89,14 @@ sub find {
 
 sub rewrite2 {
     my ($tree, $lang) = @_;
-    my $i18ned_open_quote  = $ {{ fr => "«", de => "„"}}{$lang};
-    my $i18ned_close_quote = $ {{ fr => "»", de => "“"}}{$lang};
-
+    my $i18ned_open_text_quote  = $ {{ fr => "« ", de => "„"}}{$lang};
+    my $i18ned_close_text_quote = $ {{ fr => " »", de => "“"}}{$lang};
+    my $i18ned_open_label_quote  = $ {{ fr => "« ", de => "„"}}{$lang};
+    my $i18ned_close_label_quote = $ {{ fr => " »", de => "“"}}{$lang};
+    my $i18ned_open_command_quote  = $ {{ fr => "« ", de => "„"}}{$lang};
+    my $i18ned_close_command_quote = $ {{ fr => " »", de => "“"}}{$lang};
+    my $i18ned_open_input_quote  = $ {{ fr => "« ", de => "»"}}{$lang};
+    my $i18ned_close_input_quote = $ {{ fr => " »", de => "«"}}{$lang};
     # rewrite2_ fills in $help
     $help = {};
     rewrite2_($tree);
@@ -121,14 +126,16 @@ sub rewrite2_ {
 	$text =~ s/\s+$//;
 	qq(\n$text\n);
     } elsif (member($tree->{tag}, 'quote', 'citetitle', 'foreignphrase')) {
-	($i18ned_open_quote || "``") . $text . ($i18ned_close_quote || "''");
+	($i18ned_open_text_quote || "``") . $text . ($i18ned_close_text_quote || "''");
     } elsif ($tree->{tag} eq 'guilabel') {
-	($i18ned_open_quote || "\\\"") . $text . ($i18ned_close_quote || "\\\"");
+	($i18ned_open_label_quote || "\\\"") . $text . ($i18ned_close_label_quote || "\\\"");
     } elsif ($tree->{tag} eq 'command') {
-	qq(\\"$text\\");
+	($i18ned_open_command_quote || "\\\"") . $text . ($i18ned_close_command_quote || "\\\"");
     } elsif ($tree->{tag} eq 'userinput') {
-	qq(>>$text<<);
-    } elsif (member($tree->{tag}, 'footnote', 'keysym')) {
+	($i18ned_open_input_quote || ">>") . $text . ($i18ned_close_input_quote || "<<");
+    } elsif (member($tree->{tag}, 'keysym')) {
+	qq($text);
+    } elsif (member($tree->{tag}, 'footnote')) {
 	'(*)'
     } elsif ($tree->{tag} eq 'warning') {
 	$text =~ s/^(\s+)/$1!! /;