Mercurial > pidgin

comparison libgaim/protocols/novell/nmuser.c @ 15000:89ae31668a9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 17779] 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. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Sun, 19 Nov 2006 07:00:25 +0000
parents 71c764f2b1a6
children
comparison
equal deleted inserted replaced
14999:82d1a2fc6d25 15000:89ae31668a9c
1904 case NMERR_PASSWORD_EXPIRED: 1904 case NMERR_PASSWORD_EXPIRED:
1905 case NMERR_PASSWORD_EXPIRED_2: 1905 case NMERR_PASSWORD_EXPIRED_2:
1906 return _("Password has expired"); 1906 return _("Password has expired");
1907 1907
1908 case NMERR_PASSWORD_INVALID: 1908 case NMERR_PASSWORD_INVALID:
1909 return _("Invalid password"); 1909 return _("Incorrect password");
1910 1910
1911 case NMERR_USER_NOT_FOUND: 1911 case NMERR_USER_NOT_FOUND:
1912 return _("User not found"); 1912 return _("User not found");
1913 1913
1914 case NMERR_USER_DISABLED: 1914 case NMERR_USER_DISABLED:
1932 case NMERR_MASTER_ARCHIVE_MISSING: 1932 case NMERR_MASTER_ARCHIVE_MISSING:
1933 return _("Master archive is misconfigured"); 1933 return _("Master archive is misconfigured");
1934 1934
1935 case NMERR_AUTHENTICATION_FAILED: 1935 case NMERR_AUTHENTICATION_FAILED:
1936 case NMERR_CREDENTIALS_MISSING: 1936 case NMERR_CREDENTIALS_MISSING:
1937 return _("Invalid username or password"); 1937 return _("Incorrect screen name or password");
1938 1938
1939 case NMERR_HOST_NOT_FOUND: 1939 case NMERR_HOST_NOT_FOUND:
1940 return _("Could not recognize the host of the username you entered"); 1940 return _("Could not recognize the host of the screen name you entered");
1941 1941
1942 case NMERR_ACCESS_DENIED: 1942 case NMERR_ACCESS_DENIED:
1943 return _("Your account has been disabled because too many invalid passwords were entered"); 1943 return _("Your account has been disabled because too many incorrect passwords were entered");
1944 1944
1945 case NMERR_DUPLICATE_PARTICIPANT: 1945 case NMERR_DUPLICATE_PARTICIPANT:
1946 return _("You cannot add the same person twice to a conversation"); 1946 return _("You cannot add the same person twice to a conversation");
1947 1947
1948 case NMERR_TOO_MANY_CONTACTS: 1948 case NMERR_TOO_MANY_CONTACTS:
1949 case NMERR_TOO_MANY_FOLDERS: 1949 case NMERR_TOO_MANY_FOLDERS:
1950 return _("You have reached your limit for the number of contacts allowed"); 1950 return _("You have reached your limit for the number of contacts allowed");
1951 1951
1952 case NMERR_OBJECT_NOT_FOUND: 1952 case NMERR_OBJECT_NOT_FOUND:
1953 return _("You have entered an invalid username"); 1953 return _("You have entered an incorrect screen name");
1954 1954
1955 case NMERR_DIRECTORY_UPDATE: 1955 case NMERR_DIRECTORY_UPDATE:
1956 return _("An error occurred while updating the directory"); 1956 return _("An error occurred while updating the directory");
1957 1957
1958 case NMERR_SERVER_PROTOCOL: 1958 case NMERR_SERVER_PROTOCOL: