Mercurial > pidgin.yaz

comparison src/protocols/silc/ops.c @ 13545:cfc2f7fcb3dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 1118b6fc3206
children
comparison
equal deleted inserted replaced
13544:46559ab11aed 13545:cfc2f7fcb3dd
1070 vcard.tels[i].telnum); 1070 vcard.tels[i].telnum);
1071 } 1071 }
1072 for (i = 0; i < vcard.num_emails; i++) { 1072 for (i = 0; i < vcard.num_emails; i++) {
1073 if (vcard.emails[i].address) 1073 if (vcard.emails[i].address)
1074 g_string_append_printf(s, "%s:\t\t%s\n", 1074 g_string_append_printf(s, "%s:\t\t%s\n",
1075 _("EMail"), 1075 _("E-Mail"),
1076 vcard.emails[i].address); 1076 vcard.emails[i].address);
1077 } 1077 }
1078 if (vcard.note) 1078 if (vcard.note)
1079 g_string_append_printf(s, "\n%s:\t\t%s\n", 1079 g_string_append_printf(s, "\n%s:\t\t%s\n",
1080 _("Note"), 1080 _("Note"),
1178 tmp2 = g_markup_escape_text(client_entry->nickname, -1); 1178 tmp2 = g_markup_escape_text(client_entry->nickname, -1);
1179 g_string_append_printf(s, "<b>%s:</b> %s", _("Nickname"), tmp2); 1179 g_string_append_printf(s, "<b>%s:</b> %s", _("Nickname"), tmp2);
1180 g_free(tmp2); 1180 g_free(tmp2);
1181 if (client_entry->realname) { 1181 if (client_entry->realname) {
1182 tmp2 = g_markup_escape_text(client_entry->realname, -1); 1182 tmp2 = g_markup_escape_text(client_entry->realname, -1);
1183 g_string_append_printf(s, "<br><b>%s:</b> %s", _("Realname"), tmp2); 1183 g_string_append_printf(s, "<br><b>%s:</b> %s", _("Real Name"), tmp2);
1184 g_free(tmp2); 1184 g_free(tmp2);
1185 } 1185 }
1186 if (client_entry->username) { 1186 if (client_entry->username) {
1187 tmp2 = g_markup_escape_text(client_entry->username, -1); 1187 tmp2 = g_markup_escape_text(client_entry->username, -1);
1188 if (client_entry->hostname) 1188 if (client_entry->hostname)
1327 tmp = g_markup_escape_text(nickname, -1); 1327 tmp = g_markup_escape_text(nickname, -1);
1328 g_string_append_printf(s, "<b>%s:</b> %s", _("Nickname"), tmp); 1328 g_string_append_printf(s, "<b>%s:</b> %s", _("Nickname"), tmp);
1329 g_free(tmp); 1329 g_free(tmp);
1330 if (realname) { 1330 if (realname) {
1331 tmp = g_markup_escape_text(realname, -1); 1331 tmp = g_markup_escape_text(realname, -1);
1332 g_string_append_printf(s, "<br><b>%s:</b> %s", _("Realname"), tmp); 1332 g_string_append_printf(s, "<br><b>%s:</b> %s", _("Real Name"), tmp);
1333 g_free(tmp); 1333 g_free(tmp);
1334 } 1334 }
1335 if (username) { 1335 if (username) {
1336 tmp = g_markup_escape_text(username, -1); 1336 tmp = g_markup_escape_text(username, -1);
1337 if (client_entry && client_entry->hostname) 1337 if (client_entry && client_entry->hostname)