Index: /home/reinout/devel/gnome/epiphany/embed/mozilla/EphyAboutModule.cpp =================================================================== --- /home/reinout/devel/gnome/epiphany/embed/mozilla/EphyAboutModule.cpp (revision 7201) +++ /home/reinout/devel/gnome/epiphany/embed/mozilla/EphyAboutModule.cpp (working copy) @@ -215,7 +215,7 @@ *aPrimary = g_strdup_printf (_("“%s” protocol is not supported."), scheme.get()); /* FIXME: get the list of supported protocols from necko */ *aSecondary = g_strdup (_("Supported protocols are “http”, “https”, “ftp”, “file”, “smb” " - "and “sftp”.")); + "and “sftp”.")); } else if (strcmp (aError, "fileNotFound") == 0) { @@ -302,7 +302,7 @@ else { *aSecondary = g_strdup (_("The server may be busy or you may have a " - "network connection problem. Try again later.")); + "network connection problem. Try again later.")); *aLinkIntro = _("There may be an old version of the page you wanted:"); } } @@ -320,7 +320,7 @@ (_("“%s” interrupted the connection."), host.get()); *aSecondary = g_strdup (_("The server may be busy or you may have a " - "network connection problem. Try again later.")); + "network connection problem. Try again later.")); *aLinkIntro = _("There may be an old version of the page you wanted:"); } else if (strcmp (aError, "netTimeout") == 0) @@ -337,9 +337,9 @@ (_("“%s” is not responding."), host.get()); *aSecondary = g_strdup (_("The connection was lost because the " - "server took too long to respond.")); + "server took too long to respond.")); *aTertiary = _("The server may be busy or you may have a network " - "connection problem. Try again later."); + "connection problem. Try again later."); *aLinkIntro = _("There may be an old version of the page you wanted:"); } else if (strcmp (aError, "malformedURI") == 0) @@ -379,7 +379,7 @@ (_("“%s” requires an encrypted connection."), host.get()); *aSecondary = g_strdup (_("The document could not be loaded because " - "encryption support is not installed.")); + "encryption support is not installed.")); } else if (strcmp (aError, "netReset") == 0) { @@ -395,7 +395,7 @@ (_("“%s” dropped the connection."), host.get()); *aSecondary = g_strdup (_("The server dropped the connection " - "before any data could be read.")); + "before any data could be read.")); *aTertiary = _("The server may be busy or you may have a " "network connection problem. Try again later."); *aLinkIntro = _("There may be an old version of the page you wanted:"); @@ -427,7 +427,7 @@ port > 0 ? port : 80, host.get()); *aSecondary = g_strdup (_("This address uses a network port which is " "normally used for purposes other than Web browsing.")); - *aTertiary = _("Epiphany has cancelled the request for your protection."); + *aTertiary = _("The request has been cancelled for your protection."); } else if (strcmp (aError, "proxyResolveFailure") == 0 || strcmp (aError, "proxyConnectFailure") == 0) @@ -435,9 +435,9 @@ *aTitle = g_strdup (_("Could not Connect to Proxy Server")); *aPrimary = g_strdup (_("Could not connect to proxy server.")); *aSecondary = g_strdup (_("Check your proxy server settings. " - "If the connection still fails, there may be " - "a problem with your proxy server or your " - "network connection.")); + "If the connection still fails, there may be " + "a problem with your proxy server or your " + "network connection.")); } /* This was introduced in gecko 1.9 */ else if (strcmp (aError, "contentEncodingError") == 0) @@ -460,9 +460,9 @@ { *_retval = nsnull; - /* First parse the arguments */ + /* First parse the arguments */ nsresult rv; - nsCAutoString spec; + nsCAutoString spec; rv = aErrorURI->GetSpec (spec); NS_ENSURE_TRUE (NS_SUCCEEDED (rv), rv); @@ -518,9 +518,9 @@ { *_retval = nsnull; - /* First parse the arguments */ + /* First parse the arguments */ nsresult rv; - nsCAutoString spec; + nsCAutoString spec; rv = aRecoverURI->GetSpec (spec); NS_ENSURE_TRUE (NS_SUCCEEDED (rv), rv);