From 2c3307fb903f427be3d021c5780b75cac9af2ce8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 17 Jun 2024 12:52:33 +0200 Subject: Merging upstream version 4.23.0. Signed-off-by: Daniel Baumann --- templates/man5/ssh_config.5.pot | 93 ++++++++++++++++++++++++++++++++--------- 1 file changed, 74 insertions(+), 19 deletions(-) (limited to 'templates/man5/ssh_config.5.pot') diff --git a/templates/man5/ssh_config.5.pot b/templates/man5/ssh_config.5.pot index b5cd6e47..92139849 100644 --- a/templates/man5/ssh_config.5.pot +++ b/templates/man5/ssh_config.5.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2024-02-15 18:11+0100\n" +"POT-Creation-Date: 2024-03-29 09:52+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,9 +17,9 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #. type: Dd -#: archlinux debian-unstable fedora-40 fedora-rawhide +#: archlinux debian-unstable #, no-wrap -msgid "$Mdocdate: October 12 2023 $" +msgid "$Mdocdate: February 21 2024 $" msgstr "" #. type: Dt @@ -169,19 +169,19 @@ msgid "Cm Match" msgstr "" #. type: Plain text -#: archlinux debian-unstable fedora-40 fedora-rawhide +#: archlinux debian-unstable msgid "" "Restricts the following declarations (up to the next E<.Cm Host> or E<.Cm " "Match> keyword) to be used only when the conditions following the E<.Cm " "Match> keyword are satisfied. Match conditions are specified using one or " "more criteria or the single token E<.Cm all> which always matches. The " "available criteria keywords are: E<.Cm canonical>, E<.Cm final>, E<.Cm " -"exec>, E<.Cm localnetwork>, E<.Cm host>, E<.Cm originalhost>, E<.Cm Tag>, E<." -"Cm user>, and E<.Cm localuser>. The E<.Cm all> criteria must appear alone " -"or immediately after E<.Cm canonical> or E<.Cm final>. Other criteria may " -"be combined arbitrarily. All criteria but E<.Cm all>, E<.Cm canonical>, and " -"E<.Cm final> require an argument. Criteria may be negated by prepending an " -"exclamation mark E<.Pq Sq !\\&>." +"exec>, E<.Cm localnetwork>, E<.Cm host>, E<.Cm originalhost>, E<.Cm tagged>, " +"E<.Cm user>, and E<.Cm localuser>. The E<.Cm all> criteria must appear " +"alone or immediately after E<.Cm canonical> or E<.Cm final>. Other criteria " +"may be combined arbitrarily. All criteria but E<.Cm all>, E<.Cm canonical>, " +"and E<.Cm final> require an argument. Criteria may be negated by prepending " +"an exclamation mark E<.Pq Sq !\\&>." msgstr "" #. type: Plain text @@ -539,27 +539,36 @@ msgid "Cm ChannelTimeout" msgstr "" #. type: Plain text -#: archlinux debian-unstable fedora-40 fedora-rawhide +#: archlinux debian-unstable msgid "" "Specifies whether and how quickly E<.Xr ssh 1> should close inactive " "channels. Timeouts are specified as one or more E<.Dq type=interval> pairs " -"separated by whitespace, where the E<.Dq type> must be a channel type name " -"(as described in the table below), optionally containing wildcard characters." +"separated by whitespace, where the E<.Dq type> must be the special keyword " +"E<.Dq global> or a channel type name from the list below, optionally " +"containing wildcard characters." msgstr "" #. type: Plain text -#: archlinux debian-unstable fedora-40 fedora-rawhide +#: archlinux debian-unstable msgid "" "The timeout value E<.Dq interval> is specified in seconds or may use any of " "the units documented in the E<.Sx TIME FORMATS> section. For example, E<.Dq " -"session=5m> would cause the interactive session to terminate after five " -"minutes of inactivity. Specifying a zero value disables the inactivity " -"timeout." +"session=5m> would cause interactive sessions to terminate after five minutes " +"of inactivity. Specifying a zero value disables the inactivity timeout." msgstr "" #. type: Plain text -#: archlinux debian-unstable fedora-40 fedora-rawhide -msgid "The available channel types include:" +#: archlinux debian-unstable +msgid "" +"The special timeout E<.Dq global> applies to all active channels, taken " +"together. Traffic on any active channel will reset the timeout, but when " +"the timeout expires then all open channels will be closed. Note that this " +"global timeout is not matched by wildcards and must be specified explicitly." +msgstr "" + +#. type: Plain text +#: archlinux debian-unstable +msgid "The available channel type names include:" msgstr "" #. type: It @@ -3689,6 +3698,28 @@ msgid "" "that the group in question contains only the user." msgstr "" +#. type: Dd +#: fedora-40 fedora-rawhide +#, no-wrap +msgid "$Mdocdate: October 12 2023 $" +msgstr "" + +#. type: Plain text +#: fedora-40 fedora-rawhide +msgid "" +"Restricts the following declarations (up to the next E<.Cm Host> or E<.Cm " +"Match> keyword) to be used only when the conditions following the E<.Cm " +"Match> keyword are satisfied. Match conditions are specified using one or " +"more criteria or the single token E<.Cm all> which always matches. The " +"available criteria keywords are: E<.Cm canonical>, E<.Cm final>, E<.Cm " +"exec>, E<.Cm localnetwork>, E<.Cm host>, E<.Cm originalhost>, E<.Cm Tag>, E<." +"Cm user>, and E<.Cm localuser>. The E<.Cm all> criteria must appear alone " +"or immediately after E<.Cm canonical> or E<.Cm final>. Other criteria may " +"be combined arbitrarily. All criteria but E<.Cm all>, E<.Cm canonical>, and " +"E<.Cm final> require an argument. Criteria may be negated by prepending an " +"exclamation mark E<.Pq Sq !\\&>." +msgstr "" + #. type: Plain text #: fedora-40 fedora-rawhide mageia-cauldron msgid "" @@ -3709,6 +3740,30 @@ msgid "" "removed from the default set instead of replacing them." msgstr "" +#. type: Plain text +#: fedora-40 fedora-rawhide +msgid "" +"Specifies whether and how quickly E<.Xr ssh 1> should close inactive " +"channels. Timeouts are specified as one or more E<.Dq type=interval> pairs " +"separated by whitespace, where the E<.Dq type> must be a channel type name " +"(as described in the table below), optionally containing wildcard characters." +msgstr "" + +#. type: Plain text +#: fedora-40 fedora-rawhide +msgid "" +"The timeout value E<.Dq interval> is specified in seconds or may use any of " +"the units documented in the E<.Sx TIME FORMATS> section. For example, E<.Dq " +"session=5m> would cause the interactive session to terminate after five " +"minutes of inactivity. Specifying a zero value disables the inactivity " +"timeout." +msgstr "" + +#. type: Plain text +#: fedora-40 fedora-rawhide +msgid "The available channel types include:" +msgstr "" + #. type: Plain text #: fedora-40 fedora-rawhide mageia-cauldron msgid "" -- cgit v1.2.3