On 24/03/2024 16:35, Wenbin Lv wrote:
Hi,
I just finished updating the zh_CN translation for 9.4.170-7b206. Below are
some string related issues I have noticed:
src/chown-core.h:101: "owner and/or "should be translatable;
Fixed in https://bugs.gnu.org/69985
src/chown.c:84: "[OWNER][:[GROUP]]" and "GROUP" should be translatable;
src/copy.c:2731: "renamed %s -> %s" should be translatable, applying _() to
the whole ternary operator is not working;
src/cp.c:198: typo, "existing"
Fixed in the attached.
thanks!
Pádraig
From 6259593ac708a989ea5beea4dce14d4651397af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <p...@draigbrady.com>
Date: Sun, 24 Mar 2024 19:55:30 +0000
Subject: [PATCH] doc: fix various translation issues
src/chown.c (usage): Translate parameterized strings.
src/copy.c (copy_internal): Translate each part of ternary.
* src/cp.c (usage): Fix typo; s/exisiting/existing/.
---
src/chown.c | 2 +-
src/copy.c | 6 +++---
src/cp.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/chown.c b/src/chown.c
index 48e0d9c5b..90ce84d67 100644
--- a/src/chown.c
+++ b/src/chown.c
@@ -81,7 +81,7 @@ Usage: %s [OPTION]... %s FILE...\n\
or: %s [OPTION]... --reference=RFILE FILE...\n\
"),
program_name,
- chown_mode == CHOWN_CHOWN ? "[OWNER][:[GROUP]]" : "GROUP",
+ chown_mode == CHOWN_CHOWN ? _("[OWNER][:[GROUP]]") : _("GROUP"),
program_name);
if (chown_mode == CHOWN_CHOWN)
fputs (_("\
diff --git a/src/copy.c b/src/copy.c
index 817d5b13b..0318e0067 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -2726,9 +2726,9 @@ skip:
if (rename_errno == 0)
{
if (x->verbose)
- emit_verbose (_(x->exchange
- ? "exchanged %s <-> %s"
- : "renamed %s -> %s"),
+ emit_verbose (x->exchange
+ ? _("exchanged %s <-> %s")
+ : _("renamed %s -> %s"),
src_name, dst_name, dst_backup);
if (x->set_security_context)
diff --git a/src/cp.c b/src/cp.c
index 91c635af8..28b0217db 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -195,7 +195,7 @@ Copy SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n\
-L, --dereference always follow symbolic links in SOURCE\n\
"), stdout);
fputs (_("\
- -n, --no-clobber (deprecated) silently skip exisiting files.\n\
+ -n, --no-clobber (deprecated) silently skip existing files.\n\
See also --update\n\
"), stdout);
fputs (_("\
--
2.44.0
