Merging upstream version 2.1.7.

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

1 files changed, 214 insertions, 183 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a107f0b..93249f8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pacemaker 2\n"
 "Report-Msgid-Bugs-To: developers@clusterlabs.org\n"
-"POT-Creation-Date: 2023-04-05 16:20-0500\n"
+"POT-Creation-Date: 2023-12-05 15:13+0800\n"
 "PO-Revision-Date: 2021-11-08 11:04+0800\n"
 "Last-Translator: Vivi <developers@clusterlabs.org>\n"
 "Language-Team: CHINESE <wangluwei@uniontech.org>\n"
@@ -20,29 +20,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: daemons/controld/controld_control.c:533
+#: daemons/controld/controld_control.c:526
 msgid "Pacemaker version on cluster node elected Designated Controller (DC)"
 msgstr "集群选定的控制器节点(DC)的 Pacemaker 版本"
 
-#: daemons/controld/controld_control.c:534
+#: daemons/controld/controld_control.c:527
 msgid ""
 "Includes a hash which identifies the exact changeset the code was built "
 "from. Used for diagnostic purposes."
 msgstr "它包含一个标识所构建代码变更版本的哈希值，其可用于诊断。"
 
-#: daemons/controld/controld_control.c:539
+#: daemons/controld/controld_control.c:532
 msgid "The messaging stack on which Pacemaker is currently running"
 msgstr "Pacemaker 正在使用的消息传输引擎"
 
-#: daemons/controld/controld_control.c:540
+#: daemons/controld/controld_control.c:533
 msgid "Used for informational and diagnostic purposes."
 msgstr "用于提供信息和诊断。"
 
-#: daemons/controld/controld_control.c:544
+#: daemons/controld/controld_control.c:537
 msgid "An arbitrary name for the cluster"
 msgstr "任意的集群名称"
 
-#: daemons/controld/controld_control.c:545
+#: daemons/controld/controld_control.c:538
 msgid ""
 "This optional value is mostly for users' convenience as desired in "
 "administration, but may also be used in Pacemaker configuration rules via "
@@ -52,17 +52,17 @@ msgstr ""
 "该可选值主要是为了方便用户管理使用，也可以在pacemaker 配置规则中通过 "
 "#cluster-name 节点属性配置使用，也可以通过高级工具和资源代理使用。"
 
-#: daemons/controld/controld_control.c:553
+#: daemons/controld/controld_control.c:546
 msgid "How long to wait for a response from other nodes during start-up"
 msgstr "启动过程中等待其他节点响应的时间"
 
-#: daemons/controld/controld_control.c:554
+#: daemons/controld/controld_control.c:547
 msgid ""
 "The optimal value will depend on the speed and load of your network and the "
 "type of switches used."
 msgstr "其最佳值将取决于你的网络速度和负载以及所用交换机的类型。"
 
-#: daemons/controld/controld_control.c:559
+#: daemons/controld/controld_control.c:552
 msgid ""
 "Zero disables polling, while positive values are an interval in "
 "seconds(unless other units are specified, for example \"5min\")"
@@ -70,13 +70,13 @@ msgstr ""
 "设置为0将禁用轮询，设置为正数将是以秒为单位的时间间隔（除非使用了其他单位，比"
 "如\"5min\"表示5分钟）"
 
-#: daemons/controld/controld_control.c:562
+#: daemons/controld/controld_control.c:555
 msgid ""
 "Polling interval to recheck cluster state and evaluate rules with date "
 "specifications"
 msgstr "重新检查集群状态并且评估具有日期规格的配置规则的轮询间隔"
 
-#: daemons/controld/controld_control.c:564
+#: daemons/controld/controld_control.c:557
 msgid ""
 "Pacemaker is primarily event-driven, and looks ahead to know when to recheck "
 "cluster state for failure timeouts and most time-based rules. However, it "
@@ -89,26 +89,26 @@ msgstr ""
 "将重新检查集群，以评估具有日期规格的规则，并为某些类型的调度程序缺陷提供故障"
 "保护。"
 
-#: daemons/controld/controld_control.c:573
+#: daemons/controld/controld_control.c:566
 msgid "Maximum amount of system load that should be used by cluster nodes"
 msgstr "集群节点应该使用的最大系统负载量"
 
-#: daemons/controld/controld_control.c:574
+#: daemons/controld/controld_control.c:567
 msgid ""
 "The cluster will slow down its recovery process when the amount of system "
 "resources used (currently CPU) approaches this limit"
 msgstr "当使用的系统资源量（当前为CPU）接近此限制时，集群将减慢其恢复过程"
 
-#: daemons/controld/controld_control.c:580
+#: daemons/controld/controld_control.c:573
 msgid ""
 "Maximum number of jobs that can be scheduled per node (defaults to 2x cores)"
 msgstr "每个节点可以调度的最大作业数（默认为2x内核数）"
 
-#: daemons/controld/controld_control.c:584
+#: daemons/controld/controld_control.c:577
 msgid "How a cluster node should react if notified of its own fencing"
 msgstr "集群节点在收到针对自己的 fence 操作结果通知时应如何反应"
 
-#: daemons/controld/controld_control.c:585
+#: daemons/controld/controld_control.c:578
 msgid ""
 "A cluster node may receive notification of its own fencing if fencing is "
 "misconfigured, or if fabric fencing is in use that doesn't cut cluster "
@@ -121,7 +121,7 @@ msgstr ""
 "止 pacemaker 并保持停用状态,或者 \"panic\" 尝试立即重新启动本地节点，并在失败"
 "时返回执行stop。"
 
-#: daemons/controld/controld_control.c:595
+#: daemons/controld/controld_control.c:588
 msgid ""
 "Declare an election failed if it is not decided within this much time. If "
 "you need to adjust this value, it probably indicates the presence of a bug."
@@ -129,7 +129,7 @@ msgstr ""
 "如果集群在本项设置时间内没有作出决定则宣布选举失败。如果您需要调整该值，这可"
 "能代表存在某些缺陷。"
 
-#: daemons/controld/controld_control.c:603
+#: daemons/controld/controld_control.c:596
 msgid ""
 "Exit immediately if shutdown does not complete within this much time. If you "
 "need to adjust this value, it probably indicates the presence of a bug."
@@ -137,20 +137,20 @@ msgstr ""
 "如果在这段时间内关机仍未完成，则立即退出。如果您需要调整该值，这可能代表存在"
 "某些缺陷。"
 
+#: daemons/controld/controld_control.c:604
 #: daemons/controld/controld_control.c:611
-#: daemons/controld/controld_control.c:618
 msgid ""
 "If you need to adjust this value, it probably indicates the presence of a "
 "bug."
 msgstr "如果您需要调整该值，这可能代表存在某些缺陷。"
 
