GNOME.org
 

[epiphany] Don't show the name Epiphany

commit ec4c072218599ee180231022aece643852ff6a06
Author: William Jon McCann <william jon mccann gmail com>
Date:   Wed Dec 11 11:56:20 2013 +0100

    Don't show the name Epiphany

 data/default-bookmarks.rdf.in         |    2 +-
 embed/ephy-about-handler.c            |    3 ++-
 embed/ephy-embed-shell.c              |    2 +-
 lib/ephy-nss-glue.c                   |    2 +-
 lib/ephy-profile-migrator.c           |   10 +++++-----
 src/bookmarks/ephy-bookmarks-editor.c |    4 ++--
 src/bookmarks/ephy-bookmarks-export.c |    2 +-
 7 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/data/default-bookmarks.rdf.in b/data/default-bookmarks.rdf.in
index 2f2b7a3..0fb77ec 100644
--- a/data/default-bookmarks.rdf.in
+++ b/data/default-bookmarks.rdf.in
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <rdf:RDF xmlns="http://purl.org/rss/1.0/"; xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:ephy="http://gnome.org/ns/epiphany#"; xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";>
   <channel rdf:about="file://@pkgdatadir@/default-bookmarks.rdf">
-    <title>Epiphany bookmarks</title>
+    <title>Web bookmarks</title>
     <link>http://www.gnome.org/projects/epiphany/</link>
     <items>
       <rdf:Seq>
diff --git a/embed/ephy-about-handler.c b/embed/ephy-about-handler.c
index 72fb93e..9e8a01c 100644
--- a/embed/ephy-about-handler.c
+++ b/embed/ephy-about-handler.c
@@ -266,7 +266,7 @@ ephy_about_handler_handle_epiphany (EphyAboutHandler *handler,
 {
   char *data;
 
-  data = g_strdup_printf ("<html><head><title>Epiphany</title>"
+  data = g_strdup_printf ("<html><head><title>%s</title>"
                           "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />"
                           "<style type=\"text/css\">%s</style></head>"
                           "<body style=\"background: #3369FF; color: white; font-style: italic;\">"
@@ -278,6 +278,7 @@ ephy_about_handler_handle_epiphany (EphyAboutHandler *handler,
                           "<!-- Terre des Hommes, III: L'Avion, p. 60 -->"
                           "Antoine de Saint-Exupéry"
                           "</div></body></html>",
+                          _("Web"),
                           ephy_about_handler_get_style_sheet (handler));
 
   ephy_about_handler_finish_request (request, data, -1);
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index e15d062..61bcb54 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -465,7 +465,7 @@ ephy_embed_shell_class_init (EphyEmbedShellClass *klass)
   object_properties[PROP_MODE] =
     g_param_spec_enum ("mode",
                        "Mode",
-                       "The  global mode for this instance of Epiphany .",
+                       "The  global mode for this instance.",
                        EPHY_TYPE_EMBED_SHELL_MODE,
                        EPHY_EMBED_SHELL_MODE_BROWSER,
                        G_PARAM_READWRITE | G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK |
diff --git a/lib/ephy-nss-glue.c b/lib/ephy-nss-glue.c
index e1c65b6..2ebd060 100644
--- a/lib/ephy-nss-glue.c
+++ b/lib/ephy-nss-glue.c
@@ -61,7 +61,7 @@ ask_for_nss_password (PK11SlotInfo *slot,
                                    GTK_BUTTONS_OK_CANCEL,
                                    _("Master password needed"));
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-                                            _("The passwords from the previous version (Gecko) are locked 
with a master password. If you want Epiphany to import them, please enter your master password below."));
+                                            _("The passwords from the previous version are locked with a 
master password. If you want to import them, please enter your master password below."));
   entry = gtk_entry_new ();
   gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE);
   gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
diff --git a/lib/ephy-profile-migrator.c b/lib/ephy-profile-migrator.c
index a3f7d61..5ca9f9a 100644
--- a/lib/ephy-profile-migrator.c
+++ b/lib/ephy-profile-migrator.c
@@ -565,7 +565,7 @@ migrate_history (void)
   /* Do nothing if the history file already exists. Safer than wiping
    * it out. */
   if (g_file_test (temporary_file, G_FILE_TEST_EXISTS)) {
-    g_warning ("Did not migrate Epiphany's history, the %s file already exists", EPHY_HISTORY_FILE);
+    g_warning ("Did not migrate history, the %s file already exists", EPHY_HISTORY_FILE);
     g_free (temporary_file);
     return;
   }
@@ -590,7 +590,7 @@ migrate_history (void)
 
   if (error) {
     if (error->code != G_IO_ERROR_NOT_FOUND)
-      g_warning ("Could not load Epiphany history data, migration aborted: %s", error->message);
+      g_warning ("Could not load history data, migration aborted: %s", error->message);
 
     g_error_free (error);
     return;
@@ -649,7 +649,7 @@ migrate_profile (const char *old_dir,
 
   /* Test if we already attempted to migrate first. */
   updated = g_build_filename (old_dir, "DEPRECATED-DIRECTORY", NULL);
-  message = _("Epiphany 3.6 deprecated this directory and tried migrating "
+  message = _("Web 3.6 deprecated this directory and tried migrating "
               "this configuration to ~/.config/epiphany");
 
   parent_dir = g_path_get_dirname (new_dir);
@@ -1044,8 +1044,8 @@ main (int argc, char *argv[])
   EphyFileHelpersFlags file_helpers_flags = EPHY_FILE_HELPERS_NONE;
 
   option_group = g_option_group_new ("ephy-profile-migrator",
-                                     N_("Epiphany profile migrator"),
-                                     N_("Epiphany profile migrator options"),
+                                     N_("Web profile migrator"),
+                                     N_("Web profile migrator options"),
                                      NULL, NULL);
 
   g_option_group_set_translation_domain (option_group, GETTEXT_PACKAGE);
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 889920f..8110218 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -72,7 +72,7 @@ static const struct
 export_formats [] = 
 /* Don't add or reoder those entries without updating export_dialog_response_cb too! */
 {
-       { N_("Epiphany (RDF)"), "rdf" },
+       { N_("Web (RDF)"), "rdf" },
        { N_("Mozilla (HTML)"), "html" }
 };
 
@@ -626,7 +626,7 @@ import_dialog_response_cb (GtkDialog *dialog,
                                 "application/x-xbel", NULL);
 
                        ephy_file_chooser_add_mime_filter
-                               (dialog, _("Epiphany bookmarks"),
+                               (dialog, _("Web bookmarks"),
                                 "text/rdf", "application/rdf+xml", NULL);
 
                        filter = ephy_file_chooser_add_pattern_filter (dialog,
diff --git a/src/bookmarks/ephy-bookmarks-export.c b/src/bookmarks/ephy-bookmarks-export.c
index 143dfa0..faad186 100644
--- a/src/bookmarks/ephy-bookmarks-export.c
+++ b/src/bookmarks/ephy-bookmarks-export.c
@@ -182,7 +182,7 @@ write_rdf (EphyBookmarks *bookmarks,
        ret = xmlTextWriterWriteElement 
                (writer,
                 (xmlChar *) "title",
-                (xmlChar *) "Epiphany bookmarks");
+                (xmlChar *) "Web bookmarks");
        if (ret < 0) goto out;
 
        ret = xmlTextWriterWriteElement
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]