Thread (29 messages) flat view 29 messages, 3 authors, 2018-07-02

Re: [PATCH 07/23] builtin/replace.c: mark more strings for translation

From: Elijah Newren <hidden>
Date: 2018-07-01 05:34:19

On Sat, Jun 30, 2018 at 2:08 AM, Nguyễn Thái Ngọc Duy [off-list ref] wrote:
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted>
---
 builtin/replace.c | 82 +++++++++++++++++++++++------------------------
 1 file changed, 41 insertions(+), 41 deletions(-)
-               return error("invalid replace format '%s'\n"
-                            "valid formats are 'short', 'medium' and 'long'\n",
+               return error(_("invalid replace format '%s'\n"
+                              "valid formats are 'short', 'medium' and 'long'"),
Was the removal of the trailing newline intentional?  If so, move it to patch 1?
quoted hunk ↗ jump to hunk
@@ -456,10 +456,10 @@ static int create_graft(int argc, const char **argv, int force, int gentle)
                return -1;
        }

-       if (remove_signature(&buf)) {
-               warning(_("the original commit '%s' has a gpg signature."), old_ref);
-               warning(_("the signature will be removed in the replacement commit!"));
-       }
+       if (remove_signature(&buf))
+               warning(_("the original commit '%s' has a gpg signature.\n"
+                         "The signature will be removed in the replacement commit!"),
+                       old_ref);
More message changes that probably belong in patch 1 for consistency.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help