[network-manager-applet: 4/4] all: merge branch 'unicode-strings-bgo695967'

[Thomas Haller <thaller src gnome org>]

commit 05c64b282ffc7b9a205c509dd3c7b747cacff62f
Merge: 2f3f268 1d8872d
Author: Thomas Haller <thaller redhat com>
Date:   Mon Oct 3 20:52:25 2016 +0200

    all: merge branch 'unicode-strings-bgo695967'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=695967

 src/applet-device-broadband.c                 |    4 +-
 src/applet-device-bt.c                        |   10 +-
 src/applet-device-ethernet.c                  |   10 +-
 src/applet-device-wifi.c                      |   20 +-
 src/applet-dialogs.c                          |    6 +-
 src/applet.c                                  |   54 ++--
 src/connection-editor/ce-ip4-routes.ui        |    2 +-
 src/connection-editor/ce-ip6-routes.ui        |    2 +-
 src/connection-editor/ce-new-connection.ui    |    2 +-
 src/connection-editor/ce-page-dcb.ui          |  326 ++++++++++++------------
 src/connection-editor/ce-page-ethernet.ui     |    2 +-
 src/connection-editor/ce-page-ip4.ui          |    2 +-
 src/connection-editor/ce-page-mobile.ui       |    2 +-
 src/connection-editor/ce-page-team-port.ui    |    4 +-
 src/connection-editor/ce-page-team.ui         |   10 +-
 src/connection-editor/ce-page-wifi.ui         |    2 +-
 src/connection-editor/ce-page.h               |   12 +-
 src/connection-editor/ce-ppp-auth-methods.ui  |    2 +-
 src/connection-editor/connection-helpers.c    |    4 +-
 src/connection-editor/nm-connection-editor.c  |    2 +-
 src/connection-editor/nm-connection-editor.ui |    2 +-
 src/connection-editor/nm-connection-list.c    |    4 +-
 src/connection-editor/page-ethernet.c         |    2 +-
 src/connection-editor/page-infiniband.c       |    4 +-
 src/connection-editor/page-ip4.c              |    8 +-
 src/connection-editor/page-ip6.c              |    8 +-
 src/connection-editor/page-master.c           |    6 +-
 src/connection-editor/page-mobile.c           |    2 +-
 src/connection-editor/page-team-port.c        |    2 +-
 src/connection-editor/page-team.c             |    2 +-
 src/connection-editor/page-vlan.c             |    4 +-
 src/connection-editor/page-vpn.c              |    6 +-
 src/connection-editor/page-wifi.c             |    4 +-
 src/connection-editor/vpn-helpers.c           |    8 +-
 src/libnm-gtk/nm-mobile-wizard.c              |   12 +-
 src/libnm-gtk/nm-wifi-dialog.c                |    4 +-
 src/libnm-gtk/wifi.ui                         |    4 +-
 src/libnma/nma-mobile-wizard.c                |   12 +-
 src/libnma/nma-wifi-dialog.c                  |    4 +-
 src/libnma/wifi.ui                            |    4 +-
 src/mobile-helpers.c                          |   14 +-
 src/wireless-security/eap-method-fast.ui      |    2 +-
 src/wireless-security/eap-method-peap.ui      |    2 +-
 src/wireless-security/eap-method-tls.c        |    2 +-
 src/wireless-security/eap-method-ttls.ui      |    2 +-
 src/wireless-security/ws-dynamic-wep.ui       |    2 +-
 src/wireless-security/ws-wep-key.ui           |    6 +-
 src/wireless-security/ws-wpa-eap.ui           |    2 +-
 48 files changed, 306 insertions(+), 306 deletions(-)
---