aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2009-08-20 21:44:10 +0800
committerJonny Lamb <jonny.lamb@collabora.co.uk>2009-08-20 21:44:10 +0800
commit900bb42ee52f895dd7c6ce252e7f6104968d1bf8 (patch)
tree87089e299a4677baa6186bbb16e7367c09fbcdfb /data
parentf6b001dd6a0ef2dd1ae6bf071c3334d934c30628 (diff)
parent3336ae452410f53254957b48b72460978f3b990a (diff)
downloadgsoc2013-empathy-900bb42ee52f895dd7c6ce252e7f6104968d1bf8.tar
gsoc2013-empathy-900bb42ee52f895dd7c6ce252e7f6104968d1bf8.tar.gz
gsoc2013-empathy-900bb42ee52f895dd7c6ce252e7f6104968d1bf8.tar.bz2
gsoc2013-empathy-900bb42ee52f895dd7c6ce252e7f6104968d1bf8.tar.lz
gsoc2013-empathy-900bb42ee52f895dd7c6ce252e7f6104968d1bf8.tar.xz
gsoc2013-empathy-900bb42ee52f895dd7c6ce252e7f6104968d1bf8.tar.zst
gsoc2013-empathy-900bb42ee52f895dd7c6ce252e7f6104968d1bf8.zip
Merge branch 'connman'
Diffstat (limited to 'data')
-rw-r--r--data/empathy.schemas.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/empathy.schemas.in b/data/empathy.schemas.in
index edd8e5bdf..bb9068725 100644
--- a/data/empathy.schemas.in
+++ b/data/empathy.schemas.in
@@ -479,15 +479,15 @@
</schema>
<schema>
- <key>/schemas/apps/empathy/use_nm</key>
- <applyto>/apps/empathy/use_nm</applyto>
+ <key>/schemas/apps/empathy/use_conn</key>
+ <applyto>/apps/empathy/use_conn</applyto>
<owner>empathy</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
- <short>NetworkManager should be used</short>
+ <short>Connection managers should be used</short>
<long>
- Whether or not the network manager should be used to automatically
+ Whether or not connectivity managers should be used to automatically
disconnect/reconnect.
</long>
</locale>