[network-manager-openconnect/nm-0-9-10: 35/35] Merge remote-tracking branch 'origin/master' into nm-0-9-10

[Dan Williams <dcbw src gnome org>]

commit 05edbd859bf428c749618121f4dd29d14461da4f
Merge: 1eb7441 81792df
Author: Dan Williams <dcbw redhat com>
Date:   Wed Dec 10 12:29:42 2014 -0600

    Merge remote-tracking branch 'origin/master' into nm-0-9-10

 auth-dialog/main.c                  |  354 +--
 import-strings.sh                   |   16 +-
 openconnect-strings.txt             | 2595 ++++++++++--------
 po/cs.po                            | 4946 +++++++++++++++++++---------------
 po/de.po                            | 5000 +++++++++++++++++++---------------
 po/el.po                            | 4998 +++++++++++++++++++----------------
 po/en_GB.po                         | 4744 ++++++++++++++++++---------------
 po/en_US.po                         | 2551 +++++++++++++-----
 po/es.po                            | 5022 ++++++++++++++++++----------------
 po/eu.po                            | 4949 +++++++++++++++++++---------------
 po/id.po                            | 4900 +++++++++++++++++++---------------
 po/lt.po                            | 4925 +++++++++++++++++++---------------
 po/nl.po                            | 4758 ++++++++++++++++++---------------
 po/pl.po                            | 4117 +++++++++++++++++------------
 po/pt.po                            | 4473 +++++++++++++++++--------------
 po/pt_BR.po                         | 5071 +++++++++++++++++++----------------
 po/sl.po                            | 4808 ++++++++++++++++++---------------
 po/ug.po                            | 4634 ++++++++++++++++++---------------
 properties/nm-openconnect-dialog.ui |    6 +
 properties/nm-openconnect.c         |   18 +-
 20 files changed, 40618 insertions(+), 32267 deletions(-)
---