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

merge changeset from trunk except pyopenssl stuff

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • branches/gajim_0.11/data/glade/accounts_window.glade

    r7183 r7787  
    2020  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> 
    2121  <property name="focus_on_map">True</property> 
     22  <property name="urgency_hint">False</property> 
    2223  <signal name="destroy" handler="on_accounts_window_destroy" last_modification_time="Sat, 02 Apr 2005 20:34:04 GMT"/> 
    2324  <signal name="key_press_event" handler="on_accounts_window_key_press_event" last_modification_time="Wed, 25 May 2005 23:19:56 GMT"/> 
     
    6465        <widget class="GtkCheckButton" id="merge_checkbutton"> 
    6566          <property name="visible">True</property> 
    66           <property name="tooltip" translatable="yes">If you have 2 or more accounts and it is checked, Gajim will list all contacts as if you had one account</property> 
     67          <property name="tooltip" translatable="yes">If you have 2 or more accounts and this is checked, Gajim will list all contacts as if you had one account</property> 
    6768          <property name="can_focus">True</property> 
    6869          <property name="label" translatable="yes">Mer_ge accounts</property>