[Ayttm-commits] CVS: ayttm/src prefs.c,1.24,1.25

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv32158/src

Modified Files:
        prefs.c 
Log Message:
iReword some labels, fix fontsize entry size


Index: prefs.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- prefs.c     24 Jan 2003 13:34:41 -0000      1.24
+++ prefs.c     24 Jan 2003 16:59:08 -0000      1.25
@@ -330,7 +330,7 @@
        gtk_entry_set_text(GTK_ENTRY(dictionary_entry), "");
     }
     do_spell_checking_old = do_spell_checking;
-    brbutton = eb_button(_("Use spell checking - Dictionary:"), 
&do_spell_checking, hbox);
+    brbutton = eb_button(_("Use spell checking - dictionary (empty for 
default):"), &do_spell_checking, hbox);
     gtk_box_pack_start(GTK_BOX(hbox), dictionary_entry, TRUE, TRUE, 10);
     gtk_widget_show(dictionary_entry);
     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
@@ -344,7 +344,7 @@
 #endif
 
     do_ayttm_debug_old = do_ayttm_debug;
-    eb_button(_("Enable Debug Messages"), &do_ayttm_debug, vbox);
+    eb_button(_("Enable debug messages"), &do_ayttm_debug, vbox);
     do_ayttm_debug_html_old = do_ayttm_debug_html;
  //   eb_button(_("Enable HTML Debug Messages"), &do_ayttm_debug_html, vbox);
     do_plugin_debug_old = do_plugin_debug;
@@ -367,7 +367,7 @@
            GTK_SIGNAL_FUNC(set_use_alternate_browser), NULL);
 
     hbox = gtk_hbox_new(FALSE, 0);
-    label = gtk_label_new(_("Full path to alternate browser:"));
+    label = gtk_label_new(_("Alternate browser command\n(%s will be replaced 
by the URL):"));
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
     gtk_widget_show(label);
 
@@ -515,9 +515,9 @@
      do_strip_html_old = do_strip_html;
      do_restore_last_conv_old = do_restore_last_conv;
 
-     eb_button(_("Log all conversations"), &do_logging, vbox);
-     eb_button(_("Restore last Conversation"), &do_restore_last_conv, vbox);
-     eb_button(_("Strip HTML tags"), &do_strip_html, vbox);
+     eb_button(_("Save all conversations to logfiles"), &do_logging, vbox);
+     eb_button(_("Restore last conversation when opening a chat window"), 
&do_restore_last_conv, vbox);
+/* advanced ;)     eb_button(_("Strip HTML tags"), &do_strip_html, vbox); */
      gtk_widget_show(vbox);
      gtk_notebook_append_page(GTK_NOTEBOOK(prefs_note), vbox, 
gtk_label_new(_("Logs")));
 }
@@ -569,7 +569,7 @@
      /* Values */
      do_tabbed_chat_old = do_tabbed_chat;
      do_tabbed_chat_orient_old = do_tabbed_chat_orient = 
iGetLocalPref("do_tabbed_chat_orient");
-     eb_button(_("Use tabbed chat windows"), &do_tabbed_chat, vbox);
+     eb_button(_("Use tabbed chat-windows"), &do_tabbed_chat, vbox);
 
      /*
        Radio button group for tabbed chat orientation
@@ -579,7 +579,7 @@
      hbox = gtk_hbox_new(FALSE, 5);
 
      /* setup intro label */
-     label = gtk_label_new (_("Tabbed Chat Orientation:"));
+     label = gtk_label_new (_("Tabs position:"));
      gtk_widget_show (label);
      gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 5);
 
@@ -806,9 +806,9 @@
         accel_change_handler_id = 0;
 
      eb_button(_("Send idle/away status to servers"), &do_send_idle_time, 
vbox);
-     eb_button(_("Raise window on incoming message"), &do_raise_window, vbox);
+     eb_button(_("Raise chat-window when receiving a message"), 
&do_raise_window, vbox);
 //     eb_button(_("Timestamp when a user logs on/off"), &do_timestamp, vbox);
-     eb_button(_("Ignore unknown users"), &do_ignore_unknown, vbox);
+     eb_button(_("Ignore unknown people"), &do_ignore_unknown, vbox);
 //     eb_button(_("Enable multi-line chat"), &do_multi_line, vbox);
 //     eb_button(_("Press enter to send"), &do_enter_send, vbox);
 //     eb_button(_("Timestamps on Messages"), &do_convo_timestamp, vbox);
@@ -817,9 +817,9 @@
 //     eb_button(_("Draw Smilies"), &do_smiley, vbox);
 //     eb_button(_("Escape Closes Chat"), &do_escape_close, vbox);
 
-     eb_button(_("Ignore Foreground Colors"), &do_ignore_fore, vbox);
-     eb_button(_("Ignore Background Colors"), &do_ignore_back, vbox);
-     eb_button(_("Ignore Fonts"), &do_ignore_font, vbox);
+     eb_button(_("Ignore foreground Colors"), &do_ignore_fore, vbox);
+     eb_button(_("Ignore background Colors"), &do_ignore_back, vbox);
+     eb_button(_("Ignore fonts"), &do_ignore_font, vbox);
 
     hbox = gtk_hbox_new(FALSE, 0);
 
