Mercurial > pidgin
changeset 8152:82aeed3c90f0
[gaim-migrate @ 8864]
I love me some consistency.
I went with "screen name" instead of "screenname" mostly because
I feel that the first one is more readable. It's also what
aim.com uses.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 20 Jan 2004 16:08:45 +0000 |
| parents | b619ee745ec0 |
| children | fd5a40b8597b |
| files | ChangeLog src/dialogs.c src/gaim-remote.c src/gtkaccount.c src/gtkprefs.c src/protocols/msn/msn.c src/protocols/oscar/oscar.c |
| diffstat | 7 files changed, 21 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jan 20 15:58:39 2004 +0000 +++ b/ChangeLog Tue Jan 20 16:08:45 2004 +0000 @@ -1,12 +1,12 @@ Gaim: The Pimpin' Penguin IM Clone that's good for the soul! version 0.76cvs: - * WYSIWYG text input (with scrollbars, too!) + * WYSIWYG text input + * Chatroom list support (Tim Ringenbach) * Improved accessibility support for screen readers and other accessibility tools (Marc Mulcahy) * Improved accessibility in conversation windows (Nathan Fredrickson) * Keyboard access to context menus via Shift+F10 (Marc Mulcahy) - * Chatroom List support (thanks, Tim Ringenbach) * TCL Plugin API changed * Catalan translation updated (Xan (DXpublica)) * English (British) translation updated (Luke Ross (lukeross))
--- a/src/dialogs.c Tue Jan 20 15:58:39 2004 +0000 +++ b/src/dialogs.c Tue Jan 20 16:08:45 2004 +0000 @@ -558,7 +558,7 @@ vbox = gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(hbox), vbox); - label = gtk_label_new(_("Please enter the screenname of the person you would like to IM.\n")); + label = gtk_label_new(_("Please enter the screen name of the person you would like to IM.\n")); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); gtk_misc_set_alignment(GTK_MISC(label), 0, 0); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); @@ -570,7 +570,7 @@ gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); label = gtk_label_new(NULL); - gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Screenname:")); + gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Screen Name:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1); @@ -635,7 +635,7 @@ vbox = gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(hbox), vbox); - label = gtk_label_new(_("Please enter the screenname of the person whose info you would like to view.\n")); + label = gtk_label_new(_("Please enter the screen name of the person whose info you would like to view.\n")); gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); gtk_misc_set_alignment(GTK_MISC(label), 0, 0); gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); @@ -647,7 +647,7 @@ gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); label = gtk_label_new(NULL); - gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Screenname:")); + gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), _("_Screen Name:")); gtk_misc_set_alignment(GTK_MISC(img), 0, 0); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 0, 1);
--- a/src/gaim-remote.c Tue Jan 20 15:58:39 2004 +0000 +++ b/src/gaim-remote.c Tue Jan 20 16:08:45 2004 +0000 @@ -89,7 +89,7 @@ " -m, --message=MESG Message to send or show in conversation window\n" " -t, --to=SCREENNAME Select a target for command\n" " -p, --protocol=PROTO Specify protocol to use\n" - " -f, --from=SCREENNAME Specify screenname to use\n" + " -f, --from=SCREENNAME Specify scree nname to use\n" " -q, --quiet Send message without showing a conversation\n" " window\n" */ @@ -203,13 +203,13 @@ if(!strcmp(command, "uri")) { message(_("\n" "Using AIM: URIs:\n" - "Sending an IM to a screenname:\n" + "Sending an IM to a screen name:\n" " gaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n" - "In this case, 'Penguin' is the screenname we wish to IM, and 'hello world'\n" + "In this case, 'Penguin' is the screen name we wish to IM, and 'hello world'\n" "is the message to be sent. '+' must be used in place of spaces.\n" "Please note the quoting used above - if you run this from a shell the '&'\n" "needs to be escaped, or the command will stop at that point.\n" - "Also,the following will just open a conversation window to a screenname,\n" + "Also,the following will just open a conversation window to a screen name,\n" "with no message:\n" " gaim-remote uri 'aim:goim?screenname=Penguin'\n\n" "Joining a chat:\n"
--- a/src/gtkaccount.c Tue Jan 20 15:58:39 2004 +0000 +++ b/src/gtkaccount.c Tue Jan 20 16:08:45 2004 +0000 @@ -389,7 +389,7 @@ /* Screen Name */ dialog->screenname_entry = gtk_entry_new(); - add_pref_box(dialog, vbox, _("Screenname:"), dialog->screenname_entry); + add_pref_box(dialog, vbox, _("Screen Name:"), dialog->screenname_entry); g_signal_connect(G_OBJECT(dialog->screenname_entry), "changed", G_CALLBACK(screenname_changed_cb), dialog);
--- a/src/gtkprefs.c Tue Jan 20 15:58:39 2004 +0000 +++ b/src/gtkprefs.c Tue Jan 20 16:08:45 2004 +0000 @@ -1042,7 +1042,7 @@ "/core/conversations/chat/show_join", vbox); gaim_gtk_prefs_checkbox(_("_Show people leaving in window"), "/core/conversations/chat/show_leave", vbox); - gaim_gtk_prefs_checkbox(_("Co_lorize screennames"), + gaim_gtk_prefs_checkbox(_("Co_lorize screen names"), "/gaim/gtk/conversations/chat/color_nicks", vbox); gtk_widget_show_all(ret);
--- a/src/protocols/msn/msn.c Tue Jan 20 15:58:39 2004 +0000 +++ b/src/protocols/msn/msn.c Tue Jan 20 16:08:45 2004 +0000 @@ -742,11 +742,11 @@ if (!strchr(who, '@')) { g_snprintf(buf, sizeof(buf), - _("An MSN screenname must be in the form \"user@server.com\". " + _("An MSN screen name must be in the form \"user@server.com\". " "Perhaps you meant %s@hotmail.com. No changes were made " "to your allow list."), who); - gaim_notify_error(gc, NULL, _("Invalid MSN screenname"), buf); + gaim_notify_error(gc, NULL, _("Invalid MSN screen name"), buf); gaim_privacy_permit_remove(gc->account, who, TRUE); return; @@ -782,11 +782,11 @@ if (!strchr(who, '@')) { g_snprintf(buf, sizeof(buf), - _("An MSN screenname must be in the form \"user@server.com\". " + _("An MSN screen name must be in the form \"user@server.com\". " "Perhaps you meant %s@hotmail.com. No changes were made " "to your block list."), who); - gaim_notify_error(gc, NULL, _("Invalid MSN screenname"), buf); + gaim_notify_error(gc, NULL, _("Invalid MSN screen name"), buf); gaim_privacy_deny_remove(gc->account, who, TRUE);
--- a/src/protocols/oscar/oscar.c Tue Jan 20 15:58:39 2004 +0000 +++ b/src/protocols/oscar/oscar.c Tue Jan 20 16:08:45 2004 +0000 @@ -3745,7 +3745,7 @@ od->chpass = FALSE; } if (od->setnick) { - gaim_debug(GAIM_DEBUG_INFO, "oscar", "formatting screenname\n"); + gaim_debug(GAIM_DEBUG_INFO, "oscar", "formatting screen name\n"); aim_admin_setnick(sess, fr->conn, od->newsn); g_free(od->newsn); od->newsn = NULL; @@ -4137,7 +4137,7 @@ SNs = va_arg(ap, char *); va_end(ap); - secondary = g_strdup_printf(_("The following screennames are associated with %s"), email); + secondary = g_strdup_printf(_("The following screen names are associated with %s"), email); text = g_string_new(""); for (i = 0; i < num; i++) g_string_append_printf(text, "%s<br>", &SNs[i * (MAXSNLEN + 1)]); @@ -6289,13 +6289,13 @@ } } else { gaim_notify_error(gc, NULL, _("The new formatting is invalid."), - _("Screenname formatting can change only capitalization and whitespace.")); + _("Screen name formatting can change only capitalization and whitespace.")); } } static void oscar_show_format_screenname(GaimConnection *gc) { - gaim_request_input(gc, NULL, _("New screenname formatting:"), NULL, + gaim_request_input(gc, NULL, _("New screen name formatting:"), NULL, gaim_connection_get_display_name(gc), FALSE, FALSE, _("OK"), G_CALLBACK(oscar_format_screenname), _("Cancel"), NULL, @@ -6537,7 +6537,7 @@ m = g_list_append(m, NULL); pam = g_new0(struct proto_actions_menu, 1); - pam->label = _("Format Screenname..."); + pam->label = _("Format Screen Name..."); pam->callback = oscar_show_format_screenname; pam->gc = gc; m = g_list_append(m, pam);