Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 22 insertions, 26 deletions

diff --git a/po/fi/man1/perl.1perl.po b/po/fi/man1/perl.1perl.po
index e7760ff1..aa207244 100644
--- a/po/fi/man1/perl.1perl.po
+++ b/po/fi/man1/perl.1perl.po
@@ -84,20 +84,19 @@ msgstr "Header"
 #| "[\\ B<-cw>\\ ]\\ [\\ B<-d>[:I<debugger>]\\ ]\\ [\\ B<-D>[I<number/"
 #| "list>]\\ ] [\\ B<-pna>\\ ]\\ [\\ B<-F>I<pattern>\\ ]\\ [\\ B<-"
 #| "l>[I<octal>]\\ ]\\ [\\ B<-0>[I<octal>]\\ ] [\\ B<-I>I<dir>\\ ]\\ [\\ B<-"
-#| "m>[B<->]I<module>\\ ]\\ [\\ B<-M>[B<->]I<'module...\\*(R'>\\ ] [\\ B<-"
-#| "P>\\ ] [\\ B<-S>\\ ] [\\ B<-x>[I<dir>]\\ ] [\\ B<-i>[I<extension>]\\ ] "
-#| "[\\ B<-e>\\ I<'command\\*(R'>\\ ]\\ [\\ B<-->\\ ]\\ [\\ "
-#| "I<programfile>\\ ]\\ [\\ I<argument>\\ ]..."
+#| "m>[B<->]I<module>\\ ]\\ [\\ B<-M>[B<->]I<'module...\\*(R'>\\ ] [\\ B<-P>"
+#| "\\ ] [\\ B<-S>\\ ] [\\ B<-x>[I<dir>]\\ ] [\\ B<-i>[I<extension>]\\ ] [\\ "
+#| "B<-e>\\ I<'command\\*(R'>\\ ]\\ [\\ B<-->\\ ]\\ [\\ I<programfile>\\ ]\\ "
+#| "[\\ I<argument>\\ ]..."
 msgid ""
 "\\&B<perl>\t[\\ B<-sTtuUWX>\\ ] [\\ B<-hv>\\ ]\\ [\\ B<-V>[:"
 "I<configvar>]\\ ] [\\ B<-cw>\\ ]\\ [\\ B<-d>[B<t>][:I<debugger>]\\ ]\\ [\\ "
 "B<-D>[I<number/list>]\\ ] [\\ B<-pna>\\ ]\\ [\\ B<-F>I<pattern>\\ ]\\ [\\ B<-"
 "l>[I<octal>]\\ ]\\ [\\ B<-0>[I<octal/hexadecimal>]\\ ] [\\ B<-I>I<dir>\\ ]\\ "
-"[\\ B<-m>[B<->]I<module>\\ ]\\ [\\ B<-M>[B<->]I<'module...'>\\ ]\\ [\\ B<-"
-"f>\\ ] [\\ B<-C\\ [>\\f(BInumber/listB<]\\ >] [\\ B<-S>\\ ] [\\ B<-"
-"x>[I<dir>]\\ ] [\\ B<-i>[I<extension>]\\ ] [\\ [B<-e>|B<-E>]\\ "
-"I<'command'>\\ ]\\ [\\ B<-->\\ ]\\ [\\ I<programfile>\\ ]\\ [\\ "
-"I<argument>\\ ]..."
+"[\\ B<-m>[B<->]I<module>\\ ]\\ [\\ B<-M>[B<->]I<'module...'>\\ ]\\ [\\ B<-f>"
+"\\ ] [\\ B<-C\\ [>\\f(BInumber/listB<]\\ >] [\\ B<-S>\\ ] [\\ B<-"
+"x>[I<dir>]\\ ] [\\ B<-i>[I<extension>]\\ ] [\\ [B<-e>|B<-E>]\\ I<'command'>"
+"\\ ]\\ [\\ B<-->\\ ]\\ [\\ I<programfile>\\ ]\\ [\\ I<argument>\\ ]..."
 msgstr ""
 "B<perl>\t[\\ B<-sTuU>\\ ] [\\ B<-hv>\\ ]\\ [\\ B<-V>[:"
 "I<konfigurointumuuttuja>]\\ ] [\\ B<-cw>\\ ]\\ [\\ B<-d>[:"
