File src/fops_misc.c changed (mode: 100644) (index 234c38f86..73db1a73d) |
... |
... |
fops_yank(view_t *view, int reg) |
472 |
472 |
|
|
473 |
473 |
regs_update_unnamed(reg); |
regs_update_unnamed(reg); |
474 |
474 |
|
|
475 |
|
ui_sb_msgf("%d item%s yanked", nyanked_files, |
|
476 |
|
(nyanked_files == 1) ? "" : "s"); |
|
|
475 |
|
ui_sb_msgf("%d item%s yanked", nyanked_files, psuffix(nyanked_files)); |
477 |
476 |
|
|
478 |
477 |
regs_sync_to_shared_memory(); |
regs_sync_to_shared_memory(); |
479 |
478 |
|
|
|
... |
... |
retarget_many(view_t *view, char *files[], int nfiles) |
712 |
711 |
|
|
713 |
712 |
un_group_close(); |
un_group_close(); |
714 |
713 |
|
|
715 |
|
ui_sb_msgf("%d link%s retargeted%s", ops->succeeded, |
|
716 |
|
(ops->succeeded == 1) ? "" : "s", fops_get_cancellation_suffix()); |
|
|
714 |
|
ui_sb_msgf("%d link%s retargeted%s", ops->succeeded, psuffix(ops->succeeded), |
|
715 |
|
fops_get_cancellation_suffix()); |
717 |
716 |
|
|
718 |
717 |
fops_free_ops(ops); |
fops_free_ops(ops); |
719 |
718 |
|
|
|
... |
... |
fops_clone(view_t *view, char *list[], int nlines, int force, int copies) |
892 |
891 |
free_string_array(list, nlines); |
free_string_array(list, nlines); |
893 |
892 |
} |
} |
894 |
893 |
|
|
895 |
|
ui_sb_msgf("%d item%s cloned%s", ops->succeeded, |
|
896 |
|
(ops->succeeded == 1) ? "" : "s", fops_get_cancellation_suffix()); |
|
|
894 |
|
ui_sb_msgf("%d item%s cloned%s", ops->succeeded, psuffix(ops->succeeded), |
|
895 |
|
fops_get_cancellation_suffix()); |
897 |
896 |
|
|
898 |
897 |
fops_free_ops(ops); |
fops_free_ops(ops); |
899 |
898 |
return 1; |
return 1; |
|
... |
... |
fops_mkfiles(view_t *view, int at, char *names[], int count) |
1129 |
1128 |
go_to_first_file(view, names, count); |
go_to_first_file(view, names, count); |
1130 |
1129 |
} |
} |
1131 |
1130 |
|
|
1132 |
|
ui_sb_msgf("%d item%s created%s", n, (n == 1) ? "" : "s", |
|
|
1131 |
|
ui_sb_msgf("%d item%s created%s", n, psuffix(n), |
1133 |
1132 |
fops_get_cancellation_suffix()); |
fops_get_cancellation_suffix()); |
1134 |
1133 |
|
|
1135 |
1134 |
fops_free_ops(ops); |
fops_free_ops(ops); |
|
... |
... |
fops_chown(int u, int g, uid_t uid, gid_t gid) |
1445 |
1444 |
un_group_close(); |
un_group_close(); |
1446 |
1445 |
|
|
1447 |
1446 |
ui_sb_msgf("%d item%s fully processed%s", ops->succeeded, |
ui_sb_msgf("%d item%s fully processed%s", ops->succeeded, |
1448 |
|
(ops->succeeded == 1) ? "" : "s", fops_get_cancellation_suffix()); |
|
|
1447 |
|
psuffix(ops->succeeded), fops_get_cancellation_suffix()); |
1449 |
1448 |
fops_free_ops(ops); |
fops_free_ops(ops); |
1450 |
1449 |
|
|
1451 |
1450 |
ui_view_reset_selection_and_reload(view); |
ui_view_reset_selection_and_reload(view); |
File src/fops_put.c changed (mode: 100644) (index 182fe3ded..5e854f5ab) |
... |
... |
put_files_i(view_t *view, int start) |
495 |
495 |
regs_pack(put_confirm.reg->name); |
regs_pack(put_confirm.reg->name); |
496 |
496 |
update_cursor_position(view); |
update_cursor_position(view); |
497 |
497 |
ui_sb_msgf("%d item%s inserted%s", put_confirm.processed, |
ui_sb_msgf("%d item%s inserted%s", put_confirm.processed, |
498 |
|
(put_confirm.processed == 1) ? "" : "s", fops_get_cancellation_suffix()); |
|
|
498 |
|
psuffix(put_confirm.processed), fops_get_cancellation_suffix()); |
499 |
499 |
|
|
500 |
500 |
return 1; |
return 1; |
501 |
501 |
} |
} |
File src/fops_rename.c changed (mode: 100644) (index f141710a6..3ef03e8b3) |
... |
... |
fops_rename(view_t *view, char *list[], int nlines, int recursive) |
216 |
216 |
const int renamed = perform_renaming(view, files, is_dup, nfiles, list); |
const int renamed = perform_renaming(view, files, is_dup, nfiles, list); |
217 |
217 |
if(renamed >= 0) |
if(renamed >= 0) |
218 |
218 |
{ |
{ |
219 |
|
ui_sb_msgf("%d item%s renamed", renamed, (renamed == 1) ? "" : "s"); |
|
|
219 |
|
ui_sb_msgf("%d item%s renamed", renamed, psuffix(renamed)); |
220 |
220 |
} |
} |
221 |
221 |
|
|
222 |
222 |
flist_sel_stash(view); |
flist_sel_stash(view); |
|
... |
... |
verify_list(char *files[], int nfiles, char *names[], int nnames, char **error, |
287 |
287 |
} |
} |
288 |
288 |
else if(moves > 0) |
else if(moves > 0) |
289 |
289 |
{ |
{ |
290 |
|
const char *suffix = (moves == 1 ? "" : "s"); |
|
|
290 |
|
const char *suffix = psuffix(moves); |
291 |
291 |
/* Stray space prevents removal of the line. */ |
/* Stray space prevents removal of the line. */ |
292 |
292 |
if(!prompt_msgf("Rename", |
if(!prompt_msgf("Rename", |
293 |
293 |
"It appears that the rename list has %d move%s, which could have " |
"It appears that the rename list has %d move%s, which could have " |
|
... |
... |
fops_incdec(view_t *view, int k) |
586 |
586 |
} |
} |
587 |
587 |
else if(err == 0) |
else if(err == 0) |
588 |
588 |
{ |
{ |
589 |
|
ui_sb_msgf("%d item%s renamed", nrenamed, (nrenamed == 1) ? "" : "s"); |
|
|
589 |
|
ui_sb_msgf("%d item%s renamed", nrenamed, psuffix(nrenamed)); |
590 |
590 |
} |
} |
591 |
591 |
|
|
592 |
592 |
return 1; |
return 1; |
|
... |
... |
rename_marked(view_t *view, const char desc[], const char lhs[], |
944 |
944 |
ui_view_schedule_redraw(view); |
ui_view_schedule_redraw(view); |
945 |
945 |
} |
} |
946 |
946 |
|
|
947 |
|
ui_sb_msgf("%d item%s renamed", nrenamed, (nrenamed == 1) ? "" : "s"); |
|
|
947 |
|
ui_sb_msgf("%d item%s renamed", nrenamed, psuffix(nrenamed)); |
948 |
948 |
return 1; |
return 1; |
949 |
949 |
} |
} |
950 |
950 |
|
|
File src/search.c changed (mode: 100644) (index 22cc44ccf..ae19438a7) |
... |
... |
print_search_msg(const view_t *view, int backward) |
318 |
318 |
{ |
{ |
319 |
319 |
ui_sb_msgf("%d of %d matching item%s for: %s", |
ui_sb_msgf("%d of %d matching item%s for: %s", |
320 |
320 |
get_current_entry(view)->search_match, view->matches, |
get_current_entry(view)->search_match, view->matches, |
321 |
|
(view->matches == 1) ? "" : "s", hists_search_last()); |
|
|
321 |
|
psuffix(view->matches), hists_search_last()); |
322 |
322 |
} |
} |
323 |
323 |
} |
} |
324 |
324 |
|
|
File src/ui/quickview.c changed (mode: 100644) (index 05fc982a7..6bb8e8f40) |
... |
... |
print_tree_stats(tree_print_state_t *s) |
512 |
512 |
fprintf(s->fp, "%s%d director%s, %d file%s\n", |
fprintf(s->fp, "%s%d director%s, %d file%s\n", |
513 |
513 |
ui_cancellation_requested() ? "(cancelled)\n" : "", |
ui_cancellation_requested() ? "(cancelled)\n" : "", |
514 |
514 |
s->ndirs, (s->ndirs == 1) ? "y" : "ies", |
s->ndirs, (s->ndirs == 1) ? "y" : "ies", |
515 |
|
s->nfiles, (s->nfiles == 1) ? "" : "s"); |
|
|
515 |
|
s->nfiles, psuffix(s->nfiles)); |
516 |
516 |
} |
} |
517 |
517 |
|
|
518 |
518 |
/* Produces tree preview of the path. Returns non-zero to request stopping of |
/* Produces tree preview of the path. Returns non-zero to request stopping of |