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/adhoc_commands_window.glade

    r7665 r7787  
    543543                <widget class="GtkLabel" id="label257"> 
    544544                  <property name="visible">True</property> 
    545                   <property name="label" translatable="yes">&lt;b&gt;An error has occured:&lt;/b&gt;</property> 
     545                  <property name="label" translatable="yes">&lt;b&gt;An error has occurred:&lt;/b&gt;</property> 
    546546                  <property name="use_underline">False</property> 
    547547                  <property name="use_markup">True</property>