[file-roller] Unexpected msgstr appears in update dialog

[Paolo Bacchilega <paobac src gnome org>]

commit 74e8b2d78519d90a06ee1ab01a70106724db7e04
Author: Kiyotaka NISHIBORI <ml nishibori kiyotaka gmail com>
Date:   Mon Aug 23 13:14:31 2010 +0200

    Unexpected msgstr appears in update dialog
    
    When Plural Forms definition in .po file is "Plural-Forms:
    nplurals=1; plural=0;\n" (e.g. ja.po), unexpected string appears
    on update dialog after one file in an archive has changed.
    
    [bug #627387]

 data/ui/update.ui |    2 +-
 src/dlg-update.c  |   12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/data/ui/update.ui b/data/ui/update.ui
index 0128909..bf41ea0 100644
--- a/data/ui/update.ui
+++ b/data/ui/update.ui
@@ -55,7 +55,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label5">
+                  <object class="GtkLabel" id="update_file_secondary_text_label">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">The file has been modified with an external application. If you don't update the file in the archive, all of your changes will be lost.</property>
diff --git a/src/dlg-update.c b/src/dlg-update.c
index f4c29fe..efcd10f 100644
--- a/src/dlg-update.c
+++ b/src/dlg-update.c
@@ -45,6 +45,7 @@ typedef struct {
 
 	GtkWidget    *update_file_dialog;
 	GtkWidget    *update_file_primary_text_label;
+	GtkWidget    *update_file_secondary_text_label;
 
 	GtkWidget    *update_files_dialog;
 	GtkWidget    *update_files_primary_text_label;
@@ -170,6 +171,15 @@ update_file_list (DialogData *data)
 		g_free (archive_name);
 		g_free (unescaped);
 		g_free (file_name);
+
+		/* secondary text */
+
+		label = g_strdup_printf (ngettext ("The file has been modified with an external application. If you don't update the version in the archive, all of your changes will be lost.",
+						   "There are %d files that have been modified with an external application. If you don't update the files in the archive, all of your changes will be lost.",
+						   n_files),
+					 n_files);
+		gtk_label_set_text (GTK_LABEL (data->update_file_secondary_text_label), label);
+		g_free (label);
 	}
 	else if (n_files > 1) {
 		char *unescaped;
@@ -289,6 +299,8 @@ dlg_update (FrWindow *window)
 
 	data->update_file_dialog = _gtk_builder_get_widget (data->builder, "update_file_dialog");
 	data->update_file_primary_text_label = _gtk_builder_get_widget (data->builder, "update_file_primary_text_label");
+	data->update_file_secondary_text_label = _gtk_builder_get_widget (data->builder, "update_file_secondary_text_label");
+
 	update_file_ok_button = _gtk_builder_get_widget (data->builder, "update_file_ok_button");
 	update_file_cancel_button = _gtk_builder_get_widget (data->builder, "update_file_cancel_button");