Merging upstream version 1:4.15.2.

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

9 files changed, 41 insertions, 42 deletions

diff --git a/man/zh_CN/man5/faillog.5 b/man/zh_CN/man5/faillog.5
index 5ac8f2b..7603c8e 100644
--- a/man/zh_CN/man5/faillog.5
+++ b/man/zh_CN/man5/faillog.5
@@ -2,12 +2,12 @@
 .\"     Title: faillog
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2022-11-08
+.\"      Date: 2024-06-21
 .\"    Manual:  File Formats and Configuration Files
-.\"    Source: shadow-utils 4.13
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Chinese Simplified
 .\"
-.TH "FAILLOG" "5" "2022-11-08" "shadow\-utils 4\&.13" "File Formats and Configuratio"
+.TH "FAILLOG" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuratio"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man5/gshadow.5 b/man/zh_CN/man5/gshadow.5
index 04ff51d..3faeb89 100644
--- a/man/zh_CN/man5/gshadow.5
+++ b/man/zh_CN/man5/gshadow.5
@@ -2,12 +2,12 @@
 .\"     Title: gshadow
 .\"    Author: Nicolas Fran\(,cois <nicolas.francois@centraliens.net>
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2022-11-08
+.\"      Date: 2024-06-21
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.13
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Chinese Simplified
 .\"
-.TH "GSHADOW" "5" "2022-11-08" "shadow\-utils 4\&.13" "File Formats and Configuration"
+.TH "GSHADOW" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -38,12 +38,12 @@ contains the shadowed information for group accounts\&.
 .PP
 此文件的每行包含逗号分隔的如下字段：
 .PP
-\fB组名\fR
+\fBgroup name\fR
 .RS 4
 必须是系统中已经存在的有效组。
 .RE
 .PP
-\fB加密了的密码\fR
+\fBencrypted password\fR
 .RS 4
 Refer to
 \fBcrypt\fR(3)
@@ -63,7 +63,7 @@ This password supersedes any password specified in
 /etc/group\&.
 .RE
 .PP
-\fB管理员\fR
+\fBadministrators\fR
 .RS 4
 必须是一个逗号分隔的用户名列表。
 .sp
@@ -72,7 +72,7 @@ This password supersedes any password specified in
 管理员也有成员一样的权限(请看下边)。
 .RE
 .PP
-\fB成员\fR
+\fBmembers\fR
 .RS 4
 必须是一个逗号分隔的用户名列表。
 .sp
diff --git a/man/zh_CN/man5/limits.5 b/man/zh_CN/man5/limits.5
index b2fe040..18aa71e 100644
--- a/man/zh_CN/man5/limits.5
+++ b/man/zh_CN/man5/limits.5
@@ -2,12 +2,12 @@
 .\"     Title: limits
 .\"    Author: Luca Berra
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2022-11-08
+.\"      Date: 2024-06-21
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.13
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Chinese Simplified
 .\"
-.TH "LIMITS" "5" "2022-11-08" "shadow\-utils 4\&.13" "File Formats and Configuration"
+.TH "LIMITS" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man5/login.access.5 b/man/zh_CN/man5/login.access.5
index 19ccadd..f4aaabd 100644
--- a/man/zh_CN/man5/login.access.5
+++ b/man/zh_CN/man5/login.access.5
@@ -2,12 +2,12 @@
 .\"     Title: login.access
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2022-11-08
+.\"      Date: 2024-06-21
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.13
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Chinese Simplified
 .\"
-.TH "LOGIN\&.ACCESS" "5" "2022-11-08" "shadow\-utils 4\&.13" "File Formats and Configuration"
+.TH "LOGIN\&.ACCESS" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man5/login.defs.5 b/man/zh_CN/man5/login.defs.5
index 5db13e4..f53439f 100644
--- a/man/zh_CN/man5/login.defs.5
+++ b/man/zh_CN/man5/login.defs.5
@@ -2,12 +2,12 @@
 .\"     Title: login.defs
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2022-11-08
+.\"      Date: 2024-06-21
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.13
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Chinese Simplified
 .\"
-.TH "LOGIN\&.DEFS" "5" "2022-11-08" "shadow\-utils 4\&.13" "File Formats and Configuration"
+.TH "LOGIN\&.DEFS" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -192,8 +192,7 @@ USERGROUPS_ENAB
 .PP
 sulogin
 .RS 4
-ENV_HZ
-ENV_TZ
+ENV_HZ ENV_TZ
 .RE
 .PP
 useradd
diff --git a/man/zh_CN/man5/passwd.5 b/man/zh_CN/man5/passwd.5
index 13c1853..eeb6262 100644
--- a/man/zh_CN/man5/passwd.5
+++ b/man/zh_CN/man5/passwd.5
@@ -2,12 +2,12 @@
 .\"     Title: passwd
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2022-11-08
+.\"      Date: 2024-06-21
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.13
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Chinese Simplified
 .\"
-.TH "PASSWD" "5" "2022-11-08" "shadow\-utils 4\&.13" "File Formats and Configuration"
+.TH "PASSWD" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man5/porttime.5 b/man/zh_CN/man5/porttime.5
index 7a6b29f..3199137 100644
--- a/man/zh_CN/man5/porttime.5
+++ b/man/zh_CN/man5/porttime.5
@@ -2,12 +2,12 @@
 .\"     Title: porttime
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2022-11-08
+.\"      Date: 2024-06-21
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.13
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Chinese Simplified
 .\"
-.TH "PORTTIME" "5" "2022-11-08" "shadow\-utils 4\&.13" "File Formats and Configuration"
+.TH "PORTTIME" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/zh_CN/man5/shadow.5 b/man/zh_CN/man5/shadow.5
index 4d4b090..7991081 100644
--- a/man/zh_CN/man5/shadow.5
+++ b/man/zh_CN/man5/shadow.5
@@ -2,12 +2,12 @@
 .\"     Title: shadow
 .\"    Author: Julianne Frances Haugh
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2022-11-08
+.\"      Date: 2024-06-21
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.13
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Chinese Simplified
 .\"
-.TH "SHADOW" "5" "2022-11-08" "shadow\-utils 4\&.13" "File Formats and Configuration"
+.TH "SHADOW" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -38,12 +38,12 @@ is a file which contains the password information for the system\*(Aqs accounts
 .PP
 Each line of this file contains 9 fields, separated by colons (\(lq:\(rq), in the following order:
 .PP
-\fB登录名\fR
+\fBlogin name\fR
 .RS 4
 必须是有效的账户名，且已经存在于系统中。
 .RE
 .PP
-\fB加密了的密码\fR
+\fBencrypted password\fR
 .RS 4
 This field may be empty, in which case no passwords are required to authenticate as the specified login name\&. However, some applications which read the
 /etc/shadow
@@ -59,7 +59,7 @@ If the password field contains some string that is not a valid result of
 \fBcrypt\fR(3), for instance ! or *, the user will not be able to use a unix password to log in (but the user may log in the system by other means)\&.
 .RE
 .PP
-\fB最后一次更改密码的日期\fR
+\fBdate of last password change\fR
 .RS 4
 The date of the last password change, expressed as the number of days since Jan 1, 1970 00:00 UTC\&.
 .sp
@@ -68,14 +68,14 @@ The value 0 has a special meaning, which is that the user should change her pass
 空字段表示密码年龄功能被禁用。
 .RE
 .PP
-\fB密码的最小年龄\fR
+\fBminimum password age\fR
 .RS 4
 最小密码年龄是指，用户一次更改密码之后，要等多长时间才再次被允许更改密码。
 .sp
 An empty field and value 0 mean that there is no minimum password age\&.
 .RE
 .PP
-\fB最大密码年龄\fR
+\fBmaximum password age\fR
 .RS 4
 最大密码年龄是指，这写天之后，用户必须更改密码。
 .sp
@@ -86,14 +86,14 @@ An empty field and value 0 mean that there is no minimum password age\&.
 如果最大密码年龄小于最小密码年龄，用户将会不能更改密码。
 .RE
 .PP
-\fB密码警告时间段\fR
+\fBpassword warning period\fR
 .RS 4
 密码过期之前，提前警告用户的的天数(请参考上边的密码的最大年龄)。
 .sp
 空字段或者 0 表示没有密码警告期。
 .RE
 .PP
-\fB密码禁用期\fR
+\fBpassword inactivity period\fR
 .RS 4
 密码过期(查看上边的密码最大年龄)后，仍然接受此密码的天数(在此期间，用户应该在下次登录时修改密码)。
 .sp
@@ -102,7 +102,7 @@ After expiration of the password and this expiration period is elapsed, no login
 空字段表示没有强制密码过期。
 .RE
 .PP
-\fB账户过期日期\fR
+\fBaccount expiration date\fR
 .RS 4
 The date of expiration of the account, expressed as the number of days since Jan 1, 1970 00:00 UTC\&.
 .sp
@@ -113,7 +113,7 @@ Note that an account expiration differs from a password expiration\&. In case of
 应该避免使用 0，因为它既能理解成永不过期也能理解成在1970年1月1日过期。
 .RE
 .PP
-\fB保留字段\fR
+\fBreserved field\fR
 .RS 4
 此字段保留作将来使用。
 .RE
diff --git a/man/zh_CN/man5/suauth.5 b/man/zh_CN/man5/suauth.5
index 55434bf..176649b 100644
--- a/man/zh_CN/man5/suauth.5
+++ b/man/zh_CN/man5/suauth.5
@@ -2,12 +2,12 @@
 .\"     Title: suauth
 .\"    Author: Marek Micha\(/lkiewicz
 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\"      Date: 2022-11-08
+.\"      Date: 2024-06-21
 .\"    Manual: File Formats and Configuration Files
-.\"    Source: shadow-utils 4.13
+.\"    Source: shadow-utils 4.15.2
 .\"  Language: Chinese Simplified
 .\"
-.TH "SUAUTH" "5" "2022-11-08" "shadow\-utils 4\&.13" "File Formats and Configuration"
+.TH "SUAUTH" "5" "2024-06-21" "shadow\-utils 4\&.15\&.2" "File Formats and Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------