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

[Thomas Haller <thaller src gnome org>]

commit 54a3d4181358231706296abfc53a203796ef8491
Merge: 8fea566 2f784c4
Author: Thomas Haller <thaller redhat com>
Date:   Mon Sep 19 10:59:29 2016 +0200

    all: merge branch 'master' into nm-1-4
    
    Reset 'master' from 1.5.0 back to 1.4.1. For the moment,
    'master' still works well with 1.3.0-or-newer API of
    NetworkManager/libnm. There is no need for upstream
    maintaining two separate versions of an applet which
    targets the same API.

 po/ca.po                                 | 1037 ++++++++++++++++++++++--------
 po/es.po                                 |   87 ++--
 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/page-general.c     |   17 +-
 src/connection-editor/page-ip4.c         |   86 +++-
 src/connection-editor/page-ip6.c         |   38 +-
 9 files changed, 941 insertions(+), 346 deletions(-)
---