Removed the repleted window title and added translator comments. Fixes #313545.

svn path=/trunk/; revision=30882

3 files changed, 44 insertions, 5 deletions

diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index 0b75458331..50ce733522 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,5 +1,13 @@
 2005-12-19  Sushma Rai  <rsushma@novell.com>
 
+	* exchange-delegates-user.c (exchange_delegates_user_edit): Using the
+	window title as "Delegates Permissions". Label "Permissions for <user>"
+	was repeated twice.
+
+	* exchange-delegates.glade: Added translator comments. Fixes #313545.
+
+2005-12-19  Sushma Rai  <rsushma@novell.com>
+
 	* exchange-account-setup.c (owa_authenticate_user): Adding the 
 	parameter "save-passwd" to CamelURL, during account creation, which can
 	be used to see if the user has remembered password or password is
diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c
index 4b0913045c..a34ee09f8c 100644
--- a/plugins/exchange-operations/exchange-delegates-user.c
+++ b/plugins/exchange-operations/exchange-delegates-user.c
@@ -188,16 +188,18 @@ exchange_delegates_user_edit (ExchangeDelegatesUser *user,
 		"delegate_permissions", PACKAGE);
 	g_return_val_if_fail (xml, FALSE);
 
-	title = g_strdup_printf (_("Permissions for %s"), user->display_name);
+	title = g_strdup (_("Delegate Permissions"));
 
 	dialog = glade_xml_get_widget (xml, "delegate_permissions");
 	gtk_window_set_title (GTK_WINDOW (dialog), title);
 	e_dialog_set_transient_for (GTK_WINDOW (dialog), parent_window);
+	g_free (title);
 
 	table = glade_xml_get_widget (xml, "toplevel_table");
 	gtk_widget_reparent (table, GTK_DIALOG (dialog)->vbox);
 	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 6);
 
+	title = g_strdup_printf (_("Permissions for %s"), user->display_name);
 	label = glade_xml_get_widget (xml, "delegate_label");
 	gtk_label_set_text (GTK_LABEL (label), title);
 	g_free (title);
diff --git a/plugins/exchange-operations/exchange-delegates.glade b/plugins/exchange-operations/exchange-delegates.glade
index 4b2e0e7695..464fd820d4 100644
--- a/plugins/exchange-operations/exchange-delegates.glade
+++ b/plugins/exchange-operations/exchange-delegates.glade
@@ -16,6 +16,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -84,6 +85,10 @@ and access your folders with the permissions you give them.</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -106,6 +111,9 @@ and access your folders with the permissions you give them.</property>
 		  <property name="rules_hint">False</property>
 		  <property name="reorderable">False</property>
 		  <property name="enable_search">False</property>
+		  <property name="fixed_height_mode">False</property>
+		  <property name="hover_selection">False</property>
+		  <property name="hover_expand">False</property>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -193,6 +201,7 @@ and access your folders with the permissions you give them.</property>
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -260,6 +269,10 @@ and access your folders with the permissions you give them.</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xpad">0</property>
 	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -280,7 +293,7 @@ and access your folders with the permissions you give them.</property>
 	      <child>
 		<widget class="GtkLabel" id="calendar_label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">C_alendar:</property>
+		  <property name="label" translatable="yes" comments="Translators: This is used for permissions for &lt;user&gt; for the folder Calendar.">C_alendar:</property>
 		  <property name="use_underline">True</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -291,6 +304,10 @@ and access your folders with the permissions you give them.</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">calendar_perms</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
@@ -305,7 +322,7 @@ and access your folders with the permissions you give them.</property>
 	      <child>
 		<widget class="GtkLabel" id="task_label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Tasks:</property>
+		  <property name="label" translatable="yes" comments="Translators: This is used for permissions for &lt;user&gt; for the folder Tasks.">_Tasks:</property>
 		  <property name="use_underline">True</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -316,6 +333,10 @@ and access your folders with the permissions you give them.</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">task_perms</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
@@ -330,7 +351,7 @@ and access your folders with the permissions you give them.</property>
 	      <child>
 		<widget class="GtkLabel" id="inbox_label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Inbox:</property>
+		  <property name="label" translatable="yes" comments="Translators: This is used for permissions for &lt;user&gt; for the folder Inbox.">_Inbox:</property>
 		  <property name="use_underline">True</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -341,6 +362,10 @@ and access your folders with the permissions you give them.</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">inbox_perms</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
@@ -355,7 +380,7 @@ and access your folders with the permissions you give them.</property>
 	      <child>
 		<widget class="GtkLabel" id="contact_label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Co_ntacts:</property>
+		  <property name="label" translatable="yes" comments="Translators: This is used for permissions for &lt;user&gt; for the folder Contacts.">Co_ntacts:</property>
 		  <property name="use_underline">True</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -366,6 +391,10 @@ and access your folders with the permissions you give them.</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="mnemonic_widget">contact_perms</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>