[glabels: 24/24] Merge branch 'zint'

[Jim Evins <jimevins src gnome org>]

commit 6c9d844640ff7c481eaa1962aff3bdebd0c2c0ff
Merge: 7e03137 e681454
Author: Jim Evins <evins snaught com>
Date:   Thu Sep 2 22:14:49 2010 -0400

    Merge branch 'zint'

 data/ui/object-editor.ui    |   47 +-
 po/ca.po                    | 3447 ++++++++++++++++++++-------------
 po/da.po                    |  617 +++++--
 po/eo.po                    | 4189 ++++++++++++++++++++++++++--------------
 po/fr.po                    |  617 +++++--
 po/it.po                    | 4039 +++++++++++++++++++++++++--------------
 po/ja.po                    | 3723 ++++++++++++++++++++++--------------
 po/ko.po                    | 4469 +++++++++++++++++++++++++++----------------
 po/nb.po                    | 1312 +++++++++-----
 po/pl.po                    | 2268 ++++++++++++++--------
 po/pt.po                    | 1278 ++++++++-----
 po/pt_BR.po                 |  614 +++++--
 po/ru.po                    | 3366 +++++++++++++++++++-------------
 po/sv.po                    | 2284 ++++++++++++++--------
 po/zh_CN.po                 | 3462 ++++++++++++++++++++-------------
 po/zh_TW.po                 | 3771 ++++++++++++++++++++++--------------
 src/Makefile.am             |    4 +
 src/bc-backends.c           |  830 ++++++++
 src/bc-backends.h           |   89 +
 src/bc-gnubarcode.c         |   23 +-
 src/bc-iec16022.c           |   10 +-
 src/bc-iec18004.c           |   10 +-
 src/bc-postnet.c            |   20 +-
 src/bc-zint.c               |  295 ++--
 src/bc.c                    |  443 ++----
 src/bc.h                    |  236 ++-
 src/label-barcode.c         |  542 ++++--
 src/label-barcode.h         |   58 +-
 src/merge-evolution.c       |   14 +-
 src/merge-text.c            |   14 +-
 src/merge-vcard.c           |   14 +-
 src/merge.c                 |   46 +-
 src/merge.h                 |   44 +-
 src/object-editor-bc-page.c |  209 ++-
 src/object-editor-private.h |   30 +-
 src/object-editor.c         |  135 +-
 src/object-editor.h         |    1 -
 src/text-node.c             |   40 +-
 src/text-node.h             |   26 +-
 src/xml-label-04.c          |   35 +-
 src/xml-label.c             |  107 +-
 templates/glabels-2.3.dtd   |    9 +
 42 files changed, 27114 insertions(+), 15673 deletions(-)
---