[glabels/glabels_2_2: 15/16] Merge original SVN glabels-2_2 branch into glabels_2_2

[Jim Evins <jimevins src gnome org>]

commit 484197466a1ddace52d14046709ad6e8c4f17bbc
Merge: 9ebfc49... d3a7257...
Author: Jim Evins <evins snaught com>
Date:   Mon Sep 28 21:11:55 2009 -0400

    Merge original SVN glabels-2_2 branch into glabels_2_2
    
    Restored history past 2.2.5 release that was lost when originally creating
    branch from SVN.

 AUTHORS                                            |   20 +-
 ChangeLog                                          |   74 +-
 Makefile.am                                        |    7 +
 configure.in                                       |    5 +-
 glabels2/help/de/de.po                             | 2661 ++++++++++++++++
 glabels2/help/de/figures/main-window-empty.png     |  Bin 0 -> 33093 bytes
 glabels2/help/de/figures/merge-ex1-1.png           |  Bin 0 -> 39810 bytes
 glabels2/help/de/figures/merge-ex1-2.png           |  Bin 0 -> 69379 bytes
 glabels2/help/de/figures/merge-ex1-3.png           |  Bin 0 -> 35172 bytes
 glabels2/help/de/figures/merge-ex1-4.png           |  Bin 0 -> 43315 bytes
 glabels2/help/de/figures/merge-ex2-1.png           |  Bin 0 -> 42168 bytes
 glabels2/help/de/figures/merge-ex2-2.png           |  Bin 0 -> 62037 bytes
 glabels2/help/de/figures/merge-ex2-3.png           |  Bin 0 -> 34780 bytes
 glabels2/help/de/figures/merge-ex2-4.png           |  Bin 0 -> 49083 bytes
 glabels2/help/de/figures/object-editor-sidebar.png |  Bin 0 -> 11132 bytes
 glabels2/help/de/figures/print-copies.png          |  Bin 0 -> 9196 bytes
 glabels2/help/de/figures/print-merge.png           |  Bin 0 -> 9722 bytes
 glabels2/help/glabels-help.pot                     | 1513 +++++++++
 glabels2/help/glabels.omf.in                       |   12 +
 glabels2/po/LINGUAS                                |   18 +
 glabels2/po/ca.po                                  | 2714 ++++++++++++++++
 glabels2/po/zh_CN.po                               | 2670 ++++++++++++++++
 gtk-doc.make                                       |   47 +-
 help/C/Makefile.am                                 |    9 -
 help/C/glabels-C.omf                               |   22 -
 help/C/glabels.xml                                 |   97 +-
 help/Makefile.am                                   |   25 +-
 po/de.po                                           | 1119 ++++----
 po/fr.po                                           |  995 ++++---
 po/ru.po                                           | 3346 ++++++++++++--------
 src/prefs-model.c                                  |   28 +-
 src/stock.c                                        |    4 +-
 32 files changed, 12924 insertions(+), 2462 deletions(-)
---