[nautilus] file: reword "items" to "files and folders"

[Carlos Soriano <csoriano src gnome org>]

commit a8dbefc0bfef7f09bc2a651d64f264ebe93cafba
Author: Carlos Soriano <csoriano gnome org>
Date:   Thu Sep 29 09:25:01 2016 +0200

    file: reword "items" to "files and folders"
    
    It looks more explicit and clear than using items.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=771586

 src/nautilus-file.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index f72645a..d814d82 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -6990,10 +6990,12 @@ format_item_count_for_display (guint    item_count,
 {
     g_assert (includes_directories || includes_files);
 
-    return g_strdup_printf (includes_directories
-                            ? (includes_files
-                               ? ngettext ("%'u item", "%'u items", item_count)
-                               : ngettext ("%'u folder", "%'u folders", item_count))
+    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))
                             : ngettext ("%'u file", "%'u files", item_count), item_count);
 }