From 6a1610f3c99e7d772f77752769860b51248c31ae Mon Sep 17 00:00:00 2001 From: Till Kamppeter Date: Sat, 2 Mar 2002 17:32:23 +0000 Subject: Replaced "Open Office" by "OpenOffice.org". --- perl-install/printer.pm | 24 ++++++++++++------------ perl-install/printerdrake.pm | 28 ++++++++++++++-------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/perl-install/printer.pm b/perl-install/printer.pm index 1e6299100..404d06346 100644 --- a/perl-install/printer.pm +++ b/perl-install/printer.pm @@ -1687,12 +1687,12 @@ sub configurestaroffice { sub configureopenoffice { my ($printer) = @_; - # Do we have Open Office installed? + # Do we have OpenOffice.org installed? my $configfilename = findopenofficeconfigfile(); return 1 if !$configfilename; $configfilename =~ m!^(.*)/share/psprint/psprint.conf$!; my $configprefix = $1; - # Load Open Office printer config file + # Load OpenOffice.org printer config file my $configfilecontent = readsofficeconfigfile($configfilename); # Update remote CUPS queues if (0 && ($printer->{SPOOLER} eq "cups") && @@ -1738,7 +1738,7 @@ sub configureopenoffice { makeopenofficeprinterentry($printer, $queue, $configprefix, $configfilecontent); } - # Write back Open Office configuration file + # Write back OpenOffice.org configuration file return writesofficeconfigfile($configfilename, $configfilecontent); } @@ -1786,12 +1786,12 @@ sub addcupsremotetostaroffice { sub addcupsremotetoopenoffice { my ($printer, $queue) = @_; - # Do we have Open Office installed? + # Do we have OpenOffice.org installed? my $configfilename = findopenofficeconfigfile(); return 1 if !$configfilename; $configfilename =~ m!^(.*)/share/psprint/psprint.conf$!; my $configprefix = $1; - # Load Open Office printer config file + # Load OpenOffice.org printer config file my $configfilecontent = readsofficeconfigfile($configfilename); # Update remote CUPS queues if (($printer->{SPOOLER} eq "cups") && @@ -1821,7 +1821,7 @@ sub addcupsremotetoopenoffice { } } } - # Write back Open Office configuration file + # Write back OpenOffice.org configuration file return writesofficeconfigfile($configfilename, $configfilecontent); } @@ -1844,18 +1844,18 @@ sub removeprinterfromstaroffice { sub removeprinterfromopenoffice { my ($printer, $queue) = @_; - # Do we have Open Office installed? + # Do we have OpenOffice.org installed? my $configfilename = findopenofficeconfigfile(); return 1 if !$configfilename; $configfilename =~ m!^(.*)/share/psprint/psprint.conf$!; my $configprefix = $1; - # Load Open Office printer config file + # Load OpenOffice.org printer config file my $configfilecontent = readsofficeconfigfile($configfilename); # Remove the printer entry $configfilecontent = removeopenofficeprinterentry($printer, $queue, $configprefix, $configfilecontent); - # Write back Open Office configuration file + # Write back OpenOffice.org configuration file return writesofficeconfigfile($configfilename, $configfilecontent); } @@ -1880,12 +1880,12 @@ sub removelocalprintersfromstaroffice { sub removelocalprintersfromopenoffice { my ($printer) = @_; - # Do we have Open Office installed? + # Do we have OpenOffice.org installed? my $configfilename = findopenofficeconfigfile(); return 1 if !$configfilename; $configfilename =~ m!^(.*)/share/psprint/psprint.conf$!; my $configprefix = $1; - # Load Open Office printer config file + # Load OpenOffice.org printer config file my $configfilecontent = readsofficeconfigfile($configfilename); # Remove the printer entries for my $queue (keys(%{$printer->{configured}})) { @@ -1893,7 +1893,7 @@ sub removelocalprintersfromopenoffice { removeopenofficeprinterentry($printer, $queue, $configprefix, $configfilecontent); } - # Write back Open Office configuration file + # Write back OpenOffice.org configuration file return writesofficeconfigfile($configfilename, $configfilecontent); } diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm index ee4411654..fdb8b158c 100644 --- a/perl-install/printerdrake.pm +++ b/perl-install/printerdrake.pm @@ -2171,7 +2171,7 @@ sub setup_default_spooler { return; } if ($printer->{SPOOLER} ne $oldspooler) { - # Remove the local printers from Star Office/Open Office + # Remove the local printers from Star Office/OpenOffice.org printer::removelocalprintersfromapplications($printer); # Get the queues of this spooler { @@ -2373,7 +2373,7 @@ sub main { messages => ($noprinters ? "" : (($printer->{SPOOLER} eq "cups") ? - _("The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; to view information about it; or to make a printer on a remote CUPS server available for Star/Open Office.") : + _("The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; to view information about it; or to make a printer on a remote CUPS server available for Star Office/OpenOffice.org.") : _("The following printers are configured. Double-click on a printer to change its settings; to make it the default printer; or to view information about it."))), cancel => (""), ok => (""), @@ -2690,8 +2690,8 @@ What do you want to modify on this printer?", (($queue ne $printer->{DEFAULT}) ? _("Set this printer as the default") : ()), ($printer->{configured}{$queue} ? () : - (_("Add this printer to Star/Open Office"), - _("Remove this printer from Star/Open Office"))), + (_("Add this printer to Star Office/OpenOffice.org"), + _("Remove this printer from Star Office/OpenOffice.org"))), _("Print test pages"), _("Know how to use this printer"), ($printer->{configured}{$queue} ? @@ -2765,23 +2765,23 @@ What do you want to modify on this printer?", printer::set_default_printer($printer); $in->ask_warn(_("Default printer"), _("The printer \"%s\" is set as the default printer now.", $queue)); - } elsif ($modify eq _("Add this printer to Star/Open Office")) { + } elsif ($modify eq _("Add this printer to Star Office/OpenOffice.org")) { if (printer::addcupsremotetoapplications ($printer, $queue)) { - $in->ask_warn(_("Adding printer to Star/Open Office"), - _("The printer \"%s\" was successfully added to Star/Open Office.", $queue)); + $in->ask_warn(_("Adding printer to Star Office/OpenOffice.org"), + _("The printer \"%s\" was successfully added to Star Office/OpenOffice.org.", $queue)); } else { - $in->ask_warn(_("Adding printer to Star/Open Office"), - _("Failed to add the printer \"%s\" to Star/Open Office.", $queue)); + $in->ask_warn(_("Adding printer to Star Office/OpenOffice.org"), + _("Failed to add the printer \"%s\" to Star Office/OpenOffice.org.", $queue)); } - } elsif ($modify eq _("Remove this printer from Star/Open Office")) { + } elsif ($modify eq _("Remove this printer from Star Office/OpenOffice.org")) { if (printer::removeprinterfromapplications ($printer, $queue)) { - $in->ask_warn(_("Removing printer from Star/Open Office"), - _("The printer \"%s\" was successfully removed from Star/Open Office.", $queue)); + $in->ask_warn(_("Removing printer from Star Office/OpenOffice.org"), + _("The printer \"%s\" was successfully removed from Star Office/OpenOffice.org.", $queue)); } else { - $in->ask_warn(_("Removing printer from Star/Open Office"), - _("Failed to remove the printer \"%s\" from Star/Open Office.", $queue)); + $in->ask_warn(_("Removing printer from Star Office/OpenOffice.org"), + _("Failed to remove the printer \"%s\" from Star Office/OpenOffice.org.", $queue)); } } elsif ($modify eq _("Print test pages")) { print_testpages($printer, $in, $upNetwork); -- cgit v1.2.1