@@ -828,6 +828,7 @@
     gtk_widget_show(label);
     
     font_size_entry = gtk_entry_new();
+    gtk_widget_set_usize(font_size_entry, 60, -1);
     g_snprintf(buff, 10, "%d", 
iGetLocalPref("FontSize")==0?4:iGetLocalPref("FontSize"));
 
     gtk_entry_set_text(GTK_ENTRY(font_size_entry), buff);
@@ -837,8 +838,8 @@
     gtk_widget_show(hbox);
     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
-        add_key_set(_("Previous Tab Hotkey (requires a modifier)"), 
&accel_prev_tab, vbox);
-        add_key_set(_("Next Tab Hotkey (requires a modifier)"), 
&accel_next_tab, vbox);
+        add_key_set(_("Hotkey to go to previous tab (requires a modifier)"), 
&accel_prev_tab, vbox);
+        add_key_set(_("Hotkey to go to next tab (requires a modifier)"), 
&accel_next_tab, vbox);
 
      gtk_widget_show(vbox);
      gtk_notebook_append_page(GTK_NOTEBOOK(prefs_note), vbox, 
gtk_label_new(_("Chat")));
@@ -932,7 +933,7 @@
      label = gtk_label_new(_("Warning: Not all services are available 
through\nproxy, please see the README for details."));
      gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
      gtk_widget_show(label);
-     button = gtk_radio_button_new_with_label(NULL, _("Direct Connection"));
+     button = gtk_radio_button_new_with_label(NULL, _("No proxy"));
      gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
      gtk_widget_show(button);
      gtk_signal_connect(GTK_OBJECT(button), "clicked", 
@@ -2026,12 +2027,12 @@
     sound_vbox = gtk_vbox_new(FALSE, 5);
      gtk_widget_show(sound_vbox);
 
-     eb_button(_("Disable sounds when away"), &do_no_sound_when_away, 
sound_vbox);
+     eb_button(_("Disable sounds when I am away"), &do_no_sound_when_away, 
sound_vbox);
      eb_button(_("Disable sounds for Ignored people"), 
&do_no_sound_for_ignore, sound_vbox);
-     eb_button(_("Play sounds when signing on or off"), &do_online_sound, 
sound_vbox);
+     eb_button(_("Play sounds when people sign on or off"), &do_online_sound, 
sound_vbox);
      eb_button(_("Play a sound when sending a message"), &do_play_send, 
sound_vbox);
      eb_button(_("Play a sound when receiving a message"), &do_play_receive, 
sound_vbox);
-     eb_button(_("Play a sound when receiving first message"), &do_play_first, 
sound_vbox);
+     eb_button(_("Play a special sound when receiving first message"), 
&do_play_first, sound_vbox);
 
     gtk_notebook_append_page(GTK_NOTEBOOK(sound_note), sound_vbox, 
gtk_label_new(_("General")));
 
@@ -2042,40 +2043,41 @@
 
      //FIXME: These widgets are never properly freed, why not?
      arrivesoundentry = 
-         add_sound_file_selection_box(_("Buddy Arrive Sound: "),
+         add_sound_file_selection_box(_("Contact signs on: "),
                                       sound_vbox,
                                       cGetLocalPref("BuddyArriveFilename"),
                                       BUDDY_ARRIVE);
      awaysoundentry = 
-         add_sound_file_selection_box(_("Buddy Away Sound: "),
+         add_sound_file_selection_box(_("Contact goes away: "),
                                       sound_vbox,
                                       cGetLocalPref("BuddyAwayFilename"),
                                       BUDDY_AWAY);
      leavesoundentry = 
-         add_sound_file_selection_box(_("Buddy Leave Sound: "),
+         add_sound_file_selection_box(_("Contact signs off: "),
                                       sound_vbox,
                                       cGetLocalPref("BuddyLeaveFilename"),
                                       BUDDY_LEAVE);
 
      sendsoundentry = 
-         add_sound_file_selection_box(_("Send Sound: "),
+         add_sound_file_selection_box(_("Message sent: "),
                                       sound_vbox,
                                       cGetLocalPref("SendFilename"),
                                       SEND);
 
+     receivesoundentry = 
+         add_sound_file_selection_box(_("Message received: "),
+                                      sound_vbox,
+                                      cGetLocalPref("ReceiveFilename"),
+                                      RECEIVE);
+
      firstmsgsoundentry = 
-         add_sound_file_selection_box(_("1st Message Receive: "),
+         add_sound_file_selection_box(_("First message received: "),
                                       sound_vbox,
                                       cGetLocalPref("FirstMsgFilename"),
                                       FIRSTMSG);
 
-     receivesoundentry = 
-         add_sound_file_selection_box(_("Receive Sound: "),
-                                      sound_vbox,
-                                      cGetLocalPref("ReceiveFilename"),
-                                      RECEIVE);
      volumesoundentry =
-       add_sound_volume_selection_box(_("Relative Volume (dB)"),
+       add_sound_volume_selection_box(_("Relative volume (dB)"),
                                      sound_vbox,
                                      
GTK_ADJUSTMENT(gtk_adjustment_new(iGetLocalPref("SoundVolume"),
                                                         -40,0,1,5,0)));