Fix for bug 329513, 329471 [gtkhtml]

rox <[email protected]>
Newsgroups gmane.comp.gnome.evolution.patches
Message-ID <[email protected]>
Hi

Following String changes are done 
Bug 329513 – replace remaining strings "smiley" by "emoticon"
Bug 329471 – String Change Please. Emoticon "Lick" to "Tongue"

Thanks,
Rohini

_______________________________________________
Evolution-patches mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/evolution-patches
bug329513.diff (text/x-patch, 6.3 KB)
Index: GNOME_GtkHTML_Editor.xml.in
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/GNOME_GtkHTML_Editor.xml.in,v
retrieving revision 1.65
diff -u -p -r1.65 GNOME_GtkHTML_Editor.xml.in
--- GNOME_GtkHTML_Editor.xml.in	5 Feb 2006 18:10:04 -0000	1.65
+++ GNOME_GtkHTML_Editor.xml.in	7 Feb 2006 05:31:39 -0000
@@ -25,17 +25,17 @@
 			<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="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="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..."/>
-			<cmd name="InsertSmiley10" _label="Li_ck" _tip="Insert Lick smiley into document..."/>
-			<cmd name="InsertSmiley11" _label="Cr_ying" _tip="Insert Crying smiley into document..."/>
-			<cmd name="InsertSmiley12" _label="S_ick" _tip="Insert Sick smiley into document..."/>
+			<cmd name="InsertSmiley3" _label="_Smile" _tip="Insert Smile emoticon into document..."/>
+			<cmd name="InsertSmiley4" _label="_Wink" _tip="Insert Wink emoticon into document..."/>
+			<cmd name="InsertSmiley5" _label="Su_rprised" _tip="Insert Surprised emoticon into document..."/>
+			<cmd name="InsertSmiley1" _label="_Laughing" _tip="Insert Laughing emoticon into document..."/>
+			<cmd name="InsertSmiley2" _label="Oh _No!" _tip="Insert Oh no! emoticon into document..."/>
+			<cmd name="InsertSmiley6" _label="_Frown" _tip="Insert Frown emoticon into document..."/>
+			<cmd name="InsertSmiley8" _label="_Indifferent" _tip="Insert Indifferent emoticon into document..."/>
+			<cmd name="InsertSmiley9" _label="_Undecided" _tip="Insert Undecided emoticon into document..."/>
+			<cmd name="InsertSmiley10" _label="_Tongue" _tip="Insert Tongue emoticon into document..."/>
+			<cmd name="InsertSmiley11" _label="Cr_ying" _tip="Insert Crying emoticon into document..."/>
+			<cmd name="InsertSmiley12" _label="S_ick" _tip="Insert Sick emoticon into document..."/>
 
 			<cmd name="HeadingNormal" _label="Normal"
 		        _tip="Make the current Paragraph style Normal"
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.10
diff -u -p -r1.10 GNOME_GtkHTML_Editor-emacs.xml.in
--- GNOME_GtkHTML_Editor-emacs.xml.in	5 Feb 2006 18:10:04 -0000	1.10
+++ GNOME_GtkHTML_Editor-emacs.xml.in	7 Feb 2006 05:31:48 -0000
@@ -26,16 +26,16 @@
 			<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="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="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..."/>
-			<cmd name="InsertSmiley10" _label="Li_ck" _tip="Insert Lick smiley into document..."/>
-			<cmd name="InsertSmiley11" _label="Cr_ying" _tip="Insert Crying smiley into document..."/>
+			<cmd name="InsertSmiley3" _label="_Smile" _tip="Insert Smile emoticon into document..."/>
+			<cmd name="InsertSmiley4" _label="_Wink" _tip="Insert Wink emoticon into document..."/>
+			<cmd name="InsertSmiley5" _label="Su_rprised" _tip="Insert Surprised emoticon into document..."/>
+			<cmd name="InsertSmiley1" _label="_Laughing" _tip="Insert Laughing emoticon into document..."/>
+			<cmd name="InsertSmiley2" _label="Oh _No!" _tip="Insert Oh no! emoticon into document..."/>
+			<cmd name="InsertSmiley6" _label="_Frown" _tip="Insert Frown emoticon into document..."/>
+			<cmd name="InsertSmiley8" _label="_Indifferent" _tip="Insert Indifferent emoticon into document..."/>
+			<cmd name="InsertSmiley9" _label="_Undecided" _tip="Insert Undecided emoticon into document..."/>
+			<cmd name="InsertSmiley10" _label="_Tongue" _tip="Insert Tongue emoticon into document..."/>
+			<cmd name="InsertSmiley11" _label="Cr_ying" _tip="Insert Crying emoticon into document..."/>
 
 			<cmd name="HeadingNormal" _label="Normal"
 		        _tip="Make the current Paragraph style Normal"
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtkhtml/components/html-editor/ChangeLog,v
retrieving revision 1.527
diff -u -p -r1.527 ChangeLog
--- ChangeLog	5 Feb 2006 18:10:04 -0000	1.527
+++ ChangeLog	7 Feb 2006 05:32:00 -0000
@@ -1,3 +1,12 @@
+2006-02-07  Rohini S  <[email protected]>
+
+	* GNOME_GtkHTML_Editor.xml.in:
+	* GNOME_GtkHTML_Editor-emacs.xml.in:
+       String Change for tooltips in Emoticon sub menu.
+	String Change for Emoticon Lick to Tongue.
+
+        Fixes bug #329513, #329471
+
 2006-02-05  Karsten Bräckelmann  <[email protected]>
 
 	* GNOME_GtkHTML_Editor.xml.in:
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.