-#: daemons/controld/controld_control.c:624
+#: daemons/controld/controld_control.c:617
 msgid ""
 "*** Advanced Use Only *** Enabling this option will slow down cluster "
 "recovery under all conditions"
 msgstr "*** Advanced Use Only *** 启用此选项将在所有情况下减慢集群恢复的速度"
 
-#: daemons/controld/controld_control.c:626
+#: daemons/controld/controld_control.c:619
 msgid ""
 "Delay cluster recovery for this much time to allow for additional events to "
 "occur. Useful if your configuration is sensitive to the order in which ping "
@@ -159,7 +159,7 @@ msgstr ""
 "集群恢复将被推迟指定的时间间隔，以等待更多事件发生。如果您的配置对 ping 更新"
 "到达的顺序很敏感，这就很有用"
 
-#: daemons/controld/controld_control.c:633
+#: daemons/controld/controld_control.c:626
 #, fuzzy
 msgid ""
 "How long before nodes can be assumed to be safely down when watchdog-based "
@@ -168,7 +168,7 @@ msgstr ""
 "当基于 watchdog 的自我 fence 机制通过SBD 被执行时，我们可以假设节点安全关闭之"
 "前需要等待多长时间"
 
-#: daemons/controld/controld_control.c:635
+#: daemons/controld/controld_control.c:628
 msgid ""
 "If this is set to a positive value, lost nodes are assumed to self-fence "
 "using watchdog-based SBD within this much time. This does not require a "
@@ -193,21 +193,21 @@ msgstr ""
 "Pacemaker将拒绝在任何节点上启动。如果设置为负值，则在使用SBD的所有节点上，"
 "`SBD_WATCHDOG_TIMEOUT`必须设置为相同的值，否则可能会发生数据损坏或丢失。"
 
-#: daemons/controld/controld_control.c:654
+#: daemons/controld/controld_control.c:647
 msgid ""
 "How many times fencing can fail before it will no longer be immediately re-"
 "attempted on a target"
 msgstr "fence操作失败多少次会停止立即尝试"
 
-#: daemons/controld/controld_control.c:662 lib/pengine/common.c:39
+#: daemons/controld/controld_control.c:655 lib/pengine/common.c:40
 msgid "What to do when the cluster does not have quorum"
 msgstr "当集群没有必需票数时该如何作"
 
-#: daemons/controld/controld_control.c:667 lib/pengine/common.c:73
+#: daemons/controld/controld_control.c:660 lib/pengine/common.c:74
 msgid "Whether to lock resources to a cleanly shut down node"
 msgstr "是否锁定资源到完全关闭的节点"
 
-#: daemons/controld/controld_control.c:668 lib/pengine/common.c:74
+#: daemons/controld/controld_control.c:661 lib/pengine/common.c:75
 msgid ""
 "When true, resources active on a node when it is cleanly shut down are kept "
 "\"locked\" to that node (not allowed to run elsewhere) until they start "
@@ -221,11 +221,11 @@ msgstr ""
 "设置）。 Stonith资源和Pacemaker Remote连接永远不会被锁定。 克隆和捆绑实例以及"
 "可升级克隆的主角色目前从未锁定，尽管可以在将来的发行版中添加支持。"
 
-#: daemons/controld/controld_control.c:680 lib/pengine/common.c:86
+#: daemons/controld/controld_control.c:673 lib/pengine/common.c:87
 msgid "Do not lock resources to a cleanly shut down node longer than this"
 msgstr "资源会被锁定到完全关闭的节点的最长时间"
 
-#: daemons/controld/controld_control.c:682 lib/pengine/common.c:88
+#: daemons/controld/controld_control.c:675 lib/pengine/common.c:89
 msgid ""
 "If shutdown-lock is true and this is set to a nonzero time duration, "
 "shutdown locks will expire after this much time has passed since the "
@@ -234,11 +234,28 @@ msgstr ""
 "如果shutdown-lock为true，并且将此选项设置为非零持续时间，则自从开始shutdown以"
 "来经过了这么长的时间后，shutdown锁将过期，即使该节点尚未重新加入。"
 
-#: daemons/fenced/pacemaker-fenced.c:1379
+#: daemons/controld/controld_control.c:683 lib/pengine/common.c:164
+msgid ""
+"How long to wait for a node that has joined the cluster to join the "
+"controller process group"
+msgstr ""
+"等待已加入集群的节点加入控制器进程组的时间"
+
+#: daemons/controld/controld_control.c:685 lib/pengine/common.c:166
+msgid ""
+"Fence nodes that do not join the controller process group within this much "
+"time after joining the cluster, to allow the cluster to continue managing "
+"resources. A value of 0 means never fence pending nodes. Setting the value "
+"to 2h means fence nodes after 2 hours."
+msgstr ""
+"如果节点加入集群后在此时间内不加入控制器进程组，Fence该节点，以便群集继续管理资源。"
+"值为0表示永远不 fence 待定节点。将值设置为2h表示2小时后 fence 待定节点。"
+
+#: daemons/fenced/pacemaker-fenced.c:536
 msgid "Advanced use only: An alternate parameter to supply instead of 'port'"
 msgstr "仅高级使用：使用替代的参数名，而不是'port'"
 
-#: daemons/fenced/pacemaker-fenced.c:1380
+#: daemons/fenced/pacemaker-fenced.c:537
 msgid ""
 "some devices do not support the standard 'port' parameter or may provide "
 "additional ones. Use this to specify an alternate, device-specific, "
@@ -249,34 +266,34 @@ msgstr ""
 "设备专用的参数名，该参数用于标识需要fence的机器。值none可以用于告诉集群不要提"
 "供任何其他的参数。"
 
-#: daemons/fenced/pacemaker-fenced.c:1389
+#: daemons/fenced/pacemaker-fenced.c:546
 msgid ""
 "A mapping of host names to ports numbers for devices that do not support "
 "host names."
 msgstr "为不支持主机名的设备提供主机名到端口号的映射。"
 
-#: daemons/fenced/pacemaker-fenced.c:1390
+#: daemons/fenced/pacemaker-fenced.c:547
 msgid ""
 "Eg. node1:1;node2:2,3 would tell the cluster to use port 1 for node1 and "
 "ports 2 and 3 for node2"
 msgstr ""
 "例如 node1:1;node2:2,3，将会告诉集群对node1使用端口1,对node2使用端口2和3 "
 
-#: daemons/fenced/pacemaker-fenced.c:1394
+#: daemons/fenced/pacemaker-fenced.c:551
 msgid "Eg. node1,node2,node3"
 msgstr "例如 node1,node2,node3"
 
