l10n: zh_CN: 2.42.0 round 2
Signed-off-by: Teng Long <dyroneteng@gmail.com>
Teng Long committed
Aug 18, 2023 at 10:23 UTC
9441efe212bcf46a7695035a0c14e03c792c95c6
1 file changed
+4
-5
po/zh_CN.po
+4
-5
@@ -151,8 +151,8 @@ msgid ""
151
msgstr ""
152
"Project-Id-Version: Git\n"
153
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
154
-"POT-Creation-Date: 2023-08-11 11:21+0800\n"
155
-"PO-Revision-Date: 2023-08-18 19:28+0800\n"
154
+"POT-Creation-Date: 2023-08-18 10:21+0800\n"
155
+"PO-Revision-Date: 2023-08-18 19:29+0800\n"
156
"Last-Translator: Teng Long <dyroneteng@gmail.com>\n"
157
"Language-Team: GitHub <https://github.com/dyrone/git/>\n"
158
"Language: zh_CN\n"
@@ -894,9 +894,8 @@ msgid "Reverting is not possible because you have unmerged files."
894
msgstr "无法回退，因为您有未合并的文件。"
895
896
#: advice.c
897
-#, c-format
898
-msgid "It is not possible to %s because you have unmerged files."
899
-msgstr "无法 %s，因为您有未合并的文件。"
897
+msgid "Rebasing is not possible because you have unmerged files."
898
+msgstr "无法变基，因为您有未合并的文件。"
899
900
#: advice.c
901
msgid ""