# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1062344132 0
# Node ID 7e2d2c8e88a8a597e45303f49e52880a69d54260
# Parent  dd9e0bd6488ea6ee61643068c114787040aed62d
[gaim-migrate @ 7182]
Nathan Poznick writes:
"I was checking over the translation changes that Bjoern submitted
+for
my Yahoo/MSN get user info patch, and I found that several strings
+were
improperly marked to be translated.

For instance, consider the line:

info_extract_field(stripped, url_text, "My Email", 5, "\n", 0, _("Private"), _("Email"), 0, NULL);

In this case, "Private" should not be translated, since that function argument
is used in the parsing, not in the displaying.  There were instances of this
in yahoo.c, and 6 instances in msn.c.  The attached patches simply remove the
_() from around those strings.

I know 0.68 is supposed to be released tomorrow, so I hope these small changes
can make it in - otherwise, it will mean that fetching an english profile will
not work as designed, if gaim is running under a different locale."

(11:20:50) faceprint: anyone look at the too-many-translated-strings thing on gaim-devel?
(11:21:12) LSchiere: that's what i was just about to ask about
(11:21:48) faceprint: looks kosher to me
(11:21:51) LSchiere: yeah
(11:23:30) SeanEgan: agreed

committer: Tailor Script <tailor@pidgin.im>

diff -r dd9e0bd6488e -r 7e2d2c8e88a8 src/protocols/msn/msn.c
--- a/src/protocols/msn/msn.c	Sun Aug 31 15:32:26 2003 +0000
+++ b/src/protocols/msn/msn.c	Sun Aug 31 15:35:32 2003 +0000
@@ -1211,27 +1211,27 @@
 
 	/* extract their Name and put it in */
 	info_extract_field(stripped, url_text, "\tName", 0, "\t", '\n',
-			_("Undisclosed"), _("Name"), 0, NULL);
+			"Undisclosed", _("Name"), 0, NULL);
 
 	/* extract their Age and put it in */
 	info_extract_field(stripped, url_text, "\tAge", 0, "\t", '\n',
-			_("Undisclosed"), _("Age"), 0, NULL);
+			"Undisclosed", _("Age"), 0, NULL);
 
 	/* extract their Gender and put it in */
 	info_extract_field(stripped, url_text, "\tGender", 6, "\t", '\n',
-			_("Undisclosed"), _("Gender"), 0, NULL);
+			"Undisclosed", _("Gender"), 0, NULL);
 
 	/* extract their MaritalStatus and put it in */
 	info_extract_field(stripped, url_text, "\tMaritalStatus", 0, "\t", '\n',
-			_("Undisclosed"), _("Marital Status"), 0, NULL);
+			"Undisclosed", _("Marital Status"), 0, NULL);
 
 	/* extract their Location and put it in */
 	info_extract_field(stripped, url_text, "\tLocation", 0, "\t", '\n',
-			_("Undisclosed"), _("Location"), 0, NULL);
+			"Undisclosed", _("Location"), 0, NULL);
 
 	/* extract their Occupation and put it in */
 	info_extract_field(stripped, url_text, "\t Occupation", 6, "\t", '\n',
-			_("Undisclosed"), _("Occupation"), 0, NULL);
+			"Undisclosed", _("Occupation"), 0, NULL);
 
 	/* the fields, 'A Little About Me', 'Favorite Things', 'Hobbies and Interests',
 	 * 'Favorite Quote', and 'My Homepage' may or may not appear, in any combination.
diff -r dd9e0bd6488e -r 7e2d2c8e88a8 src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Sun Aug 31 15:32:26 2003 +0000
+++ b/src/protocols/yahoo/yahoo.c	Sun Aug 31 15:35:32 2003 +0000
@@ -1471,7 +1471,7 @@
 
 	/* extract their Email address and put it in */
 	info_extract_field(stripped, url_text, "My Email", 5, "\n", 0,
-			_("Private"), _("Email"), 0, NULL);
+			"Private", _("Email"), 0, NULL);
 
 	/* extract the Nickname if it exists */
 	info_extract_field(stripped, url_text, "Nickname:", 1, "\n", '\n',
@@ -1491,11 +1491,11 @@
 
 	/* extract their MaritalStatus and put it in */
 	info_extract_field(stripped, url_text, "MaritalStatus:", 3, "\n", '\n',
-			_("No Answer"), _("Marital Status"), 0, NULL);
+			"No Answer", _("Marital Status"), 0, NULL);
 
 	/* extract their Gender and put it in */
 	info_extract_field(stripped, url_text, "Gender:", 3, "\n", '\n',
-			_("No Answer"), _("Gender"), 0, NULL);
+			"No Answer", _("Gender"), 0, NULL);
 
 	/* extract their Occupation and put it in */
 	info_extract_field(stripped, url_text, "Occupation:", 2, "\n", '\n',