i18n: remote: mark URL fallback text for translation
[gitweb.git] / builtin / apply.c
index ce3b77853c7a409b40d14400172327978266f9ca..205c9f8f3301b17456e5c19d68dff8e6cbfca6b6 100644 (file)
@@ -3226,7 +3226,7 @@ static int load_patch_target(struct strbuf *buf,
 {
        if (cached || check_index) {
                if (read_file_or_gitlink(ce, buf))
-                       return error(_("read of %s failed"), name);
+                       return error(_("failed to read %s"), name);
        } else if (name) {
                if (S_ISGITLINK(expected_mode)) {
                        if (ce)
@@ -3237,7 +3237,7 @@ static int load_patch_target(struct strbuf *buf,
                        return error(_("reading from '%s' beyond a symbolic link"), name);
                } else {
                        if (read_old_data(st, name, buf))
-                               return error(_("read of %s failed"), name);
+                               return error(_("failed to read %s"), name);
                }
        }
        return 0;
@@ -3282,7 +3282,7 @@ static int load_preimage(struct image *image,
                        free_fragment_list(patch->fragments);
                        patch->fragments = NULL;
                } else if (status) {
-                       return error(_("read of %s failed"), patch->old_name);
+                       return error(_("failed to read %s"), patch->old_name);
                }
        }
 
@@ -4383,6 +4383,8 @@ static int apply_patch(int fd, const char *filename, int options)
                        listp = &patch->next;
                }
                else {
+                       if (apply_verbosely)
+                               say_patch_name(stderr, _("Skipped patch '%s'."), patch);
                        free_patch(patch);
                        skipped_patch++;
                }