From b2cda1d0c6d44f53f71bad9e256f41188677dfba Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Wed, 1 Oct 2008 20:56:04 +0000
Subject: Merge revisions 36016:36533 from trunk.

svn path=/branches/kill-bonobo/; revision=36534
---
 plugins/publish-calendar/publish-calendar.glade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/publish-calendar/publish-calendar.glade')

diff --git a/plugins/publish-calendar/publish-calendar.glade b/plugins/publish-calendar/publish-calendar.glade
index f56eabbc10..6f6ae9dcf2 100644
--- a/plugins/publish-calendar/publish-calendar.glade
+++ b/plugins/publish-calendar/publish-calendar.glade
@@ -712,7 +712,7 @@ Free/Busy</property>
 			  <child>
 			    <widget class="GtkComboBox" id="publish_service">
 			      <property name="visible">True</property>
-			      <property name="items" translatable="yes">SSH
+			      <property name="items" translatable="yes">Secure FTP (SSH)
 Public FTP
 FTP (with login)
 Windows share
-- 
cgit v1.2.3