summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog17
-rw-r--r--configure.ac14
-rw-r--r--doc/reference/tmpl/EphySingle.sgml2
-rw-r--r--doc/reference/tmpl/ephy-embed-factory.sgml2
-rw-r--r--doc/reference/tmpl/ephy-embed-persist.sgml2
-rw-r--r--doc/reference/tmpl/ephy-embed-single.sgml7
-rw-r--r--doc/reference/tmpl/ephy-embed.sgml15
-rw-r--r--doc/reference/tmpl/ephy-extensions-manager.sgml5
-rw-r--r--doc/reference/tmpl/ephy-node-db.sgml2
-rw-r--r--embed/mozilla/Makefile.am2
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp4
-rw-r--r--help/eu/eu.po3
-rw-r--r--help/fi/fi.po2
-rw-r--r--help/ja/ja.po4
-rw-r--r--src/window-commands.c5
15 files changed, 41 insertions, 45 deletions
diff --git a/ChangeLog b/ChangeLog
index d20db8b63..f6fa0a74a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2006-04-24 Christian Persch <chpe@cvs.gnome.org>
+
+ === Release 2.15.1 ===
+
+ * configure.ac:
+ * embed/mozilla/Makefile.am:
+ * embed/mozilla/mozilla-embed-single.cpp:
+ * src/window-commands.c: (window_cmd_help_about):
+
+ Update for 2.15.1.
+
+ * help/eu/eu.po:
+ * help/fi/fi.po:
+ * help/ja/ja.po:
+
+ Fix the build by adding bogus translator-credits strings.
+
2006-04-20 Piers Cornwell <piers@gnome.org>
* data/glade/prefs-dialog.glade:
diff --git a/configure.ac b/configure.ac
index 8b4a5ac23..7bd05d5c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-AC_INIT([GNOME Web Browser],[2.15.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
+AC_INIT([GNOME Web Browser],[2.15.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
GNOME_COMMON_INIT
@@ -27,8 +27,13 @@ AC_CONFIG_SRCDIR([configure.ac])
EPIPHANY_MAJOR=2.15
EPIPHANY_API_VERSION=2.15
+
+# This should stay at the major version of the latest stable releases
+EPIPHANY_UA_VERSION=2.14
+
AC_SUBST([EPIPHANY_MAJOR])
AC_SUBST([EPIPHANY_API_VERSION])
+AC_SUBST([EPIPHANY_UA_VERSION])
AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip])
@@ -48,7 +53,7 @@ AC_HEADER_STDC
AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
-IT_PROG_INTLTOOL([0.34.1])
+IT_PROG_INTLTOOL([0.34.90])
PKG_PROG_PKG_CONFIG
@@ -663,11 +668,6 @@ else
AC_MSG_ERROR([iso-codes is required])
fi
-# Translators: new languages must be added to the po/LINGUAS file
-ALL_LINGUAS="`cat "$srcdir/po/LINGUAS" | grep -v '^#'`"
-
-AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
-
GETTEXT_PACKAGE=epiphany
AC_SUBST([GETTEXT_PACKAGE])
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
diff --git a/doc/reference/tmpl/EphySingle.sgml b/doc/reference/tmpl/EphySingle.sgml
index d745e9084..46149ea22 100644
--- a/doc/reference/tmpl/EphySingle.sgml
+++ b/doc/reference/tmpl/EphySingle.sgml
@@ -23,8 +23,6 @@ EphySingle
</para>
@Returns:
-<!-- # Unused Parameters # -->
-@aOwner:
<!-- ##### FUNCTION Detach ##### -->
diff --git a/doc/reference/tmpl/ephy-embed-factory.sgml b/doc/reference/tmpl/ephy-embed-factory.sgml
index 81402a264..eda17fe3a 100644
--- a/doc/reference/tmpl/ephy-embed-factory.sgml
+++ b/doc/reference/tmpl/ephy-embed-factory.sgml
@@ -30,7 +30,5 @@ To create a new instance of an #EphyEmbed, #EphyEmbedPersist or
@type:
@Returns:
-<!-- # Unused Parameters # -->
-@object_id:
diff --git a/doc/reference/tmpl/ephy-embed-persist.sgml b/doc/reference/tmpl/ephy-embed-persist.sgml
index 1962ba30f..32fa72e63 100644
--- a/doc/reference/tmpl/ephy-embed-persist.sgml
+++ b/doc/reference/tmpl/ephy-embed-persist.sgml
@@ -115,8 +115,6 @@ save_page (EphyEmbed *embed,
@persist:
@value:
-<!-- # Unused Parameters # -->
-@Param2:
<!-- ##### FUNCTION ephy_embed_persist_set_persist_key ##### -->
diff --git a/doc/reference/tmpl/ephy-embed-single.sgml b/doc/reference/tmpl/ephy-embed-single.sgml
index e76692999..8456dbde1 100644
--- a/doc/reference/tmpl/ephy-embed-single.sgml
+++ b/doc/reference/tmpl/ephy-embed-single.sgml
@@ -44,8 +44,6 @@ is used to perform browser-related actions which do not refer to an individual
</para>
@single:
-<!-- # Unused Parameters # -->
-@shell:
<!-- ##### FUNCTION ephy_embed_single_clear_auth_cache ##### -->
@@ -54,8 +52,6 @@ is used to perform browser-related actions which do not refer to an individual
</para>
@single:
-<!-- # Unused Parameters # -->
-@shell:
<!-- ##### FUNCTION ephy_embed_single_get_font_list ##### -->
@@ -66,9 +62,6 @@ is used to perform browser-related actions which do not refer to an individual
@single:
@lang_group:
@Returns:
-<!-- # Unused Parameters # -->
-@shell:
-@langGroup:
<!-- ##### FUNCTION ephy_embed_single_open_window ##### -->
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index c23485784..5956b870c 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -169,9 +169,6 @@ be done by casting).
@ephyembed: the object which received the signal.
@arg1:
-<!-- # Unused Parameters # -->
-@Returns:
-@arg2:
<!-- ##### SIGNAL EphyEmbed::ge-popup-blocked ##### -->
<para>
@@ -326,6 +323,9 @@ be done by casting).
@:
@:
@:
+@:
+@:
+@:
@:
<!-- ##### SIGNAL EphyEmbed::ge-search-key-press ##### -->
@@ -453,8 +453,6 @@ windows opened with JavaScript often use a nonstandard chrome.
@embed:
@force:
-<!-- # Unused Parameters # -->
-@flags:
<!-- ##### FUNCTION ephy_embed_get_title ##### -->
@@ -610,8 +608,6 @@ windows opened with JavaScript often use a nonstandard chrome.
@embed:
@zoom:
-<!-- # Unused Parameters # -->
-@reflow:
<!-- ##### FUNCTION ephy_embed_get_zoom ##### -->
@@ -631,9 +627,6 @@ windows opened with JavaScript often use a nonstandard chrome.
@find:
@search_string:
@case_sensitive:
-<!-- # Unused Parameters # -->
-@embed:
-@wrap_around:
<!-- ##### FUNCTION ephy_embed_set_encoding ##### -->
@@ -651,8 +644,6 @@ windows opened with JavaScript often use a nonstandard chrome.
</para>
@embed:
-<!-- # Unused Parameters # -->
-@info:
<!-- ##### FUNCTION ephy_embed_print_preview_n_pages ##### -->
diff --git a/doc/reference/tmpl/ephy-extensions-manager.sgml b/doc/reference/tmpl/ephy-extensions-manager.sgml
index 1c20618b4..e7d7c7bae 100644
--- a/doc/reference/tmpl/ephy-extensions-manager.sgml
+++ b/doc/reference/tmpl/ephy-extensions-manager.sgml
@@ -24,9 +24,6 @@ EphyExtensionsManager
@manager:
@identifier:
-<!-- # Unused Parameters # -->
-@filename:
-@Returns:
<!-- ##### FUNCTION ephy_extensions_manager_unload ##### -->
@@ -36,7 +33,5 @@ EphyExtensionsManager
@manager:
@identifier:
-<!-- # Unused Parameters # -->
-@filename:
diff --git a/doc/reference/tmpl/ephy-node-db.sgml b/doc/reference/tmpl/ephy-node-db.sgml
index 97c321d8b..49bc95913 100644
--- a/doc/reference/tmpl/ephy-node-db.sgml
+++ b/doc/reference/tmpl/ephy-node-db.sgml
@@ -119,7 +119,5 @@ A string identifier unique to this #EphyNodeDb
@db:
@id:
@Returns:
-<!-- # Unused Parameters # -->
-@Param2:
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index 5658c8571..f7285d45e 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -144,7 +144,7 @@ libephymozillaembed_la_CPPFLAGS = \
-DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \
-DMOZILLA_HOME=\"$(MOZILLA_HOME)\" \
-DMOZILLA_PREFIX=\"$(MOZILLA_PREFIX)\" \
- -DEPIPHANY_MAJOR=\"$(EPIPHANY_MAJOR)\" \
+ -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" \
-DALLOW_PRIVATE_API \
$(AM_CPPFLAGS)
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index ba0f93115..1269075d3 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -296,14 +296,14 @@ mozilla_set_default_prefs (MozillaEmbedSingle *mes)
}
#ifdef HAVE_GECKO_1_8
- pref->SetCharPref ("general.useragent.extra.epiphany", "Epiphany/" EPIPHANY_MAJOR);
+ pref->SetCharPref ("general.useragent.extra.epiphany", "Epiphany/" UA_VERSION);
/* Unset old prefs, otherwise they end up in the user agent string too */
pref->ClearUserPref ("general.useragent.vendor");
pref->ClearUserPref ("general.useragent.vendorSub");
#else
pref->SetCharPref ("general.useragent.vendor", "Epiphany");
- pref->SetCharPref ("general.useragent.vendorSub", EPIPHANY_MAJOR);
+ pref->SetCharPref ("general.useragent.vendorSub", UA_VERSION);
#endif
/* Don't open ftp uris with an external handler if one is setup */
diff --git a/help/eu/eu.po b/help/eu/eu.po
index e80f1d060..79c4d89ae 100644
--- a/help/eu/eu.po
+++ b/help/eu/eu.po
@@ -1283,3 +1283,6 @@ msgstr ""
"batean, jasotako baldintzen arabera banatzen da. Lizentzia horren kopia "
"<ulink url=\"ghelp:gpl\" type=\"help\">esteka</ulink> honetan, edo programa "
"honen iturburu-kodean sartutako COPYING fitxategian aurkituko duzu."
+
+msgid "translator-credits"
+msgstr "Someone"
diff --git a/help/fi/fi.po b/help/fi/fi.po
index 207b888f0..76e4f066e 100644
--- a/help/fi/fi.po
+++ b/help/fi/fi.po
@@ -2907,7 +2907,7 @@ msgstr ""
#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
#: ../C/epiphany.xml:0(None)
msgid "translator-credits"
-msgstr ""
+msgstr "Pauli Virtanen (suomennos)"
#~ msgid "ME-THE-TRANSLATOR (Latin translation)"
#~ msgstr "Pauli Virtanen (suomennos)"
diff --git a/help/ja/ja.po b/help/ja/ja.po
index 261f808b2..603be10d7 100644
--- a/help/ja/ja.po
+++ b/help/ja/ja.po
@@ -2658,3 +2658,7 @@ msgstr ""
"ています。 このライセンスの複製は <ulink url=\"ghelp:gpl\" type=\"help\">リン"
"ク</ulink> でみつけることができます。 またこのプログラムのソースコードに含ま"
"れる COPYING ファイルもその複製です。"
+
+msgid "translator-credits"
+msgstr "Someone"
+
diff --git a/src/window-commands.c b/src/window-commands.c
index fa36cfc9b..ac845e637 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -755,8 +755,9 @@ window_cmd_help_about (GtkAction *action,
shell = ephy_embed_shell_get_default ();
single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (shell));
- comments = g_strdup_printf (_("Using “%s” backend"),
- ephy_embed_single_get_backend_name (single));
+ comments = g_strdup_printf (_("Lets you view web pages and find information on the internet.\n"
+ "Powered by Gecko %s"),
+ ephy_embed_single_get_backend_name (single) + strlen ("gecko-"));
licence = g_strjoin ("\n\n",
_(licence_part[0]),
_(licence_part[1]),
View Lorry Controller Status