@@ -111,8 +110,8 @@ msgstr ""
 #. type: Plain text
 #: archlinux
 msgid ""
-"For more information on these options, you can run CW<\\*(C`perldoc "
-"perlrun\\*(C'>."
+"For more information on these options, you can run CW<\\*(C`perldoc perlrun"
+"\\*(C'>."
 msgstr ""
 
 #. type: IX
@@ -132,11 +131,10 @@ msgstr ""
 #. type: Plain text
 #: archlinux
 msgid ""
-"If you're new to Perl, you should start by running CW<\\*(C`perldoc "
-"perlintro\\*(C'>, which is a general intro for beginners and provides some "
-"background to help you navigate the rest of Perl's extensive documentation.  "
-"Run CW<\\*(C`perldoc perldoc\\*(C'> to learn more things you can do with "
-"I<perldoc>."
+"If you're new to Perl, you should start by running CW<\\*(C`perldoc perlintro"
+"\\*(C'>, which is a general intro for beginners and provides some background "
+"to help you navigate the rest of Perl's extensive documentation.  Run CW<"
+"\\*(C`perldoc perldoc\\*(C'> to learn more things you can do with I<perldoc>."
 msgstr ""
 
 #. type: Plain text
@@ -408,10 +406,9 @@ msgstr ""
 msgid ""
 "Some documentation is not available as man pages, so if a cross-reference is "
 "not found by man, try it with perldoc.  Perldoc can also take you directly "
-"to documentation for functions (with the B<-f> switch). See "
-"CW<\\*(C`perldoc\\ --help\\*(C'> (or CW<\\*(C`perldoc\\ perldoc\\*(C'> or "
-"\\&CW<\\*(C`man\\ perldoc\\*(C'>) for other helpful options perldoc has to "
-"offer."
+"to documentation for functions (with the B<-f> switch). See CW<\\*(C`perldoc"
+"\\ --help\\*(C'> (or CW<\\*(C`perldoc\\ perldoc\\*(C'> or \\&CW<\\*(C`man\\ "
+"perldoc\\*(C'>) for other helpful options perldoc has to offer."
 msgstr ""
 
 #. type: Plain text
@@ -458,8 +455,8 @@ msgid ""
 "extracting information from those text files, and printing reports based on "
 "that information.  It quickly became a good language for many system "
 "management tasks. Over the years, Perl has grown into a general-purpose "
-"programming language. It's widely used for everything from quick \"one-"
-"liners\" to full-scale application development."
+"programming language. It's widely used for everything from quick \"one-liners"
+"\" to full-scale application development."
 msgstr ""
 "Perl on kieli, joka on optimoitu mielivaltaisten teksitiedostojen "
 "läpikäymiseen, niissä olevan tiedon keruuseen sekä raporttien tulostamiseen "
@@ -750,10 +747,9 @@ msgid ""
 "The Perl motto is \"There's more than one way to do it.\" Divining how many "
 "more is left as an exercise to the reader."
 msgstr ""
-"Perlin motto kuuluu \\*(L\"Tapoja on olemassa enemmän kuin "
-"yksi\\*(R\" (\\*(L\"There's More Than One Way To Do It\\*(R\", TMTOWTDI). "
-"Näiden tapojen lukumäärän selvittäminen jätetään lukijalle "
-"harjoitustehtäväksi."
+"Perlin motto kuuluu \\*(L\"Tapoja on olemassa enemmän kuin yksi\\*(R\" (\\*(L"
+"\"There's More Than One Way To Do It\\*(R\", TMTOWTDI). Näiden tapojen "
+"lukumäärän selvittäminen jätetään lukijalle harjoitustehtäväksi."
 
 #. type: Plain text
 #: archlinux