Codebase list epiphany-browser / 5b1f24d
* New upstream development release. * refresh 02_ac_init.patch, 05_libexecdir.patch, 06_ssl_weak_ciphers.patch, 09_download_dialog.patch, 10_url_double-click.patch * drop 13_powered-by.patch, 15_webkit-gtk-api.patch, 16_webkit-missing-methods.patch, 17_webkit-signal-emission.patch: merged upstream. * drop 14_webkit-scrollbars.patch: EphyTab no longer exists. Sam Morris 16 years ago
14 changed file(s) with 102 addition(s) and 1592 deletion(s). Raw diff Collapse all Expand all
+12
-0
debian/changelog less more
0 epiphany-browser (2.21.4-1) UNRELEASED; urgency=low
1
2 * New upstream development release.
3 * refresh 02_ac_init.patch, 05_libexecdir.patch, 06_ssl_weak_ciphers.patch,
4 09_download_dialog.patch, 10_url_double-click.patch
5 * drop 13_powered-by.patch, 15_webkit-gtk-api.patch,
6 16_webkit-missing-methods.patch, 17_webkit-signal-emission.patch: merged
7 upstream.
8 * drop 14_webkit-scrollbars.patch: EphyTab no longer exists.
9
10 -- Sam Morris <sam@robots.org.uk> Mon, 14 Jan 2008 21:06:03 +0000
11
012 epiphany-browser (2.20.3-1) unstable; urgency=low
113
214 * New upstream translation and bugfix release.
+8
-8
debian/patches/02_ac_init.patch less more
0 Index: epiphany-2.20.0/configure.ac
0 Index: epiphany-browser-2.21.4/configure.ac
11 ===================================================================
2 --- epiphany-2.20.0.orig/configure.ac 2007-09-10 23:22:03.000000000 +0200
3 +++ epiphany-2.20.0/configure.ac 2007-09-21 14:29:47.765809378 +0200
4 @@ -15,7 +15,7 @@
5 # with this program; if not, write to the Free Software Foundation, Inc.,
6 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2 --- epiphany-browser-2.21.4.orig/configure.ac 2007-12-16 13:25:57.000000000 +0000
3 +++ epiphany-browser-2.21.4/configure.ac 2008-01-14 21:45:09.000000000 +0000
4 @@ -24,7 +24,7 @@
5 # This can be either "trunk" or "branches/gnome-x-y"
6 m4_define([epiphany_branch],["trunk"])
77
8 -AC_INIT([GNOME Web Browser],[2.20.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
9 +AC_INIT([GNOME Web Browser],[2.20.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
8 -AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
9 +AC_INIT([GNOME Web Browser],[epiphany_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany-browser])
1010
1111 GNOME_COMMON_INIT
1212
+37
-37
debian/patches/05_libexecdir.patch less more
0 Index: epiphany-2.20.3/data/epiphany.pc.in
0 Index: epiphany-browser-2.21.4/data/epiphany.pc.in
11 ===================================================================
2 --- epiphany-2.20.3.orig/data/epiphany.pc.in 2007-08-27 22:19:01.000000000 +0200
3 +++ epiphany-2.20.3/data/epiphany.pc.in 2008-01-12 02:25:29.815203666 +0100
4 @@ -2,8 +2,8 @@ prefix=@prefix@
2 --- epiphany-browser-2.21.4.orig/data/epiphany.pc.in 2007-11-04 23:44:58.000000000 +0000
3 +++ epiphany-browser-2.21.4/data/epiphany.pc.in 2008-01-14 21:46:10.000000000 +0000
4 @@ -2,8 +2,8 @@
55 exec_prefix=@exec_prefix@
66 libdir=@libdir@
77 includedir=@includedir@/epiphany/@EPIPHANY_MAJOR@
1212 datarootdir=@datarootdir@
1313 datadir=@datadir@
1414 icondir=@datadir@/@PACKAGE@/icons
15 Index: epiphany-2.20.3/embed/mozilla/Makefile.am
15 Index: epiphany-browser-2.21.4/embed/mozilla/Makefile.am
1616 ===================================================================
17 --- epiphany-2.20.3.orig/embed/mozilla/Makefile.am 2007-08-27 22:19:02.000000000 +0200
18 +++ epiphany-2.20.3/embed/mozilla/Makefile.am 2008-01-12 02:25:29.815203666 +0100
19 @@ -141,7 +141,7 @@ libephymozillaembed_la_CPPFLAGS = \
17 --- epiphany-browser-2.21.4.orig/embed/mozilla/Makefile.am 2007-07-16 21:02:17.000000000 +0100
18 +++ epiphany-browser-2.21.4/embed/mozilla/Makefile.am 2008-01-14 21:46:10.000000000 +0000
19 @@ -141,7 +141,7 @@
2020 -I$(top_srcdir) \
2121 $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
2222 -DSHARE_DIR=\"$(pkgdatadir)\" \
2525 -DMOZILLA_HOME=\"$(GECKO_HOME)\" \
2626 -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
2727 -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
28 Index: epiphany-2.20.3/embed/mozilla/Makefile.in
28 Index: epiphany-browser-2.21.4/embed/mozilla/Makefile.in
2929 ===================================================================
30 --- epiphany-2.20.3.orig/embed/mozilla/Makefile.in 2008-01-07 23:48:14.000000000 +0100
31 +++ epiphany-2.20.3/embed/mozilla/Makefile.in 2008-01-12 02:25:29.815203666 +0100
32 @@ -458,7 +458,7 @@ libephymozillaembed_la_CPPFLAGS = \
30 --- epiphany-browser-2.21.4.orig/embed/mozilla/Makefile.in 2007-12-16 13:26:20.000000000 +0000
31 +++ epiphany-browser-2.21.4/embed/mozilla/Makefile.in 2008-01-14 21:46:10.000000000 +0000
32 @@ -489,7 +489,7 @@
3333 -I$(top_srcdir) \
3434 $(addprefix -I$(GECKO_INCLUDE_ROOT)/,$(mozilla_include_subdirs)) \
3535 -DSHARE_DIR=\"$(pkgdatadir)\" \
3838 -DMOZILLA_HOME=\"$(GECKO_HOME)\" \
3939 -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
4040 -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
41 Index: epiphany-2.20.3/lib/Makefile.am
41 Index: epiphany-browser-2.21.4/lib/Makefile.am
4242 ===================================================================
43 --- epiphany-2.20.3.orig/lib/Makefile.am 2007-08-27 22:19:00.000000000 +0200
44 +++ epiphany-2.20.3/lib/Makefile.am 2008-01-12 02:25:29.815203666 +0100
45 @@ -76,7 +76,7 @@ nodist_libephymisc_la_SOURCES = \
43 --- epiphany-browser-2.21.4.orig/lib/Makefile.am 2007-11-12 10:48:23.000000000 +0000
44 +++ epiphany-browser-2.21.4/lib/Makefile.am 2008-01-14 21:46:10.000000000 +0000
45 @@ -78,7 +78,7 @@
4646 libephymisc_la_CPPFLAGS = \
4747 -I$(top_builddir)/lib \
4848 -DSHARE_DIR=\"$(pkgdatadir)\" \
5151 $(AM_CPPFLAGS)
5252
5353 libephymisc_la_CFLAGS = \
54 Index: epiphany-2.20.3/lib/Makefile.in
54 Index: epiphany-browser-2.21.4/lib/Makefile.in
5555 ===================================================================
56 --- epiphany-2.20.3.orig/lib/Makefile.in 2008-01-07 23:48:15.000000000 +0100
57 +++ epiphany-2.20.3/lib/Makefile.in 2008-01-12 02:25:29.815203666 +0100
58 @@ -406,7 +406,7 @@ nodist_libephymisc_la_SOURCES = \
56 --- epiphany-browser-2.21.4.orig/lib/Makefile.in 2007-12-16 13:26:23.000000000 +0000
57 +++ epiphany-browser-2.21.4/lib/Makefile.in 2008-01-14 21:46:10.000000000 +0000
58 @@ -441,7 +441,7 @@
5959 libephymisc_la_CPPFLAGS = \
6060 -I$(top_builddir)/lib \
6161 -DSHARE_DIR=\"$(pkgdatadir)\" \
6464 $(AM_CPPFLAGS)
6565
6666 libephymisc_la_CFLAGS = $(DEPENDENCIES_CFLAGS) $(AM_CFLAGS) \
67 Index: epiphany-2.20.3/plugins/desktop-file/Makefile.am
67 Index: epiphany-browser-2.21.4/plugins/desktop-file/Makefile.am
6868 ===================================================================
69 --- epiphany-2.20.3.orig/plugins/desktop-file/Makefile.am 2007-08-27 22:18:53.000000000 +0200
70 +++ epiphany-2.20.3/plugins/desktop-file/Makefile.am 2008-01-12 02:25:29.819203893 +0100
69 --- epiphany-browser-2.21.4.orig/plugins/desktop-file/Makefile.am 2007-07-16 21:02:37.000000000 +0100
70 +++ epiphany-browser-2.21.4/plugins/desktop-file/Makefile.am 2008-01-14 21:46:10.000000000 +0000
7171 @@ -1,4 +1,4 @@
7272 -plugindir = $(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins
7373 +plugindir = $(libexecdir)/$(EPIPHANY_MAJOR)/plugins
7474 plugin_LTLIBRARIES = libdesktopfileplugin.la
7575
7676 libdesktopfileplugin_la_SOURCES = \
77 Index: epiphany-2.20.3/plugins/desktop-file/Makefile.in
77 Index: epiphany-browser-2.21.4/plugins/desktop-file/Makefile.in
7878 ===================================================================
79 --- epiphany-2.20.3.orig/plugins/desktop-file/Makefile.in 2008-01-07 23:48:16.000000000 +0100
80 +++ epiphany-2.20.3/plugins/desktop-file/Makefile.in 2008-01-12 02:25:29.819203893 +0100
81 @@ -292,7 +292,7 @@ target_alias = @target_alias@
79 --- epiphany-browser-2.21.4.orig/plugins/desktop-file/Makefile.in 2007-12-16 13:26:23.000000000 +0000
80 +++ epiphany-browser-2.21.4/plugins/desktop-file/Makefile.in 2008-01-14 21:46:10.000000000 +0000
81 @@ -323,7 +323,7 @@
8282 top_builddir = @top_builddir@
8383 top_srcdir = @top_srcdir@
8484 with_engine = @with_engine@
8787 plugin_LTLIBRARIES = libdesktopfileplugin.la
8888 libdesktopfileplugin_la_SOURCES = \
8989 plugin.cpp
90 Index: epiphany-2.20.3/src/Makefile.am
90 Index: epiphany-browser-2.21.4/src/Makefile.am
9191 ===================================================================
92 --- epiphany-2.20.3.orig/src/Makefile.am 2007-08-27 22:18:55.000000000 +0200
93 +++ epiphany-2.20.3/src/Makefile.am 2008-01-12 02:25:29.819203893 +0100
94 @@ -112,8 +112,8 @@ libephymain_la_CPPFLAGS = \
92 --- epiphany-browser-2.21.4.orig/src/Makefile.am 2007-11-16 15:09:42.000000000 +0000
93 +++ epiphany-browser-2.21.4/src/Makefile.am 2008-01-14 21:46:10.000000000 +0000
94 @@ -113,8 +113,8 @@
9595 -I$(top_srcdir)/lib/egg \
9696 -I$(top_srcdir)/lib/widgets \
9797 -I$(top_srcdir)/src/bookmarks \
102102 -DDATADIR=\""$(pkgdatadir)"\" \
103103 -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
104104 $(AM_CPPFLAGS)
105 @@ -164,8 +164,8 @@ libpyphany_la_CPPFLAGS = \
105 @@ -165,8 +165,8 @@
106106 -I$(top_builddir)/src \
107107 -I$(top_builddir)/src/bookmarks \
108108 $(PYTHON_INCLUDES) \
113113 -DDATADIR=\""$(datadir)"\" \
114114 $(AM_CPPFLAGS)
115115
116 Index: epiphany-2.20.3/src/Makefile.in
116 Index: epiphany-browser-2.21.4/src/Makefile.in
117117 ===================================================================
118 --- epiphany-2.20.3.orig/src/Makefile.in 2008-01-07 23:48:17.000000000 +0100
119 +++ epiphany-2.20.3/src/Makefile.in 2008-01-12 02:25:29.819203893 +0100
120 @@ -518,8 +518,8 @@ libephymain_la_CPPFLAGS = \
118 --- epiphany-browser-2.21.4.orig/src/Makefile.in 2007-12-16 13:26:24.000000000 +0000
119 +++ epiphany-browser-2.21.4/src/Makefile.in 2008-01-14 21:46:10.000000000 +0000
120 @@ -558,8 +558,8 @@
121121 -I$(top_srcdir)/lib/egg \
122122 -I$(top_srcdir)/lib/widgets \
123123 -I$(top_srcdir)/src/bookmarks \
128128 -DDATADIR=\""$(pkgdatadir)"\" \
129129 -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
130130 $(AM_CPPFLAGS)
131 @@ -557,8 +557,8 @@ libephymain_la_CFLAGS = \
131 @@ -597,8 +597,8 @@
132132 @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src \
133133 @ENABLE_PYTHON_TRUE@ -I$(top_builddir)/src/bookmarks \
134134 @ENABLE_PYTHON_TRUE@ $(PYTHON_INCLUDES) \
+4
-4
debian/patches/06_ssl_weak_ciphers.patch less more
0 Index: epiphany-2.20.3/data/default-prefs-common.js
0 Index: epiphany-browser-2.21.4/data/default-prefs-common.js
11 ===================================================================
2 --- epiphany-2.20.3.orig/data/default-prefs-common.js 2008-01-07 23:47:27.000000000 +0100
3 +++ epiphany-2.20.3/data/default-prefs-common.js 2008-01-12 02:25:48.144248178 +0100
4 @@ -170,3 +170,6 @@ pref("dom.disable_window_flip", true);
2 --- epiphany-browser-2.21.4.orig/data/default-prefs-common.js 2007-11-12 10:48:23.000000000 +0000
3 +++ epiphany-browser-2.21.4/data/default-prefs-common.js 2008-01-14 21:47:03.000000000 +0000
4 @@ -171,3 +171,6 @@
55 // set to true for parity with gtk entries
66 pref("bidi.edit.delete_immediately", true);
77
+10
-10
debian/patches/09_download_dialog.patch less more
00 Index: embed/mozilla/ContentHandler.cpp
11 ===================================================================
2 --- embed/mozilla/ContentHandler.cpp.orig 2007-08-27 22:19:02.000000000 +0200
3 +++ embed/mozilla/ContentHandler.cpp 2007-09-21 14:30:06.194859590 +0200
2 --- embed/mozilla/ContentHandler.cpp.orig 2007-09-13 14:21:40.000000000 +0100
3 +++ embed/mozilla/ContentHandler.cpp 2008-01-14 21:47:37.000000000 +0000
44 @@ -336,8 +336,11 @@
55
66 gtk_dialog_add_button (GTK_DIALOG (dialog),
4444 }
4545 Index: data/glade/prefs-dialog.glade
4646 ===================================================================
47 --- data/glade/prefs-dialog.glade.orig 2007-08-27 22:19:01.000000000 +0200
48 +++ data/glade/prefs-dialog.glade 2007-09-21 14:30:06.198859818 +0200
47 --- data/glade/prefs-dialog.glade.orig 2007-11-12 10:48:23.000000000 +0000
48 +++ data/glade/prefs-dialog.glade 2008-01-14 21:47:37.000000000 +0000
4949 @@ -303,6 +303,25 @@
5050 <property name="spacing">6</property>
5151
100100 </widget>
101101 Index: src/prefs-dialog.c
102102 ===================================================================
103 --- src/prefs-dialog.c.orig 2007-08-27 22:18:55.000000000 +0200
104 +++ src/prefs-dialog.c 2007-09-21 14:30:06.198859818 +0200
105 @@ -391,6 +391,13 @@
103 --- src/prefs-dialog.c.orig 2007-11-16 15:09:42.000000000 +0000
104 +++ src/prefs-dialog.c 2008-01-14 21:47:37.000000000 +0000
105 @@ -393,6 +393,13 @@
106106 }
107107
108108 static void
116116 setup_font_combo (EphyDialog *dialog,
117117 const char *type,
118118 const char *code,
119 @@ -1525,6 +1532,7 @@
119 @@ -1529,6 +1536,7 @@
120120 EphyDialog *dialog = EPHY_DIALOG (pd);
121121 EphyEncodings *encodings;
122122 GtkWidget *window, *curr_button, *blank_button;
124124 GtkWidget *clear_cache_button, *font_prefs_button;
125125 GtkWidget *css_checkbox, *css_edit_box, *css_edit_button, *css_container;
126126 gboolean sensitive;
127 @@ -1545,6 +1553,8 @@
127 @@ -1549,6 +1557,8 @@
128128 properties[WINDOW_PROP].id, &window,
129129 properties[HOMEPAGE_CURRENT_PROP].id, &curr_button,
130130 properties[HOMEPAGE_BLANK_PROP].id, &blank_button,
133133 properties[FONT_PREFS_BUTTON_PROP].id, &font_prefs_button,
134134 properties[CSS_CHECKBOX_PROP].id, &css_checkbox,
135135 properties[CSS_EDIT_BOX_PROP].id, &css_edit_box,
136 @@ -1568,6 +1578,10 @@
136 @@ -1572,6 +1582,10 @@
137137 gtk_widget_set_sensitive (curr_button, sensitive);
138138 gtk_widget_set_sensitive (blank_button, sensitive);
139139
+5
-5
debian/patches/10_url_double-click.patch less more
0 Index: epiphany-2.20.0/lib/widgets/ephy-location-entry.c
0 Index: epiphany-browser-2.21.4/lib/widgets/ephy-location-entry.c
11 ===================================================================
2 --- epiphany-2.20.0.orig/lib/widgets/ephy-location-entry.c 2007-08-27 22:19:00.000000000 +0200
3 +++ epiphany-2.20.0/lib/widgets/ephy-location-entry.c 2007-09-21 14:30:14.987360646 +0200
4 @@ -353,18 +353,6 @@
2 --- epiphany-browser-2.21.4.orig/lib/widgets/ephy-location-entry.c 2007-10-04 00:32:03.000000000 +0100
3 +++ epiphany-browser-2.21.4/lib/widgets/ephy-location-entry.c 2008-01-14 21:48:01.000000000 +0000
4 @@ -368,18 +368,6 @@
55 }
66
77 static gboolean
2020 entry_key_press_cb (GtkEntry *entry,
2121 GdkEventKey *event,
2222 EphyLocationEntry *lentry)
23 @@ -923,8 +911,6 @@
23 @@ -938,8 +926,6 @@
2424 G_CALLBACK (entry_key_press_after_cb), entry);
2525 g_signal_connect_after (priv->icon_entry->entry, "activate",
2626 G_CALLBACK (entry_activate_after_cb), entry);
+0
-983
debian/patches/13_powered-by.patch less more
0 Index: epiphany-2.20.3/src/window-commands.c
1 ===================================================================
2 --- epiphany-2.20.3.orig/src/window-commands.c 2007-10-11 12:46:51.000000000 +0200
3 +++ epiphany-2.20.3/src/window-commands.c 2008-01-12 02:25:58.148818306 +0100
4 @@ -824,8 +824,8 @@ window_cmd_help_about (GtkAction *action
5 single = EPHY_EMBED_SINGLE (ephy_embed_shell_get_embed_single (shell));
6
7 comments = g_strdup_printf (_("Lets you view web pages and find information on the internet.\n"
8 - "Powered by Gecko %s"),
9 - ephy_embed_single_get_backend_name (single) + strlen ("gecko-"));
10 + "Powered by %s"), ephy_embed_single_get_backend_name (single) );
11 +
12 licence = g_strjoin ("\n\n",
13 _(licence_part[0]),
14 _(licence_part[1]),
15 Index: epiphany-2.20.3/po/ar.po
16 ===================================================================
17 --- epiphany-2.20.3.orig/po/ar.po 2008-01-07 23:47:27.000000000 +0100
18 +++ epiphany-2.20.3/po/ar.po 2008-01-12 02:25:58.152818534 +0100
19 @@ -4097,10 +4097,10 @@ msgstr "المطورون السابقوÙ
20 #, c-format
21 msgid ""
22 "Lets you view web pages and find information on the internet.\n"
23 -"Powered by Gecko %s"
24 +"Powered by %s"
25 msgstr ""
26 "يمَكّنُك من عرض صفحات الويب و إيجاد المعلومات على الإنترنت.\n"
27 -"يستعمل Gecko %s"
28 +"يستعمل %s"
29
30 #. Translators: This is a special message that shouldn't be translated
31 #. * literally. It is used in the about box to give credits to
32 Index: epiphany-2.20.3/po/be.po
33 ===================================================================
34 --- epiphany-2.20.3.orig/po/be.po 2007-08-27 22:19:08.000000000 +0200
35 +++ epiphany-2.20.3/po/be.po 2008-01-12 02:25:58.152818534 +0100
36 @@ -4063,10 +4063,10 @@ msgstr ""
37 #, c-format
38 msgid ""
39 "Lets you view web pages and find information on the internet.\n"
40 -"Powered by Gecko %s"
41 +"Powered by %s"
42 msgstr ""
43 "Дазваляе Вам праглядаць старонкі й шукаць зьвесткі ў інтэрнэце.\n"
44 -"Заснаваны на рухавіку Gecko %s"
45 +"Заснаваны на рухавіку %s"
46
47 #. Translators: This is a special message that shouldn't be translated
48 #. * literally. It is used in the about box to give credits to
49 Index: epiphany-2.20.3/po/bg.po
50 ===================================================================
51 --- epiphany-2.20.3.orig/po/bg.po 2007-09-17 19:37:05.000000000 +0200
52 +++ epiphany-2.20.3/po/bg.po 2008-01-12 02:25:58.160818990 +0100
53 @@ -4337,10 +4337,10 @@ msgstr "Предишни разрабоÑ
54 #, c-format
55 msgid ""
56 "Lets you view web pages and find information on the internet.\n"
57 -"Powered by Gecko %s"
58 +"Powered by %s"
59 msgstr ""
60 "Позволява ви да разглеждате уеб-страници и намирате информация в Интернет.\n"
61 -"Задвижван от Gecko %s"
62 +"Задвижван от %s"
63
64 #. Translators: This is a special message that shouldn't be translated
65 #. * literally. It is used in the about box to give credits to
66 Index: epiphany-2.20.3/po/bn_IN.po
67 ===================================================================
68 --- epiphany-2.20.3.orig/po/bn_IN.po 2007-08-27 22:19:08.000000000 +0200
69 +++ epiphany-2.20.3/po/bn_IN.po 2008-01-12 02:25:58.160818990 +0100
70 @@ -4247,7 +4247,7 @@ msgstr ""
71 #, c-format
72 msgid ""
73 "Lets you view web pages and find information on the internet.\n"
74 -"Powered by Gecko %s"
75 +"Powered by %s"
76 msgstr ""
77
78 #. Translators: This is a special message that shouldn't be translated
79 Index: epiphany-2.20.3/po/ca.po
80 ===================================================================
81 --- epiphany-2.20.3.orig/po/ca.po 2008-01-07 23:47:27.000000000 +0100
82 +++ epiphany-2.20.3/po/ca.po 2008-01-12 02:25:58.164819218 +0100
83 @@ -4337,10 +4337,10 @@ msgstr "Antics desenvolupadors:"
84 #, c-format
85 msgid ""
86 "Lets you view web pages and find information on the internet.\n"
87 -"Powered by Gecko %s"
88 +"Powered by %s"
89 msgstr ""
90 "Us permet visualitzar pàgines web i cercar informació a Internet.\n"
91 -"Funciona amb el Gecko %s"
92 +"Funciona amb el %s"
93
94 #. Translators: This is a special message that shouldn't be translated
95 #. * literally. It is used in the about box to give credits to
96 Index: epiphany-2.20.3/po/cs.po
97 ===================================================================
98 --- epiphany-2.20.3.orig/po/cs.po 2007-08-27 22:19:08.000000000 +0200
99 +++ epiphany-2.20.3/po/cs.po 2008-01-12 02:25:58.168819446 +0100
100 @@ -4265,10 +4265,10 @@ msgstr "Dřívější vývojáři"
101 #, c-format
102 msgid ""
103 "Lets you view web pages and find information on the internet.\n"
104 -"Powered by Gecko %s"
105 +"Powered by %s"
106 msgstr ""
107 "Umožňuje prohlížet webové stránky a hledat informace na internetu.\n"
108 -"Založeno na jádře Gecko %s"
109 +"Založeno na jádře %s"
110
111 #. Translators: This is a special message that shouldn't be translated
112 #. * literally. It is used in the about box to give credits to
113 Index: epiphany-2.20.3/po/da.po
114 ===================================================================
115 --- epiphany-2.20.3.orig/po/da.po 2007-09-17 19:37:04.000000000 +0200
116 +++ epiphany-2.20.3/po/da.po 2008-01-12 02:25:58.168819446 +0100
117 @@ -4342,11 +4342,11 @@ msgstr "Tidligere udviklere:"
118 #, c-format
119 msgid ""
120 "Lets you view web pages and find information on the internet.\n"
121 -"Powered by Gecko %s"
122 +"Powered by %s"
123 msgstr ""
124 "Giver dig mulighed for at læse internetsider og søge information på "
125 "internettet.\n"
126 -"Bygger på Gecko %s"
127 +"Bygger på %s"
128
129 #. Translators: This is a special message that shouldn't be translated
130 #. * literally. It is used in the about box to give credits to
131 Index: epiphany-2.20.3/po/de.po
132 ===================================================================
133 --- epiphany-2.20.3.orig/po/de.po 2008-01-07 23:47:27.000000000 +0100
134 +++ epiphany-2.20.3/po/de.po 2008-01-12 02:25:58.172819674 +0100
135 @@ -4376,10 +4376,10 @@ msgstr "Vorherige Entwickler"
136 #, c-format
137 msgid ""
138 "Lets you view web pages and find information on the internet.\n"
139 -"Powered by Gecko %s"
140 +"Powered by %s"
141 msgstr ""
142 "Lässt Sie Webseiten betrachten und Informationen im Internet finden.\n"
143 -"Verwendet Gecko %s"
144 +"Verwendet %s"
145
146 #. Translators: This is a special message that shouldn't be translated
147 #. * literally. It is used in the about box to give credits to
148 Index: epiphany-2.20.3/po/dz.po
149 ===================================================================
150 --- epiphany-2.20.3.orig/po/dz.po 2007-08-27 22:19:08.000000000 +0200
151 +++ epiphany-2.20.3/po/dz.po 2008-01-12 02:25:58.176819902 +0100
152 @@ -4050,7 +4050,7 @@ msgstr "འདས་པའི་་བà½
153 #, c-format
154 msgid ""
155 "Lets you view web pages and find information on the internet.\n"
156 -"Powered by Gecko %s"
157 +"Powered by %s"
158 msgstr ""
159 "ཁྱོད་ལུ་ཝེབ་ཤོག་ལེབ་བལྟ་ནི་དི་ ཨིན་ཊར་ནེཊི་ནང་ བརྡ་དོན་འཚོལ་བཅུགཔ་ཨིན། \n"
160 "གེཀ་ཀོ་%sགིས་ནུས་ཤུགས་བྱིནམ་ཨིན།"
161 Index: epiphany-2.20.3/po/el.po
162 ===================================================================
163 --- epiphany-2.20.3.orig/po/el.po 2007-09-28 22:30:48.000000000 +0200
164 +++ epiphany-2.20.3/po/el.po 2008-01-12 02:25:58.180820130 +0100
165 @@ -4088,10 +4088,10 @@ msgstr "Παλιοί συντελεστÎ
166 #, c-format
167 msgid ""
168 "Lets you view web pages and find information on the internet.\n"
169 -"Powered by Gecko %s"
170 +"Powered by %s"
171 msgstr ""
172 "Προβολή ιστοσελίδων και εύρεση πληροφοριών στο διαδίκτυο.\n"
173 -"Powered by Gecko %s"
174 +"Powered by %s"
175
176 #. Translators: This is a special message that shouldn't be translated
177 #. * literally. It is used in the about box to give credits to
178 Index: epiphany-2.20.3/po/en_CA.po
179 ===================================================================
180 --- epiphany-2.20.3.orig/po/en_CA.po 2007-08-27 22:19:08.000000000 +0200
181 +++ epiphany-2.20.3/po/en_CA.po 2008-01-12 02:25:58.180820130 +0100
182 @@ -4280,10 +4280,10 @@ msgstr "Past developers:"
183 #, c-format
184 msgid ""
185 "Lets you view web pages and find information on the internet.\n"
186 -"Powered by Gecko %s"
187 +"Powered by %s"
188 msgstr ""
189 "Lets you view web pages and find information on the internet.\n"
190 -"Powered by Gecko %s"
191 +"Powered by %s"
192
193 #. Translators: This is a special message that shouldn't be translated
194 #. * literally. It is used in the about box to give credits to
195 Index: epiphany-2.20.3/po/en_GB.po
196 ===================================================================
197 --- epiphany-2.20.3.orig/po/en_GB.po 2007-08-27 22:19:08.000000000 +0200
198 +++ epiphany-2.20.3/po/en_GB.po 2008-01-12 02:25:58.184820358 +0100
199 @@ -4048,10 +4048,10 @@ msgstr "Past developers:"
200 #, c-format
201 msgid ""
202 "Lets you view web pages and find information on the internet.\n"
203 -"Powered by Gecko %s"
204 +"Powered by %s"
205 msgstr ""
206 "Lets you view web pages and find information on the internet.\n"
207 -"Powered by Gecko %s"
208 +"Powered by %s"
209
210 #. Translators: This is a special message that shouldn't be translated
211 #. * literally. It is used in the about box to give credits to
212 Index: epiphany-2.20.3/po/es.po
213 ===================================================================
214 --- epiphany-2.20.3.orig/po/es.po 2007-09-10 21:45:21.000000000 +0200
215 +++ epiphany-2.20.3/po/es.po 2008-01-12 02:25:58.184820358 +0100
216 @@ -4315,10 +4315,10 @@ msgstr "Desarrolladores anteriores:"
217 #, c-format
218 msgid ""
219 "Lets you view web pages and find information on the internet.\n"
220 -"Powered by Gecko %s"
221 +"Powered by %s"
222 msgstr ""
223 "Le permite ver páginas web y encontrar información en Internet.\n"
224 -"Basado en Gecko %s"
225 +"Basado en %s"
226
227 #. Translators: This is a special message that shouldn't be translated
228 #. * literally. It is used in the about box to give credits to
229 Index: epiphany-2.20.3/po/et.po
230 ===================================================================
231 --- epiphany-2.20.3.orig/po/et.po 2008-01-07 23:47:27.000000000 +0100
232 +++ epiphany-2.20.3/po/et.po 2008-01-12 02:25:58.188820586 +0100
233 @@ -4325,10 +4325,10 @@ msgstr "Eelmised arendajad:"
234 #, c-format
235 msgid ""
236 "Lets you view web pages and find information on the internet.\n"
237 -"Powered by Gecko %s"
238 +"Powered by %s"
239 msgstr ""
240 "Veebilehtede vaatamine ja andmete otsimine internetist.\n"
241 -"Põhineb Gecko %s mootoril"
242 +"Põhineb %s mootoril"
243
244 #. Translators: This is a special message that shouldn't be translated
245 #. * literally. It is used in the about box to give credits to
246 Index: epiphany-2.20.3/po/eu.po
247 ===================================================================
248 --- epiphany-2.20.3.orig/po/eu.po 2007-09-17 19:37:05.000000000 +0200
249 +++ epiphany-2.20.3/po/eu.po 2008-01-12 02:25:58.188820586 +0100
250 @@ -4296,10 +4296,10 @@ msgstr "Iraganeko garatzaileak:"
251 #, c-format
252 msgid ""
253 "Lets you view web pages and find information on the internet.\n"
254 -"Powered by Gecko %s"
255 +"Powered by %s"
256 msgstr ""
257 "Web orrialdeak ikusteko eta interneten informazioa aurkitzeko.\n"
258 -"Gecko %s indarrarekin"
259 +"%s indarrarekin"
260
261 #. Translators: This is a special message that shouldn't be translated
262 #. * literally. It is used in the about box to give credits to
263 Index: epiphany-2.20.3/po/fa.po
264 ===================================================================
265 --- epiphany-2.20.3.orig/po/fa.po 2007-08-27 22:19:08.000000000 +0200
266 +++ epiphany-2.20.3/po/fa.po 2008-01-12 02:25:58.192820814 +0100
267 @@ -4196,7 +4196,7 @@ msgstr ""
268 #, c-format
269 msgid ""
270 "Lets you view web pages and find information on the internet.\n"
271 -"Powered by Gecko %s"
272 +"Powered by %s"
273 msgstr ""
274
275 #. Translators: This is a special message that shouldn't be translated
276 Index: epiphany-2.20.3/po/fi.po
277 ===================================================================
278 --- epiphany-2.20.3.orig/po/fi.po 2007-09-28 22:30:48.000000000 +0200
279 +++ epiphany-2.20.3/po/fi.po 2008-01-12 02:25:58.196821042 +0100
280 @@ -4319,7 +4319,7 @@ msgstr "Aikaisemmat kehittäjät:"
281 #, c-format
282 msgid ""
283 "Lets you view web pages and find information on the internet.\n"
284 -"Powered by Gecko %s"
285 +"Powered by %s"
286 msgstr ""
287 "Mahdollistaa www-sivujen katselun ja tiedon etsimisen Internetistä.\n"
288 "Käyttää Gecko-moottoria %s"
289 Index: epiphany-2.20.3/po/fr.po
290 ===================================================================
291 --- epiphany-2.20.3.orig/po/fr.po 2007-10-15 22:43:43.000000000 +0200
292 +++ epiphany-2.20.3/po/fr.po 2008-01-12 02:25:58.196821042 +0100
293 @@ -4375,11 +4375,11 @@ msgstr "Anciens développeurs :"
294 #, c-format
295 msgid ""
296 "Lets you view web pages and find information on the internet.\n"
297 -"Powered by Gecko %s"
298 +"Powered by %s"
299 msgstr ""
300 "Vous permet de consulter des pages Web et de trouver des informations sur "
301 "Internet.\n"
302 -"Propulsé par Gecko %s"
303 +"Propulsé par %s"
304
305 #. Translators: This is a special message that shouldn't be translated
306 #. * literally. It is used in the about box to give credits to
307 Index: epiphany-2.20.3/po/gl.po
308 ===================================================================
309 --- epiphany-2.20.3.orig/po/gl.po 2007-08-27 22:19:08.000000000 +0200
310 +++ epiphany-2.20.3/po/gl.po 2008-01-12 02:25:58.200821270 +0100
311 @@ -4272,10 +4272,10 @@ msgstr "Desenvolvedores anteriores:"
312 #, c-format
313 msgid ""
314 "Lets you view web pages and find information on the internet.\n"
315 -"Powered by Gecko %s"
316 +"Powered by %s"
317 msgstr ""
318 "Permítelle ver páxinas web e buscar información en internet.\n"
319 -"Baseado en Gecko %s"
320 +"Baseado en %s"
321
322 #. Translators: This is a special message that shouldn't be translated
323 #. * literally. It is used in the about box to give credits to
324 Index: epiphany-2.20.3/po/gu.po
325 ===================================================================
326 --- epiphany-2.20.3.orig/po/gu.po 2007-09-10 21:45:21.000000000 +0200
327 +++ epiphany-2.20.3/po/gu.po 2008-01-12 02:25:58.204821498 +0100
328 @@ -4306,10 +4306,10 @@ msgstr "જૂના વિકાસકà
329 #, c-format
330 msgid ""
331 "Lets you view web pages and find information on the internet.\n"
332 -"Powered by Gecko %s"
333 +"Powered by %s"
334 msgstr ""
335 "તમને વેબ પાનાંઓ જોવા માટે અને ઈન્ટરનેટ પર જાણકારી શોધવા માટે પરવાનગી આપે છે.\n"
336 -"Gecko %s દ્વારા સમર્થિત છે"
337 +"%s દ્વારા સમર્થિત છે"
338
339 #. Translators: This is a special message that shouldn't be translated
340 #. * literally. It is used in the about box to give credits to
341 Index: epiphany-2.20.3/po/he.po
342 ===================================================================
343 --- epiphany-2.20.3.orig/po/he.po 2007-08-27 22:19:08.000000000 +0200
344 +++ epiphany-2.20.3/po/he.po 2008-01-12 02:25:58.204821498 +0100
345 @@ -4232,10 +4232,10 @@ msgstr "מפתחים בעבר:"
346 #, c-format
347 msgid ""
348 "Lets you view web pages and find information on the internet.\n"
349 -"Powered by Gecko %s"
350 +"Powered by %s"
351 msgstr ""
352 "מאפשר למצוא מידע ולצפות בדפי אינטרנט.\n"
353 -"מופעל על ידי Gecko %s"
354 +"מופעל על ידי %s"
355
356 #. Translators: This is a special message that shouldn't be translated
357 #. * literally. It is used in the about box to give credits to
358 Index: epiphany-2.20.3/po/hi.po
359 ===================================================================
360 --- epiphany-2.20.3.orig/po/hi.po 2007-08-27 22:19:08.000000000 +0200
361 +++ epiphany-2.20.3/po/hi.po 2008-01-12 02:25:58.208821726 +0100
362 @@ -4248,7 +4248,7 @@ msgstr ""
363 #, c-format
364 msgid ""
365 "Lets you view web pages and find information on the internet.\n"
366 -"Powered by Gecko %s"
367 +"Powered by %s"
368 msgstr ""
369
370 # Translator credits
371 Index: epiphany-2.20.3/po/hu.po
372 ===================================================================
373 --- epiphany-2.20.3.orig/po/hu.po 2007-09-17 19:37:05.000000000 +0200
374 +++ epiphany-2.20.3/po/hu.po 2008-01-12 02:25:58.212821954 +0100
375 @@ -4312,11 +4312,11 @@ msgstr "Korábbi fejlesztők:"
376 #, c-format
377 msgid ""
378 "Lets you view web pages and find information on the internet.\n"
379 -"Powered by Gecko %s"
380 +"Powered by %s"
381 msgstr ""
382 "Lehetővé teszi weboldalak megjelenítését és információk keresését az "
383 "interneten.\n"
384 -"A Gecko %s működteti"
385 +"A %s működteti"
386
387 #. Translators: This is a special message that shouldn't be translated
388 #. * literally. It is used in the about box to give credits to
389 Index: epiphany-2.20.3/po/id.po
390 ===================================================================
391 --- epiphany-2.20.3.orig/po/id.po 2007-08-27 22:19:08.000000000 +0200
392 +++ epiphany-2.20.3/po/id.po 2008-01-12 02:25:58.212821954 +0100
393 @@ -4232,11 +4232,11 @@ msgstr ""
394 #, c-format
395 msgid ""
396 "Lets you view web pages and find information on the internet.\n"
397 -"Powered by Gecko %s"
398 +"Powered by %s"
399 msgstr ""
400 "Supaya anda dapat menampilkan halaman web dan menemukan informasi di "
401 "internet.\n"
402 -"Diperkuat oleh Gecko %s"
403 +"Diperkuat oleh %s"
404
405 #. Translators: This is a special message that shouldn't be translated
406 #. * literally. It is used in the about box to give credits to
407 Index: epiphany-2.20.3/po/it.po
408 ===================================================================
409 --- epiphany-2.20.3.orig/po/it.po 2007-09-28 22:30:48.000000000 +0200
410 +++ epiphany-2.20.3/po/it.po 2008-01-12 02:25:58.216822182 +0100
411 @@ -4436,11 +4436,11 @@ msgstr "Sviluppatori precedenti:"
412 #, c-format
413 msgid ""
414 "Lets you view web pages and find information on the internet.\n"
415 -"Powered by Gecko %s"
416 +"Powered by %s"
417 msgstr ""
418 "Permette di visualizzare le pagine web e di trovare informazioni su "
419 "internet.\n"
420 -"Basato su Gecko %s"
421 +"Basato su %s"
422
423 #. Translators: This is a special message that shouldn't be translated
424 #. * literally. It is used in the about box to give credits to
425 Index: epiphany-2.20.3/po/ja.po
426 ===================================================================
427 --- epiphany-2.20.3.orig/po/ja.po 2008-01-07 23:47:27.000000000 +0100
428 +++ epiphany-2.20.3/po/ja.po 2008-01-12 02:25:58.220822409 +0100
429 @@ -4316,7 +4316,7 @@ msgstr "前バージョンの開発者:"
430 #, c-format
431 msgid ""
432 "Lets you view web pages and find information on the internet.\n"
433 -"Powered by Gecko %s"
434 +"Powered by %s"
435 msgstr ""
436 "ウェブページを表示して、インターネット上の情報を見つけ出します。\n"
437 "使用している Gecko エンジン: %s"
438 Index: epiphany-2.20.3/po/ko.po
439 ===================================================================
440 --- epiphany-2.20.3.orig/po/ko.po 2007-09-28 22:30:48.000000000 +0200
441 +++ epiphany-2.20.3/po/ko.po 2008-01-12 02:25:58.220822409 +0100
442 @@ -4267,7 +4267,7 @@ msgstr "이전 개발자:"
443 #, c-format
444 msgid ""
445 "Lets you view web pages and find information on the internet.\n"
446 -"Powered by Gecko %s"
447 +"Powered by %s"
448 msgstr ""
449 "인터넷에서 웹페이지를 보고 정보를 찾습니다.\n"
450 "게코 %s 엔진을 사용합니다"
451 Index: epiphany-2.20.3/po/ku.po
452 ===================================================================
453 --- epiphany-2.20.3.orig/po/ku.po 2007-08-27 22:19:08.000000000 +0200
454 +++ epiphany-2.20.3/po/ku.po 2008-01-12 02:25:58.224822637 +0100
455 @@ -3982,7 +3982,7 @@ msgstr ""
456 #, c-format
457 msgid ""
458 "Lets you view web pages and find information on the internet.\n"
459 -"Powered by Gecko %s"
460 +"Powered by %s"
461 msgstr ""
462
463 #. Translators: This is a special message that shouldn't be translated
464 Index: epiphany-2.20.3/po/lt.po
465 ===================================================================
466 --- epiphany-2.20.3.orig/po/lt.po 2007-08-27 22:19:08.000000000 +0200
467 +++ epiphany-2.20.3/po/lt.po 2008-01-12 02:25:58.224822637 +0100
468 @@ -4299,10 +4299,10 @@ msgstr "Ankstesnieji kūrėjai:"
469 #, c-format
470 msgid ""
471 "Lets you view web pages and find information on the internet.\n"
472 -"Powered by Gecko %s"
473 +"Powered by %s"
474 msgstr ""
475 "Leidžia Jums peržiūrėti žiniatinklio svetaines ir rasti informaciją\n"
476 -"Internete. Sukurta Gecko %s pagrindu."
477 +"Internete. Sukurta %s pagrindu."
478
479 #. Translators: This is a special message that shouldn't be translated
480 #. * literally. It is used in the about box to give credits to
481 Index: epiphany-2.20.3/po/lv.po
482 ===================================================================
483 --- epiphany-2.20.3.orig/po/lv.po 2007-08-27 22:19:08.000000000 +0200
484 +++ epiphany-2.20.3/po/lv.po 2008-01-12 02:25:58.228822865 +0100
485 @@ -4224,10 +4224,10 @@ msgstr ""
486 #, c-format
487 msgid ""
488 "Lets you view web pages and find information on the internet.\n"
489 -"Powered by Gecko %s"
490 +"Powered by %s"
491 msgstr ""
492 "Ļauj jums aplīkot tīmekļa vietnes un meklēt informāciju internetā.\n"
493 -"Darbina Gecko %s"
494 +"Darbina %s"
495
496 #. Translators: This is a special message that shouldn't be translated
497 #. * literally. It is used in the about box to give credits to
498 Index: epiphany-2.20.3/po/mg.po
499 ===================================================================
500 --- epiphany-2.20.3.orig/po/mg.po 2007-08-27 22:19:08.000000000 +0200
501 +++ epiphany-2.20.3/po/mg.po 2008-01-12 02:25:58.232823093 +0100
502 @@ -4117,7 +4117,7 @@ msgstr ""
503 #, c-format
504 msgid ""
505 "Lets you view web pages and find information on the internet.\n"
506 -"Powered by Gecko %s"
507 +"Powered by %s"
508 msgstr ""
509
510 #. Translators: This is a special message that shouldn't be translated
511 Index: epiphany-2.20.3/po/mk.po
512 ===================================================================
513 --- epiphany-2.20.3.orig/po/mk.po 2007-09-10 21:45:21.000000000 +0200
514 +++ epiphany-2.20.3/po/mk.po 2008-01-12 02:25:58.232823093 +0100
515 @@ -4313,10 +4313,10 @@ msgstr "Претходни развивÐ
516 #, c-format
517 msgid ""
518 "Lets you view web pages and find information on the internet.\n"
519 -"Powered by Gecko %s"
520 +"Powered by %s"
521 msgstr ""
522 "Овозможува прегледување на веб страници и барање на информации на интернет.\n"
523 -"Базиран на Gecko %s"
524 +"Базиран на %s"
525
526 #. Translators: This is a special message that shouldn't be translated
527 #. * literally. It is used in the about box to give credits to
528 Index: epiphany-2.20.3/po/ml.po
529 ===================================================================
530 --- epiphany-2.20.3.orig/po/ml.po 2007-09-10 21:45:21.000000000 +0200
531 +++ epiphany-2.20.3/po/ml.po 2008-01-12 02:25:58.236823321 +0100
532 @@ -4190,7 +4190,7 @@ msgstr "‡¥Æ‡µÅ‡¥®‡µç‚Ä燥懥≤‡¥§‡µç‡¥
533 #, c-format
534 msgid ""
535 "Lets you view web pages and find information on the internet.\n"
536 -"Powered by Gecko %s"
537 +"Powered by %s"
538 msgstr "നിങ്ങളെ വെബ് താളുകള്‍ കാണുന്നതിനും ഇന്റര്‍നെറ്റില്‍ വിവരങ്ങള്‍ കണ്ടുപിടിയ്ക്കുന്നതിനും കഴിവുള്ളതാക്കുന്നു.\n"
539 "ഗെക്കോ %s ന്റെ ശക്തി"
540
541 Index: epiphany-2.20.3/po/mn.po
542 ===================================================================
543 --- epiphany-2.20.3.orig/po/mn.po 2007-08-27 22:19:08.000000000 +0200
544 +++ epiphany-2.20.3/po/mn.po 2008-01-12 02:25:58.236823321 +0100
545 @@ -4192,7 +4192,7 @@ msgstr ""
546 #, c-format
547 msgid ""
548 "Lets you view web pages and find information on the internet.\n"
549 -"Powered by Gecko %s"
550 +"Powered by %s"
551 msgstr ""
552
553 #. Translators: This is a special message that shouldn't be translated
554 Index: epiphany-2.20.3/po/mr.po
555 ===================================================================
556 --- epiphany-2.20.3.orig/po/mr.po 2007-08-27 22:19:08.000000000 +0200
557 +++ epiphany-2.20.3/po/mr.po 2008-01-12 02:25:58.240823549 +0100
558 @@ -4163,7 +4163,7 @@ msgstr "a рдЪрд╛рд╛ рд╕рд╛рдорд╛рдиреНрд
559 #, c-format
560 msgid ""
561 "Lets you view web pages and find information on the internet.\n"
562 -"Powered by Gecko %s"
563 +"Powered by %s"
564 msgstr ""
565
566 #. Translators: This is a special message that shouldn't be translated
567 Index: epiphany-2.20.3/po/ms.po
568 ===================================================================
569 --- epiphany-2.20.3.orig/po/ms.po 2007-08-27 22:19:08.000000000 +0200
570 +++ epiphany-2.20.3/po/ms.po 2008-01-12 02:25:58.244823777 +0100
571 @@ -4353,7 +4353,7 @@ msgstr "Pembangun _Perisian"
572 #, c-format
573 msgid ""
574 "Lets you view web pages and find information on the internet.\n"
575 -"Powered by Gecko %s"
576 +"Powered by %s"
577 msgstr ""
578
579 #. Translators: This is a special message that shouldn't be translated
580 Index: epiphany-2.20.3/po/nb.po
581 ===================================================================
582 --- epiphany-2.20.3.orig/po/nb.po 2007-09-17 19:37:04.000000000 +0200
583 +++ epiphany-2.20.3/po/nb.po 2008-01-12 02:25:58.244823777 +0100
584 @@ -4076,10 +4076,10 @@ msgstr "Tidligere utviklere:"
585 #, c-format
586 msgid ""
587 "Lets you view web pages and find information on the internet.\n"
588 -"Powered by Gecko %s"
589 +"Powered by %s"
590 msgstr ""
591 "Lar deg se nettsider og finne informasjon på internett.\n"
592 -" Bruker Gecko %s"
593 +" Bruker %s"
594
595 #. Translators: This is a special message that shouldn't be translated
596 #. * literally. It is used in the about box to give credits to
597 Index: epiphany-2.20.3/po/nl.po
598 ===================================================================
599 --- epiphany-2.20.3.orig/po/nl.po 2007-09-10 23:20:59.000000000 +0200
600 +++ epiphany-2.20.3/po/nl.po 2008-01-12 02:25:58.248824005 +0100
601 @@ -4972,10 +4972,10 @@ msgstr "Ex-ontwikkelaars:"
602 #, c-format
603 msgid ""
604 "Lets you view web pages and find information on the internet.\n"
605 -"Powered by Gecko %s"
606 +"Powered by %s"
607 msgstr ""
608 "Stelt u in staat webpagina's en informatie op het internet te vinden.\n"
609 -"Op basis van Gecko %s"
610 +"Op basis van %s"
611
612 #. Translators: This is a special message that shouldn't be translated
613 #. * literally. It is used in the about box to give credits to
614 Index: epiphany-2.20.3/po/nn.po
615 ===================================================================
616 --- epiphany-2.20.3.orig/po/nn.po 2007-08-27 22:19:08.000000000 +0200
617 +++ epiphany-2.20.3/po/nn.po 2008-01-12 02:25:58.252824233 +0100
618 @@ -4223,10 +4223,10 @@ msgstr ""
619 #, c-format
620 msgid ""
621 "Lets you view web pages and find information on the internet.\n"
622 -"Powered by Gecko %s"
623 +"Powered by %s"
624 msgstr ""
625 "Let deg lesa nettsider og finna informasjon på internettet.\n"
626 -"Driven av Gecko %s"
627 +"Driven av %s"
628
629 #. Translators: This is a special message that shouldn't be translated
630 #. * literally. It is used in the about box to give credits to
631 Index: epiphany-2.20.3/po/oc.po
632 ===================================================================
633 --- epiphany-2.20.3.orig/po/oc.po 2007-08-27 22:19:08.000000000 +0200
634 +++ epiphany-2.20.3/po/oc.po 2008-01-12 02:25:58.252824233 +0100
635 @@ -4106,7 +4106,7 @@ msgstr ""
636 #, c-format
637 msgid ""
638 "Lets you view web pages and find information on the internet.\n"
639 -"Powered by Gecko %s"
640 +"Powered by %s"
641 msgstr ""
642
643 #. Translators: This is a special message that shouldn't be translated
644 Index: epiphany-2.20.3/po/or.po
645 ===================================================================
646 --- epiphany-2.20.3.orig/po/or.po 2007-08-27 22:19:08.000000000 +0200
647 +++ epiphany-2.20.3/po/or.po 2008-01-12 02:25:58.252824233 +0100
648 @@ -4062,7 +4062,7 @@ msgstr ""
649 #, c-format
650 msgid ""
651 "Lets you view web pages and find information on the internet.\n"
652 -"Powered by Gecko %s"
653 +"Powered by %s"
654 msgstr ""
655
656 #. Translators: This is a special message that shouldn't be translated
657 Index: epiphany-2.20.3/po/pa.po
658 ===================================================================
659 --- epiphany-2.20.3.orig/po/pa.po 2007-09-10 21:45:21.000000000 +0200
660 +++ epiphany-2.20.3/po/pa.po 2008-01-12 02:25:58.256824461 +0100
661 @@ -4281,7 +4281,7 @@ msgstr "ਪੁਰਾਣੇ ਖੋਜੀ:
662 #, c-format
663 msgid ""
664 "Lets you view web pages and find information on the internet.\n"
665 -"Powered by Gecko %s"
666 +"Powered by %s"
667 msgstr ""
668 "ਇੰਟਰਨੈੱਟ ਉੱਤੇ ਵੈੱਬ ਸਫ਼ੇ ਵੇਖਣ ਅਤੇ ਜਾਣਕਾਰੀ ਲੱਭਣ ਦਿੰਦਾ ਹੈ।\n"
669 "ਗੀਕੋ %s ਉੱਤੇ ਅਧਾਰਿਤ ਹੈ।"
670 Index: epiphany-2.20.3/po/pl.po
671 ===================================================================
672 --- epiphany-2.20.3.orig/po/pl.po 2007-09-17 19:37:05.000000000 +0200
673 +++ epiphany-2.20.3/po/pl.po 2008-01-12 02:25:58.260824689 +0100
674 @@ -4347,10 +4347,10 @@ msgstr "Poprzedni programiści:"
675 #, c-format
676 msgid ""
677 "Lets you view web pages and find information on the internet.\n"
678 -"Powered by Gecko %s"
679 +"Powered by %s"
680 msgstr ""
681 "Umożliwia przeglądanie stron i wyszukiwanie informacji w internecie.\n"
682 -"Napędzane przez Gecko %s"
683 +"Napędzane przez %s"
684
685 #. Translators: This is a special message that shouldn't be translated
686 #. * literally. It is used in the about box to give credits to
687 Index: epiphany-2.20.3/po/pt.po
688 ===================================================================
689 --- epiphany-2.20.3.orig/po/pt.po 2007-09-17 19:37:05.000000000 +0200
690 +++ epiphany-2.20.3/po/pt.po 2008-01-12 02:25:58.260824689 +0100
691 @@ -4333,10 +4333,10 @@ msgstr "Programadores anteriores:"
692 #, c-format
693 msgid ""
694 "Lets you view web pages and find information on the internet.\n"
695 -"Powered by Gecko %s"
696 +"Powered by %s"
697 msgstr ""
698 "Permite-lhe visualizar páginas web e procurar informação na internet.\n"
699 -"Utiliza o Motor de Parseamento Gecko %s"
700 +"Utiliza o Motor de Parseamento %s"
701
702 #. Translators: This is a special message that shouldn't be translated
703 #. * literally. It is used in the about box to give credits to
704 Index: epiphany-2.20.3/po/pt_BR.po
705 ===================================================================
706 --- epiphany-2.20.3.orig/po/pt_BR.po 2008-01-07 23:47:27.000000000 +0100
707 +++ epiphany-2.20.3/po/pt_BR.po 2008-01-12 02:25:58.264824917 +0100
708 @@ -4333,10 +4333,10 @@ msgstr "Desenvolvedores no passado:"
709 #, c-format
710 msgid ""
711 "Lets you view web pages and find information on the internet.\n"
712 -"Powered by Gecko %s"
713 +"Powered by %s"
714 msgstr ""
715 "Permite que você veja páginas da web e encontre informação na internet.\n"
716 -"Baseado no Gecko %s"
717 +"Baseado no %s"
718
719 #. Translators: This is a special message that shouldn't be translated
720 #. * literally. It is used in the about box to give credits to
721 Index: epiphany-2.20.3/po/ru.po
722 ===================================================================
723 --- epiphany-2.20.3.orig/po/ru.po 2007-09-17 19:37:05.000000000 +0200
724 +++ epiphany-2.20.3/po/ru.po 2008-01-12 02:25:58.268825145 +0100
725 @@ -4326,10 +4326,10 @@ msgstr "–ü—Ä–µ–¥—ã–¥—É—â–∏–µ —Ä–∞–∑—Ä–∞–
726 #, c-format
727 msgid ""
728 "Lets you view web pages and find information on the internet.\n"
729 -"Powered by Gecko %s"
730 +"Powered by %s"
731 msgstr ""
732 "Позволяет просматривать веб-страницы и искать информацию в Интернет.\n"
733 -"Использует Gecko %s"
734 +"Использует %s"
735
736 #. Translators: This is a special message that shouldn't be translated
737 #. * literally. It is used in the about box to give credits to
738 Index: epiphany-2.20.3/po/si.po
739 ===================================================================
740 --- epiphany-2.20.3.orig/po/si.po 2007-08-27 22:19:08.000000000 +0200
741 +++ epiphany-2.20.3/po/si.po 2008-01-12 02:25:58.268825145 +0100
742 @@ -4238,7 +4238,7 @@ msgstr ""
743 #, c-format
744 msgid ""
745 "Lets you view web pages and find information on the internet.\n"
746 -"Powered by Gecko %s"
747 +"Powered by %s"
748 msgstr ""
749
750 #. Translators: This is a special message that shouldn't be translated
751 Index: epiphany-2.20.3/po/sl.po
752 ===================================================================
753 --- epiphany-2.20.3.orig/po/sl.po 2007-08-27 22:19:08.000000000 +0200
754 +++ epiphany-2.20.3/po/sl.po 2008-01-12 02:25:58.272825373 +0100
755 @@ -4322,10 +4322,10 @@ msgstr "Pretekli razvijalci:"
756 #, c-format
757 msgid ""
758 "Lets you view web pages and find information on the internet.\n"
759 -"Powered by Gecko %s"
760 +"Powered by %s"
761 msgstr ""
762 "Omogoča ogled spletnih strani in iskanje informacij na spletu.\n"
763 -"Poganja ga Gecko %s"
764 +"Poganja ga %s"
765
766 #. Translators: This is a special message that shouldn't be translated
767 #. * literally. It is used in the about box to give credits to
768 Index: epiphany-2.20.3/po/sq.po
769 ===================================================================
770 --- epiphany-2.20.3.orig/po/sq.po 2007-09-17 19:37:05.000000000 +0200
771 +++ epiphany-2.20.3/po/sq.po 2008-01-12 02:25:58.272825373 +0100
772 @@ -4321,11 +4321,11 @@ msgstr "Zhvillues të tjerë:"
773 #, c-format
774 msgid ""
775 "Lets you view web pages and find information on the internet.\n"
776 -"Powered by Gecko %s"
777 +"Powered by %s"
778 msgstr ""
779 "Ju mundëson shfaqjen e faqeve web dhe kërkimin e informacioneve\n"
780 "në internet.\n"
781 -"Fuqizuar nga Gecko %s"
782 +"Fuqizuar nga %s"
783
784 #. Translators: This is a special message that shouldn't be translated
785 #. * literally. It is used in the about box to give credits to
786 Index: epiphany-2.20.3/po/sr.po
787 ===================================================================
788 --- epiphany-2.20.3.orig/po/sr.po 2007-09-17 19:37:04.000000000 +0200
789 +++ epiphany-2.20.3/po/sr.po 2008-01-12 02:25:58.276825601 +0100
790 @@ -4332,10 +4332,10 @@ msgstr "Ранији програмерÐ
791 #, c-format
792 msgid ""
793 "Lets you view web pages and find information on the internet.\n"
794 -"Powered by Gecko %s"
795 +"Powered by %s"
796 msgstr ""
797 "Омогућава ти преглед страница на вебу и претрагу информација на интернету.\n"
798 -"Реализовано уз Gecko %s"
799 +"Реализовано уз %s"
800
801 #. Translators: This is a special message that shouldn't be translated
802 #. * literally. It is used in the about box to give credits to
803 Index: epiphany-2.20.3/po/sr@Latn.po
804 ===================================================================
805 --- epiphany-2.20.3.orig/po/sr@Latn.po 2007-09-17 19:37:04.000000000 +0200
806 +++ epiphany-2.20.3/po/sr@Latn.po 2008-01-12 02:25:58.280825829 +0100
807 @@ -4332,10 +4332,10 @@ msgstr "Raniji programeri:"
808 #, c-format
809 msgid ""
810 "Lets you view web pages and find information on the internet.\n"
811 -"Powered by Gecko %s"
812 +"Powered by %s"
813 msgstr ""
814 "Omogućava ti pregled stranica na vebu i pretragu informacija na internetu.\n"
815 -"Realizovano uz Gecko %s"
816 +"Realizovano uz %s"
817
818 #. Translators: This is a special message that shouldn't be translated
819 #. * literally. It is used in the about box to give credits to
820 Index: epiphany-2.20.3/po/sv.po
821 ===================================================================
822 --- epiphany-2.20.3.orig/po/sv.po 2007-09-10 21:45:21.000000000 +0200
823 +++ epiphany-2.20.3/po/sv.po 2008-01-12 02:25:58.280825829 +0100
824 @@ -4082,10 +4082,10 @@ msgstr "Tidigare utvecklare:"
825 #, c-format
826 msgid ""
827 "Lets you view web pages and find information on the internet.\n"
828 -"Powered by Gecko %s"
829 +"Powered by %s"
830 msgstr ""
831 "Låter dig se webbsidor och hitta information på Internet.\n"
832 -"Drivs av Gecko %s"
833 +"Drivs av %s"
834
835 #. Translators: This is a special message that shouldn't be translated
836 #. * literally. It is used in the about box to give credits to
837 Index: epiphany-2.20.3/po/ta.po
838 ===================================================================
839 --- epiphany-2.20.3.orig/po/ta.po 2007-09-28 22:30:48.000000000 +0200
840 +++ epiphany-2.20.3/po/ta.po 2008-01-12 02:25:58.284826057 +0100
841 @@ -4282,7 +4282,7 @@ msgstr "கடந்த கால மெ
842 #, c-format
843 msgid ""
844 "Lets you view web pages and find information on the internet.\n"
845 -"Powered by Gecko %s"
846 +"Powered by %s"
847 msgstr ""
848 "இணைய பக்கங்களை காணவும் உலகவலையில் தகவல் சேகரிக்கவும் பயன்படும்.\n"
849 " கெக்கோ ஆல் இயக்கப்படுகிறது %s "
850 Index: epiphany-2.20.3/po/te.po
851 ===================================================================
852 --- epiphany-2.20.3.orig/po/te.po 2007-08-27 22:19:08.000000000 +0200
853 +++ epiphany-2.20.3/po/te.po 2008-01-12 02:25:58.284826057 +0100
854 @@ -4143,7 +4143,7 @@ msgstr "‡∞ó‡∞§‡∞LJ∞≤‡±ã ‡∞µ‡∞ø‡∞∏‡±ç‡∞§‡
855 #, c-format
856 msgid ""
857 "Lets you view web pages and find information on the internet.\n"
858 -"Powered by Gecko %s"
859 +"Powered by %s"
860 msgstr ""
861
862 #. Translators: This is a special message that shouldn't be translated
863 Index: epiphany-2.20.3/po/th.po
864 ===================================================================
865 --- epiphany-2.20.3.orig/po/th.po 2007-09-17 19:37:05.000000000 +0200
866 +++ epiphany-2.20.3/po/th.po 2008-01-12 02:25:58.288826285 +0100
867 @@ -4241,10 +4241,10 @@ msgstr "ผู้พัฒนาในà¸
868 #, c-format
869 msgid ""
870 "Lets you view web pages and find information on the internet.\n"
871 -"Powered by Gecko %s"
872 +"Powered by %s"
873 msgstr ""
874 "ให้คุณเข้าชมหน้าเว็บต่างๆ และค้นหาข้อมูลในอินเทอร์เน็ต\n"
875 -"ขับเคลื่อนโดย Gecko %s"
876 +"ขับเคลื่อนโดย %s"
877
878 #. Translators: This is a special message that shouldn't be translated
879 #. * literally. It is used in the about box to give credits to
880 Index: epiphany-2.20.3/po/tr.po
881 ===================================================================
882 --- epiphany-2.20.3.orig/po/tr.po 2007-08-27 22:19:08.000000000 +0200
883 +++ epiphany-2.20.3/po/tr.po 2008-01-12 02:25:58.292826513 +0100
884 @@ -4232,11 +4232,11 @@ msgstr ""
885 #, c-format
886 msgid ""
887 "Lets you view web pages and find information on the internet.\n"
888 -"Powered by Gecko %s"
889 +"Powered by %s"
890 msgstr ""
891 "Web sayfalarını görüntülemeye ve İnternet üzerinde bilgi bulmanıza olanak "
892 "sağlar.\n"
893 -"Gecko %s ile güçlendirilmiştir"
894 +"%s ile güçlendirilmiştir"
895
896 #. Translators: This is a special message that shouldn't be translated
897 #. * literally. It is used in the about box to give credits to
898 Index: epiphany-2.20.3/po/uk.po
899 ===================================================================
900 --- epiphany-2.20.3.orig/po/uk.po 2007-09-17 19:37:04.000000000 +0200
901 +++ epiphany-2.20.3/po/uk.po 2008-01-12 02:25:58.292826513 +0100
902 @@ -4320,10 +4320,10 @@ msgstr "–ö–æ–ª–∏—à–Ω—ñ —Ä–æ–∑—Ä–æ–±–Ω–∏–
903 #, c-format
904 msgid ""
905 "Lets you view web pages and find information on the internet.\n"
906 -"Powered by Gecko %s"
907 +"Powered by %s"
908 msgstr ""
909 "Дозволяє переглядати веб-сторінки та шукати інформацію у Інтернет.\n"
910 -"Powered by Gecko %s"
911 +"Powered by %s"
912
913 #. Translators: This is a special message that shouldn't be translated
914 #. * literally. It is used in the about box to give credits to
915 Index: epiphany-2.20.3/po/vi.po
916 ===================================================================
917 --- epiphany-2.20.3.orig/po/vi.po 2007-09-10 21:45:21.000000000 +0200
918 +++ epiphany-2.20.3/po/vi.po 2008-01-12 02:25:58.296826741 +0100
919 @@ -4327,10 +4327,10 @@ msgstr "Lập trình viên trước:"
920 #, c-format
921 msgid ""
922 "Lets you view web pages and find information on the internet.\n"
923 -"Powered by Gecko %s"
924 +"Powered by %s"
925 msgstr ""
926 "Cho bạn khả năng xem trang Web và tìm thông tin qua Internet.\n"
927 -"Được hỗ trợ bởi Gecko %s"
928 +"Được hỗ trợ bởi %s"
929
930 #: ../src/window-commands.c:852
931 #. Translators: This is a special message that shouldn't be translated
932 Index: epiphany-2.20.3/po/zh_CN.po
933 ===================================================================
934 --- epiphany-2.20.3.orig/po/zh_CN.po 2007-09-17 19:37:05.000000000 +0200
935 +++ epiphany-2.20.3/po/zh_CN.po 2008-01-12 02:25:58.300826969 +0100
936 @@ -4211,10 +4211,10 @@ msgstr "先前的开发者："
937 #, c-format
938 msgid ""
939 "Lets you view web pages and find information on the internet.\n"
940 -"Powered by Gecko %s"
941 +"Powered by %s"
942 msgstr ""
943 "让您浏览网页并从 Internet 上查找信息。\n"
944 -"引擎由 Gecko %s 提供"
945 +"引擎由 %s 提供"
946
947 #. Translators: This is a special message that shouldn't be translated
948 #. * literally. It is used in the about box to give credits to
949 Index: epiphany-2.20.3/po/zh_HK.po
950 ===================================================================
951 --- epiphany-2.20.3.orig/po/zh_HK.po 2007-08-27 22:19:08.000000000 +0200
952 +++ epiphany-2.20.3/po/zh_HK.po 2008-01-12 02:25:58.300826969 +0100
953 @@ -4107,10 +4107,10 @@ msgstr "前度開發人員："
954 #, c-format
955 msgid ""
956 "Lets you view web pages and find information on the internet.\n"
957 -"Powered by Gecko %s"
958 +"Powered by %s"
959 msgstr ""
960 "讓你在互聯網上瀏覽網頁及尋找資訊。\n"
961 -"基於 Gecko %s"
962 +"基於 %s"
963
964 #. Translators: This is a special message that shouldn't be translated
965 #. * literally. It is used in the about box to give credits to
966 Index: epiphany-2.20.3/po/zh_TW.po
967 ===================================================================
968 --- epiphany-2.20.3.orig/po/zh_TW.po 2007-08-27 22:19:08.000000000 +0200
969 +++ epiphany-2.20.3/po/zh_TW.po 2008-01-12 02:25:58.304827197 +0100
970 @@ -4165,10 +4165,10 @@ msgstr "前度開發人員："
971 #, c-format
972 msgid ""
973 "Lets you view web pages and find information on the internet.\n"
974 -"Powered by Gecko %s"
975 +"Powered by %s"
976 msgstr ""
977 "讓您在網際網路上瀏覽網頁及尋找資訊。\n"
978 -"基於 Gecko %s"
979 +"基於 %s"
980
981 #. Translators: This is a special message that shouldn't be translated
982 #. * literally. It is used in the about box to give credits to
+0
-38
debian/patches/14_webkit-scrollbars.patch less more
0 Index: /home/joss/src/epiphany/src/ephy-tab.c
1 ===================================================================
2 --- epiphany/src/ephy-tab.c (révision 7506)
3 +++ epiphany/src/ephy-tab.c (révision 7507)
4 @@ -320,7 +320,25 @@
5 }
6 }
7
8 +
9 static void
10 +ephy_tab_size_request (GtkWidget *widget,
11 + GtkRequisition *requisition)
12 +{
13 + GtkWidget *child;
14 +
15 + GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition);
16 +
17 + child = GTK_BIN (widget)->child;
18 +
19 + if (child && GTK_WIDGET_VISIBLE (child))
20 + {
21 + GtkRequisition child_requisition;
22 + gtk_widget_size_request (GTK_WIDGET (child), &child_requisition);
23 + }
24 +}
25 +
26 +static void
27 ephy_tab_size_allocate (GtkWidget *widget,
28 GtkAllocation *allocation)
29 {
30 @@ -387,6 +405,7 @@
31 object_class->set_property = ephy_tab_set_property;
32
33 widget_class->size_allocate = ephy_tab_size_allocate;
34 + widget_class->size_request = ephy_tab_size_request;
35 widget_class->map = ephy_tab_map;
36 widget_class->grab_focus = ephy_tab_grab_focus;
37
+0
-128
debian/patches/15_webkit-gtk-api.patch less more
0 --- trunk/embed/webkit/webkit-embed.cpp 2007/08/16 20:46:43 7281
1 +++ trunk/embed/webkit/webkit-embed.cpp 2007/10/03 17:44:21 7514
2 @@ -41,8 +41,8 @@
3 static void ephy_embed_iface_init (EphyEmbedIface *iface);
4
5 #if 0
6 -static void load_started_cb (WebKitGtkPage *page,
7 - WebKitGtkFrame *frame,
8 +static void load_started_cb (WebKitPage *page,
9 + WebKitFrame *frame,
10 WebKitEmbed *wembed);
11
12 static void webkit_embed_location_changed_cb (GtkMozEmbed *embed,
13 @@ -80,7 +80,7 @@
14
15 struct WebKitEmbedPrivate
16 {
17 - WebKitGtkPage *page;
18 + WebKitPage *page;
19 WebKitEmbedLoadState load_state;
20 };
21
22 @@ -141,7 +141,7 @@
23 static void
24 webkit_embed_init (WebKitEmbed *embed)
25 {
26 - WebKitGtkPage *page;
27 + WebKitPage *page;
28
29 embed->priv = WEBKIT_EMBED_GET_PRIVATE (embed);
30
31 @@ -150,8 +150,8 @@
32
33 gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (embed),
34 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
35 - webkit_gtk_init ();
36 - page = WEBKIT_GTK_PAGE (webkit_gtk_page_new ());
37 + webkit_init ();
38 + page = WEBKIT_PAGE (webkit_page_new ());
39 embed->priv->page = page;
40 gtk_container_add (GTK_CONTAINER (embed), GTK_WIDGET (page));
41 gtk_widget_show (GTK_WIDGET (page));
42 @@ -180,8 +180,8 @@
43
44 #if 0
45 static void
46 -load_started_cb (WebKitGtkPage *page,
47 - WebKitGtkFrame *frame,
48 +load_started_cb (WebKitPage *page,
49 + WebKitFrame *frame,
50 WebKitEmbed *wembed)
51 {
52 g_debug("load-started, emitting ge_location with www.google.com as location");
53 @@ -197,7 +197,7 @@
54
55 g_debug ("a url %s", url);
56
57 - webkit_gtk_page_open (wembed->priv->page, url);
58 + webkit_page_open (wembed->priv->page, url);
59 }
60
61 static char * impl_get_location (EphyEmbed *embed, gboolean toplevel);
62 @@ -211,25 +211,25 @@
63 WebKitEmbed *wembed = WEBKIT_EMBED (embed);
64
65 g_debug ("url %s", url);
66 - webkit_gtk_page_open (wembed->priv->page, url);
67 + webkit_page_open (wembed->priv->page, url);
68 }
69
70 static void
71 impl_stop_load (EphyEmbed *embed)
72 {
73 - webkit_gtk_page_stop_loading (WEBKIT_EMBED (embed)->priv->page);
74 + webkit_page_stop_loading (WEBKIT_EMBED (embed)->priv->page);
75 }
76
77 static gboolean
78 impl_can_go_back (EphyEmbed *embed)
79 {
80 - return webkit_gtk_page_can_go_backward (WEBKIT_EMBED (embed)->priv->page);
81 + return webkit_page_can_go_backward (WEBKIT_EMBED (embed)->priv->page);
82 }
83
84 static gboolean
85 impl_can_go_forward (EphyEmbed *embed)
86 {
87 - return webkit_gtk_page_can_go_forward (WEBKIT_EMBED (embed)->priv->page);
88 + return webkit_page_can_go_forward (WEBKIT_EMBED (embed)->priv->page);
89 }
90
91 static gboolean
92 @@ -247,13 +247,13 @@
93 static void
94 impl_go_back (EphyEmbed *embed)
95 {
96 - webkit_gtk_page_go_backward (WEBKIT_EMBED (embed)->priv->page);
97 + webkit_page_go_backward (WEBKIT_EMBED (embed)->priv->page);
98 }
99
100 static void
101 impl_go_forward (EphyEmbed *embed)
102 {
103 - webkit_gtk_page_go_forward (WEBKIT_EMBED (embed)->priv->page);
104 + webkit_page_go_forward (WEBKIT_EMBED (embed)->priv->page);
105 }
106
107 static void
108 @@ -290,7 +290,7 @@
109 impl_reload (EphyEmbed *embed,
110 gboolean force)
111 {
112 - webkit_gtk_page_reload (WEBKIT_EMBED (embed)->priv->page);
113 + webkit_page_reload (WEBKIT_EMBED (embed)->priv->page);
114 }
115
116 static void
117 --- trunk/configure.ac.old 2007-11-01 07:05:04.000000000 +0100
118 +++ trunk/configure.ac 2007-11-01 07:05:56.000000000 +0100
119 @@ -354,7 +354,7 @@
120 AM_CONDITIONAL([WITH_WEBKIT_ENGINE], test "$with_engine" = "webkit")
121 if test "$with_engine" = "webkit" ; then
122 AC_DEFINE([WITH_WEBKIT_ENGINE],[1],[Define if you wish to enable webkit engine])
123 - PKG_CHECK_MODULES([WEBKIT], WebKitGdk)
124 + PKG_CHECK_MODULES([WEBKIT], WebKitGtk)
125 AC_SUBST([WEBKIT_CFLAGS])
126 AC_SUBST([WEBKIT_LIBS])
127 fi # with_engine = webkit
+0
-270
debian/patches/16_webkit-missing-methods.patch less more
0 --- trunk/embed/webkit/webkit-embed.cpp 2007/10/03 17:44:21 7514
1 +++ trunk/embed/webkit/webkit-embed.cpp 2007/10/06 19:21:14 7517
2 @@ -27,6 +27,7 @@
3 #include "ephy-string.h"
4 #include "ephy-embed-event.h"
5
6 +#include <webkitgtkframe.h>
7 #include <webkitgtkpage.h>
8 #include <webkitgtkglobal.h>
9 #include <string.h>
10 @@ -40,34 +41,6 @@
11 static void webkit_embed_finalize (GObject *object);
12 static void ephy_embed_iface_init (EphyEmbedIface *iface);
13
14 -#if 0
15 -static void load_started_cb (WebKitPage *page,
16 - WebKitFrame *frame,
17 - WebKitEmbed *wembed);
18 -
19 -static void webkit_embed_location_changed_cb (GtkMozEmbed *embed,
20 - WebKitEmbed *membed);
21 -static void webkit_embed_net_state_all_cb (GtkMozEmbed *embed,
22 - const char *aURI,
23 - gint state,
24 - guint status,
25 - WebKitEmbed *membed);
26 -static gboolean webkit_embed_dom_mouse_click_cb(GtkMozEmbed *embed,
27 - gpointer dom_event,
28 - WebKitEmbed *membed);
29 -static gboolean webkit_embed_dom_mouse_down_cb (GtkMozEmbed *embed,
30 -
31 -
32 - WebKitEmbed *membed);
33 -static gboolean webkit_embed_dom_key_press_cb (GtkMozEmbed *embed,
34 - gpointer dom_event,
35 - WebKitEmbed *membed);
36 -static void webkit_embed_new_window_cb (GtkMozEmbed *embed,
37 - GtkMozEmbed **newEmbed,
38 - guint chrome_mask,
39 - WebKitEmbed *membed);
40 -#endif
41 -
42 #define WEBKIT_EMBED_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), WEBKIT_TYPE_EMBED, WebKitEmbedPrivate))
43
44 typedef enum
45 @@ -82,6 +55,7 @@
46 {
47 WebKitPage *page;
48 WebKitEmbedLoadState load_state;
49 + char *loading_uri;
50 };
51
52 static void
53 @@ -121,14 +95,98 @@
54 }
55
56 static void
57 +webkit_embed_title_changed_cb (WebKitFrame *frame,
58 + gchar *title,
59 + gchar *location,
60 + EphyEmbed *embed)
61 +{
62 + /* FIXME: We emit ge-location signal here, but it should really belong
63 + * to a "location_changed" signal by WebKit, as we can change title
64 + * without changing location or change location without changing title
65 + */
66 +
67 + g_signal_emit_by_name (embed, "ge-location", location, NULL);
68 + g_signal_emit_by_name (embed, "title", title, NULL);
69 +}
70 +
71 +static void
72 +update_load_state (WebKitEmbed *embed, WebKitPage *page)
73 +{
74 + EphyEmbedNetState estate = EPHY_EMBED_STATE_UNKNOWN;
75 +
76 + if (embed->priv->load_state == WEBKIT_EMBED_LOAD_STARTED)
77 + estate = (EphyEmbedNetState) (estate |
78 + EPHY_EMBED_STATE_START |
79 + EPHY_EMBED_STATE_NEGOTIATING |
80 + EPHY_EMBED_STATE_IS_REQUEST |
81 + EPHY_EMBED_STATE_IS_NETWORK);
82 +
83 + if (embed->priv->load_state == WEBKIT_EMBED_LOAD_LOADING)
84 + estate = (EphyEmbedNetState) (estate |
85 + EPHY_EMBED_STATE_TRANSFERRING |
86 + EPHY_EMBED_STATE_IS_REQUEST |
87 + EPHY_EMBED_STATE_IS_NETWORK);
88 +
89 + if (embed->priv->load_state == WEBKIT_EMBED_LOAD_STOPPED)
90 + estate = (EphyEmbedNetState) (estate |
91 + EPHY_EMBED_STATE_STOP |
92 + EPHY_EMBED_STATE_IS_DOCUMENT |
93 + EPHY_EMBED_STATE_IS_NETWORK);
94 +
95 + g_signal_emit_by_name (EPHY_EMBED (embed), "ge_net_state",
96 + embed->priv->loading_uri, estate);
97 +}
98 +
99 +static void
100 +webkit_embed_load_started_cb (WebKitPage *page,
101 + WebKitFrame *frame,
102 + EphyEmbed *embed)
103 +{
104 + WebKitEmbed *wembed = WEBKIT_EMBED (embed);
105 + wembed->priv->load_state = WEBKIT_EMBED_LOAD_STARTED;
106 +
107 + update_load_state (wembed, page);
108 +}
109 +
110 +static void
111 +webkit_embed_load_progress_changed_cb (WebKitPage *page,
112 + int progress,
113 + EphyEmbed *embed)
114 +{
115 + WebKitEmbed *wembed = WEBKIT_EMBED (embed);
116 +
117 + if (wembed->priv->load_state == WEBKIT_EMBED_LOAD_STARTED)
118 + wembed->priv->load_state = WEBKIT_EMBED_LOAD_LOADING;
119 +
120 + /* FIXME: EphyTab seems to have a strange way of calculating progress,
121 + * and it's not compatible with the simple integer value WebKit emits.
122 + * EphyTab IMHO should use "progress" signal from GtkMozEmbed. That way,
123 + * we could use the same functions for WebKit too.
124 + */
125 +
126 + update_load_state (wembed, page);
127 +}
128 +
129 +static void
130 +webkit_embed_load_finished_cb (WebKitPage *page,
131 + WebKitFrame *frame,
132 + EphyEmbed *embed)
133 +{
134 + WebKitEmbed *wembed = WEBKIT_EMBED (embed);
135 + wembed->priv->load_state = WEBKIT_EMBED_LOAD_STOPPED;
136 +
137 + update_load_state (wembed, page);
138 +
139 + g_signal_emit_by_name (embed, "net-stop", NULL);
140 +}
141 +
142 +static void
143 webkit_embed_class_init (WebKitEmbedClass *klass)
144 {
145 GObjectClass *object_class = G_OBJECT_CLASS (klass);
146 GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass);
147 GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
148
149 - webkit_embed_parent_class = (GObjectClass *) g_type_class_peek_parent (klass);
150 -
151 object_class->finalize = webkit_embed_finalize;
152
153 gtk_object_class->destroy = webkit_embed_destroy;
154 @@ -144,6 +202,7 @@
155 WebKitPage *page;
156
157 embed->priv = WEBKIT_EMBED_GET_PRIVATE (embed);
158 + embed->priv->loading_uri = NULL;
159
160 gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (embed), NULL);
161 gtk_scrolled_window_set_hadjustment (GTK_SCROLLED_WINDOW (embed), NULL);
162 @@ -156,14 +215,14 @@
163 gtk_container_add (GTK_CONTAINER (embed), GTK_WIDGET (page));
164 gtk_widget_show (GTK_WIDGET (page));
165
166 -#if 0
167 g_signal_connect (G_OBJECT (page), "load-started",
168 - G_CALLBACK (load_started_cb), embed);
169 + G_CALLBACK (webkit_embed_load_started_cb), embed);
170 + g_signal_connect (G_OBJECT (page), "load_finished",
171 + G_CALLBACK (webkit_embed_load_finished_cb), embed);
172 g_signal_connect (G_OBJECT (page), "title-changed",
173 - G_CALLBACK (title_changed_cb), page);
174 + G_CALLBACK (webkit_embed_title_changed_cb), embed);
175 g_signal_connect (G_OBJECT (page), "load-progress-changed",
176 - G_CALLBACK (load_progress_changed), page);
177 -#endif
178 + G_CALLBACK (webkit_embed_load_progress_changed_cb), embed);
179 }
180
181 static void
182 @@ -175,19 +234,12 @@
183 static void
184 webkit_embed_finalize (GObject *object)
185 {
186 - G_OBJECT_CLASS (webkit_embed_parent_class)->finalize (object);
187 -}
188 + WebKitEmbed *wembed = WEBKIT_EMBED (object);
189
190 -#if 0
191 -static void
192 -load_started_cb (WebKitPage *page,
193 - WebKitFrame *frame,
194 - WebKitEmbed *wembed)
195 -{
196 - g_debug("load-started, emitting ge_location with www.google.com as location");
197 - g_signal_emit_by_name (wembed, "ge_location", "www.google.com");
198 + g_free (wembed->priv->loading_uri);
199 +
200 + G_OBJECT_CLASS (webkit_embed_parent_class)->finalize (object);
201 }
202 -#endif
203
204 static void
205 impl_load_url (EphyEmbed *embed,
206 @@ -195,13 +247,9 @@
207 {
208 WebKitEmbed *wembed = WEBKIT_EMBED (embed);
209
210 - g_debug ("a url %s", url);
211 -
212 webkit_page_open (wembed->priv->page, url);
213 }
214
215 -static char * impl_get_location (EphyEmbed *embed, gboolean toplevel);
216 -
217 static void
218 impl_load (EphyEmbed *embed,
219 const char *url,
220 @@ -209,9 +257,27 @@
221 EphyEmbed *preview_embed)
222 {
223 WebKitEmbed *wembed = WEBKIT_EMBED (embed);
224 + char *effective_url = NULL;
225
226 - g_debug ("url %s", url);
227 - webkit_page_open (wembed->priv->page, url);
228 + /* FIXME: WebKit has some strange bug for which there must be
229 + * protocol prefix into the parsed URL, or it will not show images
230 + * and lock badly. I copied this function from WebKit's
231 + * GdkLauncher.
232 + */
233 + if (strncmp ("http://", url, 7) != 0 &&
234 + strncmp ("https://", url, 8) != 0 &&
235 + strncmp ("file://", url, 7) != 0 &&
236 + strncmp ("ftp://", url, 6) != 0)
237 + effective_url = g_strconcat ("http://", url, NULL);
238 + else
239 + effective_url = g_strdup (url);
240 +
241 + g_free (wembed->priv->loading_uri);
242 + wembed->priv->loading_uri = g_strdup (effective_url);
243 +
244 + webkit_page_open (wembed->priv->page, effective_url);
245 +
246 + g_free (effective_url);
247 }
248
249 static void
250 @@ -264,7 +330,8 @@
251 static char *
252 impl_get_title (EphyEmbed *embed)
253 {
254 - return NULL;
255 + WebKitFrame *frame = webkit_page_get_main_frame (WEBKIT_EMBED (embed)->priv->page);
256 + return g_strdup (webkit_frame_get_title (frame));
257 }
258
259 static char *
260 @@ -283,7 +350,8 @@
261 impl_get_location (EphyEmbed *embed,
262 gboolean toplevel)
263 {
264 - return NULL;
265 + WebKitFrame *frame = webkit_page_get_main_frame (WEBKIT_EMBED (embed)->priv->page);
266 + return g_strdup (webkit_frame_get_location (frame));
267 }
268
269 static void
+0
-21
debian/patches/17_webkit-signal-emission.patch less more
0 --- trunk/embed/webkit/webkit-embed.cpp 2007/10/06 19:21:14 7517
1 +++ trunk/embed/webkit/webkit-embed.cpp 2007/10/06 19:46:44 7518
2 @@ -105,8 +105,7 @@
3 * without changing location or change location without changing title
4 */
5
6 - g_signal_emit_by_name (embed, "ge-location", location, NULL);
7 - g_signal_emit_by_name (embed, "title", title, NULL);
8 + g_signal_emit_by_name (embed, "ge-location", location);
9 }
10
11 static void
12 @@ -176,8 +175,6 @@
13 wembed->priv->load_state = WEBKIT_EMBED_LOAD_STOPPED;
14
15 update_load_state (wembed, page);
16 -
17 - g_signal_emit_by_name (embed, "net-stop", NULL);
18 }
19
20 static void
+24
-83
debian/patches/99_autoreconf.patch less more
11 aclocal-1.10 -I m4
22 automake-1.10
33 autoconf
4 Index: epiphany-2.20.3/aclocal.m4
5 ===================================================================
6 --- epiphany-2.20.3.orig/aclocal.m4 2008-01-07 23:48:06.000000000 +0100
7 +++ epiphany-2.20.3/aclocal.m4 2008-01-12 02:27:56.227547229 +0100
8 @@ -682,7 +682,7 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
4 Index: epiphany-browser-2.21.4/aclocal.m4
5 ===================================================================
6 --- epiphany-browser-2.21.4.orig/aclocal.m4 2007-12-16 13:26:10.000000000 +0000
7 +++ epiphany-browser-2.21.4/aclocal.m4 2008-01-14 22:05:28.000000000 +0000
8 @@ -682,7 +682,7 @@
99
1010 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
1111
1414
1515
1616 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
17 Index: epiphany-2.20.3/configure
18 ===================================================================
19 --- epiphany-2.20.3.orig/configure 2008-01-07 23:48:19.000000000 +0100
20 +++ epiphany-2.20.3/configure 2008-01-12 02:28:22.049018711 +0100
21 @@ -727,7 +727,7 @@ SHELL=${CONFIG_SHELL-/bin/sh}
17 Index: epiphany-browser-2.21.4/configure
18 ===================================================================
19 --- epiphany-browser-2.21.4.orig/configure 2007-12-16 13:26:26.000000000 +0000
20 +++ epiphany-browser-2.21.4/configure 2008-01-14 22:05:55.000000000 +0000
21 @@ -727,7 +727,7 @@
2222
2323 # Identity of this package.
2424 PACKAGE_NAME='GNOME Web Browser'
2525 -PACKAGE_TARNAME='epiphany'
2626 +PACKAGE_TARNAME='epiphany-browser'
27 PACKAGE_VERSION='2.20.3'
28 PACKAGE_STRING='GNOME Web Browser 2.20.3'
27 PACKAGE_VERSION='2.21.4'
28 PACKAGE_STRING='GNOME Web Browser 2.21.4'
2929 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany'
30 @@ -1606,7 +1606,7 @@ Fine tuning of the installation director
30 @@ -1658,7 +1658,7 @@
3131 --infodir=DIR info documentation [DATAROOTDIR/info]
3232 --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
3333 --mandir=DIR man documentation [DATAROOTDIR/man]
3636 --htmldir=DIR html documentation [DOCDIR]
3737 --dvidir=DIR dvi documentation [DOCDIR]
3838 --pdfdir=DIR pdf documentation [DOCDIR]
39 @@ -2527,7 +2527,7 @@ fi
39 @@ -2608,7 +2608,7 @@
4040
4141
4242 # Define the identity of the package.
4343 - PACKAGE='epiphany'
4444 + PACKAGE='epiphany-browser'
45 VERSION='2.20.3'
46
47
48 @@ -26353,12 +26353,12 @@ if test -n "$PKG_CONFIG"; then
49 pkg_cv_WEBKIT_CFLAGS="$WEBKIT_CFLAGS"
50 else
51 if test -n "$PKG_CONFIG" && \
52 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"WebKitGdk\"") >&5
53 - ($PKG_CONFIG --exists --print-errors "WebKitGdk") 2>&5
54 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"WebKitGtk\"") >&5
55 + ($PKG_CONFIG --exists --print-errors "WebKitGtk") 2>&5
56 ac_status=$?
57 echo "$as_me:$LINENO: \$? = $ac_status" >&5
58 (exit $ac_status); }; then
59 - pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "WebKitGdk" 2>/dev/null`
60 + pkg_cv_WEBKIT_CFLAGS=`$PKG_CONFIG --cflags "WebKitGtk" 2>/dev/null`
61 else
62 pkg_failed=yes
63 fi
64 @@ -26371,12 +26371,12 @@ if test -n "$PKG_CONFIG"; then
65 pkg_cv_WEBKIT_LIBS="$WEBKIT_LIBS"
66 else
67 if test -n "$PKG_CONFIG" && \
68 - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"WebKitGdk\"") >&5
69 - ($PKG_CONFIG --exists --print-errors "WebKitGdk") 2>&5
70 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"WebKitGtk\"") >&5
71 + ($PKG_CONFIG --exists --print-errors "WebKitGtk") 2>&5
72 ac_status=$?
73 echo "$as_me:$LINENO: \$? = $ac_status" >&5
74 (exit $ac_status); }; then
75 - pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "WebKitGdk" 2>/dev/null`
76 + pkg_cv_WEBKIT_LIBS=`$PKG_CONFIG --libs "WebKitGtk" 2>/dev/null`
77 else
78 pkg_failed=yes
79 fi
80 @@ -26395,14 +26395,14 @@ else
81 _pkg_short_errors_supported=no
82 fi
83 if test $_pkg_short_errors_supported = yes; then
84 - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "WebKitGdk"`
85 + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "WebKitGtk"`
86 else
87 - WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "WebKitGdk"`
88 + WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "WebKitGtk"`
89 fi
90 # Put the nasty error message in config.log where it belongs
91 echo "$WEBKIT_PKG_ERRORS" >&5
92
93 - { { echo "$as_me:$LINENO: error: Package requirements (WebKitGdk) were not met:
94 + { { echo "$as_me:$LINENO: error: Package requirements (WebKitGtk) were not met:
95
96 $WEBKIT_PKG_ERRORS
97
98 @@ -26413,7 +26413,7 @@ Alternatively, you may set the environme
99 and WEBKIT_LIBS to avoid the need to call pkg-config.
100 See the pkg-config man page for more details.
101 " >&5
102 -echo "$as_me: error: Package requirements (WebKitGdk) were not met:
103 +echo "$as_me: error: Package requirements (WebKitGtk) were not met:
104
105 $WEBKIT_PKG_ERRORS
106
107 Index: epiphany-2.20.3/gtk-doc.make
45 VERSION='2.21.4'
46
47
48 Index: epiphany-browser-2.21.4/gtk-doc.make
10849 ===================================================================
10950 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
110 +++ epiphany-2.20.3/gtk-doc.make 2008-01-12 02:27:03.808560042 +0100
51 +++ epiphany-browser-2.21.4/gtk-doc.make 2008-01-14 22:05:28.000000000 +0000
11152 @@ -0,0 +1,174 @@
11253 +# -*- mode: makefile -*-
11354 +
283224 + -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
284225 +
285226 +.PHONY : dist-hook-local docs
286 Index: epiphany-2.20.3/ltmain.sh
287 ===================================================================
288 --- epiphany-2.20.3.orig/ltmain.sh 2007-08-01 16:12:57.000000000 +0200
289 +++ epiphany-2.20.3/ltmain.sh 2007-11-27 21:09:41.000000000 +0100
290 @@ -43,7 +43,7 @@ EXIT_FAILURE=1
227 Index: epiphany-browser-2.21.4/ltmain.sh
228 ===================================================================
229 --- epiphany-browser-2.21.4.orig/ltmain.sh 2007-08-01 15:12:57.000000000 +0100
230 +++ epiphany-browser-2.21.4/ltmain.sh 2007-11-27 21:23:09.000000000 +0000
231 @@ -43,7 +43,7 @@
291232
292233 PROGRAM=ltmain.sh
293234 PACKAGE=libtool
+0
-5
debian/patches/series less more
99 09_download_dialog.patch -p0
1010 10_url_double-click.patch
1111 11_useragent-weasel.patch
12 13_powered-by.patch
13 14_webkit-scrollbars.patch
14 15_webkit-gtk-api.patch
15 16_webkit-missing-methods.patch
16 17_webkit-signal-emission.patch
1712 99_autoreconf.patch
+2
-0
debian/rules less more
00 #!/usr/bin/make -f
1
2 include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
13
24 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
35 DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')