Mercurial > pidgin

comparison src/protocols/silc/silc.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 0a3c968b07dc
children 2c84df43f126
comparison
equal deleted inserted replaced
13544:46559ab11aed 13545:cfc2f7fcb3dd
679 gaim_request_field_group_add_field(g, f); 679 gaim_request_field_group_add_field(g, f);
680 f = gaim_request_field_bool_new("mood_ashamed", _("Ashamed"), mashamed); 680 f = gaim_request_field_bool_new("mood_ashamed", _("Ashamed"), mashamed);
681 gaim_request_field_group_add_field(g, f); 681 gaim_request_field_group_add_field(g, f);
682 f = gaim_request_field_bool_new("mood_invincible", _("Invincible"), minvincible); 682 f = gaim_request_field_bool_new("mood_invincible", _("Invincible"), minvincible);
683 gaim_request_field_group_add_field(g, f); 683 gaim_request_field_group_add_field(g, f);
684 f = gaim_request_field_bool_new("mood_inlove", _("In Love"), minlove); 684 f = gaim_request_field_bool_new("mood_inlove", _("In love"), minlove);
685 gaim_request_field_group_add_field(g, f); 685 gaim_request_field_group_add_field(g, f);
686 f = gaim_request_field_bool_new("mood_sleepy", _("Sleepy"), msleepy); 686 f = gaim_request_field_bool_new("mood_sleepy", _("Sleepy"), msleepy);
687 gaim_request_field_group_add_field(g, f); 687 gaim_request_field_group_add_field(g, f);
688 f = gaim_request_field_bool_new("mood_bored", _("Bored"), mbored); 688 f = gaim_request_field_bool_new("mood_bored", _("Bored"), mbored);
689 gaim_request_field_group_add_field(g, f); 689 gaim_request_field_group_add_field(g, f);
694 694
695 f = gaim_request_field_label_new("l4", _("\nYour Preferred Contact Methods")); 695 f = gaim_request_field_label_new("l4", _("\nYour Preferred Contact Methods"));
696 gaim_request_field_group_add_field(g, f); 696 gaim_request_field_group_add_field(g, f);
697 f = gaim_request_field_bool_new("contact_chat", _("Chat"), cchat); 697 f = gaim_request_field_bool_new("contact_chat", _("Chat"), cchat);
698 gaim_request_field_group_add_field(g, f); 698 gaim_request_field_group_add_field(g, f);
699 f = gaim_request_field_bool_new("contact_email", _("Email"), cemail); 699 f = gaim_request_field_bool_new("contact_email", _("E-mail"), cemail);
700 gaim_request_field_group_add_field(g, f); 700 gaim_request_field_group_add_field(g, f);
701 f = gaim_request_field_bool_new("contact_call", _("Phone"), ccall); 701 f = gaim_request_field_bool_new("contact_call", _("Phone"), ccall);
702 gaim_request_field_group_add_field(g, f); 702 gaim_request_field_group_add_field(g, f);
703 f = gaim_request_field_bool_new("contact_sms", _("SMS"), csms); 703 f = gaim_request_field_bool_new("contact_sms", _("SMS"), csms);
704 gaim_request_field_group_add_field(g, f); 704 gaim_request_field_group_add_field(g, f);
705 f = gaim_request_field_bool_new("contact_mms", _("MMS"), cmms); 705 f = gaim_request_field_bool_new("contact_mms", _("MMS"), cmms);
706 gaim_request_field_group_add_field(g, f); 706 gaim_request_field_group_add_field(g, f);
707 f = gaim_request_field_bool_new("contact_video", _("Video Conferencing"), cvideo); 707 f = gaim_request_field_bool_new("contact_video", _("Video conferencing"), cvideo);
708 gaim_request_field_group_add_field(g, f); 708 gaim_request_field_group_add_field(g, f);
709 gaim_request_fields_add_group(fields, g); 709 gaim_request_fields_add_group(fields, g);
710 710
711 g = gaim_request_field_group_new(NULL); 711 g = gaim_request_field_group_new(NULL);
712 f = gaim_request_field_string_new("status_text", _("Your Current Status"), 712 f = gaim_request_field_string_new("status_text", _("Your Current Status"),
919 gaim_account_get_string(gc->account, "private-key", prd2)); 919 gaim_account_get_string(gc->account, "private-key", prd2));
920 920
921 fields = gaim_request_fields_new(); 921 fields = gaim_request_fields_new();
922 922
923 g = gaim_request_field_group_new(NULL); 923 g = gaim_request_field_group_new(NULL);
924 f = gaim_request_field_string_new("key", _("Key Length"), "2048", FALSE); 924 f = gaim_request_field_string_new("key", _("Key length"), "2048", FALSE);
925 gaim_request_field_group_add_field(g, f); 925 gaim_request_field_group_add_field(g, f);
926 f = gaim_request_field_string_new("pkfile", _("Public Key File"), pkd, FALSE); 926 f = gaim_request_field_string_new("pkfile", _("Public key file"), pkd, FALSE);
927 gaim_request_field_group_add_field(g, f); 927 gaim_request_field_group_add_field(g, f);
928 f = gaim_request_field_string_new("prfile", _("Private Key File"), prd, FALSE); 928 f = gaim_request_field_string_new("prfile", _("Private key file"), prd, FALSE);
929 gaim_request_field_group_add_field(g, f); 929 gaim_request_field_group_add_field(g, f);
930 gaim_request_fields_add_group(fields, g); 930 gaim_request_fields_add_group(fields, g);
931 931
932 g = gaim_request_field_group_new(NULL); 932 g = gaim_request_field_group_new(NULL);
933 f = gaim_request_field_string_new("un", _("Username"), username ? username : "", FALSE); 933 f = gaim_request_field_string_new("un", _("Username"), username ? username : "", FALSE);
934 gaim_request_field_group_add_field(g, f); 934 gaim_request_field_group_add_field(g, f);
935 f = gaim_request_field_string_new("hn", _("Hostname"), hostname ? hostname : "", FALSE); 935 f = gaim_request_field_string_new("hn", _("Hostname"), hostname ? hostname : "", FALSE);
936 gaim_request_field_group_add_field(g, f); 936 gaim_request_field_group_add_field(g, f);
937 f = gaim_request_field_string_new("rn", _("Real Name"), realname ? realname : "", FALSE); 937 f = gaim_request_field_string_new("rn", _("Real name"), realname ? realname : "", FALSE);
938 gaim_request_field_group_add_field(g, f); 938 gaim_request_field_group_add_field(g, f);
939 f = gaim_request_field_string_new("e", _("Email"), tmp, FALSE); 939 f = gaim_request_field_string_new("e", _("E-mail"), tmp, FALSE);
940 gaim_request_field_group_add_field(g, f); 940 gaim_request_field_group_add_field(g, f);
941 f = gaim_request_field_string_new("o", _("Organization"), "", FALSE); 941 f = gaim_request_field_string_new("o", _("Organization"), "", FALSE);
942 gaim_request_field_group_add_field(g, f); 942 gaim_request_field_group_add_field(g, f);
943 f = gaim_request_field_string_new("c", _("Country"), "", FALSE); 943 f = gaim_request_field_string_new("c", _("Country"), "", FALSE);
944 gaim_request_field_group_add_field(g, f); 944 gaim_request_field_group_add_field(g, f);
946 946
947 g = gaim_request_field_group_new(NULL); 947 g = gaim_request_field_group_new(NULL);
948 f = gaim_request_field_string_new("pass1", _("Passphrase"), "", FALSE); 948 f = gaim_request_field_string_new("pass1", _("Passphrase"), "", FALSE);
949 gaim_request_field_string_set_masked(f, TRUE); 949 gaim_request_field_string_set_masked(f, TRUE);
950 gaim_request_field_group_add_field(g, f); 950 gaim_request_field_group_add_field(g, f);
951 f = gaim_request_field_string_new("pass2", _("Re-type Passphrase"), "", FALSE); 951 f = gaim_request_field_string_new("pass2", _("Passphrase (retype)"), "", FALSE);
952 gaim_request_field_string_set_masked(f, TRUE); 952 gaim_request_field_string_set_masked(f, TRUE);
953 gaim_request_field_group_add_field(g, f); 953 gaim_request_field_group_add_field(g, f);
954 gaim_request_fields_add_group(fields, g); 954 gaim_request_fields_add_group(fields, g);
955 955
956 gaim_request_fields(gc, _("Create New SILC Key Pair"), 956 gaim_request_fields(gc, _("Create New SILC Key Pair"),