Revert "file: reword "items" to "files and folders""

It needs more handling than just this, and sometimes we cannot know
whether the child has both files and folders or not. So "items" it's
probably the safest bet in here.

This reverts commit a8dbefc0bfef7f09bc2a651d64f264ebe93cafba.

1 files changed, 4 insertions, 6 deletions

diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index c162b0825..9ac9b51f6 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -6990,12 +6990,10 @@ format_item_count_for_display (guint    item_count,
 {
     g_assert (includes_directories || includes_files);
 
-    return g_strdup_printf (includes_directories ? (includes_files
-                                                    /* Translators: "file and folder" is a string that will never
-                                                     * happen, since this is only used when there are minimum 2 items
-                                                     */
-                                                    ? ngettext ("%'u file and folder", "%'u files and folders", item_count)
-                                                    : ngettext ("%'u folder", "%'u folders", item_count))
+    return g_strdup_printf (includes_directories
+                            ? (includes_files
+                               ? ngettext ("%'u item", "%'u items", item_count)
+                               : ngettext ("%'u folder", "%'u folders", item_count))
                             : ngettext ("%'u file", "%'u files", item_count), item_count);
 }