Mercurial > pidgin
comparison src/protocols/silc/util.c @ 13545:cfc2f7fcb3dd
[gaim-migrate @ 15922]
Way more changes that I initially thought I was going to make. I apologize
for the commit message spam. These changes bring a lot of consistency to
our capitalization and punctuation, especially of words like "e-mail".
For reference, I've used these rules (after discussing in #gaim):
e-mail, a case of two words joined:
"e-mail" - in the middle of a sentence caps context
"E-mail" - start of text in a sentence caps context
"E-Mail" - in a header (title) caps context
re-enable, a single word, would be:
"re-enable", "Re-enable", and "Re-enable" (respectively)
The reason this changeset exploded is that, as I went through and verified
these changes, I realized we were using improper capitalization (e.g. header
instead of sentence) in a number of dialogs. I fixed a number of these
cases before, and this corrects another pile.
This looks like I've made a LOT of work for the translators, but the impact
is significantly mitigated by three factors: 1) Many of these changes use
strings that already exist, or change one string in many places. 2) I've
used sed to correct the .po files where possible. 3) The actual changes
are extremely trivial.
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Tue, 21 Mar 2006 04:32:45 +0000 |
| parents | 029802981b81 |
| children | a92263b13380 |
comparison
equal
deleted
inserted
replaced
| 13544:46559ab11aed | 13545:cfc2f7fcb3dd |
|---|---|
| 313 sum: 3 tabs or 24 characters) */ | 313 sum: 3 tabs or 24 characters) */ |
| 314 g_string_append_printf(s, _("Real Name: \t%s\n"), ident->realname); | 314 g_string_append_printf(s, _("Real Name: \t%s\n"), ident->realname); |
| 315 if (ident->username) | 315 if (ident->username) |
| 316 g_string_append_printf(s, _("User Name: \t%s\n"), ident->username); | 316 g_string_append_printf(s, _("User Name: \t%s\n"), ident->username); |
| 317 if (ident->email) | 317 if (ident->email) |
| 318 g_string_append_printf(s, _("EMail: \t\t%s\n"), ident->email); | 318 g_string_append_printf(s, _("E-Mail: \t\t%s\n"), ident->email); |
| 319 if (ident->host) | 319 if (ident->host) |
| 320 g_string_append_printf(s, _("Host Name: \t%s\n"), ident->host); | 320 g_string_append_printf(s, _("Host Name: \t%s\n"), ident->host); |
| 321 if (ident->org) | 321 if (ident->org) |
| 322 g_string_append_printf(s, _("Organization: \t%s\n"), ident->org); | 322 g_string_append_printf(s, _("Organization: \t%s\n"), ident->org); |
| 323 if (ident->country) | 323 if (ident->country) |
| 507 attr = silcgaim_get_attr(attrs, SILC_ATTRIBUTE_PREFERRED_CONTACT); | 507 attr = silcgaim_get_attr(attrs, SILC_ATTRIBUTE_PREFERRED_CONTACT); |
| 508 if (attr && silc_attribute_get_object(attr, &contact, sizeof(contact))) { | 508 if (attr && silc_attribute_get_object(attr, &contact, sizeof(contact))) { |
| 509 if (contact & SILC_ATTRIBUTE_CONTACT_CHAT) | 509 if (contact & SILC_ATTRIBUTE_CONTACT_CHAT) |
| 510 g_string_append_printf(s, "[%s] ", _("Chat")); | 510 g_string_append_printf(s, "[%s] ", _("Chat")); |
| 511 if (contact & SILC_ATTRIBUTE_CONTACT_EMAIL) | 511 if (contact & SILC_ATTRIBUTE_CONTACT_EMAIL) |
| 512 g_string_append_printf(s, "[%s] ", _("Email")); | 512 g_string_append_printf(s, "[%s] ", _("E-Mail")); |
| 513 if (contact & SILC_ATTRIBUTE_CONTACT_CALL) | 513 if (contact & SILC_ATTRIBUTE_CONTACT_CALL) |
| 514 g_string_append_printf(s, "[%s] ", _("Phone")); | 514 g_string_append_printf(s, "[%s] ", _("Phone")); |
| 515 if (contact & SILC_ATTRIBUTE_CONTACT_PAGE) | 515 if (contact & SILC_ATTRIBUTE_CONTACT_PAGE) |
| 516 g_string_append_printf(s, "[%s] ", _("Paging")); | 516 g_string_append_printf(s, "[%s] ", _("Paging")); |
| 517 if (contact & SILC_ATTRIBUTE_CONTACT_SMS) | 517 if (contact & SILC_ATTRIBUTE_CONTACT_SMS) |
