~dylanmccall/ubuntu/oneiric/network-manager-applet/lp852961-disable-autostart-for-gnome-shell

« back to all changes in this revision

Viewing changes to nm-applet.desktop.in

Committer: Bazaar Package Importer
Author(s): Mathieu Trudel-Lapierre
Date: 2011-05-30 13:25:18 UTC
mto: This revision was merged to the branch mainline in revision 68.
Revision ID: james.westby@ubuntu.com-20110530132518-ya5i5mcrl8szsmoj

Tags: upstream-0.8.9997+git.20110529t170033.9ec4c5d

Import upstream version 0.8.9997+git.20110529t170033.9ec4c5d

files added:
po/af.po

po/an.po

po/ug.po

src/applet-agent.c

src/applet-agent.h

src/applet-device-wimax.c

src/applet-device-wimax.h

src/applet-vpn-request.c

src/applet-vpn-request.h

src/gconf-helpers/tests

src/gconf-helpers/tests/08openvpn-not-saved.xml

src/gconf-helpers/tests/08openvpn-saved.xml

src/gconf-helpers/tests/08vpnc.xml

src/gconf-helpers/tests/08wifi.xml

src/gconf-helpers/tests/Makefile.am

src/gconf-helpers/tests/fake-gconf.c

src/gconf-helpers/tests/fake-gconf.h

src/gconf-helpers/tests/fake-keyring.c

src/gconf-helpers/tests/fake-keyring.h

src/gconf-helpers/tests/test-import.xml

src/gconf-helpers/tests/test-upgrade.c

src/nm-applet-introspection.xml

files removed:
nm-applet-dbus-126.conf

nm-applet-pre-dbus-126.conf

src/applet-dbus-manager.c

src/applet-dbus-manager.h

src/gconf-helpers/nma-gconf-connection.c

src/gconf-helpers/nma-gconf-connection.h

src/gconf-helpers/nma-gconf-settings.c

src/gconf-helpers/nma-gconf-settings.h

src/utils/nma-bling-spinner.c

src/utils/nma-bling-spinner.h

src/vpn-password-dialog.c

src/vpn-password-dialog.h

files modified:
.gitignore

Makefile.am

NEWS

configure.ac

network-manager-applet.doap

nm-applet.desktop.in

po/LINGUAS

po/POTFILES.in

po/ar.po

po/bg.po

po/ca.po

po/ca@valencia.po

po/cs.po

po/da.po

po/de.po

po/el.po

po/en_GB.po

po/eo.po

po/es.po

po/et.po

po/eu.po

po/fi.po

po/fr.po

po/gl.po

po/gu.po

po/he.po

po/hu.po

po/id.po

po/it.po

po/ja.po

po/ko.po

po/lt.po

po/lv.po

po/mr.po

po/nb.po

po/nl.po

po/or.po

po/pa.po

po/pl.po

po/pt.po

po/pt_BR.po

po/ro.po

po/ru.po

po/sl.po

po/sr.po

po/sr@latin.po

po/sv.po

po/th.po

po/tr.po

po/uk.po

po/vi.po

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

src/Makefile.am

src/ap-menu-item.c

src/applet-device-bt.c

src/applet-device-cdma.c

src/applet-device-cdma.h

src/applet-device-gsm.c

src/applet-device-gsm.h

src/applet-device-wifi.c

src/applet-device-wired.c

src/applet-dialogs.c

src/applet-dialogs.h

src/applet.c

src/applet.h

src/connection-editor/Makefile.am

src/connection-editor/ce-ip4-routes.ui

src/connection-editor/ce-ip6-routes.ui

src/connection-editor/ce-page.c

src/connection-editor/ce-page.h

src/connection-editor/ce-polkit-button.c

src/connection-editor/ce-polkit-button.h

src/connection-editor/ce-ppp-auth-methods.ui

src/connection-editor/ce-vpn-wizard.ui

src/connection-editor/ip4-routes-dialog.c

src/connection-editor/ip6-routes-dialog.c

src/connection-editor/main.c

src/connection-editor/nm-connection-editor-service.xml

src/connection-editor/nm-connection-editor.c

src/connection-editor/nm-connection-editor.h

src/connection-editor/nm-connection-list.c

src/connection-editor/nm-connection-list.h

src/connection-editor/page-dsl.c

src/connection-editor/page-ip4.c

src/connection-editor/page-ip6.c

src/connection-editor/page-mobile.c

src/connection-editor/page-ppp.c

src/connection-editor/page-vpn.c

src/connection-editor/page-wired-security.c

src/connection-editor/page-wired.c

src/connection-editor/page-wireless-security.c

src/connection-editor/page-wireless.c

src/connection-editor/ppp-auth-methods-dialog.c

src/connection-editor/vpn-helpers.c

src/gconf-helpers/Makefile.am

src/gconf-helpers/gconf-helpers.c

src/gconf-helpers/gconf-helpers.h

src/gconf-helpers/gconf-upgrade.c

src/gconf-helpers/gconf-upgrade.h

src/gnome-bluetooth/Makefile.am

src/gnome-bluetooth/bt-widget.c

src/gsm-unlock.ui

src/info.ui

src/main.c

src/marshallers/nma-marshal.list

src/mb-menu-item.c

src/mb-menu-item.h

src/mobile-helpers.c

src/mobile-helpers.h

src/utils/Makefile.am

src/utils/mobile-wizard.c

src/utils/mobile-wizard.h

src/utils/nmn-mobile-providers.c

src/utils/tests/Makefile.am

src/utils/utils.c

src/utils/utils.h

src/wired-dialog.c

src/wired-dialog.h

src/wireless-dialog.c

src/wireless-security/Makefile.am

src/wireless-security/eap-method-leap.c

src/wireless-security/eap-method-peap.c

src/wireless-security/eap-method-simple.c

src/wireless-security/eap-method-tls.c

src/wireless-security/eap-method-ttls.c

src/wireless-security/eap-method.c

src/wireless-security/eap-method.h

src/wireless-security/helpers.c

src/wireless-security/nag-user-dialog.ui

src/wireless-security/wireless-security.c

src/wireless-security/ws-leap.c

src/wireless-security/ws-wep-key.c

src/wireless-security/ws-wpa-psk.c

Show diffs side-by-side

added added

removed removed

nm-applet.desktop.in

[Desktop Entry]

_Name=Network Manager

_Comment=Control your network connections

_Name=Network

_Comment=Manage your network connections

Icon=nm-device-wireless

Exec=nm-applet --sm-disable

Exec=nm-applet

Terminal=false

Type=Application

NoDisplay=true

X-GNOME-Bugzilla-Bugzilla=GNOME

X-GNOME-Bugzilla-Product=NetworkManager

X-GNOME-Bugzilla-Component=general

Older »