network-manager-applet r1019 - in trunk: . po

[dcbw svn gnome org]

Author: dcbw
Date: Fri Nov 14 17:17:41 2008
New Revision: 1019
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=1019&view=rev

Log:
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)



Added:
   trunk/nm-applet.desktop.in
      - copied, changed from r1018, /trunk/nm-applet.desktop
   trunk/nm-connection-editor.desktop.in
      - copied, changed from r1018, /trunk/nm-connection-editor.desktop
Removed:
   trunk/nm-applet.desktop
   trunk/nm-connection-editor.desktop
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/po/POTFILES.in

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Nov 14 17:17:41 2008
@@ -9,15 +9,23 @@
 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
+

Copied: trunk/nm-applet.desktop.in (from r1018, /trunk/nm-applet.desktop)
==============================================================================
--- /trunk/nm-applet.desktop	(original)
+++ trunk/nm-applet.desktop.in	Fri Nov 14 17:17:41 2008
@@ -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

Copied: trunk/nm-connection-editor.desktop.in (from r1018, /trunk/nm-connection-editor.desktop)
==============================================================================
--- /trunk/nm-connection-editor.desktop	(original)
+++ trunk/nm-connection-editor.desktop.in	Fri Nov 14 17:17:41 2008
@@ -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

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Fri Nov 14 17:17:41 2008
@@ -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