[Xfce4-commits] <xfce4-settings:nick/xsettingsd-merge> Merge branch 'nick/xsettingsd-merge' of ssh://git.xfce.org/git/xfce/xfce4-settings into nick/xsettingsd-merge

[Nick Schermer]

Updating branch refs/heads/nick/xsettingsd-merge
         to 5f886c3a90a4632266fb93ada7f7e6641bae94d3 (commit)
       from 0efbc1c5f3aebd82bed8d8c9c39b6a4ba0b9a8d3 (commit)

commit 5f886c3a90a4632266fb93ada7f7e6641bae94d3
Merge: 0efbc1c 1c76e2d
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Feb 25 10:06:23 2011 +0100

    Merge branch 'nick/xsettingsd-merge' of ssh://git.xfce.org/git/xfce/xfce4-settings into nick/xsettingsd-merge

commit 1c76e2d290a2a88bda0e120adec708b47bdd0877
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Feb 23 23:45:18 2011 +0100

    Add comment to desktop file and make name untranslatable.

 xfsettingsd/xfsettingsd.desktop.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/xfsettingsd/xfsettingsd.desktop.in b/xfsettingsd/xfsettingsd.desktop.in
index d4be1d2..6b1d446 100644
--- a/xfsettingsd/xfsettingsd.desktop.in
+++ b/xfsettingsd/xfsettingsd.desktop.in
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Version=1.0
-_Name=Xfce Settings Daemon
+Name=Xfsettingsd
+_Comment=The Xfce Settings Daemon
 Exec=xfsettingsd
 Icon=applications-system
 Terminal=false