Menu
▾
▴
[Gaim-commits] SF.net SVN: gaim: [17779] trunk/libgaim/protocols
|
From: <rl...@us...> - 2006-11-19 07:00:27
|
Revision: 17779
http://svn.sourceforge.net/gaim/?rev=17779&view=rev
Author: rlaager
Date: 2006-11-18 23:00:25 -0800 (Sat, 18 Nov 2006)
Log Message:
-----------
I'm committing this to get it out of my tree...
As mentioned on gaim-devel, this normalizes some stuff. Mark wants to standardize on "username" instead. For recognition purposes, I'd prefer that, but using "screen name" is potentially useful in that users might not enter their OS username. In any case, it's not a huge deal to me either way. I believe the consensus before was for "screen name", and barring a consensus to change, "screen name" is the status quo anyway, so I'm making things consistent.
Modified Paths:
--------------
trunk/libgaim/protocols/msn/error.c
trunk/libgaim/protocols/novell/nmuser.c
trunk/libgaim/protocols/simple/simple.c
trunk/libgaim/protocols/toc/toc.c
trunk/libgaim/protocols/yahoo/yahoo.c
Modified: trunk/libgaim/protocols/msn/error.c
===================================================================
--- trunk/libgaim/protocols/msn/error.c 2006-11-19 06:54:38 UTC (rev 17778)
+++ trunk/libgaim/protocols/msn/error.c 2006-11-19 07:00:25 UTC (rev 17779)
@@ -46,19 +46,19 @@
break;
case 206:
g_snprintf(msg, sizeof(msg),
- _("Fully Qualified Domain Name missing"));
+ _("Fully qualified domain name missing"));
break;
case 207:
- g_snprintf(msg, sizeof(msg), _("Already Logged In"));
+ g_snprintf(msg, sizeof(msg), _("Already logged in"));
break;
case 208:
- g_snprintf(msg, sizeof(msg), _("Invalid Username"));
+ g_snprintf(msg, sizeof(msg), _("Invalid screen name"));
break;
case 209:
- g_snprintf(msg, sizeof(msg), _("Invalid Friendly Name"));
+ g_snprintf(msg, sizeof(msg), _("Invalid friendly name"));
break;
case 210:
- g_snprintf(msg, sizeof(msg), _("List Full"));
+ g_snprintf(msg, sizeof(msg), _("List full"));
break;
case 215:
g_snprintf(msg, sizeof(msg), _("Already there"));
@@ -99,7 +99,7 @@
g_snprintf(msg, sizeof(msg), _("Switchboard failed"));
break;
case 281:
- g_snprintf(msg, sizeof(msg), _("Notify Transfer failed"));
+ g_snprintf(msg, sizeof(msg), _("Notify transfer failed"));
break;
case 300:
@@ -113,7 +113,7 @@
break;
case 500:
- g_snprintf(msg, sizeof(msg), _("Service Temporarily Unavailable"));
+ g_snprintf(msg, sizeof(msg), _("Service temporarily unavailable"));
break;
case 501:
g_snprintf(msg, sizeof(msg), _("Database server error"));
@@ -138,7 +138,7 @@
g_snprintf(msg, sizeof(msg), _("Server unavailable"));
break;
case 602:
- g_snprintf(msg, sizeof(msg), _("Peer Notification server down"));
+ g_snprintf(msg, sizeof(msg), _("Peer notification server down"));
break;
case 603:
g_snprintf(msg, sizeof(msg), _("Database connect error"));
Modified: trunk/libgaim/protocols/novell/nmuser.c
===================================================================
--- trunk/libgaim/protocols/novell/nmuser.c 2006-11-19 06:54:38 UTC (rev 17778)
+++ trunk/libgaim/protocols/novell/nmuser.c 2006-11-19 07:00:25 UTC (rev 17779)
@@ -1906,7 +1906,7 @@
return _("Password has expired");
case NMERR_PASSWORD_INVALID:
- return _("Invalid password");
+ return _("Incorrect password");
case NMERR_USER_NOT_FOUND:
return _("User not found");
@@ -1934,13 +1934,13 @@
case NMERR_AUTHENTICATION_FAILED:
case NMERR_CREDENTIALS_MISSING:
- return _("Invalid username or password");
+ return _("Incorrect screen name or password");
case NMERR_HOST_NOT_FOUND:
- return _("Could not recognize the host of the username you entered");
+ return _("Could not recognize the host of the screen name you entered");
case NMERR_ACCESS_DENIED:
- return _("Your account has been disabled because too many invalid passwords were entered");
+ return _("Your account has been disabled because too many incorrect passwords were entered");
case NMERR_DUPLICATE_PARTICIPANT:
return _("You cannot add the same person twice to a conversation");
@@ -1950,7 +1950,7 @@
return _("You have reached your limit for the number of contacts allowed");
case NMERR_OBJECT_NOT_FOUND:
- return _("You have entered an invalid username");
+ return _("You have entered an incorrect screen name");
case NMERR_DIRECTORY_UPDATE:
return _("An error occurred while updating the directory");
Modified: trunk/libgaim/protocols/simple/simple.c
===================================================================
--- trunk/libgaim/protocols/simple/simple.c 2006-11-19 06:54:38 UTC (rev 17778)
+++ trunk/libgaim/protocols/simple/simple.c 2006-11-19 07:00:25 UTC (rev 17779)
@@ -1644,7 +1644,7 @@
if (strpbrk(username, " \t\v\r\n") != NULL) {
gc->wants_to_die = TRUE;
- gaim_connection_error(gc, _("SIP usernames may not contain whitespaces or @ symbols"));
+ gaim_connection_error(gc, _("SIP screen names may not contain whitespaces or @ symbols"));
return;
}
Modified: trunk/libgaim/protocols/toc/toc.c
===================================================================
--- trunk/libgaim/protocols/toc/toc.c 2006-11-19 06:54:38 UTC (rev 17778)
+++ trunk/libgaim/protocols/toc/toc.c 2006-11-19 07:00:25 UTC (rev 17779)
@@ -546,7 +546,7 @@
g_snprintf(buf, sizeof(buf), _("Failure unknown: %s."), w);
break;
case 980:
- g_snprintf(buf, sizeof(buf), _("Incorrect nickname or password."));
+ g_snprintf(buf, sizeof(buf), _("Incorrect screen name or password."));
break;
case 981:
g_snprintf(buf, sizeof(buf), _("The service is temporarily unavailable."));
Modified: trunk/libgaim/protocols/yahoo/yahoo.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo.c 2006-11-19 06:54:38 UTC (rev 17778)
+++ trunk/libgaim/protocols/yahoo/yahoo.c 2006-11-19 07:00:25 UTC (rev 17779)
@@ -1902,7 +1902,7 @@
switch (err) {
case 3:
- msg = g_strdup(_("Invalid username."));
+ msg = g_strdup(_("Invalid screen name."));
break;
case 13:
if (!yd->wm) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
