[orca/new-settings: 18/18] Merge from master

[Juanje Ojeda Croissier <jojeda src gnome org>]

commit fd317a8fb60d80761d6c264927b2a5637c058c7a
Merge: 653ce00 ede0bd4
Author: Juanje Ojeda <jojeda emergya es>
Date:   Mon Sep 27 11:47:35 2010 +0200

    Merge from master

 README                                             |    2 +-
 configure.in                                       |    4 +-
 po/POTFILES.in                                     |    2 +
 po/cs.po                                           |  291 +-
 po/da.po                                           | 3363 +++++++++++++-------
 po/it.po                                           | 3304 +++++++++++++-------
 po/ja.po                                           | 1216 ++++----
 po/pl.po                                           | 3320 +++++++++++++-------
 po/pt_BR.po                                        | 3377 +++++++++++++-------
 src/orca/scripts/apps/Makefile.am                  |    1 +
 src/orca/scripts/apps/epiphany/Makefile.am         |    7 +
 src/orca/scripts/apps/epiphany/__init__.py         |   20 +
 src/orca/scripts/apps/epiphany/script.py           |   70 +
 src/orca/scripts/apps/soffice/script.py            |   12 +-
 src/orca/scripts/toolkits/Makefile.am              |    2 +-
 src/orca/scripts/toolkits/WebKitGtk/Makefile.am    |   11 +
 src/orca/scripts/toolkits/WebKitGtk/__init__.py    |    1 +
 .../toolkits/WebKitGtk/braille_generator.py        |   67 +
 src/orca/scripts/toolkits/WebKitGtk/script.py      |  163 +
 .../scripts/toolkits/WebKitGtk/script_utilities.py |   74 +
 .../scripts/toolkits/WebKitGtk/speech_generator.py |   97 +
 .../toolkits/WebKitGtk/structural_navigation.py    |   62 +
 src/orca/settings.py                               |    4 +-
 test/harness/runone.sh                             |   17 +
 test/html/EpiphanyProfile/bookmarks.rdf            |   38 +
 test/html/EpiphanyProfile/states.xml               |   27 +
 26 files changed, 10176 insertions(+), 5376 deletions(-)
---
diff --cc configure.in
index 027f538,0ca1e31..ee07e55
--- a/configure.in
+++ b/configure.in
@@@ -126,7 -127,7 +127,8 @@@ src/orca/scripts/toolkits/Makefil
  src/orca/scripts/toolkits/Gecko/Makefile
  src/orca/scripts/toolkits/J2SE-access-bridge/Makefile
  src/orca/scripts/toolkits/CALLY/Makefile
+ src/orca/scripts/toolkits/WebKitGtk/Makefile
 +src/orca/backends/Makefile
  src/orca/orca
  src/orca/orca_i18n.py
  src/orca/orca_platform.py