aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog11
-rw-r--r--NEWS31
-rw-r--r--configure.ac2
-rw-r--r--doc/reference/tmpl/ephy-embed.sgml12
-rw-r--r--doc/reference/tmpl/ephy-permission-manager.sgml50
-rw-r--r--doc/reference/tmpl/ephy-shell.sgml61
-rw-r--r--doc/reference/tmpl/epiphany-unused.sgml101
7 files changed, 156 insertions, 112 deletions
diff --git a/ChangeLog b/ChangeLog
index a3afb5298..1e861987d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
2006-01-31 Christian Persch <chpe@cvs.gnome.org>
+ === Release 1.9.6 ===
+
+ * NEWS:
+ * configure.ac:
+ * doc/reference/tmpl/ephy-embed.sgml:
+ * doc/reference/tmpl/ephy-permission-manager.sgml:
+ * doc/reference/tmpl/ephy-shell.sgml:
+ * doc/reference/tmpl/epiphany-unused.sgml:
+
+2006-01-31 Christian Persch <chpe@cvs.gnome.org>
+
* src/bookmarks/ephy-bookmark-properties.c: (show_duplicate_cb):
Use ngettext here.
diff --git a/NEWS b/NEWS
index 8b301ec6a..a46baf1d0 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,37 @@ Bug fixes:
Contributors to this release: Christian Persch, Peter Harvey, Brian Pepple,
Jean-François Rameau, Crispin Flowerday, Reinout van Schouwen
+
+Updated translations:
+
+ * Rostislav \"zbrox\" Raykov (bg)
+ * Jordi Mallach (ca)
+ * Ole Laursen (da)
+ * Kostas Papadimas (el)
+ * Adam Weinberger (en_CA)
+ * Crispin FLowerday (en_GB)
+ * Francisco Javier F. Serrador (es)
+ * Ilkka Tuohela (fi)
+ * Ignacio Casal Quinteiro (gl)
+ * Ankit Patel (gu)
+ * Gil Osher (he)
+ * Mohammad DAMT (id)
+ * Takeshi AIHANA (ja)
+ * Žygimantas Beručka (lt)
+ * Kjartan Maraas (nb)
+ * Pawan Chitrakar (ne)
+ * Reinout van Schouwen (nl)
+ * Kjartan Maraas (no)
+ * Evandro Fernandes Giovanini (pt_BR)
+ * Duarte Loreto (pt)
+ * Nickolay V. Shmyrev (ru)
+ * Steve Murphy (rw)
+ * Слободан Д. Средојевић (sr, sr@Latn)
+ * Theppitak Karoonboonyanan (th)
+ * Clytie Siddall (vi)
+ * Liu Songhe (zh_CN)
+
+
================
Epiphany 1.9.5.1
================
diff --git a/configure.ac b/configure.ac
index 1e1ce8494..bb231e64b 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],[1.9.5.90],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
+AC_INIT([GNOME Web Browser],[1.9.6],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
GNOME_COMMON_INIT
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index b43fe35e1..4d7cf4aa1 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -53,6 +53,14 @@ be done by casting).
@ephyembed: the object which received the signal.
@Returns:
+<!-- ##### SIGNAL EphyEmbed::content-blocked ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1:
+
<!-- ##### SIGNAL EphyEmbed::dom-content-loaded ##### -->
<para>
@@ -312,6 +320,9 @@ be done by casting).
@:
@:
@:
+@:
+@:
+@:
@:
<!-- ##### SIGNAL EphyEmbed::ge-search-key-press ##### -->
@@ -357,6 +368,7 @@ be done by casting).
@security_change:
@zoom_change:
@content_change:
+@content_blocked:
@modal_alert:
@modal_alert_closed:
@document_type:
diff --git a/doc/reference/tmpl/ephy-permission-manager.sgml b/doc/reference/tmpl/ephy-permission-manager.sgml
index 043e0b463..ded9a0742 100644
--- a/doc/reference/tmpl/ephy-permission-manager.sgml
+++ b/doc/reference/tmpl/ephy-permission-manager.sgml
@@ -76,53 +76,3 @@ Determines whether the website is allowed or denied access.
@info:
-<!-- ##### FUNCTION ephy_permission_manager_add ##### -->
-<para>
-
-</para>
-
-@manager:
-@host:
-@type:
-@permission:
-
-
-<!-- ##### FUNCTION ephy_permission_manager_remove ##### -->
-<para>
-
-</para>
-
-@manager:
-@host:
-@type:
-
-
-<!-- ##### FUNCTION ephy_permission_manager_clear ##### -->
-<para>
-
-</para>
-
-@manager:
-
-
-<!-- ##### FUNCTION ephy_permission_manager_test ##### -->
-<para>
-
-</para>
-
-@manager:
-@host:
-@type:
-@Returns:
-
-
-<!-- ##### FUNCTION ephy_permission_manager_list ##### -->
-<para>
-
-</para>
-
-@manager:
-@type:
-@Returns:
-
-
diff --git a/doc/reference/tmpl/ephy-shell.sgml b/doc/reference/tmpl/ephy-shell.sgml
index 5e68be840..824e0627d 100644
--- a/doc/reference/tmpl/ephy-shell.sgml
+++ b/doc/reference/tmpl/ephy-shell.sgml
@@ -23,35 +23,6 @@ ephy-shell
</para>
-<!-- ##### MACRO EPHY_SHELL_ERROR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### ENUM EphyShellError ##### -->
-<para>
-
-</para>
-
-@EPHY_SHELL_ERROR_MISSING_SERVER:
-@EPHY_SHELL_ERROR_OBJECT_REG_FAILED:
-@EPHY_SHELL_ERROR_FACTORY_REG_FAILED:
-
-<!-- ##### ENUM EphyShellStartupFlags ##### -->
-<para>
-
-</para>
-
-@EPHY_SHELL_STARTUP_TABS:
-@EPHY_SHELL_STARTUP_EXISTING_WINDOW:
-@EPHY_SHELL_STARTUP_FULLSCREEN:
-@EPHY_SHELL_STARTUP_BOOKMARKS_EDITOR:
-@EPHY_SHELL_STARTUP_SESSION:
-@EPHY_SHELL_STARTUP_IMPORT_BOOKMARKS:
-@EPHY_SHELL_STARTUP_ADD_BOOKMARK:
-
<!-- ##### ENUM EphyNewTabFlags ##### -->
<para>
@@ -68,38 +39,6 @@ ephy-shell
@EPHY_NEW_TAB_IN_NEW_WINDOW:
@EPHY_NEW_TAB_IN_EXISTING_WINDOW:
-<!-- ##### FUNCTION ephy_shell_error_quark ##### -->
-<para>
-
-</para>
-
-@Returns:
-
-
-<!-- ##### FUNCTION ephy_shell_new ##### -->
-<para>
-
-</para>
-
-@Returns:
-
-
-<!-- ##### FUNCTION ephy_shell_startup ##### -->
-<para>
-
-</para>
-
-@shell:
-@flags:
-@user_time:
-@args:
-@string_arg:
-@error:
-@Returns:
-<!-- # Unused Parameters # -->
-@startup_id:
-
-
<!-- ##### FUNCTION ephy_shell_new_tab ##### -->
<para>
diff --git a/doc/reference/tmpl/epiphany-unused.sgml b/doc/reference/tmpl/epiphany-unused.sgml
index 848a0013f..3e04d799d 100644
--- a/doc/reference/tmpl/epiphany-unused.sgml
+++ b/doc/reference/tmpl/epiphany-unused.sgml
@@ -36,6 +36,12 @@ mozilla-embed-event
@k:
+<!-- ##### MACRO EPHY_SHELL_ERROR ##### -->
+<para>
+
+</para>
+
+
<!-- ##### MACRO EPHY_SHELL_TYPE_DEF ##### -->
<para>
@@ -207,6 +213,28 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
</para>
+<!-- ##### ENUM EphyShellError ##### -->
+<para>
+
+</para>
+
+@EPHY_SHELL_ERROR_MISSING_SERVER:
+@EPHY_SHELL_ERROR_OBJECT_REG_FAILED:
+@EPHY_SHELL_ERROR_FACTORY_REG_FAILED:
+
+<!-- ##### ENUM EphyShellStartupFlags ##### -->
+<para>
+
+</para>
+
+@EPHY_SHELL_STARTUP_TABS:
+@EPHY_SHELL_STARTUP_EXISTING_WINDOW:
+@EPHY_SHELL_STARTUP_FULLSCREEN:
+@EPHY_SHELL_STARTUP_BOOKMARKS_EDITOR:
+@EPHY_SHELL_STARTUP_SESSION:
+@EPHY_SHELL_STARTUP_IMPORT_BOOKMARKS:
+@EPHY_SHELL_STARTUP_ADD_BOOKMARK:
+
<!-- ##### ARG EphyTab:blocked-popup-count ##### -->
<para>
@@ -343,6 +371,51 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
@manager:
@info:
+<!-- ##### FUNCTION ephy_permission_manager_add ##### -->
+<para>
+
+</para>
+
+@manager:
+@host:
+@type:
+@permission:
+
+<!-- ##### FUNCTION ephy_permission_manager_clear ##### -->
+<para>
+
+</para>
+
+@manager:
+
+<!-- ##### FUNCTION ephy_permission_manager_list ##### -->
+<para>
+
+</para>
+
+@manager:
+@type:
+@Returns:
+
+<!-- ##### FUNCTION ephy_permission_manager_remove ##### -->
+<para>
+
+</para>
+
+@manager:
+@host:
+@type:
+
+<!-- ##### FUNCTION ephy_permission_manager_test ##### -->
+<para>
+
+</para>
+
+@manager:
+@host:
+@type:
+@Returns:
+
<!-- ##### FUNCTION ephy_shell_delete_on_exit ##### -->
<para>
@@ -352,6 +425,13 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
@path:
@gs:
+<!-- ##### FUNCTION ephy_shell_error_quark ##### -->
+<para>
+
+</para>
+
+@Returns:
+
<!-- ##### FUNCTION ephy_shell_get_active_window ##### -->
<para>
@@ -360,6 +440,27 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
@shell:
@Returns:
+<!-- ##### FUNCTION ephy_shell_new ##### -->
+<para>
+
+</para>
+
+@Returns:
+
+<!-- ##### FUNCTION ephy_shell_startup ##### -->
+<para>
+
+</para>
+
+@shell:
+@flags:
+@user_time:
+@args:
+@string_arg:
+@error:
+@Returns:
+@startup_id:
+
<!-- ##### FUNCTION ephy_tab_get_location ##### -->
<para>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 21:05:06 +0800