[orca/new-settings: 24/24] Resolved merge conflic
- From: Juanje Ojeda Croissier <jojeda src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca/new-settings: 24/24] Resolved merge conflic
- Date: Fri, 5 Nov 2010 10:19:52 +0000 (UTC)
commit 92de6defb36708be47274bf4fe6f9d8e65d89250
Merge: 3fd4eba 030483e
Author: Juanje Ojeda <jojeda emergya es>
Date: Fri Nov 5 09:58:55 2010 +0100
Resolved merge conflic
COPYING | 216 +-
NEWS | 64 +
README | 6 +-
configure.in | 3 +-
po/LINGUAS | 1 +
po/POTFILES.in | 1 -
po/ast.po |10655 ++++++++++++++++++++
po/bg.po | 256 +-
po/ca.po | 3285 ++++---
po/ca valencia po | 3362 ++++---
po/de.po | 512 +-
po/el.po | 939 +-
po/et.po | 4334 ++++++---
po/gl.po | 291 +-
po/ja.po | 365 +-
po/sl.po | 335 +-
src/orca/Makefile.am | 1 -
src/orca/acss.py | 8 +-
src/orca/app_gui_prefs.py | 11 +-
src/orca/app_prefs.py | 8 +-
src/orca/bookmarks.py | 8 +-
src/orca/braille.py | 8 +-
src/orca/braille_generator.py | 8 +-
src/orca/brlmon.py | 8 +-
src/orca/chat.py | 8 +-
src/orca/chnames.py | 8 +-
src/orca/common_keyboardmap.py | 8 +-
src/orca/dbusserver.py | 8 +-
src/orca/debug.py | 8 +-
src/orca/dectalk.py | 8 +-
src/orca/default.py | 16 +-
src/orca/desktop_keyboardmap.py | 8 +-
src/orca/espeechfactory.py | 8 +-
src/orca/eventsynthesizer.py | 8 +-
src/orca/find.py | 8 +-
src/orca/flat_review.py | 8 +-
src/orca/focus_tracking_presenter.py | 8 +-
src/orca/formatting.py | 8 +-
src/orca/generator.py | 8 +-
src/orca/gnomespeechfactory.py | 8 +-
src/orca/gsmag.py | 24 +-
src/orca/httpserver.py | 8 +-
src/orca/input_event.py | 8 +-
src/orca/keybindings.py | 8 +-
src/orca/keynames.py | 8 +-
src/orca/laptop_keyboardmap.py | 8 +-
src/orca/mag.py | 8 +-
src/orca/mouse_review.py | 8 +-
src/orca/notification_messages.py | 8 +-
src/orca/openttsfactory.py | 500 -
src/orca/orca.in | 8 +-
src/orca/orca.py | 10 +-
src/orca/orca_console_prefs.py | 8 +-
src/orca/orca_gtkbuilder.py | 8 +-
src/orca/orca_gui_find.py | 8 +-
src/orca/orca_gui_main.py | 16 +-
src/orca/orca_gui_prefs.py | 8 +-
src/orca/orca_gui_splash.py | 9 +-
src/orca/orca_i18n.py.in | 8 +-
src/orca/orca_platform.py.in | 8 +-
src/orca/orca_prefs.py | 8 +-
src/orca/orca_quit.py | 8 +-
src/orca/orca_state.py | 8 +-
src/orca/outline.py | 8 +-
src/orca/outloud.py | 8 +-
src/orca/phonnames.py | 8 +-
src/orca/presentation_manager.py | 8 +-
src/orca/pronunciation_dict.py | 8 +-
src/orca/punctuation_settings.py | 8 +-
src/orca/rolenames.py | 8 +-
src/orca/script.py | 8 +-
src/orca/script_utilities.py | 8 +-
src/orca/scripts/apps/Eclipse/script.py | 8 +-
src/orca/scripts/apps/Eclipse/script_utilities.py | 8 +-
src/orca/scripts/apps/Instantbird/__init__.py | 8 +-
src/orca/scripts/apps/Instantbird/chat.py | 8 +-
src/orca/scripts/apps/Instantbird/script.py | 8 +-
.../scripts/apps/Instantbird/script_utilities.py | 8 +-
src/orca/scripts/apps/Mozilla/__init__.py | 8 +-
src/orca/scripts/apps/Mozilla/script.py | 8 +-
src/orca/scripts/apps/Thunderbird/__init__.py | 12 +-
src/orca/scripts/apps/Thunderbird/formatting.py | 8 +-
src/orca/scripts/apps/Thunderbird/script.py | 8 +-
.../scripts/apps/Thunderbird/script_settings.py | 8 +-
.../scripts/apps/Thunderbird/script_utilities.py | 8 +-
.../scripts/apps/Thunderbird/speech_generator.py | 8 +-
src/orca/scripts/apps/acroread/__init__.py | 8 +-
src/orca/scripts/apps/acroread/script.py | 8 +-
src/orca/scripts/apps/ddu/__init__.py | 8 +-
src/orca/scripts/apps/ddu/script.py | 8 +-
src/orca/scripts/apps/ddu/script_utilities.py | 8 +-
src/orca/scripts/apps/ekiga/__init__.py | 8 +-
src/orca/scripts/apps/ekiga/script.py | 8 +-
src/orca/scripts/apps/empathy/__init__.py | 8 +-
src/orca/scripts/apps/empathy/script.py | 8 +-
src/orca/scripts/apps/empathy/script_utilities.py | 8 +-
src/orca/scripts/apps/epiphany/__init__.py | 8 +-
src/orca/scripts/apps/epiphany/script.py | 8 +-
src/orca/scripts/apps/evolution/__init__.py | 8 +-
src/orca/scripts/apps/evolution/formatting.py | 8 +-
src/orca/scripts/apps/evolution/script.py | 8 +-
.../scripts/apps/evolution/script_utilities.py | 8 +-
.../scripts/apps/evolution/speech_generator.py | 8 +-
src/orca/scripts/apps/gajim/__init__.py | 8 +-
src/orca/scripts/apps/gajim/script.py | 8 +-
src/orca/scripts/apps/gcalctool/__init__.py | 8 +-
src/orca/scripts/apps/gcalctool/script.py | 8 +-
.../scripts/apps/gcalctool/speech_generator.py | 8 +-
src/orca/scripts/apps/gdmlogin/__init__.py | 8 +-
src/orca/scripts/apps/gdmlogin/script.py | 9 +-
src/orca/scripts/apps/gedit/__init__.py | 8 +-
src/orca/scripts/apps/gedit/script.py | 8 +-
.../scripts/apps/gnome-keyring-ask/__init__.py | 8 +-
src/orca/scripts/apps/gnome-keyring-ask/script.py | 8 +-
src/orca/scripts/apps/gnome-mud/__init__.py | 8 +-
src/orca/scripts/apps/gnome-mud/script.py | 8 +-
src/orca/scripts/apps/gnome-panel/Makefile.am | 3 +-
src/orca/scripts/apps/gnome-panel/__init__.py | 8 +-
src/orca/scripts/apps/gnome-panel/script.py | 15 +-
.../scripts/apps/gnome-panel/speech_generator.py | 62 +
.../apps/gnome-screensaver-dialog/__init__.py | 9 +-
.../apps/gnome-screensaver-dialog/script.py | 8 +-
.../scripts/apps/gnome-search-tool/__init__.py | 8 +-
src/orca/scripts/apps/gnome-search-tool/script.py | 8 +-
.../scripts/apps/gnome-system-monitor/__init__.py | 8 +-
.../scripts/apps/gnome-system-monitor/script.py | 8 +-
src/orca/scripts/apps/gnome-terminal/__init__.py | 8 +-
src/orca/scripts/apps/gnome-terminal/script.py | 8 +-
.../apps/gnome-window-properties/__init__.py | 8 +-
.../apps/gnome-window-properties/formatting.py | 8 +-
.../scripts/apps/gnome-window-properties/script.py | 8 +-
src/orca/scripts/apps/gnome_segv2/__init__.py | 8 +-
src/orca/scripts/apps/gnome_segv2/script.py | 8 +-
.../scripts/apps/gtk-window-decorator/__init__.py | 8 +-
.../scripts/apps/gtk-window-decorator/script.py | 8 +-
src/orca/scripts/apps/liferea/__init__.py | 8 +-
src/orca/scripts/apps/liferea/script.py | 8 +-
src/orca/scripts/apps/metacity/__init__.py | 8 +-
src/orca/scripts/apps/metacity/script.py | 8 +-
src/orca/scripts/apps/nautilus/__init__.py | 8 +-
src/orca/scripts/apps/nautilus/script.py | 8 +-
.../scripts/apps/notification-daemon/__init__.py | 8 +-
.../scripts/apps/notification-daemon/script.py | 8 +-
src/orca/scripts/apps/notify-osd/__init__.py | 8 +-
src/orca/scripts/apps/notify-osd/script.py | 8 +-
src/orca/scripts/apps/packagemanager/__init__.py | 8 +-
.../apps/packagemanager/braille_generator.py | 8 +-
src/orca/scripts/apps/packagemanager/script.py | 8 +-
.../scripts/apps/packagemanager/script_settings.py | 8 +-
.../apps/packagemanager/script_utilities.py | 8 +-
.../apps/packagemanager/speech_generator.py | 8 +-
.../apps/packagemanager/tutorialgenerator.py | 8 +-
src/orca/scripts/apps/pidgin/__init__.py | 8 +-
src/orca/scripts/apps/pidgin/chat.py | 8 +-
src/orca/scripts/apps/pidgin/script.py | 8 +-
src/orca/scripts/apps/pidgin/script_utilities.py | 8 +-
src/orca/scripts/apps/pidgin/speech_generator.py | 8 +-
src/orca/scripts/apps/planner/__init__.py | 8 +-
src/orca/scripts/apps/planner/braille_generator.py | 8 +-
src/orca/scripts/apps/planner/script.py | 8 +-
src/orca/scripts/apps/planner/speech_generator.py | 8 +-
src/orca/scripts/apps/rhythmbox/__init__.py | 12 +-
.../scripts/apps/rhythmbox/braille_generator.py | 8 +-
src/orca/scripts/apps/rhythmbox/formatting.py | 8 +-
src/orca/scripts/apps/rhythmbox/script.py | 8 +-
.../scripts/apps/rhythmbox/speech_generator.py | 8 +-
src/orca/scripts/apps/soffice/braille_generator.py | 8 +-
src/orca/scripts/apps/soffice/formatting.py | 8 +-
src/orca/scripts/apps/soffice/script.py | 8 +-
src/orca/scripts/apps/soffice/script_settings.py | 8 +-
src/orca/scripts/apps/soffice/script_utilities.py | 8 +-
src/orca/scripts/apps/soffice/speech_generator.py | 8 +-
.../scripts/apps/soffice/structural_navigation.py | 8 +-
src/orca/scripts/apps/yelp/__init__.py | 12 +-
src/orca/scripts/apps/yelp/script.py | 8 +-
src/orca/scripts/apps/yelp/script_settings.py | 8 +-
src/orca/scripts/apps/yelp/script_utilities.py | 8 +-
src/orca/scripts/self_voicing.py | 8 +-
src/orca/scripts/toolkits/CALLY/script.py | 8 +-
src/orca/scripts/toolkits/GAIL.py | 8 +-
src/orca/scripts/toolkits/Gecko/bookmarks.py | 8 +-
.../scripts/toolkits/Gecko/braille_generator.py | 9 +-
src/orca/scripts/toolkits/Gecko/formatting.py | 8 +-
src/orca/scripts/toolkits/Gecko/keymaps.py | 8 +-
src/orca/scripts/toolkits/Gecko/script.py | 8 +-
src/orca/scripts/toolkits/Gecko/script_settings.py | 8 +-
.../scripts/toolkits/Gecko/script_utilities.py | 8 +-
.../scripts/toolkits/Gecko/speech_generator.py | 8 +-
.../toolkits/Gecko/structural_navigation.py | 8 +-
.../toolkits/J2SE-access-bridge/formatting.py | 8 +-
.../scripts/toolkits/J2SE-access-bridge/script.py | 8 +-
.../J2SE-access-bridge/script_utilities.py | 8 +-
.../J2SE-access-bridge/speech_generator.py | 8 +-
src/orca/scripts/toolkits/VCL.py | 8 +-
.../toolkits/WebKitGtk/braille_generator.py | 8 +-
src/orca/scripts/toolkits/WebKitGtk/script.py | 8 +-
.../scripts/toolkits/WebKitGtk/script_utilities.py | 8 +-
.../scripts/toolkits/WebKitGtk/speech_generator.py | 8 +-
.../toolkits/WebKitGtk/structural_navigation.py | 8 +-
src/orca/settings.py | 9 +-
src/orca/sound.py | 8 +-
src/orca/speech.py | 8 +-
src/orca/speech_generator.py | 8 +-
src/orca/speechdispatcherfactory.py | 8 +-
src/orca/speechserver.py | 8 +-
src/orca/structural_navigation.py | 8 +-
src/orca/text_attribute_names.py | 8 +-
src/orca/tutorialgenerator.py | 8 +-
src/orca/where_am_I.py | 8 +-
209 files changed, 20316 insertions(+), 6448 deletions(-)
---
diff --cc configure.in
index 7a477e2,7b268f8..d24f1b1
--- a/configure.in
+++ b/configure.in
@@@ -53,7 -53,7 +53,8 @@@ AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Cou
AM_CHECK_PYMOD(pyatspi,,,[AC_MSG_ERROR(Could not find python module: pyatspi)])
AM_CHECK_PYMOD(cairo,,,[AC_MSG_ERROR(Could not find python module: cairo)])
AM_CHECK_PYMOD(pango,,,[AC_MSG_ERROR(Could not find python module: pango)])
+AM_CHECK_PYMOD(yaml,,,[AC_MSG_ERROR(Could not find python module: yaml)])
+ AM_CHECK_PYMOD(xdg,,,[AC_MSG_ERROR(Could not find python module: xdg)])
AM_CHECK_PYMOD(wnck,,[wnck_available="yes"],[wnck_available="no"])
AM_CHECK_PYORBIT_MOD(GNOME_Speech,[gnome_speech_available="yes"],[gnome_speech_available="no"])
AM_CHECK_PYORBIT_MOD(GNOME_Magnifier,[gnome_mag_available="yes"],[gnome_mag_available="no"])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
