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

[Thomas Haller <thaller src gnome org>]

commit e02ed804cfa14abb8ea36a7164433f9a65305408
Merge: 9722921 3095707
Author: Thomas Haller <thaller redhat com>
Date:   Wed Sep 14 15:38:51 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
    to maintaining two separate versions of a applet that
    both target the same API.

 po/ca.po                                 | 1037 ++++++++++++++++++++++--------
 po/es.po                                 |   87 ++--
 src/connection-editor/ce-page-general.ui |    2 +-
 src/connection-editor/page-general.c     |   17 +-
 4 files changed, 819 insertions(+), 324 deletions(-)
---