Mercurial > pidgin.yaz
changeset 12489:12db50600de5
[gaim-migrate @ 14801]
A few minor string changes. Some from Bj??rn Voigt. Yaaaayyy Bj??rn.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 15 Dec 2005 22:59:06 +0000 |
| parents | 40fada5b3d59 |
| children | 59303812aa9c |
| files | plugins/gevolution/new_person_dialog.c po/POTFILES.in src/protocols/bonjour/bonjour.c src/protocols/gg/gg.c src/protocols/msn/msn.c src/protocols/sametime/sametime.c src/protocols/simple/simple.c src/protocols/yahoo/yahoo.c |
| diffstat | 8 files changed, 21 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/gevolution/new_person_dialog.c Thu Dec 15 16:13:56 2005 +0000 +++ b/plugins/gevolution/new_person_dialog.c Thu Dec 15 22:59:06 2005 +0000 @@ -291,7 +291,7 @@ /* Screen Name */ dialog->screenname = gtk_entry_new(); - add_pref_box(sg, vbox, _("Screenname:"), dialog->screenname); + add_pref_box(sg, vbox, _("Screen name:"), dialog->screenname); if (username != NULL) gtk_entry_set_text(GTK_ENTRY(dialog->screenname), username);
--- a/po/POTFILES.in Thu Dec 15 16:13:56 2005 +0000 +++ b/po/POTFILES.in Thu Dec 15 22:59:06 2005 +0000 @@ -2,7 +2,6 @@ plugins/contact_priority.c plugins/crazychat/cc_gaim_plugin.c plugins/dbus-example.c -plugins/docklet/docklet-win32.c plugins/docklet/docklet.c plugins/docklet/eggtrayicon.c plugins/extplacement.c
--- a/src/protocols/bonjour/bonjour.c Thu Dec 15 16:13:56 2005 +0000 +++ b/src/protocols/bonjour/bonjour.c Thu Dec 15 22:59:06 2005 +0000 @@ -550,7 +550,7 @@ initialize_default_account_values(); /* Creating the user splits */ - split = gaim_account_user_split_new(_("Host name"), default_hostname, '@'); + split = gaim_account_user_split_new(_("Hostname"), default_hostname, '@'); prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); /* Creating the options for the protocol */
--- a/src/protocols/gg/gg.c Thu Dec 15 16:13:56 2005 +0000 +++ b/src/protocols/gg/gg.c Thu Dec 15 22:59:06 2005 +0000 @@ -986,7 +986,7 @@ column = gaim_notify_searchresults_column_new(_("First name")); gaim_notify_searchresults_column_add(results, column); - column = gaim_notify_searchresults_column_new(_("Nick name")); + column = gaim_notify_searchresults_column_new(_("Nickname")); gaim_notify_searchresults_column_add(results, column); column = gaim_notify_searchresults_column_new(_("City"));
--- a/src/protocols/msn/msn.c Thu Dec 15 16:13:56 2005 +0000 +++ b/src/protocols/msn/msn.c Thu Dec 15 22:59:06 2005 +0000 @@ -594,11 +594,11 @@ types = g_list_append(types, status); status = gaim_status_type_new_full(GAIM_STATUS_AWAY, "phone", - _("On The Phone"), FALSE, TRUE, FALSE); + _("On the Phone"), FALSE, TRUE, FALSE); types = g_list_append(types, status); status = gaim_status_type_new_full(GAIM_STATUS_AWAY, "lunch", - _("Out To Lunch"), FALSE, TRUE, FALSE); + _("Out to Lunch"), FALSE, TRUE, FALSE); types = g_list_append(types, status); status = gaim_status_type_new_full(GAIM_STATUS_HIDDEN, "invisible", @@ -1342,7 +1342,6 @@ { GString *s; GaimBuddy *b; - const char *p; s = g_string_sized_new(80); /* wild guess */
--- a/src/protocols/sametime/sametime.c Thu Dec 15 16:13:56 2005 +0000 +++ b/src/protocols/sametime/sametime.c Thu Dec 15 22:59:06 2005 +0000 @@ -5775,7 +5775,7 @@ l = g_list_append(l, opt); /* notesbuddy hack encoding */ - opt = gaim_account_option_string_new(_("NotesBuddy Encoding"), + opt = gaim_account_option_string_new(_("NotesBuddy encoding"), MW_KEY_ENCODING, MW_PLUGIN_DEFAULT_ENCODING); l = g_list_append(l, opt); @@ -5784,7 +5784,7 @@ there. Don't delete the preference, since there may be more than one account that wants to check for it. */ gboolean b = FALSE; - const char *label = _("Force Login (Ignore Server Redirects)"); + const char *label = _("Force login (ignore server redirects)"); if(gaim_prefs_exists(MW_PRPL_OPT_FORCE_LOGIN)) b = gaim_prefs_get_bool(MW_PRPL_OPT_FORCE_LOGIN); @@ -5794,7 +5794,7 @@ } /* pretend to be Sametime Connect */ - opt = gaim_account_option_bool_new(_("Hide Client Identity"), + opt = gaim_account_option_bool_new(_("Hide client identity"), MW_KEY_FAKE_IT, FALSE); l = g_list_append(l, opt);
--- a/src/protocols/simple/simple.c Thu Dec 15 16:13:56 2005 +0000 +++ b/src/protocols/simple/simple.c Thu Dec 15 22:59:06 2005 +0000 @@ -1311,6 +1311,7 @@ g_free(hosttoconnect); /* register timeout callback for register / subscribe renewal */ + /* TODO: What if the timeout is called before gaim_srv_resolve() finishes?! */ sip->registertimeout = gaim_timeout_add((rand()%100)+10*1000, (GSourceFunc)register_timeout, sip); } @@ -1421,12 +1422,12 @@ NULL, /**< dependencies */ GAIM_PRIORITY_DEFAULT, /**< priority */ - "prpl-simple", /**< id */ - "SIMPLE", /**< name */ + "prpl-simple", /**< id */ + "SIMPLE", /**< name */ VERSION, /**< version */ - N_("SIP/SIMPLE Protocol Plugin"), /** summary */ - N_("The SIP/SIMPLE Protocol Plugin"), /** description */ - N_("Thomas Butter <butter@uni-mannheim.de>"), /**< author */ + N_("SIP/SIMPLE Protocol Plugin"), /** summary */ + N_("The SIP/SIMPLE Protocol Plugin"), /** description */ + "Thomas Butter <butter@uni-mannheim.de>", /**< author */ GAIM_WEBSITE, /**< homepage */ NULL, /**< load */ @@ -1447,12 +1448,12 @@ split = gaim_account_user_split_new(_("Server"), "", '@'); prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); - option = gaim_account_option_bool_new(_("Publish Status (note: everyone may watch you)"), "dopublish", TRUE); + option = gaim_account_option_bool_new(_("Publish status (note: everyone may watch you)"), "dopublish", TRUE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); option = gaim_account_option_bool_new(_("Use UDP"), "udp", FALSE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - option = gaim_account_option_bool_new(_("Use Proxy"), "useproxy", FALSE); + option = gaim_account_option_bool_new(_("Use proxy"), "useproxy", FALSE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); option = gaim_account_option_string_new(_("Proxy"), "proxy", ""); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
--- a/src/protocols/yahoo/yahoo.c Thu Dec 15 16:13:56 2005 +0000 +++ b/src/protocols/yahoo/yahoo.c Thu Dec 15 22:59:06 2005 +0000 @@ -3220,22 +3220,22 @@ type = gaim_status_type_new(GAIM_STATUS_AWAY, YAHOO_STATUS_TYPE_BUSY, _("Busy"), TRUE); types = g_list_append(types, type); - type = gaim_status_type_new(GAIM_STATUS_AWAY, YAHOO_STATUS_TYPE_NOTATHOME, _("Not At Home"), TRUE); + type = gaim_status_type_new(GAIM_STATUS_AWAY, YAHOO_STATUS_TYPE_NOTATHOME, _("Not at Home"), TRUE); types = g_list_append(types, type); - type = gaim_status_type_new(GAIM_STATUS_AWAY, YAHOO_STATUS_TYPE_NOTATDESK, _("Not At Desk"), TRUE); + type = gaim_status_type_new(GAIM_STATUS_AWAY, YAHOO_STATUS_TYPE_NOTATDESK, _("Not at Desk"), TRUE); types = g_list_append(types, type); - type = gaim_status_type_new(GAIM_STATUS_AWAY, YAHOO_STATUS_TYPE_NOTINOFFICE, _("Not In Office"), TRUE); + type = gaim_status_type_new(GAIM_STATUS_AWAY, YAHOO_STATUS_TYPE_NOTINOFFICE, _("Not in Office"), TRUE); types = g_list_append(types, type); - type = gaim_status_type_new(GAIM_STATUS_AWAY, YAHOO_STATUS_TYPE_ONPHONE, _("On The Phone"), TRUE); + type = gaim_status_type_new(GAIM_STATUS_AWAY, YAHOO_STATUS_TYPE_ONPHONE, _("On the Phone"), TRUE); types = g_list_append(types, type); type = gaim_status_type_new(GAIM_STATUS_AWAY, YAHOO_STATUS_TYPE_ONVACATION, _("On Vacation"), TRUE); types = g_list_append(types, type); - type = gaim_status_type_new(GAIM_STATUS_AWAY, YAHOO_STATUS_TYPE_OUTTOLUNCH, _("Out To Lunch"), TRUE); + type = gaim_status_type_new(GAIM_STATUS_AWAY, YAHOO_STATUS_TYPE_OUTTOLUNCH, _("Out to Lunch"), TRUE); types = g_list_append(types, type); type = gaim_status_type_new(GAIM_STATUS_AWAY, YAHOO_STATUS_TYPE_STEPPEDOUT, _("Stepped Out"), TRUE);