-#: daemons/fenced/pacemaker-fenced.c:1395
+#: daemons/fenced/pacemaker-fenced.c:552
 msgid ""
 "A list of machines controlled by this device (Optional unless "
 "pcmk_host_list=static-list)"
 msgstr "该设备控制的机器列表(可选参数，除非 pcmk_host_list 设置为 static-list)"
 
-#: daemons/fenced/pacemaker-fenced.c:1400
+#: daemons/fenced/pacemaker-fenced.c:557
 msgid "How to determine which machines are controlled by the device."
 msgstr "如何确定设备控制哪些机器。"
 
-#: daemons/fenced/pacemaker-fenced.c:1401
+#: daemons/fenced/pacemaker-fenced.c:558
 msgid ""
 "Allowed values: dynamic-list (query the device via the 'list' command), "
 "static-list (check the pcmk_host_list attribute), status (query the device "
@@ -286,12 +303,11 @@ msgstr ""
 "pcmk_host_list属性），status（通过'status'命令查询设备），none（假设每个设备"
 "都可fence 每台机器 ）"
 
-#: daemons/fenced/pacemaker-fenced.c:1410
-#: daemons/fenced/pacemaker-fenced.c:1419
+#: daemons/fenced/pacemaker-fenced.c:567 daemons/fenced/pacemaker-fenced.c:576
 msgid "Enable a base delay for fencing actions and specify base delay value."
 msgstr "在执行 fencing 操作前启用不超过指定时间的延迟。"
 
-#: daemons/fenced/pacemaker-fenced.c:1411
+#: daemons/fenced/pacemaker-fenced.c:568
 msgid ""
 "Enable a delay of no more than the time specified before executing fencing "
 "actions. Pacemaker derives the overall delay by taking the value of "
@@ -302,7 +318,7 @@ msgstr ""
 "pcmk_delay_base的值并添加随机延迟值来得出总体延迟,从而使总和保持在此最大值以"
 "下。"
 
-#: daemons/fenced/pacemaker-fenced.c:1421
+#: daemons/fenced/pacemaker-fenced.c:578
 msgid ""
 "This enables a static delay for fencing actions, which can help avoid "
 "\"death matches\" where two nodes try to fence each other at the same time. "
@@ -318,12 +334,12 @@ msgstr ""
 "目标分别配置了各自的设备的情况）， 或着设置为一个节点映射 （例如，\"node1:1s;"
 "node2:5\"）从而为每个目标设置不同值。"
 
-#: daemons/fenced/pacemaker-fenced.c:1433
+#: daemons/fenced/pacemaker-fenced.c:590
 msgid ""
 "The maximum number of actions can be performed in parallel on this device"
 msgstr "可以在该设备上并发执行的最多操作数量"
 
-#: daemons/fenced/pacemaker-fenced.c:1434
+#: daemons/fenced/pacemaker-fenced.c:591
 msgid ""
 "Cluster property concurrent-fencing=true needs to be configured first.Then "
 "use this to specify the maximum number of actions can be performed in "
@@ -332,11 +348,11 @@ msgstr ""
 "需要首先配置集群属性 concurrent-fencing=true 。然后使用此参数指定可以在该设备"
 "上并发执行的最多操作数量。 -1 代表没有限制"
 
-#: daemons/fenced/pacemaker-fenced.c:1439
+#: daemons/fenced/pacemaker-fenced.c:597
 msgid "Advanced use only: An alternate command to run instead of 'reboot'"
 msgstr "仅高级使用：运行替代命令，而不是'reboot'"
 
-#: daemons/fenced/pacemaker-fenced.c:1440
+#: daemons/fenced/pacemaker-fenced.c:598
 msgid ""
 "Some devices do not support the standard commands or may provide additional "
 "ones.\n"
@@ -346,13 +362,13 @@ msgstr ""
 "一些设备不支持标准命令或可能提供其他命令，使用此选项可以指定一个该设备特定的"
 "替代命令，用来实现'reboot'操作。"
 
-#: daemons/fenced/pacemaker-fenced.c:1445
+#: daemons/fenced/pacemaker-fenced.c:603
 msgid ""
 "Advanced use only: Specify an alternate timeout to use for reboot actions "
 "instead of stonith-timeout"
 msgstr "仅高级使用：指定用于'reboot' 操作的替代超时，而不是stonith-timeout"
 
-#: daemons/fenced/pacemaker-fenced.c:1446
+#: daemons/fenced/pacemaker-fenced.c:604
 msgid ""
 "Some devices need much more/less time to complete than normal.Use this to "
 "specify an alternate, device-specific, timeout for 'reboot' actions."
@@ -360,13 +376,13 @@ msgstr ""
 "一些设备需要比正常情况下更多或更少的时间来完成操作，使用此选项指定一个用"
 "于'reboot'操作的该设备特定的替代超时。"
 
-#: daemons/fenced/pacemaker-fenced.c:1451
+#: daemons/fenced/pacemaker-fenced.c:609
 msgid ""
 "Advanced use only: The maximum number of times to retry the 'reboot' command "
 "within the timeout period"
 msgstr "仅高级使用：在超时前重试'reboot'命令的最大次数"
 
-#: daemons/fenced/pacemaker-fenced.c:1452
+#: daemons/fenced/pacemaker-fenced.c:610
 msgid ""
 "Some devices do not support multiple connections. Operations may 'fail' if "
 "the device is busy with another task so Pacemaker will automatically retry "
@@ -377,11 +393,11 @@ msgstr ""
 "Pacemaker将自动重试（如果时间允许）。 使用此选项更改Pacemaker在放弃之前重"
 "试'reboot' 操作的次数."
 
-#: daemons/fenced/pacemaker-fenced.c:1458
+#: daemons/fenced/pacemaker-fenced.c:617
 msgid "Advanced use only: An alternate command to run instead of 'off'"
 msgstr "仅高级使用：运行替代命令，而不是'off'"
 
-#: daemons/fenced/pacemaker-fenced.c:1459
+#: daemons/fenced/pacemaker-fenced.c:618
 msgid ""
 "Some devices do not support the standard commands or may provide additional "
 "ones.Use this to specify an alternate, device-specific, command that "
@@ -390,13 +406,13 @@ msgstr ""
 "一些设备不支持标准命令或可能提供其他命令,使用此选项可指定一个该设备专用的替代"
 "命令，用来实现'off'操作。"
 
-#: daemons/fenced/pacemaker-fenced.c:1464
+#: daemons/fenced/pacemaker-fenced.c:623
 msgid ""
 "Advanced use only: Specify an alternate timeout to use for off actions "
 "instead of stonith-timeout"
 msgstr "仅高级使用：指定用于off 操作的替代超时，而不是stonith-timeout"
 
-#: daemons/fenced/pacemaker-fenced.c:1465
+#: daemons/fenced/pacemaker-fenced.c:624
 msgid ""
 "Some devices need much more/less time to complete than normal.Use this to "
 "specify an alternate, device-specific, timeout for 'off' actions."
@@ -404,13 +420,13 @@ msgstr ""
 "一些设备需要比正常情况下更多或更少的时间来完成操作，使用此选项指定一个用"
 "于'off'操作的该设备特定的替代超时。"
 
-#: daemons/fenced/pacemaker-fenced.c:1470
+#: daemons/fenced/pacemaker-fenced.c:629
 msgid ""
 "Advanced use only: The maximum number of times to retry the 'off' command "
 "within the timeout period"
 msgstr "仅高级使用：在超时前重试'off'命令的最大次数"
 
-#: daemons/fenced/pacemaker-fenced.c:1471
+#: daemons/fenced/pacemaker-fenced.c:630
 msgid ""
 "Some devices do not support multiple connections. Operations may 'fail' if "
 "the device is busy with another task so Pacemaker will automatically retry "
@@ -421,11 +437,11 @@ msgstr ""
 "Pacemaker将自动重试（如果时间允许）。 使用此选项更改Pacemaker在放弃之前重"
 "试'off' 操作的次数."
 
-#: daemons/fenced/pacemaker-fenced.c:1477
+#: daemons/fenced/pacemaker-fenced.c:637
 msgid "Advanced use only: An alternate command to run instead of 'on'"
 msgstr "仅高级使用：运行替代命令，而不是'on'"
 
-#: daemons/fenced/pacemaker-fenced.c:1478
+#: daemons/fenced/pacemaker-fenced.c:638
 msgid ""
 "Some devices do not support the standard commands or may provide additional "
 "ones.Use this to specify an alternate, device-specific, command that "
@@ -434,13 +450,13 @@ msgstr ""
 "一些设备不支持标准命令或可能提供其他命令，使用此选项可指定一个该设备特定的替"
 "代命令，用来实现'on'操作。"
 
-#: daemons/fenced/pacemaker-fenced.c:1483
+#: daemons/fenced/pacemaker-fenced.c:643
 msgid ""
 "Advanced use only: Specify an alternate timeout to use for on actions "
 "instead of stonith-timeout"
 msgstr "仅高级使用：指定用于on 操作的替代超时，而不是stonith-timeout"
 
-#: daemons/fenced/pacemaker-fenced.c:1484
+#: daemons/fenced/pacemaker-fenced.c:644
 msgid ""
 "Some devices need much more/less time to complete than normal.Use this to "
 "specify an alternate, device-specific, timeout for 'on' actions."
@@ -448,13 +464,13 @@ msgstr ""
 "一些设备需要比正常情况下更多或更少的时间来完成操作，使用此选项指定一个用"
 "于'on'操作的该设备特定的替代超时。"
 
-#: daemons/fenced/pacemaker-fenced.c:1489
+#: daemons/fenced/pacemaker-fenced.c:649
 msgid ""
 "Advanced use only: The maximum number of times to retry the 'on' command "
 "within the timeout period"
 msgstr "仅高级使用：在超时前重试'on'命令的最大次数"
 
-#: daemons/fenced/pacemaker-fenced.c:1490
+#: daemons/fenced/pacemaker-fenced.c:650
 msgid ""
 "Some devices do not support multiple connections. Operations may 'fail' if "
 "the device is busy with another task so Pacemaker will automatically retry "
@@ -465,11 +481,11 @@ msgstr ""
 "Pacemaker将自动重试（如果时间允许）。 使用此选项更改Pacemaker在放弃之前重"
 "试'on' 操作的次数."
 
-#: daemons/fenced/pacemaker-fenced.c:1496
+#: daemons/fenced/pacemaker-fenced.c:657
 msgid "Advanced use only: An alternate command to run instead of 'list'"
 msgstr "仅高级使用：运行替代命令，而不是'list'"
 
-#: daemons/fenced/pacemaker-fenced.c:1497
+#: daemons/fenced/pacemaker-fenced.c:658
 msgid ""
 "Some devices do not support the standard commands or may provide additional "
 "ones.Use this to specify an alternate, device-specific, command that "
@@ -478,13 +494,13 @@ msgstr ""
 "一些设备不支持标准命令或可能提供其他命令，使用此选项可指定一个该设备特定的替"
 "代命令，用来实现'list'操作。"
 
-#: daemons/fenced/pacemaker-fenced.c:1502
+#: daemons/fenced/pacemaker-fenced.c:663
 msgid ""
 "Advanced use only: Specify an alternate timeout to use for list actions "
 "instead of stonith-timeout"
 msgstr "仅高级使用：指定用于list 操作的替代超时，而不是stonith-timeout"
 
-#: daemons/fenced/pacemaker-fenced.c:1503
+#: daemons/fenced/pacemaker-fenced.c:664
 msgid ""
 "Some devices need much more/less time to complete than normal.Use this to "
 "specify an alternate, device-specific, timeout for 'list' actions."
@@ -492,13 +508,13 @@ msgstr ""
 "一些设备需要比正常情况下更多或更少的时间来完成操作，使用此选项指定一个用"
 "于'list'操作的该设备特定的替代超时。"
 
-#: daemons/fenced/pacemaker-fenced.c:1508
+#: daemons/fenced/pacemaker-fenced.c:669
 msgid ""
 "Advanced use only: The maximum number of times to retry the 'list' command "
 "within the timeout period"
 msgstr "仅高级使用：在超时前重试'list'命令的最大次数"
 
-#: daemons/fenced/pacemaker-fenced.c:1509
+#: daemons/fenced/pacemaker-fenced.c:670
 msgid ""
 "Some devices do not support multiple connections. Operations may 'fail' if "
 "the device is busy with another task so Pacemaker will automatically retry "
@@ -509,11 +525,11 @@ msgstr ""
 "Pacemaker将自动重试（如果时间允许）。 使用此选项更改Pacemaker在放弃之前重"
 "试'list' 操作的次数."
 
-#: daemons/fenced/pacemaker-fenced.c:1515
+#: daemons/fenced/pacemaker-fenced.c:677
 msgid "Advanced use only: An alternate command to run instead of 'monitor'"
 msgstr "仅高级使用：运行替代命令，而不是'monitor'"
 
-#: daemons/fenced/pacemaker-fenced.c:1516
+#: daemons/fenced/pacemaker-fenced.c:678
 msgid ""
 "Some devices do not support the standard commands or may provide additional "
 "ones.Use this to specify an alternate, device-specific, command that "
@@ -522,13 +538,13 @@ msgstr ""
 "一些设备不支持标准命令或可能提供其他命令，使用此选项可指定一个该设备特定的替"
 "代命令，用来实现'monitor'操作。"
 
