Merge pull request #118 from adobe/rlim/refresh-issue#72

Change two instances of 'Reload' to 'Refresh in rc file

bin/mac/Brackets.app/Contents/Resources/brackets_extensions.js

@@ -1,3 +1,26 @@
+/*
+ * Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
+ *  
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"), 
+ * to deal in the Software without restriction, including without limitation 
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
+ * and/or sell copies of the Software, and to permit persons to whom the 
+ * Software is furnished to do so, subject to the following conditions:
+ *  
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+ * DEALINGS IN THE SOFTWARE.
+ * 
+ */ 
+
 // This is the JavaScript code for bridging to native functionality
 // See brackets_extentions.mm for implementation of native methods.
 //

src/mac/cefclient/mac/English.lproj/MainMenu.xib

@@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="57"/>
+			<integer value="296"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -238,7 +238,7 @@
 								<bool key="EncodedWithXMLCoder">YES</bool>
 								<object class="NSMenuItem" id="467575825">
 									<reference key="NSMenu" ref="466310130"/>
-									<string key="NSTitle">Refresh</string>
+									<string key="NSTitle">Reload Window</string>
 									<string key="NSKeyEquiv">r</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
@@ -746,17 +746,17 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{{515, 865}, {194, 73}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{329, 938}, {269, 20}}</string>
+					<string>{{615, 781}, {269, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{465, 895}, {238, 43}}</string>
+					<string>{{751, 738}, {238, 43}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{341, 755}, {193, 183}}</string>
+					<string>{{627, 598}, {193, 183}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -785,6 +785,7 @@
 				<bool key="EncodedWithXMLCoder">YES</bool>
 				<object class="IBPartialClassDescription">
 					<string key="className">FirstResponder</string>
+					<string key="superclassName">NSObject</string>
 					<object class="NSMutableDictionary" key="actions">
 						<string key="NS.key.0">showAbout:</string>
 						<string key="NS.object.0">id</string>

src/win/cefclient/cefclient.rc

@@ -63,8 +63,8 @@ BEGIN
     END
     POPUP "&View"
     BEGIN
-		MENUITEM "&Reload",						IDC_NAV_RELOAD
-        MENUITEM "&Show Developer Tools",        ID_TESTS_DEVTOOLS_SHOW
+        MENUITEM "&Reload Window",              IDC_NAV_RELOAD
+        MENUITEM "&Show Developer Tools",       ID_TESTS_DEVTOOLS_SHOW
    END
     POPUP "&Help"
     BEGIN
@@ -80,7 +80,7 @@ BEGIN
     END
     POPUP "&View"
     BEGIN
-        MENUITEM "&Reload",                     IDC_NAV_RELOAD
+        MENUITEM "&Reload Window",              IDC_NAV_RELOAD
         MENUITEM "&Show Developer Tools",       ID_TESTS_DEVTOOLS_SHOW
     END
 END