[Commits] [SCM] claws branch, master, updated. 3.14.0-89-g0f33f4b

[wwp at claws-mail.org]

The branch, master has been updated
       via  0f33f4bbfabef892fdf147d48d9ee02c23f088ef (commit)
      from  3a5f7d5d11e019046db183125e916e94825f177c (commit)

Summary of changes:
 src/plugins/vcalendar/plugin.c      |    2 +-
 src/plugins/vcalendar/vcal_folder.c |   10 +++++-----
 src/plugins/vcalendar/vcal_prefs.c  |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)


- Log -----------------------------------------------------------------
commit 0f33f4bbfabef892fdf147d48d9ee02c23f088ef
Author: wwp <wwp at free.fr>
Date:   Fri Sep 23 09:25:14 2016 +0200

    Normalize Webcal name capitalization everywhere (instead of WebCal, webCal,
    webcal). Rephrase a bit a confirmation dialog to talk about subscription
    instead of folder.

diff --git a/src/plugins/vcalendar/plugin.c b/src/plugins/vcalendar/plugin.c
index 575181d..d142346 100644
--- a/src/plugins/vcalendar/plugin.c
+++ b/src/plugins/vcalendar/plugin.c
@@ -79,7 +79,7 @@ const gchar *plugin_desc(void)
 		 "appropriate form and you will be able to accept or decline them.\n"
 		 "To create a meeting right-click on the vCalendar or "
 		 "Meetings folder and choose \"New meeting...\".\n\n"
-		 "You will also be able to subscribe to remote webCal feeds,"
+		 "You will also be able to subscribe to remote Webcal feeds,"
 		 "export your meetings and calendars, publish your free/busy "
 		 "information and retrieve that information from others.");
 }
diff --git a/src/plugins/vcalendar/vcal_folder.c b/src/plugins/vcalendar/vcal_folder.c
index e462fe0..633830a 100644
--- a/src/plugins/vcalendar/vcal_folder.c
+++ b/src/plugins/vcalendar/vcal_folder.c
@@ -164,7 +164,7 @@ static char *vcal_popup_labels[] =
 {
 	N_("_New meeting..."),
 	N_("_Export calendar..."),
-	N_("_Subscribe to webCal..."),
+	N_("_Subscribe to Webcal..."),
 	N_("_Unsubscribe..."),
 	N_("_Rename..."),
 	N_("U_pdate subscriptions"),
@@ -1832,10 +1832,10 @@ static void update_subscription_finish(const gchar *uri, gchar *feed, gboolean v
 	}
 	if (strncmp(feed, "BEGIN:VCALENDAR", strlen("BEGIN:VCALENDAR"))) {
 		if (verbose && manual_update) {
-			alertpanel_error(_("This URL does not look like a WebCal URL:\n%s\n%s"),
+			alertpanel_error(_("This URL does not look like a Webcal URL:\n%s\n%s"),
 					uri, error ? error:_("Unknown error"));
 		} else  {
-			log_error(LOG_PROTOCOL, _("This URL does not look like a WebCal URL:\n%s\n%s\n"),
+			log_error(LOG_PROTOCOL, _("This URL does not look like a Webcal URL:\n%s\n%s\n"),
 					uri, error ? error:_("Unknown error"));
 		}
 		g_free(feed);
@@ -1936,7 +1936,7 @@ static void subscribe_cal_cb(GtkAction *action, gpointer data)
 	gchar *uri = NULL;
 	gchar *tmp = NULL;
 
-	tmp = input_dialog(_("Subscribe to WebCal"), _("Enter the WebCal URL:"), NULL);
+	tmp = input_dialog(_("Subscribe to Webcal"), _("Enter the WebCal URL:"), NULL);
 	if (tmp == NULL)
 		return;
 	
@@ -1977,7 +1977,7 @@ static void unsubscribe_cal_cb(GtkAction *action, gpointer data)
 
 	message = g_strdup_printf
 		(_("Do you really want to unsubscribe?"));
-	avalue = alertpanel_full(_("Delete folder"), message,
+	avalue = alertpanel_full(_("Delete subscription"), message,
 		 		 GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, 
 				 FALSE, NULL, ALERT_WARNING, G_ALERTDEFAULT);
 	g_free(message);
diff --git a/src/plugins/vcalendar/vcal_prefs.c b/src/plugins/vcalendar/vcal_prefs.c
index 3968172..63edcee 100644
--- a/src/plugins/vcalendar/vcal_prefs.c
+++ b/src/plugins/vcalendar/vcal_prefs.c
@@ -367,7 +367,7 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
 	gtk_widget_show (hbox2);
 	gtk_box_pack_start(GTK_BOX (vbox3), hbox2, TRUE, TRUE, 0);
 
-	export_subs_checkbtn = gtk_check_button_new_with_label(_("Include webcal subscriptions in export"));
+	export_subs_checkbtn = gtk_check_button_new_with_label(_("Include Webcal subscriptions in export"));
 	gtk_widget_show(export_subs_checkbtn);
 	gtk_box_pack_start(GTK_BOX (hbox2), export_subs_checkbtn, FALSE, FALSE, 0);
 	SET_TOGGLE_SENSITIVITY(export_enable_checkbtn, export_subs_checkbtn);

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail