[evolution-webcal] Bug 615717 — Miscellaneous string fixes

[Philip Withnall <pwithnall src gnome org>]

commit e1bfdd69d1c790489b81fe992fcc109854c48ad2
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Apr 13 18:06:27 2010 +0100

    Bug 615717 â?? Miscellaneous string fixes
    
    Some punctuation and capitalisation fixes, and removal of markup from
    a couple of translatable strings. Closes: bgo#615717

 evolution-webcal.schemas.in.in |    4 ++--
 src/evolution-webcal-main.c    |    4 ++--
 src/evolution-webcal-notify.c  |   12 ++++++++----
 3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/evolution-webcal.schemas.in.in b/evolution-webcal.schemas.in.in
index 6a533a1..9c77c04 100644
--- a/evolution-webcal.schemas.in.in
+++ b/evolution-webcal.schemas.in.in
@@ -19,8 +19,8 @@
      <type>string</type>
      <default>@libexecdir@/evolution-webcal %s</default>
      <locale name="C">
-       <short>URL handler for webcal uris</short>
-       <long>URL handler for webcal uris</long>
+       <short>URL handler for webcal URIs</short>
+       <long>URL handler for webcal URIs</long>
      </locale>
     </schema>
 
diff --git a/src/evolution-webcal-main.c b/src/evolution-webcal-main.c
index 1110587..80b1f39 100644
--- a/src/evolution-webcal-main.c
+++ b/src/evolution-webcal-main.c
@@ -52,7 +52,7 @@ static void e_webcal_load (const gchar * body, const gchar * uri)
 
     message = g_strdup_printf (_("There was an error parsing the calendar, "
 				 "\"%s\". Please verify that it is a valid "
-				 "calendar, and try again."),
+				 "calendar and try again."),
 			       tmpname);
 
     e_webcal_display_error (_("Error Parsing Calendar"),
@@ -228,7 +228,7 @@ static gboolean e_webcal_idle_callback (void * data) {
     e_webcal_display_error (_("No URI Specified"),
 			    _("No URI to load was specified. You need to "
 			      "pass the URI of the calendar to subscribe "
-			      "to, as an argument on the command line."),
+			      "to as an argument on the command line."),
 			    NULL);
     gtk_main_quit ();
   }
diff --git a/src/evolution-webcal-notify.c b/src/evolution-webcal-notify.c
index 8cb110b..fa23481 100644
--- a/src/evolution-webcal-notify.c
+++ b/src/evolution-webcal-notify.c
@@ -242,12 +242,14 @@ void e_webcal_query_user (const gchar * name, const gchar * desc,
 
   /* If we are already subscribed, pop up an error dialog */
   if (!has_events && !has_tasks) {
-    gchar * msg;
+    gchar * msg, * title;
 
     msg = g_strdup_printf (_("No events or tasks were found in the calendar "
 			     "\"%s\"."),
 			   name ? name : tmpname);
-    e_webcal_display_error (_("<b>No Tasks or Events Found</b>"), msg, NULL);
+    title = g_strdup_printf ("<b>%s</b>", _("No Tasks or Events Found"));
+    e_webcal_display_error (title, msg, NULL);
+    g_free (title);
     g_free (msg);
 
     g_free (tmpname);
@@ -301,12 +303,14 @@ void e_webcal_query_user (const gchar * name, const gchar * desc,
 
   /* If we are already subscribed, pop up an error dialog */
   if (!has_events && !has_tasks) {
-    gchar * msg;
+    gchar * msg, * title;
 
     msg = g_strdup_printf (_("You are already subscribed to the calendar "
 			     "\"%s\". Please subscribe to another calendar."),
 			   name ? name : tmpname);
-    e_webcal_display_error (_("<b>Already Subscribed</b>"), msg, NULL);
+    title = g_strdup_printf ("<b>%s</b>", _("Already Subscribed"));
+    e_webcal_display_error (title, msg, NULL);
+    g_free (title);
     g_free (msg);
 
     g_free (tmpname);