[epiphany] Minor string improvements

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 8cf88469248e1637373a92f9f4c98eddc9e6e413
Author: Ekaterina Gerasimova <kittykat3756 gmail com>
Date:   Mon Oct 20 13:53:42 2014 +0100

    Minor string improvements
    
    Mostly use "website" instead of "web site", as is the case in
    documentation.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=738866

 data/org.gnome.epiphany.gschema.xml |    2 +-
 embed/ephy-web-view.c               |   20 ++++++++++----------
 src/resources/prefs-dialog.ui       |    2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
index ffa9563..716d618 100644
--- a/data/org.gnome.epiphany.gschema.xml
+++ b/data/org.gnome.epiphany.gschema.xml
@@ -39,7 +39,7 @@
                <key type="b" name="remember-passwords">
                        <default>true</default>
                        <summary>Remember passwords</summary>
-                       <description>Whether to store and prefill passwords in web sites.</description>
+                       <description>Whether to store and prefill passwords in websites.</description>
                </key>
                <key type="b" name="managed-network">
                        <default>true</default>
diff --git a/embed/ephy-web-view.c b/embed/ephy-web-view.c
index 6357471..aed3c1a 100644
--- a/embed/ephy-web-view.c
+++ b/embed/ephy-web-view.c
@@ -1731,37 +1731,37 @@ detailed_message_from_tls_errors (GTlsCertificateFlags tls_errors)
 
   if (tls_errors & G_TLS_CERTIFICATE_BAD_IDENTITY) {
     /* Possible error message when a site presents a bad certificate. */
-    g_ptr_array_add (errors, _("This web site presented identification that belongs to a different web 
site."));
+    g_ptr_array_add (errors, _("This website presented identification that belongs to a different 
website."));
   }
 
   if (tls_errors & G_TLS_CERTIFICATE_EXPIRED) {
     /* Possible error message when a site presents a bad certificate. */
-    g_ptr_array_add (errors, _("This web site’s identification is too old to trust. Check the date on your 
computer’s calendar."));
+    g_ptr_array_add (errors, _("This website’s identification is too old to trust. Check the date on your 
computer’s calendar."));
   }
 
   if (tls_errors & G_TLS_CERTIFICATE_UNKNOWN_CA) {
     /* Possible error message when a site presents a bad certificate. */
-    g_ptr_array_add (errors, _("This web site’s identification was not issued by a trusted organization."));
+    g_ptr_array_add (errors, _("This website’s identification was not issued by a trusted organization."));
   }
 
   if (tls_errors & G_TLS_CERTIFICATE_GENERIC_ERROR) {
     /* Possible error message when a site presents a bad certificate. */
-    g_ptr_array_add (errors, _("This web site’s identification could not be processed. It may be 
corrupted."));
+    g_ptr_array_add (errors, _("This website’s identification could not be processed. It may be 
corrupted."));
   }
 
   if (tls_errors & G_TLS_CERTIFICATE_REVOKED) {
     /* Possible error message when a site presents a bad certificate. */
-    g_ptr_array_add (errors, _("This web site’s identification has been revoked by the trusted organization 
that issued it."));
+    g_ptr_array_add (errors, _("This website’s identification has been revoked by the trusted organization 
that issued it."));
   }
 
   if (tls_errors & G_TLS_CERTIFICATE_INSECURE) {
     /* Possible error message when a site presents a bad certificate. */
-    g_ptr_array_add (errors, _("This web site’s identification cannot be trusted because it uses very weak 
encryption."));
+    g_ptr_array_add (errors, _("This website’s identification cannot be trusted because it uses very weak 
encryption."));
   }
 
   if (tls_errors & G_TLS_CERTIFICATE_NOT_ACTIVATED) {
     /* Possible error message when a site presents a bad certificate. */
-    g_ptr_array_add (errors, _("This web site’s identification is only valid for future dates. Check the 
date on your computer’s calendar."));
+    g_ptr_array_add (errors, _("This website’s identification is only valid for future dates. Check the date 
on your computer’s calendar."));
   }
 
   if (errors->len == 1) {
@@ -1802,15 +1802,15 @@ get_tls_error_page_message (EphyWebView *view, const char *hostname)
   msg = g_strdup_printf ("<p>%s</p><p>%s</p><p>%s</p><p>%s <strong>%s</strong></p>",
                          warning,
                          /* Message when a site's TLS certificate is invalid. */
-                         _("When you try to connect securely, web sites present "
+                         _("When you try to connect securely, websites present "
                            "identification to prove that your connection has not been "
                            "maliciously intercepted. There is something wrong with "
-                           "this site’s identification:"),
+                           "this website’s identification:"),
                          details,
                          /* Message when a site's TLS certificate is invalid. */
                          _("A third party may have hijacked your connection. You should "
                            "continue only if you know there is a good reason why this "
-                           "site does not use trusted identification."),
+                           "website does not use trusted identification."),
                          /* Good advice from Firefox; displays when a site's TLS certificate is invalid. */
                          _("Legitimate banks, stores, and other public sites will "
                            "not ask you to do this."));
diff --git a/src/resources/prefs-dialog.ui b/src/resources/prefs-dialog.ui
index 7d8d199..8853d9e 100644
--- a/src/resources/prefs-dialog.ui
+++ b/src/resources/prefs-dialog.ui
@@ -785,7 +785,7 @@
                     </child>
                     <child>
                       <object class="GtkCheckButton" id="do_not_track_checkbutton">
-                        <property name="label" translatable="yes">_Tell web sites I do not want to be 
tracked</property>
+                        <property name="label" translatable="yes">_Tell websites I do not want to be 
tracked</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>