[evolution-rss] Bug 626943 - translation questions

[Lucian Langa <lucilanga src gnome org>]

commit 61765a83b29177a42ca9d037287b64f9b89c72ec
Author: Lucian Langa <lucilanga gnome org>
Date:   Thu Aug 19 08:42:07 2010 +0300

    Bug 626943 - translation questions

 src/evolution-rss.schemas.in.in |    4 ++--
 src/rss-config-factory.c        |   29 +++++++++++++++++++++++++++++
 src/rss-config-factory.h        |    4 +++-
 src/rss-main.ui                 |    6 ++----
 src/rss.c                       |    4 ++--
 5 files changed, 38 insertions(+), 9 deletions(-)
---
diff --git a/src/evolution-rss.schemas.in.in b/src/evolution-rss.schemas.in.in
index d39b68f..16081fe 100644
--- a/src/evolution-rss.schemas.in.in
+++ b/src/evolution-rss.schemas.in.in
@@ -152,7 +152,7 @@
 	<locale name="C">
 		<short>Automaticaly Resize Images</short>
 		<long>
-			Evolution RSS will automatically resize images lager than displayed area.
+			Evolution RSS will automatically resize images larger than displayed area.
 		</long>
 	</locale>
     </schema>
@@ -307,7 +307,7 @@
       <locale name="C">
         <short>Show articles comments</short>
         <long>
-    	    It will display article's comments by default if present.
+    	    If a feed article has comments, it will be displayed.
         </long>
       </locale>
     </schema>
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index 3e42452..ffdd0dc 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -416,6 +416,14 @@ del_days_cb (GtkWidget *widget, add_feed *data)
 }
 
 void
+update_days_label_cb (GtkWidget *widget, GtkLabel *data)
+{
+	guint val = gtk_spin_button_get_value((GtkSpinButton*)widget);
+	gtk_label_set_text(data,
+		ngettext("day", "days", val));
+}
+
+void
 del_messages_cb (GtkWidget *widget, add_feed *data)
 {
 	guint adj = gtk_spin_button_get_value((GtkSpinButton*)widget);
@@ -423,6 +431,14 @@ del_messages_cb (GtkWidget *widget, add_feed *data)
 }
 
 void
+update_messages_label_cb (GtkWidget *widget, GtkLabel *data)
+{
+	guint val = gtk_spin_button_get_value((GtkSpinButton*)widget);
+	gtk_label_set_text(data,
+		ngettext("message", "messages", val));
+}
+
+void
 disable_widget_cb(GtkWidget *widget, GtkBuilder *data)
 {
 	GtkWidget *authuser = GTK_WIDGET (gtk_builder_get_object(data, "auth_user"));
@@ -469,6 +485,7 @@ build_dialog_add(gchar *url, gchar *feed_text)
 		*radiobutton6,
 		*radiobutton7,
 		*ttl_value;
+	GtkWidget *label1, *label2;
 	GtkWidget *spinbutton1, *spinbutton2;
 	GtkWidget *checkbutton4;
 	GtkImage *image;
@@ -574,6 +591,12 @@ build_dialog_add(gchar *url, gchar *feed_text)
 
 	spinbutton1 = GTK_WIDGET (gtk_builder_get_object(gui, "storage_sb1"));
 	spinbutton2 = GTK_WIDGET (gtk_builder_get_object(gui, "storage_sb2"));
+	label1 = GTK_WIDGET(gtk_builder_get_object(gui, "label12"));
+	g_signal_connect(
+		spinbutton1,
+		"value-changed",
+		G_CALLBACK(update_messages_label_cb),
+		label1);
 	if (feed->del_messages)
 		gtk_spin_button_set_value(
 			GTK_SPIN_BUTTON(spinbutton1),
@@ -624,6 +647,12 @@ build_dialog_add(gchar *url, gchar *feed_text)
 			1);
 	}
 
+	label2 = GTK_WIDGET(gtk_builder_get_object(gui, "label13"));
+	g_signal_connect(
+		spinbutton2,
+		"value-changed",
+		G_CALLBACK(update_days_label_cb),
+		label2);
 	if (feed->del_days)
 		gtk_spin_button_set_value(
 			GTK_SPIN_BUTTON(spinbutton2),
diff --git a/src/rss-config-factory.h b/src/rss-config-factory.h
index d66c23f..adb4530 100644
--- a/src/rss-config-factory.h
+++ b/src/rss-config-factory.h
@@ -27,7 +27,6 @@ void import_dialog_response(
 	guint response,
 	gpointer user_data);
 
-void del_days_cb (GtkWidget *widget, add_feed *data);
 void delete_feed_folder_alloc(gchar *old_name);
 
 void rss_delete_folders (
@@ -38,7 +37,10 @@ void rss_delete_folders (
 void remove_feed_hash(gpointer name);
 void init_rss_prefs(void);
 void accept_cookies_cb(GtkWidget *widget, GtkWidget *data);
+void del_days_cb (GtkWidget *widget, add_feed *data);
+void update_days_label_cb (GtkWidget *widget, GtkLabel *data);
 void del_messages_cb (GtkWidget *widget, add_feed *data);
+void update_messages_label_cb (GtkWidget *widget, GtkLabel *data);
 void disable_widget_cb(GtkWidget *widget, GtkBuilder *data);
 add_feed *build_dialog_add(gchar *url, gchar *feed_text);
 void actions_dialog_add(add_feed *feed, gchar *url);
diff --git a/src/rss-main.ui b/src/rss-main.ui
index c65bbd3..8dfb387 100644
--- a/src/rss-main.ui
+++ b/src/rss-main.ui
@@ -965,9 +965,9 @@
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">dialog</property>
-    <property name="action">save</property>
-    <property name="show_hidden">True</property>
     <property name="local_only">False</property>
+    <property name="show_hidden">True</property>
+    <property name="action">save</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="vbox26">
         <property name="visible">True</property>
@@ -1389,7 +1389,6 @@
                                 <child>
                                   <object class="GtkLabel" id="label12">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes" comments="To translators: this label is part of the following message: &quot;Delete all but the last X messages.">messages</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -1441,7 +1440,6 @@
                                 <child>
                                   <object class="GtkLabel" id="label13">
                                     <property name="visible">True</property>
-                                    <property name="label" translatable="yes" comments="for translators: this label is part of the &quot;Delete articles older than X days&quot; message.">days</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
diff --git a/src/rss.c b/src/rss.c
index a9678f4..d8ba62a 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -887,7 +887,7 @@ receive_cancel(GtkButton *button, struct _send_info *info)
 			gtk_label_set_markup (GTK_LABEL (info->status_label),
 //                        e_clipped_label_set_text (
 //                              E_CLIPPED_LABEL (info->status_label),
-				_("Canceling..."));
+				_("Cancelling..."));
 		info->state = SEND_CANCELLED;
 		readrss_dialog_cb(NULL, NULL);
 	}
@@ -2929,7 +2929,7 @@ finish_setup_feed(
 		g_set_error(&err, NET_ERROR, NET_ERROR_GENERIC, "%s",
 			soup_status_get_phrase(msg->status_code));
 		rss_error(crc_feed,
-			feed->feed_name ? feed->feed_name: _("Unamed feed"),
+			feed->feed_name ? feed->feed_name: _("Unnamed feed"),
 			_("Error while setting up feed."),
 			err->message);
 		goto out;