[evolution-patches] Fix for bug#246237 [mailer]

[Rohini <srohini novell com>]

Hi

Fix for Bug#246237: – Compose a message dialog - label suggestions

There's no Show attachments menu item in View Menu(6) and Insert HTML
Template for the tooltip (16) due to changes in the current version of
Evolution.

Thanks,
Rohini

Index: e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.525
diff -u -p -r1.525 e-msg-composer.c
--- e-msg-composer.c	7 Dec 2005 08:29:51 -0000	1.525
+++ e-msg-composer.c	21 Dec 2005 08:27:18 -0000
@@ -2495,7 +2495,7 @@ subject_changed_cb (EMsgComposerHdrs *hd
 	
 	composer = E_MSG_COMPOSER (data);
 	
-	gtk_window_set_title (GTK_WINDOW (composer), subject[0] ? subject : _("Compose a message"));
+	gtk_window_set_title (GTK_WINDOW (composer), subject[0] ? subject : _("Compose Message"));
 }
 
 static void
@@ -3696,10 +3696,10 @@ create_composer (int visible_mask)
 	BonoboObject *impl;	
 	EMsgComposerPrivate *p;
 	
-	composer = g_object_new (E_TYPE_MSG_COMPOSER, "win_name", _("Compose a message"), NULL);
+	composer = g_object_new (E_TYPE_MSG_COMPOSER, "win_name", _("Compose Message"), NULL);
 	p = composer->priv;
 	
-	gtk_window_set_title ((GtkWindow *) composer, _("Compose a message"));
+	gtk_window_set_title ((GtkWindow *) composer, _("Compose Message"));
 	
 	all_composers = g_slist_prepend (all_composers, composer);
 	
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.724
diff -u -p -r1.724 ChangeLog
--- ChangeLog	7 Dec 2005 08:29:51 -0000	1.724
+++ ChangeLog	21 Dec 2005 08:27:24 -0000
@@ -1,3 +1,11 @@
+2005-12-21 Rohini S <srohini novell com>
+
+	** See bug #246237
+	* e-msg-composer.c: 
+	(create_composer):
+	(subject_changed_cb):
+	Modified to change window title to "Compose Message"
+
 2005-12-07  Parthasarathi Susarla <sparthasarathi novell com>
 	
 	* e-msg-composer.[ch]:

Index: GNOME_GtkHTML_Editor.xml.in
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/GNOME_GtkHTML_Editor.xml.in,v
retrieving revision 1.60
diff -u -p -r1.60 GNOME_GtkHTML_Editor.xml.in
--- GNOME_GtkHTML_Editor.xml.in	24 Jan 2005 15:10:46 -0000	1.60
+++ GNOME_GtkHTML_Editor.xml.in	21 Dec 2005 08:37:04 -0000
@@ -15,7 +15,7 @@
 
 			<cmd name="EditSelectAll" _label="Select _All"
 			_tip="Select the entire contents of the document"/>
-			<cmd name="EditSpellCheck" _label="_Spell Check Document..."
+			<cmd name="EditSpellCheck" _label="Check _Spelling..."
 			_tip="Check spelling of the document" accel="*Ctrl**Shift*l" pixtype="pixbuf"/>
 
 			<cmd name="InsertImage" _label="_Image..." _tip="Insert image into document..." pixtype="pixbuf"/>
@@ -23,13 +23,13 @@
 			<cmd name="InsertRule"  _label="_Rule..." _tip="Insert rule into document..."/>
 			<cmd name="InsertTable" _label="_Table..." _tip="Insert table into document..."/>
 			<cmd name="InsertTemplate" _label="Te_mplate..." _tip="Insert HTML template into document..."/>
-			<cmd name="InsertTextFile" _label="Te_xt file..." _tip="Insert text file into document..."/>
-			<cmd name="InsertHTMLFile" _label="_HTML file..." _tip="Insert HTML file into document..."/>
+			<cmd name="InsertTextFile" _label="Te_xt File..." _tip="Insert text file into document..."/>
+			<cmd name="InsertHTMLFile" _label="_HTML File..." _tip="Insert HTML file into document..."/>
 			<cmd name="InsertSmiley3" _label="_Smile" _tip="Insert Smile smiley into document..."/>
 			<cmd name="InsertSmiley4" _label="_Wink" _tip="Insert Wink smiley into document..."/>
 			<cmd name="InsertSmiley5" _label="Su_rprised" _tip="Insert Surprised smiley into document..."/>
 			<cmd name="InsertSmiley1" _label="_Laughing" _tip="Insert Laughing smiley into document..."/>
-			<cmd name="InsertSmiley2" _label="Oh _no!" _tip="Insert Oh no! smiley into document..."/>
+			<cmd name="InsertSmiley2" _label="Oh _No!" _tip="Insert Oh no! smiley into document..."/>
 			<cmd name="InsertSmiley6" _label="_Frown" _tip="Insert Frown smiley into document..."/>
 			<cmd name="InsertSmiley8" _label="_Indifferent" _tip="Insert Indifferent smiley into document..."/>
 			<cmd name="InsertSmiley9" _label="_Undecided" _tip="Insert Undecided smiley into document..."/>
