[yelp/webkit: 50/50] Merge branch 'master' into webkit

[Frederic Peters <fpeters src gnome org>]

commit dd93ab5575b53d05a574a4be8a0f86501ef933e9
Merge: f26a70b... 5ef7b44...
Author: Frédéric Péters <fpeters 0d be>
Date:   Wed Sep 23 21:53:33 2009 +0200

    Merge branch 'master' into webkit
    
    Conflicts:
    	src/yelp-html.c
    	src/yelp-info-parser.c
    	src/yelp-window.c

 NEWS                      |   69 ++
 configure.in              |    2 +-
 po/LINGUAS                |    3 +-
 po/ar.po                  |  205 ++++--
 po/as.po                  |  306 +++++---
 po/bn.po                  | 1821 ++++++++++++++++++++++++---------------------
 po/bn_IN.po               |  273 ++++---
 po/br.po                  | 1626 ++++++++++++++++++++++++++++++----------
 po/ca.po                  |  301 +++++---
 po/ca valencia po         | 1600 +++++++++++++++++++++++++++++++++++++++
 po/cs.po                  |  264 ++++---
 po/da.po                  |  286 +++++---
 po/el.po                  |  430 ++++++-----
 po/en_GB.po               |  321 +++++---
 po/eu.po                  |  253 ++++---
 po/gu.po                  |  380 ++++++-----
 po/hi.po                  |  266 ++++---
 po/hu.po                  |  291 +++++---
 po/ja.po                  |  294 +++++---
 po/kn.po                  |  282 +++++---
 po/ko.po                  |  296 +++++---
 po/ml.po                  |  301 +++++---
 po/mr.po                  |  379 ++++++----
 po/nb.po                  |  112 +++-
 po/{nds NFE po => nds.po} |    0
 po/or.po                  |  278 ++++---
 po/pa.po                  |  215 ++++--
 po/pl.po                  |  722 +++++++-----------
 po/pt.po                  |  285 +++++---
 po/pt_BR.po               |   55 +-
 po/ro.po                  |  425 ++++++-----
 po/sl.po                  |  333 +++++----
 po/sr.po                  |  291 +++++---
 po/sr latin po            |  291 +++++---
 po/ta.po                  |  251 ++++---
 po/te.po                  |  718 +++++++++---------
 po/tr.po                  |  266 ++++---
 po/uk.po                  |  214 ++++--
 po/zh_CN.po               |  316 +++++---
 src/yelp-document.c       |   29 +
 src/yelp-document.h       |    3 +
 src/yelp-error.c          |    2 +-
 src/yelp-info-parser.c    |    1 -
 src/yelp-mallard.c        |   23 +-
 src/yelp-utils.c          |    1 -
 src/yelp-window.c         |   57 +-
 46 files changed, 9663 insertions(+), 5474 deletions(-)
---