Philipp Hörist pushed to branch master at gajim / gajim
Commits: 13754945 by Philipp Hörist at 2019-07-09T17:00:04Z GroupchatInfo: Refine some strings
Use only participant on user facing strings
- - - - - f4225008 by Philipp Hörist at 2019-07-09T17:00:04Z GroupchatInfo: Fix visible state
- - - - -
2 changed files:
- gajim/data/gui/groupchat_info_scrolled.ui - gajim/gtk/groupchat_info.py
Changes:
===================================== gajim/data/gui/groupchat_info_scrolled.ui ===================================== @@ -191,8 +191,8 @@ </child> <child> <object class="GtkLabel" id="lang"> - <property name="visible">True</property> <property name="can_focus">False</property> + <property name="no_show_all">True</property> <property name="halign">start</property> <property name="valign">start</property> </object> @@ -238,9 +238,9 @@ </child> <child> <object class="GtkImage" id="users_image"> - <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Occupants</property> + <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">Participants</property> <property name="halign">end</property> <property name="valign">center</property> <property name="icon_name">system-users-symbolic</property> @@ -255,8 +255,8 @@ </child> <child> <object class="GtkImage" id="lang_image"> - <property name="visible">True</property> <property name="can_focus">False</property> + <property name="no_show_all">True</property> <property name="tooltip_text" translatable="yes">Group Chat Language</property> <property name="halign">end</property> <property name="valign">center</property>
===================================== gajim/gtk/groupchat_info.py ===================================== @@ -37,12 +37,12 @@ MUC_FEATURES = { 'feather-hard-drive-symbolic', Q_('?Group chat feature:Persistent'), _('This group chat persists ' - 'even if it's unoccupied')), + 'even if there are no participants')), 'muc_temporary': ( 'feather-clock-symbolic', Q_('?Group chat feature:Temporary'), _('This group chat will be destroyed ' - 'once the last occupant left')), + 'once the last participant left')), 'muc_moderated': ( 'feather-mic-off-symbolic', Q_('?Group chat feature:Moderated'), @@ -51,8 +51,8 @@ MUC_FEATURES = { 'muc_unmoderated': ( 'feather-mic-symbolic', Q_('?Group chat feature:Not Moderated'), - _('Participants entering this group chat can ' - 'write messages to all participants')), + _('Participants entering this group chat are ' + 'allowed to send messages')), 'muc_open': ( 'feather-globe-symbolic', Q_('?Group chat feature:Open'), @@ -73,7 +73,7 @@ MUC_FEATURES = { 'muc_nonanonymous': ( 'feather-shield-off-symbolic', Q_('?Group chat feature:Not Anonymous'), - _('All other group chat occupants ' + _('All other group chat participants ' 'can see your XMPP address')), 'muc_semianonymous': ( 'feather-shield-symbolic',
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0ccf4391b3e95926fb936c85e20ccbd1a8...