-#: daemons/fenced/pacemaker-fenced.c:1521
+#: daemons/fenced/pacemaker-fenced.c:683
 msgid ""
 "Advanced use only: Specify an alternate timeout to use for monitor actions "
 "instead of stonith-timeout"
 msgstr "仅高级使用：指定用于monitor 操作的替代超时，而不是stonith-timeout"
 
-#: daemons/fenced/pacemaker-fenced.c:1522
+#: daemons/fenced/pacemaker-fenced.c:684
 msgid ""
 "Some devices need much more/less time to complete than normal.\n"
 "Use this to specify an alternate, device-specific, timeout for 'monitor' "
@@ -537,13 +553,13 @@ msgstr ""
 "一些设备需要比正常情况下更多或更少的时间来完成操作，使用此选项指定一个用"
 "于'monitor'操作的该设备特定的替代超时。"
 
-#: daemons/fenced/pacemaker-fenced.c:1527
+#: daemons/fenced/pacemaker-fenced.c:689
 msgid ""
 "Advanced use only: The maximum number of times to retry the 'monitor' "
 "command within the timeout period"
 msgstr "仅高级使用：在超时前重试'monitor'命令的最大次数"
 
-#: daemons/fenced/pacemaker-fenced.c:1528
+#: daemons/fenced/pacemaker-fenced.c:690
 msgid ""
 "Some devices do not support multiple connections. Operations may 'fail' if "
 "the device is busy with another task so Pacemaker will automatically retry "
@@ -554,11 +570,11 @@ msgstr ""
 "Pacemaker将自动重试（如果时间允许）。 使用此选项更改Pacemaker在放弃之前重"
 "试'monitor' 操作的次数."
 
-#: daemons/fenced/pacemaker-fenced.c:1534
+#: daemons/fenced/pacemaker-fenced.c:697
 msgid "Advanced use only: An alternate command to run instead of 'status'"
 msgstr "仅高级使用：运行替代命令，而不是'status'"
 
-#: daemons/fenced/pacemaker-fenced.c:1535
+#: daemons/fenced/pacemaker-fenced.c:698
 msgid ""
 "Some devices do not support the standard commands or may provide additional "
 "ones.Use this to specify an alternate, device-specific, command that "
@@ -567,13 +583,13 @@ msgstr ""
 "一些设备不支持标准命令或可能提供其他命令，使用此选项可指定一个该设备特定的替"
 "代命令，用来实现'status'操作。"
 
-#: daemons/fenced/pacemaker-fenced.c:1540
+#: daemons/fenced/pacemaker-fenced.c:703
 msgid ""
 "Advanced use only: Specify an alternate timeout to use for status actions "
 "instead of stonith-timeout"
 msgstr "仅高级使用：指定用于status 操作的替代超时，而不是stonith-timeout"
 
-#: daemons/fenced/pacemaker-fenced.c:1541
+#: daemons/fenced/pacemaker-fenced.c:704
 msgid ""
 "Some devices need much more/less time to complete than normal.Use this to "
 "specify an alternate, device-specific, timeout for 'status' actions."
@@ -581,13 +597,13 @@ msgstr ""
 "一些设备需要比正常情况下更多或更少的时间来完成操作，使用此选项指定一个用"
 "于'status'操作的该设备特定的替代超时"
 
-#: daemons/fenced/pacemaker-fenced.c:1546
+#: daemons/fenced/pacemaker-fenced.c:709
 msgid ""
 "Advanced use only: The maximum number of times to retry the 'status' command "
 "within the timeout period"
 msgstr "仅高级使用：在超时前重试'status'命令的最大次数"
 
-#: daemons/fenced/pacemaker-fenced.c:1547
+#: daemons/fenced/pacemaker-fenced.c:710
 msgid ""
 "Some devices do not support multiple connections. Operations may 'fail' if "
 "the device is busy with another task so Pacemaker will automatically retry "
@@ -598,11 +614,11 @@ msgstr ""
 "Pacemaker将自动重试（如果时间允许）。 使用此选项更改Pacemaker在放弃之前重"
 "试'status' 操作的次数."
 
-#: daemons/fenced/pacemaker-fenced.c:1556
+#: daemons/fenced/pacemaker-fenced.c:719
 msgid "Instance attributes available for all \"stonith\"-class resources"
 msgstr " 可用于所有stonith类资源的实例属性"
 
-#: daemons/fenced/pacemaker-fenced.c:1558
+#: daemons/fenced/pacemaker-fenced.c:721
 msgid ""
 "Instance attributes available for all \"stonith\"-class resources and used "
 "by Pacemaker's fence daemon, formerly known as stonithd"
@@ -610,15 +626,27 @@ msgstr ""
 " 可用于所有stonith类资源的实例属性，并由Pacemaker的fence守护程序使用（以前称"
 "为stonithd)"
 
-#: lib/cib/cib_utils.c:589
+#: daemons/fenced/pacemaker-fenced.c:734
+msgid "Deprecated (will be removed in a future release)"
+msgstr "已弃用(将在未来版本中删除)"
+
+#: daemons/fenced/pacemaker-fenced.c:737
+msgid "Intended for use in regression testing only"
+msgstr "仅适用于回归测试"
+
+#: daemons/fenced/pacemaker-fenced.c:740
+msgid "Send logs to the additional named logfile"
+msgstr "将日志发送到其他命名日志文件"
+
+#: lib/cib/cib_utils.c:875
 msgid "Enable Access Control Lists (ACLs) for the CIB"
 msgstr "为CIB启用访问控制列表(ACL)"
 
-#: lib/cib/cib_utils.c:595
+#: lib/cib/cib_utils.c:881
 msgid "Maximum IPC message backlog before disconnecting a cluster daemon"
 msgstr "断开集群守护程序之前的最大IPC消息积压"
 
-#: lib/cib/cib_utils.c:596
+#: lib/cib/cib_utils.c:882
 msgid ""
 "Raise this if log has \"Evicting client\" messages for cluster daemon PIDs "
 "(a good value is the number of resources in the cluster multiplied by the "
@@ -627,7 +655,7 @@ msgstr ""
 "如果日志中有针对集群守护程序PID的消息“Evicting client”，（则建议将值设为集群"
 "中的资源数量乘以节点数量）"
 
-#: lib/common/options.c:401
+#: lib/common/options.c:414
 msgid "  Allowed values: "
 msgstr " 允许的值: "
 
@@ -659,41 +687,41 @@ msgstr "输出选项"
 msgid "Show output help"
 msgstr "显示输出帮助"
 
-#: lib/pengine/common.c:45
+#: lib/pengine/common.c:46
 msgid "Whether resources can run on any node by default"
 msgstr "资源是否默认可以在任何节点上运行"
 
-#: lib/pengine/common.c:51
+#: lib/pengine/common.c:52
 msgid ""
 "Whether the cluster should refrain from monitoring, starting, and stopping "
 "resources"
 msgstr "集群是否应避免监视，启动和停止资源"
 
-#: lib/pengine/common.c:58
+#: lib/pengine/common.c:59
 msgid ""
 "Whether a start failure should prevent a resource from being recovered on "
 "the same node"
 msgstr "是否避免在同一节点上重启启动失败的资源"
 
-#: lib/pengine/common.c:60
+#: lib/pengine/common.c:61
 msgid ""
 "When true, the cluster will immediately ban a resource from a node if it "
 "fails to start there. When false, the cluster will instead check the "
 "resource's fail count against its migration-threshold."
 msgstr ""
-"当为true，如果资源启动失败，集群将立即禁止节点启动该资源，当为false，群集将根"
+"当为true，如果资源启动失败，集群将立即禁止节点启动该资源，当为false，集群将根"
 "据其迁移阈值来检查资源的失败计数。"
 
-#: lib/pengine/common.c:67
+#: lib/pengine/common.c:68
 msgid "Whether the cluster should check for active resources during start-up"
-msgstr "群集是否在启动期间检查运行资源"
+msgstr "集群是否在启动期间检查运行资源"
 
-#: lib/pengine/common.c:98
+#: lib/pengine/common.c:99
 msgid ""
 "*** Advanced Use Only *** Whether nodes may be fenced as part of recovery"
 msgstr "*** Advanced Use Only *** 节点是否可以被 fence 以作为集群恢复的一部分"
 
-#: lib/pengine/common.c:100
+#: lib/pengine/common.c:101
 msgid ""
 "If false, unresponsive nodes are immediately assumed to be harmless, and "
 "resources that were active on them may be recovered elsewhere. This can "
@@ -703,17 +731,17 @@ msgstr ""
 "如果为false，则立即假定无响应的节点是无害的，并且可以在其他位置恢复在其上活动"
 "的资源。 这可能会导致 \"split-brain\" 情况，可能导致数据丢失和/或服务不可用。"
 
-#: lib/pengine/common.c:108
+#: lib/pengine/common.c:109
 msgid ""
 "Action to send to fence device when a node needs to be fenced (\"poweroff\" "
 "is a deprecated alias for \"off\")"
 msgstr "发送到 fence 设备的操作（ \"poweroff\" 是 \"off \"的别名,不建议使用)"
 
-#: lib/pengine/common.c:115
+#: lib/pengine/common.c:116
 msgid "*** Advanced Use Only *** Unused by Pacemaker"
 msgstr "*** Advanced Use Only *** pacemaker未使用"
 
-#: lib/pengine/common.c:116
+#: lib/pengine/common.c:117
 msgid ""
 "This value is not used by Pacemaker, but is kept for backward compatibility, "
 "and certain legacy fence agents might use it."
@@ -721,11 +749,11 @@ msgstr ""
 "Pacemaker不使用此值，但保留此值是为了向后兼容，某些传统的fence 代理可能会使用"
 "它。"
 
-#: lib/pengine/common.c:122
+#: lib/pengine/common.c:123
 msgid "Whether watchdog integration is enabled"
 msgstr "是否启用watchdog集成设置"
 
-#: lib/pengine/common.c:123
+#: lib/pengine/common.c:124
 msgid ""
 "This is set automatically by the cluster according to whether SBD is "
 "detected to be in use. User-configured values are ignored. The value `true` "
@@ -739,15 +767,15 @@ msgstr ""
 "这种情况下，无需明确配置fence资源，如果需要fence时，基于watchdog的自我fence会"
 "通过SBD执行。"
 
-#: lib/pengine/common.c:133
+#: lib/pengine/common.c:134
 msgid "Allow performing fencing operations in parallel"
 msgstr "允许并行执行 fencing 操作"
 
-#: lib/pengine/common.c:139
+#: lib/pengine/common.c:140
 msgid "*** Advanced Use Only *** Whether to fence unseen nodes at start-up"
 msgstr "*** 仅高级使用 *** 是否在启动时fence不可见节点"
 
-#: lib/pengine/common.c:140
+#: lib/pengine/common.c:141
 msgid ""
 "Setting this to false may lead to a \"split-brain\" situation,potentially "
 "leading to data loss and/or service unavailability."
@@ -755,13 +783,13 @@ msgstr ""
 "将此设置为 false 可能会导致 \"split-brain\" 的情况，可能导致数据丢失和/或服务"
 "不可用。"
 
-#: lib/pengine/common.c:146
+#: lib/pengine/common.c:147
 msgid ""
 "Apply fencing delay targeting the lost nodes with the highest total resource "
 "priority"
 msgstr "针对具有最高总资源优先级的丢失节点应用fencing延迟"
 
-#: lib/pengine/common.c:147
+#: lib/pengine/common.c:148
 msgid ""
 "Apply specified delay for the fencings that are targeting the lost nodes "
 "with the highest total resource priority in case we don't have the majority "
@@ -781,11 +809,11 @@ msgstr ""
 "加到此延迟。为了安全, 这个延迟应该明显大于 pcmk_delay_base/max 的最大设置值，"
 "例如两倍。默认情况下，优先级fencing延迟已禁用。"
 
-#: lib/pengine/common.c:164
+#: lib/pengine/common.c:175
 msgid "Maximum time for node-to-node communication"
 msgstr "最大节点间通信时间"
 
-#: lib/pengine/common.c:165
+#: lib/pengine/common.c:176
 msgid ""
 "The node elected Designated Controller (DC) will consider an action failed "
 "if it does not get a response from the node executing the action within this "
@@ -796,14 +824,14 @@ msgstr ""
 "响应，则会被选为指定控制器（DC）的节点认定为失败。\"正确\" 值将取决于速度和您"
 "的网络和集群节点的负载。"
 
-#: lib/pengine/common.c:174
+#: lib/pengine/common.c:185
 #, fuzzy
 msgid ""
 "Maximum number of jobs that the cluster may execute in parallel across all "
 "nodes"
 msgstr "集群可以在所有节点上并发执行的最大作业数"
 
-#: lib/pengine/common.c:176
+#: lib/pengine/common.c:187
 msgid ""
 "The \"correct\" value will depend on the speed and load of your network and "
 "cluster nodes. If set to 0, the cluster will impose a dynamically calculated "
@@ -812,106 +840,106 @@ msgstr ""
 "\"正确\" 值将取决于速度和您的网络与集群节点的负载。如果设置为0，当任何节点具"
 "有高负载时，集群将施加一个动态计算的限制。"
 
