Merge branch 'da/difftool' into maint

diff --git a/builtin/remote.c b/builtin/remote.c
index fda5c2e53d28ae84f4876ca77ac9fefebee9ada2..d33766be395ad637c4505f5ca9024a9b8331d99d 100644 (file)
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -1154,6 +1154,8 @@ static int show(int argc, const char **argv)
                        url_nr = states.remote->url_nr;
                }
                for (i = 0; i < url_nr; i++)
+                       /* TRANSLATORS: the colon ':' should align with
+                          the one in "  Fetch URL: %s" translation */
                        printf_ln(_("  Push  URL: %s"), url[i]);
                if (!i)
                        printf_ln(_("  Push  URL: %s"), "(no URL)");