Philipp Hörist pushed to branch master at gajim / gajim

Commits:

2 changed files:

Changes:

  • gajim/data/gui/groupchat_info_scrolled.ui
    ... ... @@ -191,8 +191,8 @@
    191 191
         </child>
    
    192 192
         <child>
    
    193 193
           <object class="GtkLabel" id="lang">
    
    194
    -        <property name="visible">True</property>
    
    195 194
             <property name="can_focus">False</property>
    
    195
    +        <property name="no_show_all">True</property>
    
    196 196
             <property name="halign">start</property>
    
    197 197
             <property name="valign">start</property>
    
    198 198
           </object>
    
    ... ... @@ -238,9 +238,9 @@
    238 238
         </child>
    
    239 239
         <child>
    
    240 240
           <object class="GtkImage" id="users_image">
    
    241
    -        <property name="visible">True</property>
    
    242 241
             <property name="can_focus">False</property>
    
    243
    -        <property name="tooltip_text" translatable="yes">Occupants</property>
    
    242
    +        <property name="no_show_all">True</property>
    
    243
    +        <property name="tooltip_text" translatable="yes">Participants</property>
    
    244 244
             <property name="halign">end</property>
    
    245 245
             <property name="valign">center</property>
    
    246 246
             <property name="icon_name">system-users-symbolic</property>
    
    ... ... @@ -255,8 +255,8 @@
    255 255
         </child>
    
    256 256
         <child>
    
    257 257
           <object class="GtkImage" id="lang_image">
    
    258
    -        <property name="visible">True</property>
    
    259 258
             <property name="can_focus">False</property>
    
    259
    +        <property name="no_show_all">True</property>
    
    260 260
             <property name="tooltip_text" translatable="yes">Group Chat Language</property>
    
    261 261
             <property name="halign">end</property>
    
    262 262
             <property name="valign">center</property>
    

  • gajim/gtk/groupchat_info.py
    ... ... @@ -37,12 +37,12 @@ MUC_FEATURES = {
    37 37
             'feather-hard-drive-symbolic',
    
    38 38
             Q_('?Group chat feature:Persistent'),
    
    39 39
             _('This group chat persists '
    
    40
    -          'even if it\'s unoccupied')),
    
    40
    +          'even if there are no participants')),
    
    41 41
         'muc_temporary': (
    
    42 42
             'feather-clock-symbolic',
    
    43 43
             Q_('?Group chat feature:Temporary'),
    
    44 44
             _('This group chat will be destroyed '
    
    45
    -          'once the last occupant left')),
    
    45
    +          'once the last participant left')),
    
    46 46
         'muc_moderated': (
    
    47 47
             'feather-mic-off-symbolic',
    
    48 48
             Q_('?Group chat feature:Moderated'),
    
    ... ... @@ -51,8 +51,8 @@ MUC_FEATURES = {
    51 51
         'muc_unmoderated': (
    
    52 52
             'feather-mic-symbolic',
    
    53 53
             Q_('?Group chat feature:Not Moderated'),
    
    54
    -        _('Participants entering this group chat can '
    
    55
    -          'write messages to all participants')),
    
    54
    +        _('Participants entering this group chat are '
    
    55
    +          'allowed to send messages')),
    
    56 56
         'muc_open': (
    
    57 57
             'feather-globe-symbolic',
    
    58 58
             Q_('?Group chat feature:Open'),
    
    ... ... @@ -73,7 +73,7 @@ MUC_FEATURES = {
    73 73
         'muc_nonanonymous': (
    
    74 74
             'feather-shield-off-symbolic',
    
    75 75
             Q_('?Group chat feature:Not Anonymous'),
    
    76
    -        _('All other group chat occupants '
    
    76
    +        _('All other group chat participants '
    
    77 77
               'can see your XMPP address')),
    
    78 78
         'muc_semianonymous': (
    
    79 79
             'feather-shield-symbolic',