Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

This commit is contained in:
Latif Khalifa
2013-11-26 00:36:43 +01:00
10 changed files with 39 additions and 32 deletions

View File

@@ -54,14 +54,14 @@
</menu_item_call>
<menu_item_separator/>
<menu_item_call label="Mute/Unmute" name="Mute/Unmute">
<on_click function="List.Mute"/>
<on_click function="List.ToggleMute"/>
<on_enable function="List.EnableMute"/>
<on_visible function="List.EnableAnySelected"/>
</menu_item_call>
<!--menu_item_call label="Report Abuse" name="Report Abuse">
<on_click function="List.ReportAbuse"/>
<menu_item_call label="Report Abuse" name="Report Abuse">
<on_click function="List.AbuseReport"/>
<on_visible function="List.EnableSingleSelected"/>
</menu_item_call-->
</menu_item_call>
<menu_item_call label="Copy Key" name="Copy Key">
<on_click function="List.CopyUUIDs"/>
<on_enable function="List.EnableAnySelected"/>

View File

@@ -129,14 +129,14 @@
</menu>
<menu label="Moderation" name="Moderation" create_jump_keys="true">
<menu_item_call label="Mute/Unmute" name="Mute/Unmute">
<on_click function="List.Mute"/>
<on_click function="List.ToggleMute"/>
<on_enable function="List.EnableMute"/>
<on_visible function="List.EnableAnySelected"/>
</menu_item_call>
<!--menu_item_call label="Report Abuse" name="Report Abuse">
<on_click function="List.ReportAbuse"/>
<menu_item_call label="Report Abuse" name="Report Abuse">
<on_click function="List.AbuseReport"/>
<on_visible function="List.EnableSingleSelected"/>
</menu_item_call-->
</menu_item_call>
<menu_item_separator/>
<menu_item_call label="Freeze" name="Freeze">
<on_click function="List.Freeze"/>

View File

@@ -4244,6 +4244,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="group_role_officers">Officers</string>
<string name="group_role_owners">Owners</string>
<string name="group_member_status_online">Online</string>
<string name="group_member_status_unknown">Unknown</string>
<string name="uploading_abuse_report">Uploading...