# HG changeset patch # User Richard Laager # Date 1146343640 0 # Node ID 2f7b356812bcbb7e6992ad7d68a1e22f9db8473c # Parent 1a1248de26edda9a073d1006acb3c2e1b38a43bd [gaim-migrate @ 16108] Bj«Órn mentioned on gaim-i18n that we use a lot of similar terms for Server in the account options. I've normalized them. I'm not 100% satisfied with the Yahoo ones, but I did what I could. committer: Tailor Script diff -r 1a1248de26ed -r 2f7b356812bc src/protocols/msn/msn.c --- a/src/protocols/msn/msn.c Sat Apr 29 19:20:28 2006 +0000 +++ b/src/protocols/msn/msn.c Sat Apr 29 20:47:20 2006 +0000 @@ -2046,7 +2046,7 @@ { GaimAccountOption *option; - option = gaim_account_option_string_new(_("Login server"), "server", + option = gaim_account_option_string_new(_("Server"), "server", MSN_SERVER); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); diff -r 1a1248de26ed -r 2f7b356812bc src/protocols/oscar/oscar.c --- a/src/protocols/oscar/oscar.c Sat Apr 29 19:20:28 2006 +0000 +++ b/src/protocols/oscar/oscar.c Sat Apr 29 20:47:20 2006 +0000 @@ -6454,10 +6454,10 @@ { GaimAccountOption *option; - option = gaim_account_option_string_new(_("Auth host"), "server", OSCAR_DEFAULT_LOGIN_SERVER); + option = gaim_account_option_string_new(_("Server"), "server", OSCAR_DEFAULT_LOGIN_SERVER); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - option = gaim_account_option_int_new(_("Auth port"), "port", OSCAR_DEFAULT_LOGIN_PORT); + option = gaim_account_option_int_new(_("Port"), "port", OSCAR_DEFAULT_LOGIN_PORT); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); option = gaim_account_option_string_new(_("Encoding"), "encoding", OSCAR_DEFAULT_CUSTOM_ENCODING); diff -r 1a1248de26ed -r 2f7b356812bc src/protocols/toc/toc.c --- a/src/protocols/toc/toc.c Sat Apr 29 19:20:28 2006 +0000 +++ b/src/protocols/toc/toc.c Sat Apr 29 20:47:20 2006 +0000 @@ -2337,11 +2337,11 @@ { GaimAccountOption *option; - option = gaim_account_option_string_new(_("TOC host"), "server", TOC_HOST); + option = gaim_account_option_string_new(_("Server"), "server", TOC_HOST); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - option = gaim_account_option_int_new(_("TOC port"), "port", TOC_PORT); + option = gaim_account_option_int_new(_("Port"), "port", TOC_PORT); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); diff -r 1a1248de26ed -r 2f7b356812bc src/protocols/yahoo/yahoo.c --- a/src/protocols/yahoo/yahoo.c Sat Apr 29 19:20:28 2006 +0000 +++ b/src/protocols/yahoo/yahoo.c Sat Apr 29 20:47:20 2006 +0000 @@ -3751,19 +3751,19 @@ option = gaim_account_option_bool_new(_("Yahoo Japan"), "yahoojp", FALSE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - option = gaim_account_option_string_new(_("Pager host"), "server", YAHOO_PAGER_HOST); + option = gaim_account_option_string_new(_("Pager server"), "server", YAHOO_PAGER_HOST); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - option = gaim_account_option_string_new(_("Japan Pager host"), "serverjp", YAHOOJP_PAGER_HOST); + option = gaim_account_option_string_new(_("Japan Pager server"), "serverjp", YAHOOJP_PAGER_HOST); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); option = gaim_account_option_int_new(_("Pager port"), "port", YAHOO_PAGER_PORT); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - option = gaim_account_option_string_new(_("File transfer host"), "xfer_host", YAHOO_XFER_HOST); + option = gaim_account_option_string_new(_("File transfer server"), "xfer_host", YAHOO_XFER_HOST); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - option = gaim_account_option_string_new(_("Japan file transfer host"), "xferjp_host", YAHOOJP_XFER_HOST); + option = gaim_account_option_string_new(_("Japan file transfer server"), "xferjp_host", YAHOOJP_XFER_HOST); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); option = gaim_account_option_int_new(_("File transfer port"), "xfer_port", YAHOO_XFER_PORT); @@ -3779,10 +3779,10 @@ option = gaim_account_option_string_new(_("Chat room list URL"), "room_list", YAHOO_ROOMLIST_URL); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - option = gaim_account_option_string_new(_("YCHT host"), "ycht-server", YAHOO_YCHT_HOST); + option = gaim_account_option_string_new(_("Yahoo Chat server"), "ycht-server", YAHOO_YCHT_HOST); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); - option = gaim_account_option_int_new(_("YCHT port"), "ycht-port", YAHOO_YCHT_PORT); + option = gaim_account_option_int_new(_("Yahoo Chat port"), "ycht-port", YAHOO_YCHT_PORT); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); #endif