@@ -152,7 +152,7 @@
 				pixtype="filename" pixname="@ICONSDIR@/insert-table-16.png"/>
 				<menuitem name="InsertTextFile" verb=""/>
 				<menuitem name="InsertHTMLFile" verb=""/>
-				<submenu name="Smiley" _label="_Smiley"
+				<submenu name="Smiley" _label="Emoti_con"
                                 pixtype="filename" pixname="@ICONSDIR@/smiley-3.png">
 					<menuitem name="InsertSmiley3" verb=""
         	                        pixtype="filename" pixname="@ICONSDIR@/smiley-3.png"/>
@@ -185,7 +185,7 @@
 
 			<placeholder name="FormatParagaph">
 				<submenu name="FontStyle" _label="_Style">
-					<menuitem name="FormatFixed" verb="" _label="_Plain text"
+					<menuitem name="FormatFixed" verb="" _label="_Plain Text"
                                          pixtype="filename" pixname="@ICONSDIR@/font-tt-16.png"/>
 
 					<separator/>
@@ -193,7 +193,7 @@
 					<menuitem name="FormatBold" verb="" _label="_Bold"/>
 					<menuitem name="FormatItalic" verb="" _label="_Italic"/>
 					<menuitem name="FormatUnderline" verb="" _label="_Underline"/>
-					<menuitem name="FormatStrikeout" verb="" _label="_Strikeout"/>
+					<menuitem name="FormatStrikeout" verb="" _label="_Strikethrough"/>
 					
 <!--					
 					<separator/>
@@ -246,7 +246,7 @@
 					<menuitem name="HeadingAlphabeticalList" verb="" _label="_Alphabetical List"/>
 					<separator/>
 					<menuitem name="HeadingAddress" verb="" _label="A_ddress"/>
-					<menuitem name="HeadingPreformat" verb="" _label="_Preformat"/>
+					<menuitem name="HeadingPreformat" verb="" _label="_Preformatted"/>
 				</submenu>
                 
 				<submenu name="Alignment" _label="_Alignment">
@@ -284,16 +284,16 @@
 		<separator/>
 
 		<toolitem name="EditFind" verb=""  _label="Find" _tip="Find"/>
-		<toolitem name="EditReplace" verb=""  _label="Replace" _tip="Find And Replace"
+		<toolitem name="EditReplace" verb=""  _label="Replace" _tip="Find and replace"
                  pixtype="stock" pixname="gtk-find-and-replace"/>
 
 		<separator/>
 
-		<toolitem name="InsertImage" verb="" _label="Image"/>
-		<toolitem name="InsertLink" verb="" _label="Link"/>
-		<toolitem name="InsertRule" verb="" _label="Rule"
+		<toolitem name="InsertImage" verb="" _label="Image" _tip="Insert image"/>
+		<toolitem name="InsertLink" verb="" _label="Link" _tip="Insert link"/>
+		<toolitem name="InsertRule" verb="" _label="Rule" _tip="Insert rule"
 		pixtype="filename" pixname="@ICONSDIR@/insert-rule-24.png"/>
-		<toolitem name="InsertTable" verb="" _label="Table"
+		<toolitem name="InsertTable" verb="" _label="Table" _tip="Insert rule"
 		pixtype="filename" pixname="@ICONSDIR@/insert-table-24.png"/>
 	</dockitem>
 
Index: GNOME_GtkHTML_Editor-emacs.xml.in
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/GNOME_GtkHTML_Editor-emacs.xml.in,v
retrieving revision 1.5
diff -u -p -r1.5 GNOME_GtkHTML_Editor-emacs.xml.in
--- GNOME_GtkHTML_Editor-emacs.xml.in	26 Jan 2005 10:19:55 -0000	1.5
+++ GNOME_GtkHTML_Editor-emacs.xml.in	21 Dec 2005 08:37:11 -0000
@@ -16,7 +16,7 @@
 
 			<cmd name="EditSelectAll" _label="Select _All"
 			_tip="Select the entire contents of the document"/>
-			<cmd name="EditSpellCheck" _label="_Spell Check Document..."
+			<cmd name="EditSpellCheck" _label="Check _Spelling..."
 			_tip="Check spelling of the document" accel="*Ctrl**Shift*l"/>
 
 			<cmd name="InsertImage" _label="_Image..." _tip="Insert image into document..."/>
@@ -24,13 +24,13 @@
 			<cmd name="InsertRule"  _label="_Rule..." _tip="Insert rule into document..."/>
 			<cmd name="InsertTable" _label="_Table..." _tip="Insert table into document..."/>
 			<cmd name="InsertTemplate" _label="Te_mplate..." _tip="Insert HTML template into document..."/>
