[glom/spread-table: 22/22] Fix merge conflict

[Murray Cumming <murrayc src gnome org>]

commit d3ddb661fe11f4e282cbc31d9640bde2ac8fa1e7
Merge: 8fb37e8 1d2408e
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Nov 4 17:03:51 2010 +0100

    Fix merge conflict

 ChangeLog                                          |   81 +-
 Makefile.am                                        |    8 +-
 Makefile_glom.am                                   |    2 -
 NEWS                                               |   46 +
 configure.ac                                       |   10 +-
 docs/pyglom_reference/Makefile.am                  |    2 +-
 docs/user-guide/Makefile.am                        |    2 +-
 docs/user-guide/sl/sl.po                           | 1020 +++++
 glom/bakery/app_withdoc.cc                         |    1 -
 glom/glom_developer.glade                          |   16 +-
 glom/libglom/example_document_load.cc              |    2 +
 glom/libglom/init.h                                |    4 +-
 glom/libglom/test_connectionpool.cc                |   11 +-
 glom/libglom/test_sharedptr_layoutitem.cc          |   17 +-
 glom/mode_data/datawidget/combo.cc                 |   74 +-
 glom/mode_data/datawidget/combo.h                  |    3 +-
 .../datawidget/combochoiceswithtreemodel.cc        |    3 +-
 glom/mode_data/datawidget/comboentry.cc            |  427 --
 glom/mode_data/datawidget/comboentry.h             |  121 -
 glom/mode_data/datawidget/datawidget.cc            |    3 +-
 .../datawidget/treemodel_db_withextratext.h        |    2 +-
 glom/mode_design/comboentry_currency.cc            |    8 +-
 glom/mode_design/comboentry_currency.h             |    4 +-
 glom/mode_design/dialog_add_related_table.cc       |    2 +-
 glom/mode_design/fields/dialog_fielddefinition.cc  |    2 +-
 .../layout_item_dialogs/comboentry_borderwidth.cc  |    8 +-
 .../layout_item_dialogs/comboentry_borderwidth.h   |    4 +-
 .../script_library/dialog_script_library.cc        |    2 +-
 glom/mode_design/users/dialog_users_list.cc        |    4 +-
 glom/python_embed/python_module/py_glom_module.cc  |    2 +-
 glom/variablesmap.cc                               |   15 +-
 glom/variablesmap.h                                |    4 +-
 po/LINGUAS                                         |    1 +
 po/POTFILES.in                                     |    1 -
 po/ca valencia po                                  | 4401 ++++++++++++++++++++
 po/fr.po                                           |  701 ++--
 po/zh_CN.po                                        | 3790 ++++++++++++++++-
 tests/test_document_autosave.cc                    |    1 +
 tests/test_document_load.cc                        |   16 +-
 tests/test_load_python_library.cc                  |    5 +-
 tests/test_parsing_time.cc                         |    9 +-
 tests/test_python_execute_func.cc                  |    4 +-
 tests/test_python_execute_func_bad_syntax.cc       |    8 +-
 .../test_python_execute_func_change_result_type.cc |    4 +-
 tests/test_python_execute_script.cc                |    3 +-
 tests/test_selfhosting_new_empty.cc                |    1 +
 tests/test_selfhosting_new_from_example.cc         |    1 +
 47 files changed, 9666 insertions(+), 1190 deletions(-)
---