Mercurial > pidgin.yaz
comparison src/protocols/jabber/jabber.c @ 5236:0d4b8ca97c17
[gaim-migrate @ 5606]
Bjoern Voigt writes:
"I made some i18n fixes and updates for the German translation. The
i18n fixes include:
- new i18n files in po/POTFILES.in
- i18n fixes for the Jabber plugin
- i18n fixes for IRC plugin"
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Sat, 26 Apr 2003 20:42:30 +0000 |
parents | 890b29f00b68 |
children | e4dadc60ea5a |
comparison
equal
deleted
inserted
replaced
5235:1dc233cc3349 | 5236:0d4b8ca97c17 |
---|---|
3172 return; | 3172 return; |
3173 } | 3173 } |
3174 | 3174 |
3175 jbd = jabber_find_buddy(gc, realwho, TRUE); | 3175 jbd = jabber_find_buddy(gc, realwho, TRUE); |
3176 | 3176 |
3177 *ap++ = g_strdup_printf("<B>Jabber ID:</B> %s<BR>\n", realwho); | 3177 *ap++ = g_strdup_printf("<B>%s:</B> %s<BR>\n", _("Jabber ID"), realwho); |
3178 *ap++ = g_strdup_printf("<B>Error:</B> %s<BR>\n", jbd->error_msg); | 3178 *ap++ = g_strdup_printf("<B>%s:</B> %s<BR>\n", _("Error"), jbd->error_msg); |
3179 *ap = NULL; | 3179 *ap = NULL; |
3180 | 3180 |
3181 final= g_strjoinv(NULL, str_arr); | 3181 final= g_strjoinv(NULL, str_arr); |
3182 | 3182 |
3183 g_strfreev(str_arr); | 3183 g_strfreev(str_arr); |
3223 { | 3223 { |
3224 jab_res_info jri = resources->data; | 3224 jab_res_info jri = resources->data; |
3225 char *status; | 3225 char *status; |
3226 realwho = g_strdup_printf("%s/%s", buddy, jri->name); | 3226 realwho = g_strdup_printf("%s/%s", buddy, jri->name); |
3227 status = strdup_withhtml(jabber_lookup_away(gjc, realwho)); | 3227 status = strdup_withhtml(jabber_lookup_away(gjc, realwho)); |
3228 *ap++ = g_strdup_printf("<B>Jabber ID:</B> %s<BR>\n", realwho); | 3228 *ap++ = g_strdup_printf("<B>%s:</B> %s<BR>\n", _("Jabber ID"), realwho); |
3229 *ap++ = g_strdup_printf("<B>Status:</B> %s%s%s<BR>\n", jabber_get_state_string(jri->state), status ? ": " : "", status ? status : ""); | 3229 *ap++ = g_strdup_printf("<B>%s:</B> %s%s%s<BR>\n", _("Status"), jabber_get_state_string(jri->state), status ? ": " : "", status ? status : ""); |
3230 g_free(status); | 3230 g_free(status); |
3231 g_free(realwho); | 3231 g_free(realwho); |
3232 resources = resources->next; | 3232 resources = resources->next; |
3233 } | 3233 } |
3234 | 3234 |
3282 char *stripped = strip_html(jabber_lookup_away(GC_GJ(b->account->gc), | 3282 char *stripped = strip_html(jabber_lookup_away(GC_GJ(b->account->gc), |
3283 b->name)); | 3283 b->name)); |
3284 char *text = NULL; | 3284 char *text = NULL; |
3285 if(stripped) | 3285 if(stripped) |
3286 text = g_markup_escape_text(stripped, strlen(stripped)); | 3286 text = g_markup_escape_text(stripped, strlen(stripped)); |
3287 ret = g_strdup_printf(_("<b>Status:</b> %s%s%s"), | 3287 ret = g_strdup_printf("<b>%s:</b> %s%s%s", |
3288 _("Status"), | |
3288 jabber_get_state_string(jri->state), text ? ": " : "", | 3289 jabber_get_state_string(jri->state), text ? ": " : "", |
3289 text ? text : ""); | 3290 text ? text : ""); |
3290 | 3291 |
3291 if(stripped) { | 3292 if(stripped) { |
3292 g_free(stripped); | 3293 g_free(stripped); |
3293 g_free(text); | 3294 g_free(text); |
3294 } | 3295 } |
3295 } else if(jbd && !GAIM_BUDDY_IS_ONLINE(b) && | 3296 } else if(jbd && !GAIM_BUDDY_IS_ONLINE(b) && |
3296 (jbd->subscription & JABBER_SUB_PENDING || | 3297 (jbd->subscription & JABBER_SUB_PENDING || |
3297 !(jbd->subscription & JABBER_SUB_TO))) { | 3298 !(jbd->subscription & JABBER_SUB_TO))) { |
3298 ret = g_strdup(_("<b>Status:</b> Not Authorized")); | 3299 ret = g_strdup_printf("<b>%s:</b> %s", _("Status"), _("Not Authorized")); |
3299 } | 3300 } |
3300 return ret; | 3301 return ret; |
3301 } | 3302 } |
3302 | 3303 |
3303 static char *jabber_status_text(struct buddy *b) | 3304 static char *jabber_status_text(struct buddy *b) |
3647 return; | 3648 return; |
3648 } | 3649 } |
3649 | 3650 |
3650 jri = jabber_find_resource(GJ_GC(gjc), buddy); | 3651 jri = jabber_find_resource(GJ_GC(gjc), buddy); |
3651 | 3652 |
3652 *ap++ = g_strdup_printf("<B>Jabber ID:</B> %s<BR>\n", buddy); | 3653 *ap++ = g_strdup_printf("<B>%s:</B> %s<BR>\n", _("Jabber ID"), buddy); |
3653 | 3654 |
3654 for(vc_tp = vcard_template_data; vc_tp->label != NULL; ++vc_tp) { | 3655 for(vc_tp = vcard_template_data; vc_tp->label != NULL; ++vc_tp) { |
3655 if(strcmp(vc_tp->tag, "DESC") == 0) | 3656 if(strcmp(vc_tp->tag, "DESC") == 0) |
3656 continue; /* special handling later */ | 3657 continue; /* special handling later */ |
3657 if(vc_tp->ptag == NULL) { | 3658 if(vc_tp->ptag == NULL) { |
3661 cdata = xmlnode_get_tag_data(querynode, tag); | 3662 cdata = xmlnode_get_tag_data(querynode, tag); |
3662 g_free(tag); | 3663 g_free(tag); |
3663 } | 3664 } |
3664 if(cdata != NULL) { | 3665 if(cdata != NULL) { |
3665 if(vc_tp->url == NULL) { | 3666 if(vc_tp->url == NULL) { |
3666 *ap++ = g_strdup_printf("<B>%s:</B> %s<BR>\n", vc_tp->label, cdata); | 3667 *ap++ = g_strdup_printf("<B>%s:</B> %s<BR>\n", _(vc_tp->label), cdata); |
3667 } else { | 3668 } else { |
3668 gchar *fmt = g_strdup_printf("<B>%%s:</B> %s<BR>\n", vc_tp->url); | 3669 gchar *fmt = g_strdup_printf("<B>%%s:</B> %s<BR>\n", vc_tp->url); |
3669 *ap++ = g_strdup_printf(fmt, vc_tp->label, cdata, cdata); | 3670 *ap++ = g_strdup_printf(fmt, _(vc_tp->label), cdata, cdata); |
3670 g_free(fmt); | 3671 g_free(fmt); |
3671 } | 3672 } |
3672 } | 3673 } |
3673 } | 3674 } |
3674 | 3675 |
3675 | 3676 |
3676 status = strdup_withhtml(jabber_lookup_away(gjc, buddy)); | 3677 status = strdup_withhtml(jabber_lookup_away(gjc, buddy)); |
3677 *ap++ = g_strdup_printf("<B>Status:</B> %s%s%s<BR>\n", | 3678 *ap++ = g_strdup_printf("<B>%s:</B> %s%s%s<BR>\n", |
3679 _("Status"), | |
3678 jri ? jabber_get_state_string(jri->state) : "", | 3680 jri ? jabber_get_state_string(jri->state) : "", |
3679 jri && status ? ": " : "", status ? status : ""); | 3681 jri && status ? ": " : "", status ? status : ""); |
3680 g_free(status); | 3682 g_free(status); |
3681 | 3683 |
3682 /* | 3684 /* |
4039 g_free(user_info); | 4041 g_free(user_info); |
4040 } | 4042 } |
4041 | 4043 |
4042 b->title = _("Gaim - Edit Jabber vCard"); | 4044 b->title = _("Gaim - Edit Jabber vCard"); |
4043 b->role = "set_info"; | 4045 b->role = "set_info"; |
4044 b->instructions->text = g_strdup(multi_entry_instructions); | 4046 b->instructions->text = g_strdup(_(multi_entry_instructions)); |
4045 b->entries_title = g_strdup(entries_title); | 4047 b->entries_title = g_strdup(_(entries_title)); |
4046 | 4048 |
4047 b->custom = (void *) jabber_format_info; | 4049 b->custom = (void *) jabber_format_info; |
4048 | 4050 |
4049 show_set_vcard(b); | 4051 show_set_vcard(b); |
4050 } | 4052 } |