[network-manager-applet/th/master: 33/33] all: merge branch 'master' into nm-1-4

[Thomas Haller <thaller src gnome org>]

commit 47194f7a11984c47dc168ae9bd8696861f21d445
Merge: 6c71c72 7ee48ac
Author: Thomas Haller <thaller redhat com>
Date:   Mon Oct 3 12:28:39 2016 +0200

    all: merge branch 'master' into nm-1-4
    
    We wrongly did a 1.4.2 release based on an old nm-1-4 branch.
    Merge master and 1.4 branch together again.
    
    See also commit 54a3d4181358231706296abfc53a203796ef8491.

 configure.ac                                |    4 +-
 m4/git-sha-record.m4                        |   15 +
 po/POTFILES.in                              |    1 +
 po/ca.po                                    | 1037 ++++++++++++++++++-------
 po/de.po                                    |   81 ++-
 po/es.po                                    |   87 +--
 po/hu.po                                    |  246 ++++---
 po/pl.po                                    |  215 +++---
 po/sr.po                                    | 1050 +++++++++++++++++++------
 po/sr latin po                              | 1140 ++++++++++++++++++++-------
 src/applet.c                                |   15 +
 src/connection-editor/ce-page-general.ui    |    2 +-
 src/connection-editor/ce-page-ip4.ui        |    3 -
 src/connection-editor/ce-page-ip6.ui        |    3 -
 src/connection-editor/ce-page.h             |   14 +
 src/connection-editor/connection-helpers.c  |   33 +-
 src/connection-editor/page-8021x-security.c |    6 +-
 src/connection-editor/page-general.c        |   17 +-
 src/connection-editor/page-ip4.c            |   86 ++-
 src/connection-editor/page-ip6.c            |   38 +-
 20 files changed, 2926 insertions(+), 1167 deletions(-)
---