aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog18
-rw-r--r--embed/mozilla/ContentHandler.cpp6
-rw-r--r--embed/mozilla/GtkNSSClientAuthDialogs.cpp2
-rw-r--r--embed/mozilla/GtkNSSDialogs.cpp22
-rwxr-xr-xembed/print-dialog.c2
-rw-r--r--lib/ephy-gui.c4
-rw-r--r--src/bookmarks/ephy-bookmark-properties.c2
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c6
-rw-r--r--src/bookmarks/ephy-bookmarks.c4
-rw-r--r--src/bookmarks/ephy-new-bookmark.c2
-rw-r--r--src/ephy-extensions-manager.c1
-rw-r--r--src/ephy-tab.c8
12 files changed, 48 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index b2b61e6e2..b3aa89d3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
2005-11-01 Christian Persch <chpe@cvs.gnome.org>
+ * embed/mozilla/ContentHandler.cpp:
+ * embed/mozilla/GtkNSSClientAuthDialogs.cpp:
+ * embed/mozilla/GtkNSSDialogs.cpp:
+ * embed/print-dialog.c: (ephy_print_verify_postscript):
+ * lib/ephy-gui.c: (ephy_gui_check_location_writable):
+ * src/bookmarks/ephy-bookmark-properties.c: (update_window_title):
+ * src/bookmarks/ephy-bookmarks-editor.c:
+ (delete_topic_dialog_construct), (add_bookmarks_source),
+ (import_bookmarks):
+ * src/bookmarks/ephy-bookmarks.c: (redirect_cb):
+ * src/bookmarks/ephy-new-bookmark.c: (duplicate_dialog_construct):
+ * src/ephy-extensions-manager.c: (dir_changed_cb):
+ * src/ephy-tab.c: (update_net_state_message):
+
+ More curly quotes.
+
+2005-11-01 Christian Persch <chpe@cvs.gnome.org>
+
* src/ephy-window.c: (update_popups_tooltips):
Use curly quotes.
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index ead2ea138..678ea5077 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -331,7 +331,7 @@ NS_METHOD GContentHandler::MIMEConfirmAction ()
(GTK_MESSAGE_DIALOG (dialog),
/* translators: First %s is the file type description,
Second %s is the file name */
- _("File Type: %s.\n\nIt is unsafe to open \"%s\" as "
+ _("File Type: “%s”.\n\nIt is unsafe to open “%s” as "
"it could potentially damage your documents or "
"invade your privacy. You can download it instead."),
mime_description, file_name.get());
@@ -348,7 +348,7 @@ NS_METHOD GContentHandler::MIMEConfirmAction ()
/* translators: First %s is the file type description,
Second %s is the file name,
Third %s is the application used to open the file */
- _("File Type: %s.\n\nYou can open \"%s\" using \"%s\" or save it."),
+ _("File Type: “%s”.\n\nYou can open “%s” using “%s” or save it."),
mime_description, file_name.get(), mHelperApp->name);
}
else
@@ -362,7 +362,7 @@ NS_METHOD GContentHandler::MIMEConfirmAction ()
(GTK_MESSAGE_DIALOG (dialog),
/* translators: First %s is the file type description,
Second %s is the file name */
- _("File Type: %s.\n\nYou have no application able to open \"%s\". "
+ _("File Type: “%s”.\n\nYou have no application able to open “%s”. "
"You can download it instead."),
mime_description, file_name.get());
}
diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
index 290f57ed3..62e85f17e 100644
--- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp
+++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
@@ -200,7 +200,7 @@ GtkNSSClientAuthDialogs::ChooseCertificate (nsIInterfaceRequestor *ctx,
NS_UTF16ToCString (nsEmbedString (cn),
NS_CSTRING_ENCODING_UTF8, utf8_cn);
- msg = g_markup_printf_escaped (_("Choose a certificate to present as identification to \"%s\"."),
+ 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."),
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index 95844b920..835b79df2 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -308,14 +308,14 @@ GtkNSSDialogs::ConfirmMismatchDomain (nsIInterfaceRequestor *ctx,
nsEmbedCString cTargetUrl (targetURL);
- first = g_markup_printf_escaped (_("The site \"%s\" returned security information for "
- "\"%s\". It is possible that someone is intercepting "
+ 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());
second = g_markup_printf_escaped (_("You should only accept the security information if you "
- "trust \"%s\" and \"%s\"."),
+ "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",
@@ -350,14 +350,14 @@ GtkNSSDialogs::ConfirmUnknownIssuer (nsIInterfaceRequestor *ctx,
NS_CSTRING_ENCODING_UTF8, cCommonName);
secondary = g_markup_printf_escaped
- (_("It was not possible to automatically trust \"%s\". "
+ (_("It was not possible to automatically trust “%s”. "
"It is possible that someone is intercepting your "
"communication to obtain your confidential information."),
cCommonName.get());
tertiary = g_markup_printf_escaped
(_("You should only connect to the site if you are certain "
- "you are connected to \"%s\"."),
+ "you are connected to “%s”."),
cCommonName.get());
msg = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s\n\n%s",
@@ -426,14 +426,16 @@ GtkNSSDialogs::ConfirmCertExpired (nsIInterfaceRequestor *ctx,
if (LL_CMP(now, >, notAfter))
{
primary = _("Accept expired security information?");
- text = _("The security information for \"%s\" "
+ /* Translators: first %s is a hostname, second %s is a time/date */
+ 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.");
+ /* Translators: first %s is a hostname, second %s is a time/date */
+ text = _("The security information for “%s” isn't valid until %s.");
timeToUse = notBefore;
}
@@ -503,10 +505,10 @@ GtkNSSDialogs::NotifyCrlNextupdate (nsIInterfaceRequestor *ctx,
nsEmbedCString cTargetUrl (targetURL);
- primary = g_markup_printf_escaped (_("Cannot establish connection to \"%s\"."),
+ primary = g_markup_printf_escaped (_("Cannot establish connection to “%s”."),
cTargetUrl.get());
- secondary = g_markup_printf_escaped (_("The certificate revocation list (CRL) from \"%s\" "
+ 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",
@@ -568,7 +570,7 @@ GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx,
NS_UTF16ToCString (commonName,
NS_CSTRING_ENCODING_UTF8, cCommonName);
- primary = g_markup_printf_escaped (_("Trust new Certificate Authority \"%s\" to identify web sites?"),
+ primary = g_markup_printf_escaped (_("Trust new Certificate Authority “%s” to identify web sites?"),
cCommonName.get());
msg = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s",
diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index 72f39428c..956353cda 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -275,7 +275,7 @@ ephy_print_verify_postscript (GnomePrintDialog *print_dialog)
_("Printing is not supported on this printer"));
gtk_message_dialog_format_secondary_text (
GTK_MESSAGE_DIALOG (dialog),
- _("You were trying to print to a printer using the \"%s\" driver. This program requires a PostScript printer driver."),
+ _("You were trying to print to a printer using the “%s” driver. This program requires a PostScript printer driver."),
gnome_print_config_get (
config, (guchar *)"Settings.Engine.Backend.Driver"));
}
diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c
index 28dee83f3..3f30acd32 100644
--- a/lib/ephy-gui.c
+++ b/lib/ephy-gui.c
@@ -325,7 +325,7 @@ ephy_gui_check_location_writable (GtkWidget *parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
- _("Directory %s is not writable"), path);
+ _("Directory “%s” is not writable"), path);
gtk_message_dialog_format_secondary_text (
GTK_MESSAGE_DIALOG (dialog),
@@ -362,7 +362,7 @@ ephy_gui_check_location_writable (GtkWidget *parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
- _("File %s is not writable"), display_name);
+ _("File “%s” is not writable"), display_name);
gtk_message_dialog_format_secondary_text (
GTK_MESSAGE_DIALOG (dialog),
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 07b83d319..0494ab507 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -222,7 +222,7 @@ update_window_title(EphyBookmarkProperties *editor)
tmp = ephy_node_get_property_string (editor->priv->bookmark,
EPHY_NODE_BMK_PROP_TITLE);
- title = g_strdup_printf (_("%s Properties"), tmp);
+ title = g_strdup_printf (_("“%s” Properties"), tmp);
gtk_window_set_title (GTK_WINDOW (editor), title);
g_free (title);
}
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 998ee15c1..5d5399b4a 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -388,7 +388,7 @@ delete_topic_dialog_construct (GtkWindow *parent,
GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_CANCEL,
- _("Delete topic \"%s\"?"),
+ _("Delete topic “%s”?"),
topic);
gtk_window_set_title (GTK_WINDOW (dialog), _("Delete this topic?"));
@@ -515,7 +515,7 @@ add_bookmarks_source (const char *file,
else if (strcmp (p, ".mozilla") == 0)
{
/* Translators: The %s is the name of a Mozilla profile. */
- description = g_strdup_printf (_("Mozilla \"%s\" profile"), path[i+1]);
+ description = g_strdup_printf (_("Mozilla “%s” profile"), path[i+1]);
}
else if (strcmp (p, ".galeon") == 0)
{
@@ -557,7 +557,7 @@ import_bookmarks (EphyBookmarksEditor *editor,
gtk_window_set_title (GTK_WINDOW (dialog), _("Import Failed"));
gtk_message_dialog_format_secondary_text
(GTK_MESSAGE_DIALOG (dialog),
- _("The bookmarks from \"%s\" could not be imported "
+ _("The bookmarks from “%s” could not be imported "
"because the file is corrupted or of an "
"unsupported type."),
basename);
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 52e5b4855..69f01df19 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -468,12 +468,12 @@ redirect_cb (EphyHistory *history,
GTK_MESSAGE_QUESTION,
GTK_BUTTONS_NONE,
/* translators: the %s is the title of the bookmark */
- _("Update bookmark \"%s\"?"),
+ _("Update bookmark “%s”?"),
title);
gtk_message_dialog_format_secondary_text
(GTK_MESSAGE_DIALOG (dialog),
/* translators: the %s is a URL */
- _("The bookmarked page has moved to \"%s\"."),
+ _("The bookmarked page has moved to “%s”."),
to_uri);
gtk_dialog_add_button (GTK_DIALOG (dialog),
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index 46c05b216..75b2c8948 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -309,7 +309,7 @@ duplicate_dialog_construct (GtkWindow *parent,
GtkWidget *dialog;
char *str, *tmp_str;
- tmp_str = g_markup_printf_escaped (_("You already have a bookmark titled \"%s\" for this page."),
+ tmp_str = g_markup_printf_escaped (_("You already have a bookmark titled “%s” for this page."),
title);
str = g_strconcat ("<span weight=\"bold\" size=\"larger\">", tmp_str, "</span>", NULL);
diff --git a/src/ephy-extensions-manager.c b/src/ephy-extensions-manager.c
index bb6578be7..fd50d0260 100644
--- a/src/ephy-extensions-manager.c
+++ b/src/ephy-extensions-manager.c
@@ -937,7 +937,6 @@ dir_changed_cb (GnomeVFSMonitorHandle *handle,
g_str_has_suffix (info_uri, ".xml") == FALSE) return;
path = gnome_vfs_get_local_path_from_uri (info_uri);
- g_print ("notify, uri=%s path=%s\n", info_uri, path);
switch (event_type)
{
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index 353f0d30b..0546a96f2 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -1624,15 +1624,15 @@ update_net_state_message (EphyTab *tab, const char *uri, EphyEmbedNetState flags
{
if (flags & EPHY_EMBED_STATE_REDIRECTING)
{
- msg = _("Redirecting to %s...");
+ msg = _("Redirecting to “%s”...");
}
else if (flags & EPHY_EMBED_STATE_TRANSFERRING)
{
- msg = _("Transferring data from %s...");
+ msg = _("Transferring data from “%s”...");
}
else if (flags & EPHY_EMBED_STATE_NEGOTIATING)
{
- msg = _("Waiting for authorization from %s...");
+ msg = _("Waiting for authorization from “%s”...");
}
}
@@ -1640,7 +1640,7 @@ update_net_state_message (EphyTab *tab, const char *uri, EphyEmbedNetState flags
{
if (flags & EPHY_EMBED_STATE_START)
{
- msg = _("Loading %s...");
+ msg = _("Loading “%s”...");
}
}