diff options
author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-07 15:11:10 +0000 |
---|---|---|
committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-07 15:11:10 +0000 |
commit | 297a5569f00c5a27968755453bfc8590982e3c42 (patch) | |
tree | eb3388bd50123260b78dcd6acd11c69b60a705ef /chrome/app/nibs | |
parent | e0c982d972a1072eee2ad41354f56c6eaca544e3 (diff) | |
download | chromium_src-297a5569f00c5a27968755453bfc8590982e3c42.zip chromium_src-297a5569f00c5a27968755453bfc8590982e3c42.tar.gz chromium_src-297a5569f00c5a27968755453bfc8590982e3c42.tar.bz2 |
Deps roll to pull in new GTM.
Bookmark localization (BookmarkBar, BookmarkEditor, and BookmarkNameFolder).
Toolbar localization.
TabView localization (the tab itself).
Bookmark Editor window fixup:
Align the labels to the front of the edit fields (ui guidelines).
Make the labels auto size to their text and resize the window as needed.
Make the buttons auto size to their strings and adjust to stay right pinned.
Make the window resize in general correctly.
BUG=16764
TEST=Try the Danish local, a bunch of this UI should localized, and the bookmark editor shouldn't truncate the labels or buttons.
Review URL: http://codereview.chromium.org/160328
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/nibs')
-rw-r--r-- | chrome/app/nibs/BookmarkBar.xib | 109 | ||||
-rw-r--r-- | chrome/app/nibs/BookmarkEditor.xib | 531 | ||||
-rw-r--r-- | chrome/app/nibs/BookmarkNameFolder.xib | 73 | ||||
-rw-r--r-- | chrome/app/nibs/TabView.xib | 84 | ||||
-rw-r--r-- | chrome/app/nibs/Toolbar.xib | 157 |
5 files changed, 719 insertions, 235 deletions
diff --git a/chrome/app/nibs/BookmarkBar.xib b/chrome/app/nibs/BookmarkBar.xib index cc39ec8..b8da664 100644 --- a/chrome/app/nibs/BookmarkBar.xib +++ b/chrome/app/nibs/BookmarkBar.xib @@ -82,7 +82,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMenuItem" id="6422781"> <reference key="NSMenu" ref="183701277"/> - <string key="NSTitle">Open all bookmarks</string> + <string key="NSTitle">^IDS_BOOMARK_BAR_OPEN_ALL</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <object class="NSCustomResource" key="NSOnImage" id="636322919"> @@ -96,7 +96,7 @@ </object> <object class="NSMenuItem" id="115646576"> <reference key="NSMenu" ref="183701277"/> - <string key="NSTitle">Open all bookmarks in new window</string> + <string key="NSTitle">^IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -104,7 +104,7 @@ </object> <object class="NSMenuItem" id="509003741"> <reference key="NSMenu" ref="183701277"/> - <string key="NSTitle">Open all bookmarks in incognito window</string> + <string key="NSTitle">^IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -122,7 +122,7 @@ </object> <object class="NSMenuItem" id="112128065"> <reference key="NSMenu" ref="183701277"/> - <string key="NSTitle">Rename...</string> + <string key="NSTitle">^IDS_BOOKMARK_BAR_RENAME_FOLDER</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -130,7 +130,7 @@ </object> <object class="NSMenuItem" id="168951506"> <reference key="NSMenu" ref="183701277"/> - <string key="NSTitle">Delete</string> + <string key="NSTitle">^IDS_BOOKMARK_BAR_REMOVE</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -148,7 +148,7 @@ </object> <object class="NSMenuItem" id="926809071"> <reference key="NSMenu" ref="183701277"/> - <string key="NSTitle">Add page...</string> + <string key="NSTitle">^IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -156,7 +156,7 @@ </object> <object class="NSMenuItem" id="90793013"> <reference key="NSMenu" ref="183701277"/> - <string key="NSTitle">Add folder...</string> + <string key="NSTitle">^IDS_BOOMARK_BAR_NEW_FOLDER</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -174,7 +174,7 @@ </object> <object class="NSMenuItem" id="61770624"> <reference key="NSMenu" ref="183701277"/> - <string key="NSTitle">Bookmark manager</string> + <string key="NSTitle">^IDS_BOOKMARK_MANAGER</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -183,7 +183,7 @@ </object> <object class="NSMenuItem" id="23014313"> <reference key="NSMenu" ref="183701277"/> - <string key="NSTitle">Always show bookmarks bar</string> + <string key="NSTitle">^IDS_BOOMARK_BAR_ALWAYS_SHOW</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -198,7 +198,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMenuItem" id="1071747565"> <reference key="NSMenu" ref="672481054"/> - <string key="NSTitle">Open in new tab</string> + <string key="NSTitle">^IDS_BOOMARK_BAR_OPEN_IN_NEW_TAB</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -206,7 +206,7 @@ </object> <object class="NSMenuItem" id="308357419"> <reference key="NSMenu" ref="672481054"/> - <string key="NSTitle">Open in new window</string> + <string key="NSTitle">^IDS_BOOMARK_BAR_OPEN_IN_NEW_WINDOW</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -214,7 +214,7 @@ </object> <object class="NSMenuItem" id="300791080"> <reference key="NSMenu" ref="672481054"/> - <string key="NSTitle">Open in incognito window</string> + <string key="NSTitle">^IDS_BOOMARK_BAR_OPEN_INCOGNITO</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -232,7 +232,7 @@ </object> <object class="NSMenuItem" id="182996500"> <reference key="NSMenu" ref="672481054"/> - <string key="NSTitle">Edit...</string> + <string key="NSTitle">^IDS_BOOKMARK_BAR_EDIT</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -240,7 +240,7 @@ </object> <object class="NSMenuItem" id="908072523"> <reference key="NSMenu" ref="672481054"/> - <string key="NSTitle">Delete</string> + <string key="NSTitle">^IDS_BOOKMARK_BAR_REMOVE</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -258,7 +258,7 @@ </object> <object class="NSMenuItem" id="527115352"> <reference key="NSMenu" ref="672481054"/> - <string key="NSTitle">Add page...</string> + <string key="NSTitle">^IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -266,7 +266,7 @@ </object> <object class="NSMenuItem" id="595609715"> <reference key="NSMenu" ref="672481054"/> - <string key="NSTitle">Add folder...</string> + <string key="NSTitle">^IDS_BOOMARK_BAR_NEW_FOLDER</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -284,7 +284,7 @@ </object> <object class="NSMenuItem" id="807677456"> <reference key="NSMenu" ref="672481054"/> - <string key="NSTitle">Bookmark manager</string> + <string key="NSTitle">^IDS_BOOKMARK_MANAGER</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -293,7 +293,7 @@ </object> <object class="NSMenuItem" id="515274494"> <reference key="NSMenu" ref="672481054"/> - <string key="NSTitle">Always show bookmarks bar</string> + <string key="NSTitle">^IDS_BOOMARK_BAR_ALWAYS_SHOW</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="636322919"/> @@ -302,6 +302,9 @@ </object> </object> </object> + <object class="NSCustomObject" id="849863465"> + <string key="NSClassName">BookmarkBarLocalizer</string> + </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -506,6 +509,22 @@ </object> <int key="connectionID">71</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">otherObjectToLocalize_</string> + <reference key="source" ref="849863465"/> + <reference key="destination" ref="183701277"/> + </object> + <int key="connectionID">73</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">yetAnotherObjectToLocalize_</string> + <reference key="source" ref="849863465"/> + <reference key="destination" ref="672481054"/> + </object> + <int key="connectionID">74</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -727,6 +746,11 @@ <reference key="object" ref="1055451269"/> <reference key="parent" ref="1071220197"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">72</int> + <reference key="object" ref="849863465"/> + <reference key="parent" ref="1002"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -767,6 +791,7 @@ <string>63.IBPluginDependency</string> <string>64.IBPluginDependency</string> <string>7.IBPluginDependency</string> + <string>72.IBPluginDependency</string> <string>8.IBPluginDependency</string> <string>9.IBPluginDependency</string> </object> @@ -784,7 +809,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{859, 729}, {249, 213}}</string> + <string>{{859, 729}, {365, 213}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -798,7 +823,8 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{518, 726}, {334, 213}}</string> + <string>{{518, 726}, {375, 213}}</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> @@ -830,7 +856,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">71</int> + <int key="maxID">74</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -892,6 +918,45 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">BookmarkBarLocalizer</string> + <string key="superclassName">ChromeUILocalizer</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../xcodebuild/chrome.build/DerivedSources/Debug/xib_localizers/bookmark_bar_localizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">ChromeUILocalizer</string> + <string key="superclassName">GTMUILocalizer</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/ui_localizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">GTMUILocalizer</string> + <string key="superclassName">NSObject</string> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>otherObjectToLocalize_</string> + <string>owner_</string> + <string>yetAnotherObjectToLocalize_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + <string>id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> @@ -926,6 +991,7 @@ <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>backgroundButton_</string> + <string>closeButton_</string> <string>contextMenu_</string> <string>iconView_</string> <string>target_</string> @@ -933,6 +999,7 @@ <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSButton</string> + <string>NSButton</string> <string>NSMenu</string> <string>NSView</string> <string>id</string> diff --git a/chrome/app/nibs/BookmarkEditor.xib b/chrome/app/nibs/BookmarkEditor.xib index deb0835..0d03abc 100644 --- a/chrome/app/nibs/BookmarkEditor.xib +++ b/chrome/app/nibs/BookmarkEditor.xib @@ -8,7 +8,7 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="2"/> + <integer value="40"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -58,7 +58,7 @@ <object class="NSButtonCell" key="NSCell" id="732374144"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134217728</int> - <string key="NSContents">New Folder</string> + <string key="NSContents">^IDS_BOOMARK_EDITOR_NEW_FOLDER_BUTTON</string> <object class="NSFont" key="NSSupport" id="899171858"> <string key="NSName">LucidaGrande</string> <double key="NSSize">1.300000e+01</double> @@ -73,164 +73,224 @@ <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSButton" id="983581711"> + <object class="NSBrowser" id="723395462"> <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">289</int> - <string key="NSFrame">{{370, 12}, {96, 32}}</string> + <int key="NSvFlags">274</int> + <string key="NSFrame">{{20, 60}, {440, 143}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="137649770"> - <int key="NSCellFlags">604110336</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">OK</string> - <reference key="NSSupport" ref="899171858"/> - <reference key="NSControlView" ref="983581711"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> + <object class="NSBrowserCell" key="NSCellPrototype"> + <int key="NSCellFlags">67239488</int> + <int key="NSCellFlags2">2048</int> + <string key="NSContents"> </string> + <object class="NSFont" key="NSSupport"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.200000e+01</double> + <int key="NSfFlags">16</int> + </object> </object> + <string key="NSPathSeparator">/</string> + <int key="NSMinColumnWidth">100</int> + <int key="NSNumberOfVisibleColumns">3</int> + <int key="NSColumnResizingType">1</int> + <double key="NSPreferedColumnWidth">1.000000e+02</double> + <bool key="NSAllowsTypeSelect">YES</bool> + <int key="NSBrFlags">469843968</int> </object> - <object class="NSButton" id="110527617"> + <object class="NSCustomView" id="138844528"> <reference key="NSNextResponder" ref="1006"/> <int key="NSvFlags">289</int> - <string key="NSFrame">{{274, 12}, {96, 32}}</string> - <reference key="NSSuperview" ref="1006"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="820689210"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Cancel</string> - <reference key="NSSupport" ref="899171858"/> - <reference key="NSControlView" ref="110527617"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">268435585</int> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent">.</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSTextField" id="1036501322"> - <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 230}, {45, 17}}</string> - <reference key="NSSuperview" ref="1006"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="52444064"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">Name:</string> - <reference key="NSSupport" ref="899171858"/> - <reference key="NSControlView" ref="1036501322"/> - <object class="NSColor" key="NSBackgroundColor" id="519536938"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">controlColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="983581711"> + <reference key="NSNextResponder" ref="138844528"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{101, 12}, {96, 32}}</string> + <reference key="NSSuperview" ref="138844528"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="137649770"> + <int key="NSCellFlags">604110336</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">^IDS_APP_OK</string> + <reference key="NSSupport" ref="899171858"/> + <reference key="NSControlView" ref="983581711"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">129</int> + <string key="NSAlternateContents"/> + <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSColor" key="NSTextColor" id="728676191"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">controlTextColor</string> - <object class="NSColor" key="NSColor" id="528526553"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MAA</bytes> + <object class="NSButton" id="110527617"> + <reference key="NSNextResponder" ref="138844528"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{5, 12}, {96, 32}}</string> + <reference key="NSSuperview" ref="138844528"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="820689210"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> + <string key="NSContents">^IDS_APP_CANCEL</string> + <reference key="NSSupport" ref="899171858"/> + <reference key="NSControlView" ref="110527617"/> + <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags2">268435585</int> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent">.</string> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> </object> </object> </object> - </object> - <object class="NSTextField" id="209927002"> - <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{17, 205}, {38, 17}}</string> + <string key="NSFrame">{{269, 0}, {211, 52}}</string> <reference key="NSSuperview" ref="1006"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="268808428"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents">URL:</string> - <reference key="NSSupport" ref="899171858"/> - <reference key="NSControlView" ref="209927002"/> - <reference key="NSBackgroundColor" ref="519536938"/> - <reference key="NSTextColor" ref="728676191"/> - </object> + <string key="NSClassName">GTMWidthBasedTweaker</string> </object> - <object class="NSTextField" id="921757931"> + <object class="NSCustomView" id="563188797"> <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">266</int> - <string key="NSFrame">{{74, 228}, {386, 22}}</string> - <reference key="NSSuperview" ref="1006"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="1025899850"> - <int key="NSCellFlags">-1804468671</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="899171858"/> - <reference key="NSControlView" ref="921757931"/> - <bool key="NSDrawsBackground">YES</bool> - <object class="NSColor" key="NSBackgroundColor" id="31051313"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">textBackgroundColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> + <int key="NSvFlags">292</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="1036501322"> + <reference key="NSNextResponder" ref="563188797"/> + <int key="NSvFlags">265</int> + <string key="NSFrame">{{17, 32}, {50, 17}}</string> + <reference key="NSSuperview" ref="563188797"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="52444064"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents">^IDS_BOOMARK_EDITOR_NAME_LABEL</string> + <reference key="NSSupport" ref="899171858"/> + <reference key="NSControlView" ref="1036501322"/> + <object class="NSColor" key="NSBackgroundColor" id="519536938"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC42NjY2NjY2OQA</bytes> + </object> + </object> + <object class="NSColor" key="NSTextColor" id="728676191"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">controlTextColor</string> + <object class="NSColor" key="NSColor" id="528526553"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MAA</bytes> + </object> + </object> </object> </object> - <object class="NSColor" key="NSTextColor" id="90031784"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">textColor</string> - <reference key="NSColor" ref="528526553"/> + <object class="NSTextField" id="209927002"> + <reference key="NSNextResponder" ref="563188797"/> + <int key="NSvFlags">265</int> + <string key="NSFrame">{{17, 7}, {50, 17}}</string> + <reference key="NSSuperview" ref="563188797"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="268808428"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents">^IDS_BOOMARK_EDITOR_URL_LABEL</string> + <reference key="NSSupport" ref="899171858"/> + <reference key="NSControlView" ref="209927002"/> + <reference key="NSBackgroundColor" ref="519536938"/> + <reference key="NSTextColor" ref="728676191"/> + </object> </object> </object> - </object> - <object class="NSTextField" id="812603726"> - <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">266</int> - <string key="NSFrame">{{74, 203}, {386, 22}}</string> + <string key="NSFrame">{{0, 198}, {71, 58}}</string> <reference key="NSSuperview" ref="1006"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="991096593"> - <int key="NSCellFlags">-1804468671</int> - <int key="NSCellFlags2">272630784</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="899171858"/> - <reference key="NSControlView" ref="812603726"/> - <bool key="NSDrawsBackground">YES</bool> - <reference key="NSBackgroundColor" ref="31051313"/> - <reference key="NSTextColor" ref="90031784"/> - </object> + <string key="NSClassName">GTMWidthBasedTweaker</string> </object> - <object class="NSBrowser" id="723395462"> + <object class="NSBox" id="898764481"> <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{20, 60}, {440, 143}}</string> + <int key="NSvFlags">10</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSView" id="293856163"> + <reference key="NSNextResponder" ref="898764481"/> + <int key="NSvFlags">256</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextField" id="921757931"> + <reference key="NSNextResponder" ref="293856163"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{3, 34}, {386, 22}}</string> + <reference key="NSSuperview" ref="293856163"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="1025899850"> + <int key="NSCellFlags">-1804468671</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="899171858"/> + <reference key="NSControlView" ref="921757931"/> + <bool key="NSDrawsBackground">YES</bool> + <object class="NSColor" key="NSBackgroundColor" id="31051313"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">textBackgroundColor</string> + <object class="NSColor" key="NSColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MQA</bytes> + </object> + </object> + <object class="NSColor" key="NSTextColor" id="90031784"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">textColor</string> + <reference key="NSColor" ref="528526553"/> + </object> + </object> + </object> + <object class="NSTextField" id="812603726"> + <reference key="NSNextResponder" ref="293856163"/> + <int key="NSvFlags">266</int> + <string key="NSFrame">{{3, 9}, {386, 22}}</string> + <reference key="NSSuperview" ref="293856163"/> + <bool key="NSEnabled">YES</bool> + <object class="NSTextFieldCell" key="NSCell" id="991096593"> + <int key="NSCellFlags">-1804468671</int> + <int key="NSCellFlags2">272630784</int> + <string key="NSContents"/> + <reference key="NSSupport" ref="899171858"/> + <reference key="NSControlView" ref="812603726"/> + <bool key="NSDrawsBackground">YES</bool> + <reference key="NSBackgroundColor" ref="31051313"/> + <reference key="NSTextColor" ref="90031784"/> + </object> + </object> + </object> + <string key="NSFrameSize">{412, 67}</string> + <reference key="NSSuperview" ref="898764481"/> + </object> + </object> + <string key="NSFrame">{{71, 194}, {412, 67}}</string> <reference key="NSSuperview" ref="1006"/> - <bool key="NSEnabled">YES</bool> - <object class="NSBrowserCell" key="NSCellPrototype"> - <int key="NSCellFlags">67239488</int> - <int key="NSCellFlags2">2048</int> - <string key="NSContents"> </string> + <string key="NSOffsets">{0, 0}</string> + <object class="NSTextFieldCell" key="NSTitleCell"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents"/> <object class="NSFont" key="NSSupport"> <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.200000e+01</double> - <int key="NSfFlags">16</int> + <double key="NSSize">1.100000e+01</double> + <int key="NSfFlags">3100</int> + </object> + <reference key="NSBackgroundColor" ref="31051313"/> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> </object> </object> - <string key="NSPathSeparator">/</string> - <int key="NSMinColumnWidth">100</int> - <int key="NSNumberOfVisibleColumns">3</int> - <int key="NSColumnResizingType">1</int> - <double key="NSPreferedColumnWidth">1.000000e+02</double> - <bool key="NSAllowsTypeSelect">YES</bool> - <int key="NSBrFlags">469843968</int> + <reference key="NSContentView" ref="293856163"/> + <int key="NSBorderType">0</int> + <int key="NSBoxType">0</int> + <int key="NSTitlePosition">0</int> + <bool key="NSTransparent">NO</bool> + <bool key="NSFullyTransparent">YES</bool> </object> </object> <string key="NSFrameSize">{480, 270}</string> @@ -240,6 +300,12 @@ <string key="NSMinSize">{331, 292}</string> <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> + <object class="NSCustomObject" id="764065517"> + <string key="NSClassName">BookmarkEditorLocalizer</string> + </object> + <object class="NSCustomObject" id="12470901"> + <string key="NSClassName">GTMUILocalizerAndLayoutTweaker</string> + </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -324,6 +390,38 @@ </object> <int key="connectionID">31</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">uiObject_</string> + <reference key="source" ref="12470901"/> + <reference key="destination" ref="1005"/> + </object> + <int key="connectionID">38</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">localizer_</string> + <reference key="source" ref="12470901"/> + <reference key="destination" ref="764065517"/> + </object> + <int key="connectionID">39</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">viewToResize_</string> + <reference key="source" ref="563188797"/> + <reference key="destination" ref="1005"/> + </object> + <int key="connectionID">41</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">viewToSlideAndResize_</string> + <reference key="source" ref="563188797"/> + <reference key="destination" ref="898764481"/> + </object> + <int key="connectionID">43</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -369,13 +467,10 @@ <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="631907363"/> - <reference ref="110527617"/> - <reference ref="921757931"/> - <reference ref="1036501322"/> - <reference ref="812603726"/> - <reference ref="209927002"/> <reference ref="723395462"/> - <reference ref="983581711"/> + <reference ref="138844528"/> + <reference ref="563188797"/> + <reference ref="898764481"/> </object> <reference key="parent" ref="1005"/> </object> @@ -394,13 +489,33 @@ <reference key="parent" ref="631907363"/> </object> <object class="IBObjectRecord"> + <int key="objectID">26</int> + <reference key="object" ref="723395462"/> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">34</int> + <reference key="object" ref="764065517"/> + <reference key="parent" ref="1002"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">36</int> + <reference key="object" ref="138844528"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="983581711"/> + <reference ref="110527617"/> + </object> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">5</int> <reference key="object" ref="983581711"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="137649770"/> </object> - <reference key="parent" ref="1006"/> + <reference key="parent" ref="138844528"/> </object> <object class="IBObjectRecord"> <int key="objectID">6</int> @@ -414,7 +529,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="820689210"/> </object> - <reference key="parent" ref="1006"/> + <reference key="parent" ref="138844528"/> </object> <object class="IBObjectRecord"> <int key="objectID">8</int> @@ -422,13 +537,28 @@ <reference key="parent" ref="110527617"/> </object> <object class="IBObjectRecord"> + <int key="objectID">37</int> + <reference key="object" ref="12470901"/> + <reference key="parent" ref="1002"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">40</int> + <reference key="object" ref="563188797"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="1036501322"/> + <reference ref="209927002"/> + </object> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">9</int> <reference key="object" ref="1036501322"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="52444064"/> </object> - <reference key="parent" ref="1006"/> + <reference key="parent" ref="563188797"/> </object> <object class="IBObjectRecord"> <int key="objectID">10</int> @@ -442,7 +572,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="268808428"/> </object> - <reference key="parent" ref="1006"/> + <reference key="parent" ref="563188797"/> </object> <object class="IBObjectRecord"> <int key="objectID">12</int> @@ -450,13 +580,23 @@ <reference key="parent" ref="209927002"/> </object> <object class="IBObjectRecord"> + <int key="objectID">42</int> + <reference key="object" ref="898764481"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="812603726"/> + <reference ref="921757931"/> + </object> + <reference key="parent" ref="1006"/> + </object> + <object class="IBObjectRecord"> <int key="objectID">13</int> <reference key="object" ref="921757931"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="1025899850"/> </object> - <reference key="parent" ref="1006"/> + <reference key="parent" ref="898764481"/> </object> <object class="IBObjectRecord"> <int key="objectID">14</int> @@ -470,18 +610,13 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="991096593"/> </object> - <reference key="parent" ref="1006"/> + <reference key="parent" ref="898764481"/> </object> <object class="IBObjectRecord"> <int key="objectID">16</int> <reference key="object" ref="991096593"/> <reference key="parent" ref="812603726"/> </object> - <object class="IBObjectRecord"> - <int key="objectID">26</int> - <reference key="object" ref="723395462"/> - <reference key="parent" ref="1006"/> - </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -493,6 +628,7 @@ <string>-3.IBPluginDependency</string> <string>1.IBEditorWindowLastContentRect</string> <string>1.IBPluginDependency</string> + <string>1.IBViewEditorWindowController.showingLayoutRectangles</string> <string>1.IBWindowTemplateEditedContentRect</string> <string>1.NSWindowTemplate.visibleAtLaunch</string> <string>1.WindowOrigin</string> @@ -509,8 +645,11 @@ <string>15.IBPluginDependency</string> <string>16.IBPluginDependency</string> <string>2.IBPluginDependency</string> + <string>2.IBUserGuides</string> <string>26.IBPluginDependency</string> <string>3.IBPluginDependency</string> + <string>34.IBPluginDependency</string> + <string>37.IBPluginDependency</string> <string>4.IBPluginDependency</string> <string>5.IBPluginDependency</string> <string>6.IBPluginDependency</string> @@ -525,8 +664,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{555, 472}, {480, 270}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{555, 472}, {480, 270}}</string> <boolean value="NO" id="6"/> + <string>{{555, 472}, {480, 270}}</string> + <reference ref="6"/> <string>{196, 240}</string> <string>{{357, 418}, {480, 270}}</string> <reference ref="6"/> @@ -541,6 +681,11 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableArray"> + <bool key="EncodedWithXMLCoder">YES</bool> + </object> + <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> @@ -571,7 +716,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">31</int> + <int key="maxID">43</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -619,6 +764,88 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">BookmarkEditorLocalizer</string> + <string key="superclassName">ChromeUILocalizer</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../xcodebuild/chrome.build/DerivedSources/Debug/xib_localizers/bookmark_editor_localizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">ChromeUILocalizer</string> + <string key="superclassName">GTMUILocalizer</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/ui_localizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">GTMUILocalizer</string> + <string key="superclassName">NSObject</string> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>otherObjectToLocalize_</string> + <string>owner_</string> + <string>yetAnotherObjectToLocalize_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + <string>id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">GTMUILocalizerAndLayoutTweaker</string> + <string key="superclassName">NSObject</string> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>localizerOwner_</string> + <string>localizer_</string> + <string>uiObject_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>GTMUILocalizer</string> + <string>id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier" id="262327023"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">GTMWidthBasedTweaker</string> + <string key="superclassName">NSView</string> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>viewToResize_</string> + <string>viewToSlideAndResize_</string> + <string>viewToSlide_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>NSView</string> + <string>NSView</string> + </object> + </object> + <reference key="sourceIdentifier" ref="262327023"/> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> diff --git a/chrome/app/nibs/BookmarkNameFolder.xib b/chrome/app/nibs/BookmarkNameFolder.xib index 420253c..82b8da5 100644 --- a/chrome/app/nibs/BookmarkNameFolder.xib +++ b/chrome/app/nibs/BookmarkNameFolder.xib @@ -57,7 +57,7 @@ <object class="NSTextFieldCell" key="NSCell" id="383706794"> <int key="NSCellFlags">68288064</int> <int key="NSCellFlags2">272630784</int> - <string key="NSContents">Name:</string> + <string key="NSContents">^IDS_BOOMARK_BAR_EDIT_FOLDER_LABEL</string> <object class="NSFont" key="NSSupport" id="11363697"> <string key="NSName">LucidaGrande</string> <double key="NSSize">1.300000e+01</double> @@ -86,7 +86,7 @@ </object> <object class="NSTextField" id="781907324"> <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">268</int> + <int key="NSvFlags">266</int> <string key="NSFrame">{{67, 60}, {393, 22}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> @@ -116,14 +116,14 @@ </object> <object class="NSButton" id="810399603"> <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">268</int> + <int key="NSvFlags">289</int> <string key="NSFrame">{{370, 12}, {96, 32}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="869818464"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134217728</int> - <string key="NSContents">OK</string> + <string key="NSContents">^IDS_APP_OK</string> <reference key="NSSupport" ref="11363697"/> <reference key="NSControlView" ref="810399603"/> <int key="NSButtonFlags">-2038284033</int> @@ -136,14 +136,14 @@ </object> <object class="NSButton" id="166877485"> <reference key="NSNextResponder" ref="1006"/> - <int key="NSvFlags">268</int> + <int key="NSvFlags">289</int> <string key="NSFrame">{{274, 12}, {96, 32}}</string> <reference key="NSSuperview" ref="1006"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1061805124"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Cancel</string> + <string key="NSContents">^IDS_APP_CANCEL</string> <reference key="NSSupport" ref="11363697"/> <reference key="NSControlView" ref="166877485"/> <int key="NSButtonFlags">-2038284033</int> @@ -161,6 +161,9 @@ <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> </object> + <object class="NSCustomObject" id="352865609"> + <string key="NSClassName">BookmarkNameFolderLocalizer</string> + </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -197,6 +200,14 @@ </object> <int key="connectionID">14</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">owner_</string> + <reference key="source" ref="352865609"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">16</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -242,10 +253,10 @@ <reference key="object" ref="1006"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1000877900"/> <reference ref="810399603"/> <reference ref="166877485"/> <reference ref="781907324"/> + <reference ref="1000877900"/> </object> <reference key="parent" ref="1005"/> </object> @@ -305,6 +316,11 @@ <reference key="object" ref="1061805124"/> <reference key="parent" ref="166877485"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">15</int> + <reference key="object" ref="352865609"/> + <reference key="parent" ref="1002"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -321,6 +337,7 @@ <string>1.WindowOrigin</string> <string>1.editorWindowContentRectSynchronizationRect</string> <string>10.IBPluginDependency</string> + <string>15.IBPluginDependency</string> <string>2.IBPluginDependency</string> <string>3.IBPluginDependency</string> <string>4.IBPluginDependency</string> @@ -350,6 +367,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -372,7 +390,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">14</int> + <int key="maxID">16</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -403,6 +421,45 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">BookmarkNameFolderLocalizer</string> + <string key="superclassName">ChromeUILocalizer</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../xcodebuild/chrome.build/DerivedSources/Debug/xib_localizers/bookmark_name_folder_localizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">ChromeUILocalizer</string> + <string key="superclassName">GTMUILocalizer</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/ui_localizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">GTMUILocalizer</string> + <string key="superclassName">NSObject</string> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>otherObjectToLocalize_</string> + <string>owner_</string> + <string>yetAnotherObjectToLocalize_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + <string>id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> diff --git a/chrome/app/nibs/TabView.xib b/chrome/app/nibs/TabView.xib index 14ff731..0a80d73 100644 --- a/chrome/app/nibs/TabView.xib +++ b/chrome/app/nibs/TabView.xib @@ -2,12 +2,13 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9F33</string> + <string key="IBDocument.SystemVersion">9J61</string> <string key="IBDocument.InterfaceBuilderVersion">677</string> - <string key="IBDocument.AppKitVersion">949.34</string> - <string key="IBDocument.HIToolboxVersion">352.00</string> + <string key="IBDocument.AppKitVersion">949.46</string> + <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="60"/> <integer value="1"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> @@ -171,7 +172,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMenuItem" id="91607659"> <reference key="NSMenu" ref="398259350"/> - <string key="NSTitle">New Tab</string> + <string key="NSTitle">^IDS_TAB_CXMENU_NEWTAB</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <object class="NSCustomResource" key="NSOnImage" id="530899574"> @@ -196,7 +197,7 @@ </object> <object class="NSMenuItem" id="881095412"> <reference key="NSMenu" ref="398259350"/> - <string key="NSTitle">Reload</string> + <string key="NSTitle">^IDS_TAB_CXMENU_RELOAD</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="530899574"/> @@ -205,7 +206,7 @@ </object> <object class="NSMenuItem" id="851396572"> <reference key="NSMenu" ref="398259350"/> - <string key="NSTitle">Duplicate</string> + <string key="NSTitle">^IDS_TAB_CXMENU_DUPLICATE</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="530899574"/> @@ -224,7 +225,7 @@ </object> <object class="NSMenuItem" id="287599043"> <reference key="NSMenu" ref="398259350"/> - <string key="NSTitle">Close Tab</string> + <string key="NSTitle">^IDS_TAB_CXMENU_CLOSETAB</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="530899574"/> @@ -233,7 +234,7 @@ </object> <object class="NSMenuItem" id="590824484"> <reference key="NSMenu" ref="398259350"/> - <string key="NSTitle">Close Other Tabs</string> + <string key="NSTitle">^IDS_TAB_CXMENU_CLOSEOTHERTABS</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="530899574"/> @@ -242,7 +243,7 @@ </object> <object class="NSMenuItem" id="393128310"> <reference key="NSMenu" ref="398259350"/> - <string key="NSTitle">Close Tabs To the Right</string> + <string key="NSTitle">^IDS_TAB_CXMENU_CLOSETABSTORIGHT</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="530899574"/> @@ -251,7 +252,7 @@ </object> <object class="NSMenuItem" id="716790779"> <reference key="NSMenu" ref="398259350"/> - <string key="NSTitle">Close Tabs Opened By This Tab</string> + <string key="NSTitle">^IDS_TAB_CXMENU_CLOSETABSOPENEDBY</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="530899574"/> @@ -260,7 +261,7 @@ </object> <object class="NSMenuItem" id="1067896488"> <reference key="NSMenu" ref="398259350"/> - <string key="NSTitle">Reopen Closed Tab</string> + <string key="NSTitle">^IDS_RESTORE_TAB</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="530899574"/> @@ -269,6 +270,9 @@ </object> </object> </object> + <object class="NSCustomObject" id="208901833"> + <string key="NSClassName">TabViewLocalizer</string> + </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -441,6 +445,14 @@ </object> <int key="connectionID">89</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">owner_</string> + <reference key="source" ref="208901833"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">91</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -607,6 +619,11 @@ <reference key="object" ref="716790779"/> <reference key="parent" ref="398259350"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">90</int> + <reference key="object" ref="208901833"/> + <reference key="parent" ref="1002"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -641,6 +658,7 @@ <string>70.IBPluginDependency</string> <string>71.IBPluginDependency</string> <string>72.IBPluginDependency</string> + <string>90.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -660,7 +678,8 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{400, 795}, {270, 183}}</string> + <string>{{820, 795}, {341, 183}}</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> @@ -694,7 +713,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">89</int> + <int key="maxID">91</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -708,6 +727,14 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">ChromeUILocalizer</string> + <string key="superclassName">GTMUILocalizer</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/ui_localizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">FirstResponder</string> <string key="superclassName">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -716,6 +743,29 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">GTMUILocalizer</string> + <string key="superclassName">NSObject</string> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>otherObjectToLocalize_</string> + <string>owner_</string> + <string>yetAnotherObjectToLocalize_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + <string>id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> @@ -798,6 +848,14 @@ <string key="minorKey">browser/cocoa/tab_view.h</string> </object> </object> + <object class="IBPartialClassDescription"> + <string key="className">TabViewLocalizer</string> + <string key="superclassName">ChromeUILocalizer</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../xcodebuild/chrome.build/DerivedSources/Debug/xib_localizers/tab_view_localizer.h</string> + </object> + </object> </object> </object> <int key="IBDocument.localizationMode">0</int> diff --git a/chrome/app/nibs/Toolbar.xib b/chrome/app/nibs/Toolbar.xib index 49d293d..e77045d 100644 --- a/chrome/app/nibs/Toolbar.xib +++ b/chrome/app/nibs/Toolbar.xib @@ -8,8 +8,9 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="48"/> + <integer value="102"/> <integer value="4"/> + <integer value="88"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -301,7 +302,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMenuItem" id="531344134"> <reference key="NSMenu" ref="1035953805"/> - <string type="base64-UTF8" key="NSTitle">Q3JlYXRlIEFwcGxpY2F0aW9uIFNob3J0Y3V04oCmA</string> + <string key="NSTitle">^IDS_CREATE_SHORTCUTS</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <object class="NSCustomResource" key="NSOnImage" id="351843178"> @@ -325,7 +326,7 @@ </object> <object class="NSMenuItem" id="356573692"> <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">Cut</string> + <string key="NSTitle">^IDS_CUT</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -333,7 +334,7 @@ </object> <object class="NSMenuItem" id="525046613"> <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">Copy</string> + <string key="NSTitle">^IDS_COPY</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -341,7 +342,7 @@ </object> <object class="NSMenuItem" id="871702681"> <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">Paste</string> + <string key="NSTitle">^IDS_PASTE</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -359,7 +360,7 @@ </object> <object class="NSMenuItem" id="552802748"> <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">Find In Page</string> + <string key="NSTitle">^IDS_FIND</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -368,7 +369,7 @@ </object> <object class="NSMenuItem" id="759431372"> <reference key="NSMenu" ref="1035953805"/> - <string type="base64-UTF8" key="NSTitle">U2F2ZSBQYWdl4oCmA</string> + <string key="NSTitle">^IDS_SAVE_PAGE</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -377,7 +378,7 @@ </object> <object class="NSMenuItem" id="950677546"> <reference key="NSMenu" ref="1035953805"/> - <string type="base64-UTF8" key="NSTitle">UHJpbnTigKY</string> + <string key="NSTitle">^IDS_PRINT</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -395,19 +396,19 @@ </object> <object class="NSMenuItem" id="398561686"> <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">Zoom</string> + <string key="NSTitle">^IDS_ZOOM_MENU</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> <reference key="NSMixedImage" ref="771186395"/> <string key="NSAction">submenuAction:</string> <object class="NSMenu" key="NSSubmenu" id="767450548"> - <string key="NSTitle">Zoom</string> + <string key="NSTitle">^IDS_ZOOM_MENU</string> <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMenuItem" id="117630796"> <reference key="NSMenu" ref="767450548"/> - <string key="NSTitle">Larger</string> + <string key="NSTitle">^IDS_ZOOM_PLUS</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -416,7 +417,7 @@ </object> <object class="NSMenuItem" id="246635843"> <reference key="NSMenu" ref="767450548"/> - <string key="NSTitle">Normal</string> + <string key="NSTitle">^IDS_ZOOM_NORMAL</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -425,7 +426,7 @@ </object> <object class="NSMenuItem" id="660549409"> <reference key="NSMenu" ref="767450548"/> - <string key="NSTitle">Smaller</string> + <string key="NSTitle">^IDS_ZOOM_MINUS</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -437,14 +438,14 @@ </object> <object class="NSMenuItem" id="275495410"> <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">Encoding</string> + <string key="NSTitle">^IDS_ENCODING_MENU</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> <reference key="NSMixedImage" ref="771186395"/> <string key="NSAction">submenuAction:</string> <object class="NSMenu" key="NSSubmenu" id="1054137046"> - <string key="NSTitle">Encoding</string> + <string key="NSTitle">^IDS_ENCODING_MENU</string> <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMenuItem" id="1047175866"> @@ -470,19 +471,19 @@ </object> <object class="NSMenuItem" id="448429887"> <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">Developer</string> + <string key="NSTitle">^IDS_DEVELOPER_MENU</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> <reference key="NSMixedImage" ref="771186395"/> <string key="NSAction">submenuAction:</string> <object class="NSMenu" key="NSSubmenu" id="383305928"> - <string key="NSTitle">Developer</string> + <string key="NSTitle">^IDS_DEVELOPER_MENU</string> <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMenuItem" id="688272012"> <reference key="NSMenu" ref="383305928"/> - <string key="NSTitle">View Source</string> + <string key="NSTitle">^IDS_VIEW_SOURCE</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -491,7 +492,7 @@ </object> <object class="NSMenuItem" id="830865062"> <reference key="NSMenu" ref="383305928"/> - <string key="NSTitle">JavaScript Console</string> + <string key="NSTitle">^IDS_DEV_TOOLS</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -499,7 +500,7 @@ </object> <object class="NSMenuItem" id="712404949"> <reference key="NSMenu" ref="383305928"/> - <string key="NSTitle">Task Manager</string> + <string key="NSTitle">^IDS_TASK_MANAGER</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -520,7 +521,7 @@ </object> <object class="NSMenuItem" id="966232471"> <reference key="NSMenu" ref="1035953805"/> - <string type="base64-UTF8" key="NSTitle">UmVwb3J0IEJ1ZyBPciBCcm9rZW4gV2Vic2l0ZeKApg</string> + <string key="NSTitle">^IDS_REPORT_BUG</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -535,7 +536,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMenuItem" id="824187729"> <reference key="NSMenu" ref="558188039"/> - <string key="NSTitle">New Tab</string> + <string key="NSTitle">^IDS_NEW_TAB</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -544,7 +545,7 @@ </object> <object class="NSMenuItem" id="300890436"> <reference key="NSMenu" ref="558188039"/> - <string key="NSTitle">New Window</string> + <string key="NSTitle">^IDS_NEW_WINDOW</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -553,7 +554,7 @@ </object> <object class="NSMenuItem" id="498957868"> <reference key="NSMenu" ref="558188039"/> - <string key="NSTitle">New Incognito Window</string> + <string key="NSTitle">^IDS_NEW_INCOGNITO_WINDOW</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -572,7 +573,7 @@ </object> <object class="NSMenuItem" id="755764032"> <reference key="NSMenu" ref="558188039"/> - <string key="NSTitle">Always Show Bookmarks Bar</string> + <string key="NSTitle">^IDS_BOOMARK_BAR_ALWAYS_SHOW</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -581,7 +582,7 @@ </object> <object class="NSMenuItem" id="1051303932"> <reference key="NSMenu" ref="558188039"/> - <string key="NSTitle">Full Screen</string> + <string key="NSTitle">^IDS_FULLSCREEN</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -600,7 +601,7 @@ </object> <object class="NSMenuItem" id="6307962"> <reference key="NSMenu" ref="558188039"/> - <string key="NSTitle">History</string> + <string key="NSTitle">^IDS_SHOW_HISTORY</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -609,7 +610,7 @@ </object> <object class="NSMenuItem" id="241294165"> <reference key="NSMenu" ref="558188039"/> - <string key="NSTitle">Bookmark Manager</string> + <string key="NSTitle">^IDS_BOOKMARK_MANAGER</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -617,7 +618,7 @@ </object> <object class="NSMenuItem" id="548636593"> <reference key="NSMenu" ref="558188039"/> - <string key="NSTitle">Downloads</string> + <string key="NSTitle">^IDS_SHOW_DOWNLOADS</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -636,7 +637,7 @@ </object> <object class="NSMenuItem" id="608727971"> <reference key="NSMenu" ref="558188039"/> - <string type="base64-UTF8" key="NSTitle">Q2xlYXIgQnJvd3NpbmcgRGF0YeKApg</string> + <string key="NSTitle">^IDS_CLEAR_BROWSING_DATA</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -645,7 +646,7 @@ </object> <object class="NSMenuItem" id="784606405"> <reference key="NSMenu" ref="558188039"/> - <string type="base64-UTF8" key="NSTitle">SW1wb3J0IEJvb2ttYXJrc+KApg</string> + <string key="NSTitle">^IDS_IMPORT_SETTINGS</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -663,7 +664,7 @@ </object> <object class="NSMenuItem" id="510846575"> <reference key="NSMenu" ref="558188039"/> - <string type="base64-UTF8" key="NSTitle">UHJlZmVyZW5jZXPigKY</string> + <string key="NSTitle">^IDS_PREFERENCES_MAC</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="351843178"/> @@ -671,6 +672,9 @@ </object> </object> </object> + <object class="NSCustomObject" id="1044322163"> + <string key="NSClassName">ToolbarLocalizer</string> + </object> </object> <object class="IBObjectContainer" key="IBDocument.Objects"> <object class="NSMutableArray" key="connectionRecords"> @@ -1051,6 +1055,22 @@ </object> <int key="connectionID">121</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">owner_</string> + <reference key="source" ref="1044322163"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">123</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">otherObjectToLocalize_</string> + <reference key="source" ref="1044322163"/> + <reference key="destination" ref="558188039"/> + </object> + <int key="connectionID">124</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1504,6 +1524,11 @@ <reference key="object" ref="510846575"/> <reference key="parent" ref="558188039"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">122</int> + <reference key="object" ref="1044322163"/> + <reference key="parent" ref="1002"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -1528,6 +1553,7 @@ <string>107.IBPluginDependency</string> <string>12.CustomClassName</string> <string>12.IBPluginDependency</string> + <string>122.IBPluginDependency</string> <string>13.CustomClassName</string> <string>13.IBPluginDependency</string> <string>14.CustomClassName</string> @@ -1613,6 +1639,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>ToolbarButtonCell</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>AutocompleteTextFieldCell</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>ToolbarButtonCell</string> @@ -1632,12 +1659,12 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>AutocompleteTextField</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{361, 757}, {274, 273}}</string> + <string>{{669, 773}, {235, 273}}</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>{{961, 437}, {248, 263}}</string> + <string>{{984, 816}, {306, 263}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1651,16 +1678,16 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{635, 797}, {105, 63}}</string> + <string>{{904, 813}, {202, 63}}</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>{{635, 747}, {180, 63}}</string> + <string>{{904, 763}, {204, 63}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{635, 817}, {86, 23}}</string> + <string>{{904, 833}, {86, 23}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1699,7 +1726,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">121</int> + <int key="maxID">124</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -1765,6 +1792,14 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">ChromeUILocalizer</string> + <string key="superclassName">GTMUILocalizer</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/ui_localizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">FirstResponder</string> <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="actions"> @@ -1777,6 +1812,29 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">GTMUILocalizer</string> + <string key="superclassName">NSObject</string> + <object class="NSMutableDictionary" key="outlets"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>otherObjectToLocalize_</string> + <string>owner_</string> + <string>yetAnotherObjectToLocalize_</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + <string>id</string> + </object> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../third_party/GTM/AppKit/GTMUILocalizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">GradientButtonCell</string> <string key="superclassName">NSButtonCell</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -1788,6 +1846,13 @@ <string key="className">NSObject</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> + <string key="minorKey">browser/cocoa/status_bubble_mac.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">NSObject</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> <string key="minorKey">browser/cocoa/tab_strip_model_observer_bridge.h</string> </object> </object> @@ -1803,9 +1868,9 @@ <string>importData:</string> <string>makeDefaultBrowser:</string> <string>removeSelectedHomepages:</string> - <string>resetTheme:</string> <string>showPreferences:</string> <string>showSavedPasswords:</string> + <string>themesGallery:</string> <string>useCurrentPagesAsHomepage:</string> </object> <object class="NSMutableArray" key="dict.values"> @@ -1864,6 +1929,7 @@ <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> <string>backgroundButton_</string> + <string>closeButton_</string> <string>contextMenu_</string> <string>iconView_</string> <string>target_</string> @@ -1871,6 +1937,7 @@ <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSButton</string> + <string>NSButton</string> <string>NSMenu</string> <string>NSView</string> <string>id</string> @@ -1937,7 +2004,7 @@ <string>NSButton</string> <string>NSButton</string> <string>NSButton</string> - <string>NSTextField</string> + <string>AutocompleteTextField</string> <string>NSButton</string> <string>NSMenu</string> <string>NSButton</string> @@ -1952,6 +2019,14 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">ToolbarLocalizer</string> + <string key="superclassName">ChromeUILocalizer</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">../xcodebuild/chrome.build/DerivedSources/Debug/xib_localizers/toolbar_localizer.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">ToolbarView</string> <string key="superclassName">BackgroundGradientView</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -1970,7 +2045,7 @@ </object> </object> <int key="IBDocument.localizationMode">0</int> - <string key="IBDocument.LastKnownRelativeProjectPath">../../../chrome.xcodeproj</string> + <string key="IBDocument.LastKnownRelativeProjectPath">../../chrome.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> </data> </archive> |