diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-11-14 17:17:41 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@src.gnome.org> | 2008-11-14 17:17:41 +0000 |
| commit | 744cc71c7ee753e3fefaed56e7f4131f407dde2c (patch) | |
| tree | b6e27bc7cd768285a7e82a2dc649ad094f42f0a0 | |
| parent | 6f34f53a45f252cd9c703f7cb45ddfa81c76416a (diff) | |
| download | network-manager-applet-744cc71c7ee753e3fefaed56e7f4131f407dde2c.tar.gz | |
Patch from Kelemen Gábor <kelemeng@gnome.hu>
2008-11-14 Dan Williams <dcbw@redhat.com>
Patch from Kelemen Gábor <kelemeng@gnome.hu>
* Makefile.am
nm-applet.desktop.in
nm-connection-editor.desktop.in
po/POTFILES.in
- Make desktop files translatable and fix up the descriptions to not
suck (bgo #559636)
svn path=/trunk/; revision=1019
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.am | 26 | ||||
| -rw-r--r-- | nm-applet.desktop.in (renamed from nm-applet.desktop) | 4 | ||||
| -rw-r--r-- | nm-connection-editor.desktop.in (renamed from nm-connection-editor.desktop) | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 |
5 files changed, 34 insertions, 13 deletions
@@ -1,3 +1,14 @@ +2008-11-14 Dan Williams <dcbw@redhat.com> + + Patch from Kelemen Gábor <kelemeng@gnome.hu> + + * Makefile.am + nm-applet.desktop.in + nm-connection-editor.desktop.in + po/POTFILES.in + - Make desktop files translatable and fix up the descriptions to not + suck (bgo #559636) + 2008-11-13 Dan Williams <dcbw@redhat.com> Add support for PKCS#12 private keys (bgo #558982) diff --git a/Makefile.am b/Makefile.am index 7763198d..6e66bbb7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,15 +9,23 @@ EXTRA_DIST = \ dbusservicedir = $(DBUS_SYS_DIR) dbusservice_DATA = nm-applet.conf -EXTRA_DIST += \ - $(dbusservice_DATA) \ - nm-applet.desktop \ - nm-connection-editor.desktop - -DISTCLEANFILES = intltool-extract intltool-merge intltool-update - +autostart_in_files = nm-applet.desktop.in autostartdir = $(sysconfdir)/xdg/autostart -autostart_DATA = nm-applet.desktop +autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) +desktop_in_files = nm-connection-editor.desktop.in desktopdir = $(datadir)/applications -desktop_DATA = nm-connection-editor.desktop +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +@INTLTOOL_DESKTOP_RULE@ + +EXTRA_DIST += \ + $(dbusservice_DATA) \ + $(autostart_DATA) \ + $(desktop_DATA) + +CLEANFILES = \ + $(autostart_DATA) \ + $(desktop_DATA) + +DISTCLEANFILES = intltool-extract intltool-merge intltool-update + diff --git a/nm-applet.desktop b/nm-applet.desktop.in index d29163de..a9cd88ed 100644 --- a/nm-applet.desktop +++ b/nm-applet.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -Name=Network Manager -Comment=Network Manager applet +_Name=Network Manager +_Comment=Control your network connections Icon=nm-device-wireless Exec=nm-applet --sm-disable Terminal=false diff --git a/nm-connection-editor.desktop b/nm-connection-editor.desktop.in index 319b7375..5c5d741f 100644 --- a/nm-connection-editor.desktop +++ b/nm-connection-editor.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -Name=Network Configuration -Comment=Network Manager configuration +_Name=Network Connections +_Comment=Manage and change your network connection settings Icon=nm-device-wireless Exec=nm-connection-editor Terminal=false diff --git a/po/POTFILES.in b/po/POTFILES.in index f6fbc8e5..8b16fedd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,8 @@ [encoding: UTF-8] # List of source files containing translatable strings. # Please keep this file sorted alphabetically. +nm-applet.desktop.in +nm-connection-editor.desktop.in src/applet-dbus-manager.c src/applet-device-cdma.c src/applet-device-gsm.c |