-			<cmd name="InsertTextFile" _label="Te_xt file..." _tip="Insert text file into document..."/>
-			<cmd name="InsertHTMLFile" _label="_HTML file..." _tip="Insert HTML file into document..."/>
+			<cmd name="InsertTextFile" _label="Te_xt File..." _tip="Insert text file into document..."/>
+			<cmd name="InsertHTMLFile" _label="_HTML File..." _tip="Insert HTML file into document..."/>
 			<cmd name="InsertSmiley3" _label="_Smile" _tip="Insert Smile smiley into document..."/>
 			<cmd name="InsertSmiley4" _label="_Wink" _tip="Insert Wink smiley into document..."/>
 			<cmd name="InsertSmiley5" _label="Su_rprised" _tip="Insert Surprised smiley into document..."/>
 			<cmd name="InsertSmiley1" _label="_Laughing" _tip="Insert Laughing smiley into document..."/>
-			<cmd name="InsertSmiley2" _label="Oh _no!" _tip="Insert Oh no! smiley into document..."/>
+			<cmd name="InsertSmiley2" _label="Oh _No!" _tip="Insert Oh no! smiley into document..."/>
 			<cmd name="InsertSmiley6" _label="_Frown" _tip="Insert Frown smiley into document..."/>
 			<cmd name="InsertSmiley8" _label="_Indifferent" _tip="Insert Indifferent smiley into document..."/>
 			<cmd name="InsertSmiley9" _label="_Undecided" _tip="Insert Undecided smiley into document..."/>
@@ -157,7 +157,7 @@
 				pixtype="filename" pixname="@ICONSDIR@/insert-table-16.png"/>
 				<menuitem name="InsertTextFile" verb=""/>
 				<menuitem name="InsertHTMLFile" verb=""/>
-				<submenu name="Smiley" _label="_Smiley"
+				<submenu name="Smiley" _label="Emoti_con"
                                 pixtype="filename" pixname="@ICONSDIR@/smiley-3.png">
 					<menuitem name="InsertSmiley3" verb=""
         	                        pixtype="filename" pixname="@ICONSDIR@/smiley-3.png"/>
@@ -188,14 +188,14 @@
 
 			<placeholder name="FormatParagaph">
 				<submenu name="FontStyle" _label="_Style">
-					<menuitem name="FormatFixed" verb="" _label="_Plain text"/>
+					<menuitem name="FormatFixed" verb="" _label="_Plain Text"/>
 
 					<separator/>
 				
 					<menuitem name="FormatBold" verb="" _label="_Bold"/>
 					<menuitem name="FormatItalic" verb="" _label="_Italic"/>
 					<menuitem name="FormatUnderline" verb="" _label="_Underline"/>
-					<menuitem name="FormatStrikeout" verb="" _label="_Strikeout"/>
+					<menuitem name="FormatStrikeout" verb="" _label="_Strikethrough"/>
 					
 <!--					
 					<separator/>
@@ -234,7 +234,7 @@
                 
 				<submenu name="Heading" _label="_Heading">
 					<menuitem name="HeadingNormal" verb="" _label="_Normal"/> 
-					<menuitem name="HeadingPreformat" verb="" _label="_Preformat"/>
+					<menuitem name="HeadingPreformat" verb="" _label="_Preformatted"/>
 					<menuitem name="HeadingBulletedList" verb="" _label="_Bulleted List"/>
 					<menuitem name="HeadingRomanList" verb="" _label="_Roman Numeral List"/> 
  					<menuitem name="HeadingNumberedList" verb="" _label="Numbered _List"/> 
@@ -282,15 +282,15 @@
 		<separator/>
 
 		<toolitem name="EditFind" verb=""  _label="Find" _tip="Find"/>
-		<toolitem name="EditReplace" verb=""  _label="Replace" _tip="Find And Replace"/>
+		<toolitem name="EditReplace" verb=""  _label="Replace" _tip="Find and replace"/>
 
 		<separator/>
 
-		<toolitem name="InsertImage" verb="" _label="Image"/>
-		<toolitem name="InsertLink" verb="" _label="Link"/>
-		<toolitem name="InsertRule" verb="" _label="Rule"
+		<toolitem name="InsertImage" verb="" _label="Image" _tip="Insert image"/>
+		<toolitem name="InsertLink" verb="" _label="Link" _tip="Insert link"/>
+		<toolitem name="InsertRule" verb="" _label="Rule" _tip="Insert rule"
 		pixtype="filename" pixname="@ICONSDIR@/insert-rule-24.png"/>
-		<toolitem name="InsertTable" verb="" _label="Table"
+		<toolitem name="InsertTable" verb="" _label="Table" _tip="Insert table"
 		pixtype="filename" pixname="@ICONSDIR@/insert-table-24.png"/>
 	</dockitem>
 
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/ChangeLog,v
retrieving revision 1.518
diff -u -p -r1.518 ChangeLog
--- ChangeLog	28 Oct 2005 10:04:26 -0000	1.518
+++ ChangeLog	21 Dec 2005 08:37:24 -0000
@@ -1,3 +1,11 @@
+2005-12-21  Rohini S  <srohini novell com>
+
+	* GNOME_GtkHTML_Editor.xml.in:
+	* GNOME_GtkHTML_Editor-emacs.xml.in:
+	Tooltips and menu item labels modified
+
+	Fixes bug #246237
+
 2005-10-28  Kaushal Kumar  <kakumar novell com>
 
 	* utils.c: Use proper description for test_url_items button.