Show
Ignore:
Timestamp:
01/06/07 12:00:50 (23 months ago)
Author:
asterix
Message:

merge changeset from trunk except pyopenssl stuff

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/gajim_0.11/data/glade/account_modification_window.glade

    r7170 r7787  
    3636            <widget class="GtkLabel" id="name_label"> 
    3737              <property name="visible">True</property> 
    38               <property name="label" translatable="yes">_Name: </property> 
     38              <property name="label" translatable="yes">_Name:</property> 
    3939              <property name="use_underline">True</property> 
    4040              <property name="use_markup">False</property> 
    … …  
    235235                <widget class="GtkLabel" id="label11"> 
    236236                  <property name="visible">True</property> 
    237                   <property name="label" translatable="yes">Resour_ce: </property> 
     237                  <property name="label" translatable="yes">Resour_ce:</property> 
    238238                  <property name="use_underline">True</property> 
    239239                  <property name="use_markup">False</property> 
    … …  
    441441                  <property name="visible">True</property> 
    442442                  <property name="can_focus">True</property> 
    443                   <property name="label" translatable="yes">Autoreconnect when connection is lost</property> 
     443                  <property name="label" translatable="yes">Auto-reconnect when connection is lost</property> 
    444444                  <property name="use_underline">True</property> 
    445445                  <property name="relief">GTK_RELIEF_NORMAL</property> 
    … …  
    671671                            <widget class="GtkCheckButton" id="send_keepalive_checkbutton"> 
    672672                              <property name="visible">True</property> 
    673                               <property name="tooltip" translatable="yes">If checked, Gajim will send keep-alive packets so it prevents connection timeout which results in disconnection</property> 
     673                              <property name="tooltip" translatable="yes">If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection</property> 
    674674                              <property name="can_focus">True</property> 
    675675                              <property name="label" translatable="yes">Send keep-alive packets</property>