Mercurial > pidgin

comparison src/protocols/oscar/oscar.c @ 6623:156e6643f9db

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7147] Bjoern Voigt writes: "i18n23.patch contains: - Updated German translation - removed some (around 15-30) strings: The patch reduces the work of the translators a bit and makes the Gaim UI more consistent for all users (also for the native English users). I sorted the translatable strings with: $ cd po $ xgettext -s --default-domain=gaim --directory=.. --add-comments \ --keyword=_ --keyword=N_ --files-from=./POTFILES.in # -> look at gaim.po A lot of strings look very similar, for instance "Age" and "Age:" "Last Name" and "Lastname" "An error message" and "An error message." I tried to eliminate one string for each pair. This is possible, if string concatination functions like g_strconcat() or g_snprintf() are used. I also changed some uppercase letters to lowercase letters. But I changed very few strings, because this can be better done by a native speaker. THERE IS STILL SOME WORK TO DO: Most of the error messages have dots (".") at the end, some not. There are still some spellings of same words, for instance "screenname" and "screen name". If you are interested, please sort the strings (see above) and look at the sorted file gaim.po." committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Mon, 25 Aug 2003 15:42:39 +0000
parents a4622f1fb5a1
children 314111e7b601
comparison
equal deleted inserted replaced
6622:a4622f1fb5a1 6623:156e6643f9db
1079 gc->wants_to_die = TRUE; 1079 gc->wants_to_die = TRUE;
1080 g_snprintf(buf, sizeof(buf), _("The client version you are using is too old. Please upgrade at %s"), GAIM_WEBSITE); 1080 g_snprintf(buf, sizeof(buf), _("The client version you are using is too old. Please upgrade at %s"), GAIM_WEBSITE);
1081 gaim_connection_error(gc, buf); 1081 gaim_connection_error(gc, buf);
1082 break; 1082 break;
1083 default: 1083 default:
1084 gaim_connection_error(gc, _("Authentication Failed")); 1084 gaim_connection_error(gc, _("Authentication failed"));
1085 break; 1085 break;
1086 } 1086 }
1087 gaim_debug(GAIM_DEBUG_ERROR, "oscar", 1087 gaim_debug(GAIM_DEBUG_ERROR, "oscar",
1088 "Login Error Code 0x%04hx\n", info->errorcode); 1088 "Login Error Code 0x%04hx\n", info->errorcode);
1089 gaim_debug(GAIM_DEBUG_ERROR, "oscar", 1089 gaim_debug(GAIM_DEBUG_ERROR, "oscar",
3947 3947
3948 if (!info->uin) 3948 if (!info->uin)
3949 return 0; 3949 return 0;
3950 3950
3951 g_snprintf(who, sizeof(who), "%u", info->uin); 3951 g_snprintf(who, sizeof(who), "%u", info->uin);
3952 buf = g_strdup_printf("<b>%s</b> %s", _("UIN:"), who); 3952 buf = g_strdup_printf("<b>%s:</b> %s", _("UIN"), who);
3953 if (info->nick && info->nick[0] && (utf8 = gaim_try_conv_to_utf8(info->nick))) { 3953 if (info->nick && info->nick[0] && (utf8 = gaim_try_conv_to_utf8(info->nick))) {
3954 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Nick:"), "</b> ", utf8, NULL); g_free(tmp); g_free(utf8); 3954 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Nick"), ":</b> ", utf8, NULL); g_free(tmp); g_free(utf8);
3955 } 3955 }
3956 if (info->first && info->first[0] && (utf8 = gaim_try_conv_to_utf8(info->first))) { 3956 if (info->first && info->first[0] && (utf8 = gaim_try_conv_to_utf8(info->first))) {
3957 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("First Name:"), "</b> ", utf8, NULL); g_free(tmp); g_free(utf8); 3957 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("First Name"), ":</b> ", utf8, NULL); g_free(tmp); g_free(utf8);
3958 } 3958 }
3959 if (info->last && info->last[0] && (utf8 = gaim_try_conv_to_utf8(info->last))) { 3959 if (info->last && info->last[0] && (utf8 = gaim_try_conv_to_utf8(info->last))) {
3960 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Last Name:"), "</b> ", utf8, NULL); g_free(tmp); g_free(utf8); 3960 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Last Name"), ":</b> ", utf8, NULL); g_free(tmp); g_free(utf8);
3961 } 3961 }
3962 if (info->email && info->email[0] && (utf8 = gaim_try_conv_to_utf8(info->email))) { 3962 if (info->email && info->email[0] && (utf8 = gaim_try_conv_to_utf8(info->email))) {
3963 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Email Address:"), "</b> <a href=\"mailto:", utf8, "\">", utf8, "</a>", NULL); g_free(tmp); g_free(utf8); 3963 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Email Address"), ":</b> <a href=\"mailto:", utf8, "\">", utf8, "</a>", NULL); g_free(tmp); g_free(utf8);
3964 } 3964 }
3965 if (info->numaddresses && info->email2) { 3965 if (info->numaddresses && info->email2) {
3966 int i; 3966 int i;
3967 for (i = 0; i < info->numaddresses; i++) { 3967 for (i = 0; i < info->numaddresses; i++) {
3968 if (info->email2[i] && info->email2[i][0] && (utf8 = gaim_try_conv_to_utf8(info->email2[i]))) { 3968 if (info->email2[i] && info->email2[i][0] && (utf8 = gaim_try_conv_to_utf8(info->email2[i]))) {
3969 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Email Address:"), "</b> <a href=\"mailto:", utf8, "\">", utf8, "</a>", NULL); g_free(tmp); g_free(utf8); 3969 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Email Address"), ":</b> <a href=\"mailto:", utf8, "\">", utf8, "</a>", NULL); g_free(tmp); g_free(utf8);
3970 } 3970 }
3971 } 3971 }
3972 } 3972 }
3973 if (info->mobile && info->mobile[0] && (utf8 = gaim_try_conv_to_utf8(info->mobile))) { 3973 if (info->mobile && info->mobile[0] && (utf8 = gaim_try_conv_to_utf8(info->mobile))) {
3974 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Mobile Phone:"), "</b> ", utf8, NULL); g_free(tmp); g_free(utf8); 3974 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Mobile Phone"), ":</b> ", utf8, NULL); g_free(tmp); g_free(utf8);
3975 } 3975 }
3976 if (info->gender) { 3976 if (info->gender) {
3977 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Gender:"), "</b> ", info->gender==1 ? _("Female") : _("Male"), NULL); g_free(tmp); 3977 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Gender"), ":</b> ", info->gender==1 ? _("Female") : _("Male"), NULL); g_free(tmp);
3978 } 3978 }
3979 if (info->birthyear || info->birthmonth || info->birthday) { 3979 if (info->birthyear || info->birthmonth || info->birthday) {
3980 char date[30]; 3980 char date[30];
3981 struct tm tm; 3981 struct tm tm;
3982 tm.tm_mday = (int)info->birthday; 3982 tm.tm_mday = (int)info->birthday;
3983 tm.tm_mon = (int)info->birthmonth-1; 3983 tm.tm_mon = (int)info->birthmonth-1;
3984 tm.tm_year = (int)info->birthyear-1900; 3984 tm.tm_year = (int)info->birthyear-1900;
3985 strftime(date, sizeof(date), "%x", &tm); 3985 strftime(date, sizeof(date), "%x", &tm);
3986 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Birthday:"), "</b> ", date, NULL); g_free(tmp); 3986 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Birthday"), ":</b> ", date, NULL); g_free(tmp);
3987 } 3987 }
3988 if (info->age) { 3988 if (info->age) {
3989 char age[5]; 3989 char age[5];
3990 snprintf(age, sizeof(age), "%hhd", info->age); 3990 snprintf(age, sizeof(age), "%hhd", info->age);
3991 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Age:"), "</b> ", age, NULL); g_free(tmp); 3991 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Age"), ":</b> ", age, NULL); g_free(tmp);
3992 } 3992 }
3993 if (info->personalwebpage && info->personalwebpage[0] && (utf8 = gaim_try_conv_to_utf8(info->personalwebpage))) { 3993 if (info->personalwebpage && info->personalwebpage[0] && (utf8 = gaim_try_conv_to_utf8(info->personalwebpage))) {
3994 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Personal Web Page:"), "</b> <a href=\"", utf8, "\">", utf8, "</a>", NULL); g_free(tmp); g_free(utf8); 3994 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Personal Web Page"), ":</b> <a href=\"", utf8, "\">", utf8, "</a>", NULL); g_free(tmp); g_free(utf8);
3995 } 3995 }
3996 if (info->info && info->info[0] && (utf8 = gaim_try_conv_to_utf8(info->info))) { 3996 if (info->info && info->info[0] && (utf8 = gaim_try_conv_to_utf8(info->info))) {
3997 tmp = buf; buf = g_strconcat(tmp, "<hr><b>", _("Additional Information:"), "</b><br>", utf8, NULL); g_free(tmp); g_free(utf8); 3997 tmp = buf; buf = g_strconcat(tmp, "<hr><b>", _("Additional Information"), ":</b><br>", utf8, NULL); g_free(tmp); g_free(utf8);
3998 } 3998 }
3999 tmp = buf; buf = g_strconcat(tmp, "<hr>\n", NULL); g_free(tmp); 3999 tmp = buf; buf = g_strconcat(tmp, "<hr>\n", NULL); g_free(tmp);
4000 if ((info->homeaddr && (info->homeaddr[0])) || (info->homecity && info->homecity[0]) || (info->homestate && info->homestate[0]) || (info->homezip && info->homezip[0])) { 4000 if ((info->homeaddr && (info->homeaddr[0])) || (info->homecity && info->homecity[0]) || (info->homestate && info->homestate[0]) || (info->homezip && info->homezip[0])) {
4001 tmp = buf; buf = g_strconcat(tmp, "<b>", _("Home Address:"), "</b>", NULL); g_free(tmp); 4001 tmp = buf; buf = g_strconcat(tmp, "<b>", _("Home Address"), ":</b>", NULL); g_free(tmp);
4002 if (info->homeaddr && info->homeaddr[0] && (utf8 = gaim_try_conv_to_utf8(info->homeaddr))) { 4002 if (info->homeaddr && info->homeaddr[0] && (utf8 = gaim_try_conv_to_utf8(info->homeaddr))) {
4003 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Address:"), "</b> ", utf8, NULL); g_free(tmp); g_free(utf8); 4003 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Address"), ":</b> ", utf8, NULL); g_free(tmp); g_free(utf8);
4004 } 4004 }
4005 if (info->homecity && info->homecity[0] && (utf8 = gaim_try_conv_to_utf8(info->homecity))) { 4005 if (info->homecity && info->homecity[0] && (utf8 = gaim_try_conv_to_utf8(info->homecity))) {
4006 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("City:"), "</b> ", utf8, NULL); g_free(tmp); g_free(utf8); 4006 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("City"), ":</b> ", utf8, NULL); g_free(tmp); g_free(utf8);
4007 } 4007 }
4008 if (info->homestate && info->homestate[0] && (utf8 = gaim_try_conv_to_utf8(info->homestate))) { 4008 if (info->homestate && info->homestate[0] && (utf8 = gaim_try_conv_to_utf8(info->homestate))) {
4009 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("State:"), "</b> ", utf8, NULL); g_free(tmp); g_free(utf8); 4009 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("State"), ":</b> ", utf8, NULL); g_free(tmp); g_free(utf8);
4010 } 4010 }
4011 if (info->homezip && info->homezip[0] && (utf8 = gaim_try_conv_to_utf8(info->homezip))) { 4011 if (info->homezip && info->homezip[0] && (utf8 = gaim_try_conv_to_utf8(info->homezip))) {
4012 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Zip Code:"), "</b> ", utf8, NULL); g_free(tmp); g_free(utf8); 4012 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Zip Code"), ":</b> ", utf8, NULL); g_free(tmp); g_free(utf8);
4013 } 4013 }
4014 tmp = buf; buf = g_strconcat(tmp, "\n<hr>\n", NULL); g_free(tmp); 4014 tmp = buf; buf = g_strconcat(tmp, "\n<hr>\n", NULL); g_free(tmp);
4015 } 4015 }
4016 if ((info->workaddr && info->workaddr[0]) || (info->workcity && info->workcity[0]) || (info->workstate && info->workstate[0]) || (info->workzip && info->workzip[0])) { 4016 if ((info->workaddr && info->workaddr[0]) || (info->workcity && info->workcity[0]) || (info->workstate && info->workstate[0]) || (info->workzip && info->workzip[0])) {
4017 tmp = buf; buf = g_strconcat(tmp, "<b>", _("Work Address:"), "</b>", NULL); g_free(tmp); 4017 tmp = buf; buf = g_strconcat(tmp, "<b>", _("Work Address"), ":</b>", NULL); g_free(tmp);
4018 if (info->workaddr && info->workaddr[0] && (utf8 = gaim_try_conv_to_utf8(info->workaddr))) { 4018 if (info->workaddr && info->workaddr[0] && (utf8 = gaim_try_conv_to_utf8(info->workaddr))) {
4019 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Address:"), "</b> ", utf8, NULL); g_free(tmp); g_free(utf8); 4019 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Address"), ":</b> ", utf8, NULL); g_free(tmp); g_free(utf8);
4020 } 4020 }
4021 if (info->workcity && info->workcity[0] && (utf8 = gaim_try_conv_to_utf8(info->workcity))) { 4021 if (info->workcity && info->workcity[0] && (utf8 = gaim_try_conv_to_utf8(info->workcity))) {
4022 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("City:"), "</b> ", utf8, NULL); g_free(tmp); g_free(utf8); 4022 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("City"), ":</b> ", utf8, NULL); g_free(tmp); g_free(utf8);
4023 } 4023 }
4024 if (info->workstate && info->workstate[0] && (utf8 = gaim_try_conv_to_utf8(info->workstate))) { 4024 if (info->workstate && info->workstate[0] && (utf8 = gaim_try_conv_to_utf8(info->workstate))) {
4025 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("State:"), "</b> ", utf8, NULL); g_free(tmp); g_free(utf8); 4025 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("State"), ":</b> ", utf8, NULL); g_free(tmp); g_free(utf8);
4026 } 4026 }
4027 if (info->workzip && info->workzip[0] && (utf8 = gaim_try_conv_to_utf8(info->workzip))) { 4027 if (info->workzip && info->workzip[0] && (utf8 = gaim_try_conv_to_utf8(info->workzip))) {
4028 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Zip Code:"), "</b> ", utf8, NULL); g_free(tmp); g_free(utf8); 4028 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Zip Code"), ":</b> ", utf8, NULL); g_free(tmp); g_free(utf8);
4029 } 4029 }
4030 tmp = buf; buf = g_strconcat(tmp, "\n<hr>\n", NULL); g_free(tmp); 4030 tmp = buf; buf = g_strconcat(tmp, "\n<hr>\n", NULL); g_free(tmp);
4031 } 4031 }
4032 if ((info->workcompany && info->workcompany[0]) || (info->workdivision && info->workdivision[0]) || (info->workposition && info->workposition[0]) || (info->workwebpage && info->workwebpage[0])) { 4032 if ((info->workcompany && info->workcompany[0]) || (info->workdivision && info->workdivision[0]) || (info->workposition && info->workposition[0]) || (info->workwebpage && info->workwebpage[0])) {
4033 tmp = buf; buf = g_strconcat(tmp, "<b>", _("Work Information:"), "</b>", NULL); g_free(tmp); 4033 tmp = buf; buf = g_strconcat(tmp, "<b>", _("Work Information"), ":</b>", NULL); g_free(tmp);
4034 if (info->workcompany && info->workcompany[0] && (utf8 = gaim_try_conv_to_utf8(info->workcompany))) { 4034 if (info->workcompany && info->workcompany[0] && (utf8 = gaim_try_conv_to_utf8(info->workcompany))) {
4035 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Company:"), "</b> ", utf8, NULL); g_free(tmp); g_free(utf8); 4035 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Company"), ":</b> ", utf8, NULL); g_free(tmp); g_free(utf8);
4036 } 4036 }
4037 if (info->workdivision && info->workdivision[0] && (utf8 = gaim_try_conv_to_utf8(info->workdivision))) { 4037 if (info->workdivision && info->workdivision[0] && (utf8 = gaim_try_conv_to_utf8(info->workdivision))) {
4038 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Division:"), "</b> ", utf8, NULL); g_free(tmp); g_free(utf8); 4038 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Division"), ":</b> ", utf8, NULL); g_free(tmp); g_free(utf8);
4039 } 4039 }
4040 if (info->workposition && info->workposition[0] && (utf8 = gaim_try_conv_to_utf8(info->workposition))) { 4040 if (info->workposition && info->workposition[0] && (utf8 = gaim_try_conv_to_utf8(info->workposition))) {
4041 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Position:"), "</b> ", utf8, NULL); g_free(tmp); g_free(utf8); 4041 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Position"), ":</b> ", utf8, NULL); g_free(tmp); g_free(utf8);
4042 } 4042 }
4043 if (info->workwebpage && info->workwebpage[0] && (utf8 = gaim_try_conv_to_utf8(info->workwebpage))) { 4043 if (info->workwebpage && info->workwebpage[0] && (utf8 = gaim_try_conv_to_utf8(info->workwebpage))) {
4044 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Web Page:"), "</b> <a href=\"", utf8, "\">", utf8, "</a>", NULL); g_free(tmp); g_free(utf8); 4044 tmp = buf; buf = g_strconcat(tmp, "\n<br><b>", _("Web Page"), ":</b> <a href=\"", utf8, "\">", utf8, "</a>", NULL); g_free(tmp); g_free(utf8);
4045 } 4045 }
4046 tmp = buf; buf = g_strconcat(tmp, "\n<hr>\n", NULL); g_free(tmp); 4046 tmp = buf; buf = g_strconcat(tmp, "\n<hr>\n", NULL); g_free(tmp);
4047 } 4047 }
4048 4048
4049 g_show_info_text(gc, who, 2, buf, NULL); 4049 g_show_info_text(gc, who, 2, buf, NULL);
5934 5934
5935 if (od->sess->ssi.received_data) { 5935 if (od->sess->ssi.received_data) {
5936 char *gname = aim_ssi_itemlist_findparentname(od->sess->ssi.local, who); 5936 char *gname = aim_ssi_itemlist_findparentname(od->sess->ssi.local, who);
5937 if (gname && aim_ssi_waitingforauth(od->sess->ssi.local, gname, who)) { 5937 if (gname && aim_ssi_waitingforauth(od->sess->ssi.local, gname, who)) {
5938 pbm = g_new0(struct proto_buddy_menu, 1); 5938 pbm = g_new0(struct proto_buddy_menu, 1);
5939 pbm->label = _("Re-request Authorization"); 5939 pbm->label = _("Re-request authorization");
5940 pbm->callback = gaim_auth_sendrequest; 5940 pbm->callback = gaim_auth_sendrequest;
5941 pbm->gc = gc; 5941 pbm->gc = gc;
5942 m = g_list_append(m, pbm); 5942 m = g_list_append(m, pbm);
5943 } 5943 }
5944 } 5944 }