Merge branch 'master' of https://github.com/Scampie/TrenchBroom

Signed-off-by: Kristian Duske <[email protected]> Conflicts: Resources/Help/Documentation/scripts/commands.js
jeroenjanssens · Aug 29, 2013 · c80fa86 · c80fa86
2 parents 2428ceb + f5d0e88
commit c80fa86
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/Resources/Help/Documentation/scripts/commands.js b/Resources/Help/Documentation/scripts/commands.js
@@ -39,7 +39,7 @@ menu_commands["Mac"]["edit_select_by_file_position"]	= "Edit &raquo; Select by L
 menu_commands["Mac"]["edit_select_none"]				= "Edit &raquo; Select None - &#8679;&#8984;A";
 menu_commands["Mac"]["edit_rotate_tool"]				= "Edit &raquo; Tools &raquo; Rotate Objects Tool - R";
 menu_commands["Mac"]["edit_clip_tool"]					= "Edit &raquo; Tools &raquo; Clip Tool - C";
-menu_commands["Mac"]["edit_clip_side"]					= "Edit &raquo; Tools &raquo; Toggle Clip Side - &#x21E5;";
+menu_commands["Mac"]["edit_clip_side"]					= "Edit &raquo; Tools &raquo; Toggle Clip Side - &#8984;&#x21A9;";
 menu_commands["Mac"]["edit_perform_clip"]				= "Edit &raquo; Tools &raquo; Perform Clip - &#x21A9;";
 menu_commands["Mac"]["edit_flip_horizontally"]			= "Edit &raquo; Actions &raquo; Flip Horizontally - &#8984;F";
 menu_commands["Mac"]["edit_flip_vertically"]			= "Edit &raquo; Actions &raquo; Flip Vertically - &#x2325;&#8984;F";
@@ -59,14 +59,12 @@ menu_commands["Mac"]["edit_unlock_all"]					= "Edit &raquo; Unlock All - &#8984;
 menu_commands["Mac"]["edit_actions_correct_verts"]		= "Edit &raquo; Actions &raquo; Correct Vertices";
 menu_commands["Mac"]["edit_actions_snap_verts"]			= "Edit &raquo; Actions &raquo; Snap Vertices";
 
-menu_commands["Mac"]["view_center_on_selection"]		= "View &raquo; Camera &raquo; Center on Selection - &#x2325;C";
-
+menu_commands["Mac"]["view_center_on_selection"]		= "View &raquo; Camera &raquo; Center on Selection - &#8679;&#8984;C";
 menu_commands["Mac"]["view_camera_move_to_next_pt"]		= "View &raquo; Camera &raquo; Move Camera to Next Point - &#x2325;+)";
 menu_commands["Mac"]["view_camera_move_to_prev_pt"]		= "View &raquo; Camera &raquo; Move Camera to Previous Point - &#x2325;-)";
 menu_commands["Mac"]["view_snap_to_grid"]				= "View &raquo; Grid &raquo; Snap to Grid - &#8984;&#8679;G";
 
 
-
 menu_commands["Windows"]["preferences"] 				= "View &raquo; Preferences";
 menu_commands["Windows"]["file_new"]					= "File &raquo; New - Ctrl+N";
 menu_commands["Windows"]["file_open"]					= "File &raquo; Open... - Ctrl+O";
@@ -88,7 +86,7 @@ menu_commands["Windows"]["edit_select_by_file_position"]= "Edit &raquo; Select b
 menu_commands["Windows"]["edit_select_none"]			= "Edit &raquo; Select None - Ctrl+Shift+A";
 menu_commands["Windows"]["edit_rotate_tool"]			= "Edit &raquo; Tools &raquo; Rotate Objects Tool - R";
 menu_commands["Windows"]["edit_clip_tool"]				= "Edit &raquo; Tools &raquo; Clip Tool - C";
-menu_commands["Windows"]["edit_clip_side"]				= "Edit &raquo; Tools &raquo; Toggle Clip Side - Tab";
+menu_commands["Windows"]["edit_clip_side"]				= "Edit &raquo; Tools &raquo; Toggle Clip Side - Ctrl+Enter";
 menu_commands["Windows"]["edit_perform_clip"]			= "Edit &raquo; Tools &raquo; Perform Clip - Enter";
 menu_commands["Windows"]["edit_flip_horizontally"]		= "Edit &raquo; Actions &raquo; Flip Horizontally - Ctrl+F";
 menu_commands["Windows"]["edit_flip_vertically"]		= "Edit &raquo; Actions &raquo; Flip Vertically - Ctrl+Alt+F";
@@ -108,7 +106,7 @@ menu_commands["Windows"]["edit_unlock_all"]				= "Edit &raquo; Unlock All - Ctrl
 menu_commands["Windows"]["edit_actions_correct_verts"]	= "Edit &raquo; Actions &raquo; Correct Vertices";
 menu_commands["Windows"]["edit_actions_snap_verts"]		= "Edit &raquo; Actions &raquo; Snap Vertices";
 
-menu_commands["Windows"]["view_center_on_selection"]	= "View &raquo; Camera &raquo; Center on Selection - Alt+C";
+menu_commands["Windows"]["view_center_on_selection"]	= "View &raquo; Camera &raquo; Center on Selection - Ctrl+Shift+C";
 menu_commands["Windows"]["view_camera_move_to_next_pt"]	= "View &raquo; Camera &raquo; Move Camera to Next Point - Alt+(Plus (+))";
 menu_commands["Windows"]["view_camera_move_to_prev_pt"]	= "View &raquo; Camera &raquo; Move Camera to Previous Point - Alt+(Minus (-))";
 menu_commands["Windows"]["view_snap_to_grid"]			= "View &raquo; Grid &raquo; Snap to Grid - Ctrl+Shift+G";