[nautilus] use plural form only for messages with explicit number

[William Jon McCann <mccann src gnome org>]

commit c59ee71862939a4732a9ff9c95b9738bb12bd98d
Author: Yuriy Penkin <yuriy penkin gmail com>
Date:   Mon Aug 20 18:40:55 2012 -0400

    use plural form only for messages with explicit number
    
    https://bugzilla.gnome.org/show_bug.cgi?id=552053

 src/nautilus-view.c |   54 ++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 36 insertions(+), 18 deletions(-)
---
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index 50a929b..f224358 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -8122,33 +8122,51 @@ update_restore_from_trash_action (GtkAction *action,
 			tooltip = g_strdup_printf (_("Move the open folder out of the trash to â%sâ"), original_name);
 		} else if (files_are_all_directories (files)) {
 			if (original_name != NULL) {
-				tooltip = g_strdup_printf (ngettext ("Move the selected folder out of the trash to â%sâ",
-								     "Move the selected folders out of the trash to â%sâ",
-								     g_list_length (files)), original_name);
+				if (g_list_length (files) == 1) {
+					tooltip = g_strdup_printf (_("Move the selected folder out of the trash to â%sâ"),
+								   original_name);
+				} else {
+					tooltip = g_strdup_printf (_("Move the selected folders out of the trash to â%sâ"),
+								   original_name);
+				}
 			} else {
-				tooltip = g_strdup_printf (ngettext ("Move the selected folder out of the trash",
-								     "Move the selected folders out of the trash",
-								     g_list_length (files)));
+				if (g_list_length (files) == 1) {
+					tooltip = g_strdup (_("Move the selected folder out of the trash"));
+				} else {
+					tooltip = g_strdup (_("Move the selected folders out of the trash"));
+				}
 			}
 		} else if (files_is_none_directory (files)) {
 			if (original_name != NULL) {
-				tooltip = g_strdup_printf (ngettext ("Move the selected file out of the trash to â%sâ",
-								     "Move the selected files out of the trash to â%sâ",
-								     g_list_length (files)), original_name);
+				if (g_list_length (files) == 1) {
+					tooltip = g_strdup_printf (_("Move the selected file out of the trash to â%sâ"),
+								   original_name);
+				} else {
+					tooltip = g_strdup_printf (_("Move the selected files out of the trash to â%sâ"),
+								   original_name);
+				}
 			} else {
-				tooltip = g_strdup_printf (ngettext ("Move the selected file out of the trash",
-								     "Move the selected files out of the trash",
-								     g_list_length (files)));
+				if (g_list_length (files) == 1) {
+					tooltip = g_strdup (_("Move the selected file out of the trash"));
+				} else {
+					tooltip = g_strdup (_("Move the selected files out of the trash"));
+				}
 			}
 		} else {
 			if (original_name != NULL) {
-				tooltip = g_strdup_printf (ngettext ("Move the selected item out of the trash to â%sâ",
-								     "Move the selected items out of the trash to â%sâ",
-								     g_list_length (files)), original_name);
+				if (g_list_length (files) == 1) {
+					tooltip = g_strdup_printf (_("Move the selected item out of the trash to â%sâ"),
+								   original_name);
+				} else {
+					tooltip = g_strdup_printf (_("Move the selected items out of the trash to â%sâ"),
+								   original_name);
+				}
 			} else {
-				tooltip = g_strdup_printf (ngettext ("Move the selected item out of the trash",
-								     "Move the selected items out of the trash",
-								     g_list_length (files)));
+				if (g_list_length (files) == 1) {
+					tooltip = g_strdup (_("Move the selected item out of the trash"));
+				} else {
+					tooltip = g_strdup (_("Move the selected items out of the trash"));
+				}
 			}
 		}
 		g_free (original_name);