[gnome-color-manager: 2/2] Merging 'master' of ssh://git.gnome.org/git/gnome-color-manager

[Shankar Prasad <sprasad src gnome org>]

commit f063a2048776545e3ea14c5a2eb231463f90f900
Merge: 1d4caf4 4a57f37
Author: Shankar Prasad <svenkate redhat com>
Date:   Tue Nov 20 16:13:10 2012 +0530

    Merging 'master' of ssh://git.gnome.org/git/gnome-color-manager

 NEWS                       |   34 +
 RELEASE                    |   10 +-
 configure.ac               |    2 +-
 data/gcm-viewer.ui         |   68 +-
 help/Makefile.am           |    2 +-
 help/fr/fr.po              |  240 ++++
 po/LINGUAS                 |    3 +
 po/bg.po                   | 2910 +++++++++++++++-----------------------
 po/ca.po                   | 3343 ++++++++++++++++++++++++--------------------
 po/ca valencia po          | 3338 ++++++++++++++++++++++++--------------------
 po/et.po                   | 2095 ++++++++++++++++------------
 po/lv.po                   |  629 +++++----
 po/nb.po                   |   44 +-
 po/or.po                   | 1707 ++++++++++++++++++++++
 po/pa.po                   |  294 ++---
 po/sk.po                   | 1723 +++++++++++++++++++++++
 po/te.po                   | 1651 ++++++++++++++++++++++
 src/gcm-calibrate-argyll.c |    4 +-
 src/gcm-calibrate-main.c   |    4 +-
 src/gcm-import.c           |   48 +-
 src/gcm-profile.c          |   39 +-
 src/gcm-viewer.c           |  101 ++-
 22 files changed, 12058 insertions(+), 6231 deletions(-)
---