~noskcaj/ubuntu/wily/epiphany-browser/merge

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
[encoding: UTF-8]
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
[type: gettext/xml]data/default-bookmarks.rdf.in
data/epiphany.appdata.xml.in
data/epiphany.desktop.in.in
data/org.gnome.epiphany.gschema.xml
embed/ephy-about-handler.c
embed/ephy-download.c
embed/ephy-embed.c
embed/ephy-embed-shell.c
embed/ephy-embed-utils.c
embed/ephy-encodings.c
embed/ephy-find-toolbar.c
embed/ephy-web-view.c
lib/ephy-file-chooser.c
lib/ephy-file-helpers.c
lib/ephy-form-auth-data.c
lib/ephy-gui.c
lib/ephy-langs.c
lib/ephy-node.c
lib/ephy-nss-glue.c
lib/ephy-profile-migrator.c
lib/ephy-string.c
lib/ephy-time-helpers.c
lib/ephy-zoom.h
lib/history/ephy-history-service-hosts-table.c
lib/widgets/ephy-certificate-dialog.c
lib/widgets/ephy-certificate-popover.c
lib/widgets/ephy-download-widget.c
lib/widgets/ephy-location-entry.c
src/bookmarks/ephy-bookmark-action.c
src/bookmarks/ephy-bookmark-properties.c
src/bookmarks/ephy-bookmarks.c
src/bookmarks/ephy-bookmarks-editor.c
src/bookmarks/ephy-bookmarks-import.c
src/bookmarks/ephy-bookmarks-menu.c
src/bookmarks/ephy-bookmarks-ui.c
src/bookmarks/ephy-open-tabs-action.c
src/bookmarks/ephy-topic-action.c
src/bookmarks/ephy-topics-entry.c
src/bookmarks/ephy-topics-palette.c
[type: gettext/glade]src/resources/clear-data-dialog.ui
[type: gettext/glade]src/resources/cookies-dialog.ui
[type: gettext/glade]src/resources/encoding-dialog.ui
[type: gettext/glade]src/resources/epiphany-application-menu.ui
[type: gettext/glade]src/resources/history-dialog.ui
[type: gettext/glade]src/resources/passwords-dialog.ui
[type: gettext/glade]src/resources/prefs-dialog.ui
[type: gettext/glade]src/resources/prefs-lang-dialog.ui
src/ephy-combined-stop-reload-action.c
src/ephy-encoding-dialog.c
src/ephy-encoding-menu.c
src/ephy-history-window.c
src/ephy-main.c
src/ephy-notebook.c
src/ephy-search-provider.c
src/ephy-session.c
src/ephy-shell.c
src/ephy-window.c
src/popup-commands.c
src/prefs-dialog.c
src/clear-data-dialog.c
src/cookies-dialog.c
src/passwords-dialog.c
src/window-commands.c