-#: lib/pengine/common.c:184
+#: lib/pengine/common.c:195
 msgid ""
 "The number of live migration actions that the cluster is allowed to execute "
 "in parallel on a node (-1 means no limit)"
 msgstr "允许集群在一个节点上并行执行的实时迁移操作的数量(-1表示没有限制)"
 
-#: lib/pengine/common.c:192
+#: lib/pengine/common.c:203
 #, fuzzy
 msgid "Whether the cluster should stop all active resources"
-msgstr "群集是否在启动期间检查运行资源"
+msgstr "集群是否在启动期间检查运行资源"
 
-#: lib/pengine/common.c:198
+#: lib/pengine/common.c:209
 msgid "Whether to stop resources that were removed from the configuration"
 msgstr "是否停止配置已被删除的资源"
 
-#: lib/pengine/common.c:204
+#: lib/pengine/common.c:215
 msgid "Whether to cancel recurring actions removed from the configuration"
 msgstr "是否取消配置已被删除的的重复操作"
 
-#: lib/pengine/common.c:210
+#: lib/pengine/common.c:221
 msgid ""
 "*** Deprecated *** Whether to remove stopped resources from the executor"
 msgstr "***不推荐***是否从pacemaker-execd 守护进程中清除已停止的资源"
 
-#: lib/pengine/common.c:212
+#: lib/pengine/common.c:223
 msgid ""
 "Values other than default are poorly tested and potentially dangerous. This "
 "option will be removed in a future release."
 msgstr "非默认值未经过充分的测试，有潜在的风险。该选项将在未来的版本中删除。"
 
-#: lib/pengine/common.c:220
+#: lib/pengine/common.c:231
 msgid "The number of scheduler inputs resulting in errors to save"
 msgstr "保存导致错误的调度程序输入的数量"
 
-#: lib/pengine/common.c:221 lib/pengine/common.c:227 lib/pengine/common.c:233
+#: lib/pengine/common.c:232 lib/pengine/common.c:238 lib/pengine/common.c:244
 msgid "Zero to disable, -1 to store unlimited."
 msgstr "零表示禁用，-1表示存储不受限制。"
 
-#: lib/pengine/common.c:226
+#: lib/pengine/common.c:237
 msgid "The number of scheduler inputs resulting in warnings to save"
 msgstr "保存导致警告的调度程序输入的数量"
 
-#: lib/pengine/common.c:232
+#: lib/pengine/common.c:243
 msgid "The number of scheduler inputs without errors or warnings to save"
 msgstr "保存没有错误或警告的调度程序输入的数量"
 
-#: lib/pengine/common.c:243
+#: lib/pengine/common.c:254
 #, fuzzy
 msgid "How cluster should react to node health attributes"
 msgstr "集群节点对节点健康属性如何反应"
 
-#: lib/pengine/common.c:244
+#: lib/pengine/common.c:255
 msgid ""
 "Requires external entities to create node attributes (named with the prefix "
 "\"#health\") with values \"red\", \"yellow\", or \"green\"."
 msgstr ""
 "需要外部实体创建具有“red”,“yellow”或“green”值的节点属性(前缀为“#health”)"
 
-#: lib/pengine/common.c:251
+#: lib/pengine/common.c:262
 msgid "Base health score assigned to a node"
 msgstr "分配给节点的基本健康分数"
 
-#: lib/pengine/common.c:252
+#: lib/pengine/common.c:263
 msgid "Only used when \"node-health-strategy\" is set to \"progressive\"."
 msgstr "仅在“node-health-strategy”设置为“progressive”时使用。"
 
-#: lib/pengine/common.c:257
+#: lib/pengine/common.c:268
 msgid "The score to use for a node health attribute whose value is \"green\""
 msgstr "为节点健康属性值为“green”所使用的分数"
 
-#: lib/pengine/common.c:258 lib/pengine/common.c:264 lib/pengine/common.c:270
+#: lib/pengine/common.c:269 lib/pengine/common.c:275 lib/pengine/common.c:281
 msgid ""
 "Only used when \"node-health-strategy\" is set to \"custom\" or \"progressive"
 "\"."
 msgstr "仅在“node-health-strategy”设置为“custom”或“progressive”时使用。"
 
-#: lib/pengine/common.c:263
+#: lib/pengine/common.c:274
 msgid "The score to use for a node health attribute whose value is \"yellow\""
 msgstr "为节点健康属性值为“yellow”所使用的分数"
 
-#: lib/pengine/common.c:269
+#: lib/pengine/common.c:280
 msgid "The score to use for a node health attribute whose value is \"red\""
 msgstr "为节点健康属性值为“red”所使用的分数"
 
-#: lib/pengine/common.c:278
+#: lib/pengine/common.c:289
 #, fuzzy
 msgid "How the cluster should allocate resources to nodes"
-msgstr "群集应该如何分配资源到节点"
+msgstr "集群应该如何分配资源到节点"
 
 #: tools/crm_resource.c:258
 #, c-format
 msgid "Aborting because no messages received in %d seconds"
 msgstr "中止，因为在%d秒内没有接收到消息"
 
-#: tools/crm_resource.c:915
+#: tools/crm_resource.c:921
 #, c-format
 msgid "Invalid check level setting: %s"
 msgstr "无效的检查级别设置：%s"
 
-#: tools/crm_resource.c:999
+#: tools/crm_resource.c:1008
 #, c-format
 msgid ""
 "Resource '%s' not moved: active in %d locations (promoted in %d).\n"
@@ -923,7 +951,7 @@ msgstr ""
 "若要阻止'%s'在特定位置运行，请指定一个节点。若要防止'%s'在指定位置升级，指定"
 "一个节点并使用--promoted选项"
 
-#: tools/crm_resource.c:1010
+#: tools/crm_resource.c:1019
 #, c-format
 msgid ""
 "Resource '%s' not moved: active in %d locations.\n"
@@ -932,151 +960,154 @@ msgstr ""
 "资源%s未移动:在%d个位置运行\n"
 "若要防止'%s'运行在特定位置，指定一个节点"
 
-#: tools/crm_resource.c:1085
+#: tools/crm_resource.c:1096
 #, c-format
 msgid "Could not get modified CIB: %s\n"
 msgstr "无法获得修改的CIB：%s\n"
 
