Don't use <tt> in the strings. Fixes bug #163378.

2005-01-15  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
	* embed/mozilla/GtkNSSDialogs.cpp:

	Don't use <tt> in the strings. Fixes bug #163378.

	* lib/ephy-gui.c: (ephy_gui_confirm_overwrite_file):
	* src/bookmarks/ephy-bookmarks.c: (redirect_cb):

	Fix button text and capitalisation in the confirm-redirect-update
	dialogue. Fixes bug #164131.

	* src/ephy-window.c: (confirm_close_with_modified_forms):

	Fix primary text of confirm-close command not to have a period.

6 files changed, 61 insertions, 65 deletions

diff --git a/ChangeLog b/ChangeLog
index 64d0a78aa..0e0235036 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2005-01-15  Christian Persch  <chpe@cvs.gnome.org>
+
+	* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
+	* embed/mozilla/GtkNSSDialogs.cpp:
+
+	Don't use <tt> in the strings. Fixes bug #163378.
+
+	* lib/ephy-gui.c: (ephy_gui_confirm_overwrite_file):
+	* src/bookmarks/ephy-bookmarks.c: (redirect_cb):
+
+	Fix button text and capitalisation in the confirm-redirect-update
+	dialogue. Fixes bug #164131.
+
+	* src/ephy-window.c: (confirm_close_with_modified_forms):
+
+	Fix primary text of confirm-close command not to have a period.
+
 2005-01-15  Crispin Flowerday  <gnome@flowerday.cx>
 
 	* src/ephy-shell.c (ephy_shell_get_default): 
diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
index 4a0531e6d..3abc7d276 100644
--- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp
+++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
@@ -141,7 +141,7 @@ GtkNSSClientAuthDialogs::ChooseCertificate (nsIInterfaceRequestor *ctx,
 	GtkListStore *store;
 	GtkTreeIter iter;
 	GtkCellRenderer *renderer;
-	char *msg, *tt_cn, *markup_text;
+	char *msg, *markup_text;
 	PRUint32 i;
 
 	nsCOMPtr<nsIDOMWindow> parent = do_GetInterface (ctx);
@@ -198,16 +198,14 @@ GtkNSSClientAuthDialogs::ChooseCertificate (nsIInterfaceRequestor *ctx,
 	nsEmbedCString utf8_cn;
 	NS_UTF16ToCString (nsEmbedString (cn),
 			   NS_CSTRING_ENCODING_UTF8, utf8_cn);
-	tt_cn = g_markup_printf_escaped ("\"<tt>%s</tt>\"", utf8_cn.get());
 
-	msg = g_strdup_printf (_("Choose a certificate to present as identification to %s."),
-			       tt_cn);
+	msg = g_markup_printf_escaped (_("Choose a certificate to present as identification to \"%s\"."),
+				       utf8_cn.get());
 	markup_text = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s",
 				       _("Select a certificate to identify yourself."),
 				       msg);
 	gtk_label_set_markup (GTK_LABEL (label), markup_text);
 	g_free (msg);
-	g_free (tt_cn);
 	g_free (markup_text);
 
         /* Create and populate the combo */
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index bf4707e25..092540fdd 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -288,7 +288,7 @@ GtkNSSDialogs::ConfirmMismatchDomain (nsIInterfaceRequestor *ctx,
                                       const nsACString &targetURL,
                                       nsIX509Cert *cert, PRBool *_retval)
 {
-	char *ttTargetUrl, *ttCommonName, *first, *second, *msg;
+	char *first, *second, *msg;
 	int res;
 
 	nsEmbedString commonName;
@@ -298,20 +298,17 @@ GtkNSSDialogs::ConfirmMismatchDomain (nsIInterfaceRequestor *ctx,
 	NS_UTF16ToCString (commonName,
 			   NS_CSTRING_ENCODING_UTF8, cCommonName);
 
- 	ttTargetUrl = g_markup_printf_escaped ("\"<tt>%s</tt>\"", 
-                                               nsEmbedCString(targetURL).get());
+	nsEmbedCString cTargetUrl (targetURL);
 
-	ttCommonName = g_markup_printf_escaped ("\"<tt>%s</tt>\"", cCommonName.get());
+        first = g_markup_printf_escaped (_("The site \"%s\" returned security information for "
+					   "\"%s\". It is possible that someone is intercepting "
+					   "your communication to obtain your confidential "
+					   "information."),
+					 cTargetUrl.get(), cCommonName.get());
 
-        first = g_strdup_printf (_("The site %s returned security information for "
-				   "%s. It is possible that someone is intercepting "
-				   "your communication to obtain your confidential "
-				   "information."),
-				 ttTargetUrl, ttCommonName);
-
-        second = g_strdup_printf (_("You should only accept the security information if you "
-                                    "trust %s and %s."),
-                                  ttTargetUrl, ttCommonName);
+        second = g_markup_printf_escaped (_("You should only accept the security information if you "
+					    "trust \"%s\" and \"%s\"."),
+					  cTargetUrl.get(), cCommonName.get());
 	
 	msg = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s\n\n%s",
 			       _("Accept incorrect security information?"),
@@ -319,8 +316,6 @@ GtkNSSDialogs::ConfirmMismatchDomain (nsIInterfaceRequestor *ctx,
  
 	res = display_cert_warning_box (ctx, cert, msg, NULL, NULL, NULL);
  
-	g_free (ttTargetUrl);
-	g_free (ttCommonName);
         g_free (second);
         g_free (first);
         g_free (msg);
@@ -336,7 +331,7 @@ GtkNSSDialogs::ConfirmUnknownIssuer (nsIInterfaceRequestor *ctx,
                                      PRBool *_retval)
 {
 	gboolean accept_perm = FALSE;
-	char *ttCommonName, *secondary, *tertiary, *msg;
+	char *secondary, *tertiary, *msg;
 	int res;
 
 	nsEmbedString commonName;
@@ -346,18 +341,16 @@ GtkNSSDialogs::ConfirmUnknownIssuer (nsIInterfaceRequestor *ctx,
 	NS_UTF16ToCString (commonName,
 			   NS_CSTRING_ENCODING_UTF8, cCommonName);
 
-	ttCommonName = g_markup_printf_escaped ("\"<tt>%s</tt>\"", cCommonName.get());
-
-	secondary = g_strdup_printf
-		           (_("It was not possible to automatically trust %s. "
+	secondary = g_markup_printf_escaped
+		           (_("It was not possible to automatically trust \"%s\". "
 			      "It is possible that someone is intercepting your "
 			      "communication to obtain your confidential information."),
-			      ttCommonName);
+			      cCommonName.get());
 
-        tertiary = g_strdup_printf
+        tertiary = g_markup_printf_escaped
 		           (_("You should only connect to the site if you are certain "
-			      "you are connected to %s."),
-			    ttCommonName);
+			      "you are connected to \"%s\"."),
+			    cCommonName.get());
 
 	msg = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s\n\n%s",
 			       _("Connect to untrusted site?"),
@@ -366,7 +359,6 @@ GtkNSSDialogs::ConfirmUnknownIssuer (nsIInterfaceRequestor *ctx,
 	res = display_cert_warning_box (ctx, cert, msg, 
  					_("_Don't show this message again for this site"),
  					&accept_perm, _("Co_nnect"));
-	g_free (ttCommonName);
         g_free (tertiary);
         g_free (secondary);
         g_free (msg);
@@ -409,7 +401,7 @@ GtkNSSDialogs::ConfirmCertExpired (nsIInterfaceRequestor *ctx,
 	char formattedDate[128];
 	char *fdate;
 	const char *primary, *text;
-	char *ttCommonName, *secondary, *msg;
+	char *secondary, *msg;
 
 	*_retval = PR_FALSE;
 	
@@ -426,14 +418,14 @@ GtkNSSDialogs::ConfirmCertExpired (nsIInterfaceRequestor *ctx,
 	if (LL_CMP(now, >, notAfter))
 	{
 		primary = _("Accept expired security information?");
-		text    = _("The security information for %s "
+		text    = _("The security information for \"%s\" "
 			    "expired on %s.");
 		timeToUse = notAfter;
 	} 
 	else
 	{
 		primary = _("Accept not yet valid security information?");
-		text    = _("The security information for %s isn't valid until %s.");
+		text    = _("The security information for \"%s\" isn't valid until %s.");
 		timeToUse = notBefore;
 	}
 	
@@ -453,9 +445,7 @@ GtkNSSDialogs::ConfirmCertExpired (nsIInterfaceRequestor *ctx,
 		  localtime_r (&t, &tm));
 	fdate = g_locale_to_utf8 (formattedDate, -1, NULL, NULL, NULL);
 
-	ttCommonName = g_markup_printf_escaped ("\"<tt>%s</tt>\"", cCommonName.get());
-
-	secondary = g_strdup_printf (text, ttCommonName, fdate);
+	secondary = g_markup_printf_escaped (text, cCommonName.get(), fdate);
 
 	msg = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s\n\n%s",
 			       primary, secondary, 
@@ -466,7 +456,6 @@ GtkNSSDialogs::ConfirmCertExpired (nsIInterfaceRequestor *ctx,
 	g_free (fdate);
 	g_free (msg);
 	g_free (secondary);
-	g_free (ttCommonName);
 
 	*_retval = (res == GTK_RESPONSE_ACCEPT);
 	
@@ -480,7 +469,7 @@ GtkNSSDialogs::NotifyCrlNextupdate (nsIInterfaceRequestor *ctx,
 				    const nsACString & targetURL, nsIX509Cert *cert)
 {
 	GtkWidget *dialog, *label;
-	char *ttCommonName, *ttTargetUrl, *msg, *primary, *secondary;
+	char *msg, *primary, *secondary;
 
 	nsCOMPtr<nsIDOMWindow> parent = do_GetInterface (ctx);
 	GtkWidget *gparent = EphyUtils::FindGtkParent (parent);
@@ -504,17 +493,14 @@ GtkNSSDialogs::NotifyCrlNextupdate (nsIInterfaceRequestor *ctx,
 	NS_UTF16ToCString (commonName,
 			   NS_CSTRING_ENCODING_UTF8, cCommonName);
 
-	ttCommonName = g_markup_printf_escaped ("\"<tt>%s</tt>\"", cCommonName.get());
+	nsEmbedCString cTargetUrl (targetURL);
 
-	ttTargetUrl = g_markup_printf_escaped ("\"<tt>%s</tt>\"",
-				               nsEmbedCString(targetURL).get());
+	primary = g_markup_printf_escaped (_("Cannot establish connection to \"%s\"."),
+					   cTargetUrl.get());
 
-	primary = g_strdup_printf (_("Cannot establish connection to %s."),
-				   ttTargetUrl);
-
-	secondary = g_strdup_printf (_("The certificate revocation list (CRL) from %s "
-				       "needs to be updated."),
-				     ttCommonName);
+	secondary = g_markup_printf_escaped (_("The certificate revocation list (CRL) from \"%s\" "
+					       "needs to be updated."),
+					     cCommonName.get());
 	msg = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s\n\n%s",
 			       primary, secondary,
 			       _("Please ask your system administrator for assistance."));
@@ -524,8 +510,6 @@ GtkNSSDialogs::NotifyCrlNextupdate (nsIInterfaceRequestor *ctx,
 	g_free (primary);
 	g_free (secondary);
 	g_free (msg);
-	g_free (ttCommonName);
-	g_free (ttTargetUrl);
 
 	gtk_widget_show_all (dialog);
 
@@ -545,7 +529,7 @@ GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx,
 {
 	GtkWidget *dialog, *label, *content_vbox, *vbox;
 	GtkWidget *check_ssl, *check_software;
-	char *ttCommonName, *msg, *tertiary;
+	char *msg, *tertiary;
 
 	nsCOMPtr<nsIDOMWindow> parent = do_GetInterface (ctx);
 	GtkWindow *gparent = GTK_WINDOW (EphyUtils::FindGtkParent (parent));
@@ -577,10 +561,7 @@ GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx,
 	NS_UTF16ToCString (commonName,
 			   NS_CSTRING_ENCODING_UTF8, cCommonName);
 
-	ttCommonName = g_markup_printf_escaped ("\"<tt>%s</tt>\"",  cCommonName.get());
-
-	tertiary = g_strdup_printf (_("Trust %s to identify:"), ttCommonName);
-	g_free (ttCommonName);
+	tertiary = g_markup_printf_escaped (_("Trust \"%s\" to identify:"), cCommonName.get());
 
 	msg = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s\n\n%s",
 			       _("Trust new Certificate Authority?"),
diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c
index 344801b3d..655e8fb4f 100644
--- a/lib/ephy-gui.c
+++ b/lib/ephy-gui.c
@@ -199,24 +199,24 @@ ephy_gui_confirm_overwrite_file (GtkWidget *parent,
 		return TRUE;
 	}
 
-	display_name = g_filename_display_name (filename);
+	display_name = g_filename_display_basename (filename);
 
 	dialog = gtk_message_dialog_new
 		(parent ? GTK_WINDOW (parent) : NULL,
 		 GTK_DIALOG_DESTROY_WITH_PARENT,
-		 GTK_MESSAGE_WARNING,
+		 GTK_MESSAGE_QUESTION,
 		 GTK_BUTTONS_CANCEL,
-		 _("A file %s already exists."), display_name);
+		 _("Overwrite \"%s\"?"), display_name);
 
 	gtk_message_dialog_format_secondary_text
 		(GTK_MESSAGE_DIALOG (dialog),
-		 _("If you choose to overwrite this file, "
-		   "the contents will be lost."));
+		 _("A file with this name already exists. If you choose to "
+		   "overwrite this file, the contents will be lost."));
 
 	gtk_dialog_add_button (GTK_DIALOG (dialog),
 			       _("_Overwrite"), GTK_RESPONSE_ACCEPT);
 
-	gtk_window_set_title (GTK_WINDOW (dialog), _("Overwrite File"));
+	gtk_window_set_title (GTK_WINDOW (dialog), _("Overwrite File?"));
 	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
 
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 940e8111c..5fa33c340 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -538,16 +538,16 @@ redirect_cb (EphyHistory *history,
 	gtk_message_dialog_format_secondary_markup
 		(GTK_MESSAGE_DIALOG (dialog),
 		/* translators: the %s is a URL */
-		_("The bookmarked page has moved to <tt>%s</tt>."),
+		_("The bookmarked page has moved to \"%s\"."),
 		to_uri);
 
 	gtk_dialog_add_button (GTK_DIALOG (dialog),
-				_("_Don't update bookmark"), GTK_RESPONSE_REJECT);
+				_("_Don't Update"), GTK_RESPONSE_REJECT);
 	gtk_dialog_add_button (GTK_DIALOG (dialog),
-				_("_Update bookmark"), GTK_RESPONSE_ACCEPT);
+				_("_Update"), GTK_RESPONSE_ACCEPT);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_REJECT);
 
-	gtk_window_set_title (GTK_WINDOW (dialog), _("Update bookmark?"));
+	gtk_window_set_title (GTK_WINDOW (dialog), _("Update Bookmark?"));
 	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
 
 	g_object_set_data_full (G_OBJECT (dialog), UPDATE_URI_DATA_KEY,
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 0588b27a1..b1eec6897 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -659,7 +659,7 @@ confirm_close_with_modified_forms (EphyWindow *window)
 		 GTK_DIALOG_MODAL,
 		 GTK_MESSAGE_WARNING,
 		 GTK_BUTTONS_CANCEL,
-		 _("There are unsubmitted changes to form elements."));
+		 _("There are unsubmitted changes to form elements"));
 
 	gtk_message_dialog_format_secondary_text
 		(GTK_MESSAGE_DIALOG (dialog),