diff options
author | Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> | 2009-08-01 16:33:18 +0800 |
---|---|---|
committer | Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> | 2009-08-01 16:33:18 +0800 |
commit | 8dcbfe163b293dda9bc0481e846db3bdd4e0ea98 (patch) | |
tree | ccd09bc3f224492e9d8c360c0b903e11f8b593ab /data | |
parent | 3e8f25168aadd741ecc0fe8da4d1847eece5ff83 (diff) | |
parent | c62744a26535b8778e6053e5d7c544ca9ccc1e5f (diff) | |
download | gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.gz gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.bz2 gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.lz gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.xz gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.tar.zst gsoc2013-empathy-8dcbfe163b293dda9bc0481e846db3bdd4e0ea98.zip |
Merge branch 'master' into mc5
Diffstat (limited to 'data')
-rw-r--r-- | data/empathy.desktop.in.in | 6 | ||||
-rw-r--r-- | data/empathy.schemas.in | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/empathy.desktop.in.in b/data/empathy.desktop.in.in index d7feab251..c22206b84 100644 --- a/data/empathy.desktop.in.in +++ b/data/empathy.desktop.in.in @@ -1,13 +1,13 @@ [Desktop Entry] Version=1.0 -_Name=Empathy Instant Messenger -_Comment=Send and receive instant messages +_Name=Empathy IM Client +_Comment=Send and receive messages Exec=empathy Icon=empathy StartupNotify=false Terminal=false Type=Application -Categories=GNOME;GTK;Network;InstantMessaging; +Categories=GNOME;GTK;Network;IM; X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=empathy X-GNOME-Bugzilla-Component=General diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in index bfe64799c..f85c616b0 100644 --- a/data/empathy.schemas.in +++ b/data/empathy.schemas.in @@ -366,7 +366,7 @@ <applyto>/apps/empathy/conversation/enable_webkit_developer_tools</applyto> <owner>empathy</owner> <type>bool</type> - <default></default> + <default>false</default> <locale name="C"> <short>Enable WebKit Developer Tools</short> <long> |