-#: tools/crm_resource.c:1119
-msgid "You need to specify a resource type with -t"
-msgstr "需要使用-t指定资源类型"
-
-#: tools/crm_resource.c:1162
-#, c-format
-msgid "No agents found for standard '%s'"
-msgstr "没有发现指定的'%s'标准代理"
-
-#: tools/crm_resource.c:1165
-#, fuzzy, c-format
-msgid "No agents found for standard '%s' and provider '%s'"
-msgstr "没有发现指定的标准%s和提供者%S的资源代理"
-
-#: tools/crm_resource.c:1232
-#, c-format
-msgid "No %s found for %s"
-msgstr "没有发现%s符合%s"
-
-#: tools/crm_resource.c:1237
-#, c-format
-msgid "No %s found"
-msgstr "没有发现%s"
-
-#: tools/crm_resource.c:1297
+#: tools/crm_resource.c:1174
 #, c-format
 msgid "No cluster connection to Pacemaker Remote node %s detected"
 msgstr "未检测到至pacemaker远程节点%s的集群连接"
 
-#: tools/crm_resource.c:1358
+#: tools/crm_resource.c:1235
 msgid "Must specify -t with resource type"
 msgstr "需要使用-t指定资源类型"
 
-#: tools/crm_resource.c:1364
+#: tools/crm_resource.c:1241
 msgid "Must supply -v with new value"
 msgstr "必须使用-v指定新值"
 
-#: tools/crm_resource.c:1396
+#: tools/crm_resource.c:1273
 msgid "Could not create executor connection"
 msgstr "无法创建到pacemaker-execd守护进程的连接"
 
-#: tools/crm_resource.c:1421
+#: tools/crm_resource.c:1298
 #, fuzzy, c-format
 msgid "Metadata query for %s failed: %s"
 msgstr "，查询%s的元数据失败: %s\n"
 
-#: tools/crm_resource.c:1427
+#: tools/crm_resource.c:1304
 #, c-format
 msgid "'%s' is not a valid agent specification"
 msgstr "'%s' 是一个无效的代理"
 
-#: tools/crm_resource.c:1440
+#: tools/crm_resource.c:1317
 msgid "--resource cannot be used with --class, --agent, and --provider"
 msgstr "--resource 不能与 --class, --agent, --provider一起使用"
 
-#: tools/crm_resource.c:1445
+#: tools/crm_resource.c:1322
 msgid ""
 "--class, --agent, and --provider can only be used with --validate and --"
 "force-*"
 msgstr "--class, --agent和--provider只能被用于--validate和--force-*"
 
-#: tools/crm_resource.c:1454
+#: tools/crm_resource.c:1331
 msgid "stonith does not support providers"
 msgstr "stonith 不支持提供者"
 
-#: tools/crm_resource.c:1458
+#: tools/crm_resource.c:1335
 #, c-format
 msgid "%s is not a known stonith agent"
 msgstr "%s 不是一个已知stonith代理"
 
-#: tools/crm_resource.c:1463
+#: tools/crm_resource.c:1340
 #, c-format
 msgid "%s:%s:%s is not a known resource"
 msgstr "%s:%s:%s 不是一个已知资源"
 
-#: tools/crm_resource.c:1577
+#: tools/crm_resource.c:1454
 #, c-format
 msgid "Error creating output format %s: %s"
 msgstr "创建输出格式错误 %s:%s"
 
-#: tools/crm_resource.c:1604
+#: tools/crm_resource.c:1481
 msgid "--expired requires --clear or -U"
 msgstr "--expired需要和--clear或-U一起使用"
 
-#: tools/crm_resource.c:1621
+#: tools/crm_resource.c:1498
 #, c-format
 msgid "Error parsing '%s' as a name=value pair"
 msgstr "'%s'解析错误，格式为name=value"
 
-#: tools/crm_resource.c:1718
+#: tools/crm_resource.c:1595
 msgid "Must supply a resource id with -r"
 msgstr "必须使用-r指定资源id"
 
-#: tools/crm_resource.c:1724
+#: tools/crm_resource.c:1601
 msgid "Must supply a node name with -N"
 msgstr "必须使用-N指定节点名称"
 
-#: tools/crm_resource.c:1742
+#: tools/crm_resource.c:1619
 msgid "Could not create CIB connection"
 msgstr "无法创建到CIB的连接"
 
-#: tools/crm_resource.c:1750
+#: tools/crm_resource.c:1627
 #, c-format
 msgid "Could not connect to the CIB: %s"
 msgstr "不能连接到CIB：%s"
 
-#: tools/crm_resource.c:1771
+#: tools/crm_resource.c:1648
 #, c-format
 msgid "Resource '%s' not found"
 msgstr "没有发现'%s'资源"
 
-#: tools/crm_resource.c:1783
+#: tools/crm_resource.c:1660
 #, c-format
 msgid "Cannot operate on clone resource instance '%s'"
 msgstr "不能操作克隆资源实例'%s'"
 
-#: tools/crm_resource.c:1795
+#: tools/crm_resource.c:1672
 #, c-format
 msgid "Node '%s' not found"
 msgstr "没有发现%s节点"
 
-#: tools/crm_resource.c:1806 tools/crm_resource.c:1815
+#: tools/crm_resource.c:1683
 #, c-format
 msgid "Error connecting to the controller: %s"
 msgstr "连接到控制器错误：%s"
 
-#: tools/crm_resource.c:2064
+#: tools/crm_resource.c:1692
+#, fuzzy, c-format
+msgid "Error connecting to %s: %s"
+msgstr "连接到控制器错误：%s"
+
+#: tools/crm_resource.c:1950
 msgid "You need to supply a value with the -v option"
 msgstr "需要使用-v选项提供一个值"
 
-#: tools/crm_resource.c:2119
+#: tools/crm_resource.c:2006
+msgid "You need to specify a resource type with -t"
+msgstr "需要使用-t指定资源类型"
+
+#: tools/crm_resource.c:2013
+#, fuzzy, c-format
+msgid "Could not delete resource %s: %s"
+msgstr "无法删除资源：%s：%s"
+
+#: tools/crm_resource.c:2023
 #, c-format
 msgid "Unimplemented command: %d"
 msgstr "无效的命令：%d"
 
-#: tools/crm_resource.c:2149
+#: tools/crm_resource.c:2053
 #, c-format
 msgid "Error performing operation: %s"
 msgstr "执行操作错误：%s"
 
+#~ msgid "No agents found for standard '%s'"
+#~ msgstr "没有发现指定的'%s'标准代理"
+
+#, fuzzy
+#~ msgid "No agents found for standard '%s' and provider '%s'"
+#~ msgstr "没有发现指定的标准%s和提供者%S的资源代理"
+
+#~ msgid "No %s found for %s"
+#~ msgstr "没有发现%s符合%s"
+
+#~ msgid "No %s found"
+#~ msgstr "没有发现%s"
+
 #~ msgid ""
 #~ "If nonzero, along with `have-watchdog=true` automatically set by the "
 #~ "cluster, when fencing is required, watchdog-based self-fencing will be "