diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 17:29:30 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-26 17:29:30 +0000 |
commit | 80789d84dc6ca48278a99aae10777d556547552c (patch) | |
tree | 9deeda8ced6fac74c21e5dcd5271fecdc48e6c2a | |
parent | ef29f34b4144247658d1580049eb968b0394eccb (diff) | |
download | chromium_src-80789d84dc6ca48278a99aae10777d556547552c.zip chromium_src-80789d84dc6ca48278a99aae10777d556547552c.tar.gz chromium_src-80789d84dc6ca48278a99aae10777d556547552c.tar.bz2 |
bookmarks: Fix an obvious typo in IDS_BOOMARK_*.
Instead of IDS_BOOMARK it should be IDS_BOOKMARK, notice the missing 'K'.
BUG=None
TEST=None
R=sky@chromium.org
Review URL: http://codereview.chromium.org/7744055
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98442 0039d316-1c4b-4281-b951-d872f2087c98
32 files changed, 168 insertions, 165 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index ec1154b..21343e9 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -6212,85 +6212,85 @@ Keep your key file in a safe place. You will need it to create new versions of y </message> <!-- bookmark editor messages--> - <message name="IDS_BOOMARK_EDITOR_NAME_LABEL" desc="Label shown before the title/name of the URL."> + <message name="IDS_BOOKMARK_EDITOR_NAME_LABEL" desc="Label shown before the title/name of the URL."> Name: </message> - <message name="IDS_BOOMARK_EDITOR_URL_LABEL" desc="Label shown before the URL."> + <message name="IDS_BOOKMARK_EDITOR_URL_LABEL" desc="Label shown before the URL."> URL: </message> - <message name="IDS_BOOMARK_EDITOR_NEW_FOLDER_BUTTON" desc="Text on the new folder button."> + <message name="IDS_BOOKMARK_EDITOR_NEW_FOLDER_BUTTON" desc="Text on the new folder button."> New folder </message> - <message name="IDS_BOOMARK_EDITOR_NEW_FOLDER_MENU_ITEM" desc="Text on the new folder context menu item."> + <message name="IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM" desc="Text on the new folder context menu item."> &New folder </message> - <message name="IDS_BOOMARK_EDITOR_TITLE" desc="Title of the window the bookmark editor is in."> + <message name="IDS_BOOKMARK_EDITOR_TITLE" desc="Title of the window the bookmark editor is in."> Edit Bookmark </message> - <message name="IDS_BOOMARK_EDITOR_CONFIRM_DELETE" desc="The message shown in the dialog asking the user to confirm deleting a folder."> + <message name="IDS_BOOKMARK_EDITOR_CONFIRM_DELETE" desc="The message shown in the dialog asking the user to confirm deleting a folder."> This folder contains <ph name="COUNT">$1<ex>5</ex></ph> bookmarks. Are you sure you want to delete it? </message> <if expr="not pp_ifdef('use_titlecase')"> - <message name="IDS_BOOMARK_BAR_FOLDER_NAME" desc="Name shown in the tree for the bookmarks bar folder"> + <message name="IDS_BOOKMARK_BAR_FOLDER_NAME" desc="Name shown in the tree for the bookmarks bar folder"> Bookmarks bar </message> - <message name="IDS_BOOMARK_BAR_SYNCED_FOLDER_NAME" desc="Name shown in the tree for the synced bookmarks folder"> + <message name="IDS_BOOKMARK_BAR_SYNCED_FOLDER_NAME" desc="Name shown in the tree for the synced bookmarks folder"> Synced bookmarks </message> - <message name="IDS_BOOMARK_BAR_OTHER_FOLDER_NAME" desc="Name shown in the tree for the other bookmarks folder"> + <message name="IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME" desc="Name shown in the tree for the other bookmarks folder"> Other bookmarks </message> </if> <if expr="pp_ifdef('use_titlecase')"> - <message name="IDS_BOOMARK_BAR_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the bookmarks bar folder"> + <message name="IDS_BOOKMARK_BAR_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the bookmarks bar folder"> Bookmarks Bar </message> - <message name="IDS_BOOMARK_BAR_SYNCED_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the synced bookmarks folder"> + <message name="IDS_BOOKMARK_BAR_SYNCED_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the synced bookmarks folder"> Synced Bookmarks </message> - <message name="IDS_BOOMARK_BAR_OTHER_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the other bookmarks folder"> + <message name="IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME" desc="In Title Case: Name shown in the tree for the other bookmarks folder"> Other Bookmarks </message> </if> - <message name="IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME" desc="Name for newly created groups"> + <message name="IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME" desc="Name for newly created groups"> New folder </message> - <message name="IDS_BOOMARK_FOLDER_EDITOR_WINDOW_TITLE" desc="Window title of editor for bookmark folders"> + <message name="IDS_BOOKMARK_FOLDER_EDITOR_WINDOW_TITLE" desc="Window title of editor for bookmark folders"> Edit folder name </message> - <message name="IDS_BOOMARK_FOLDER_EDITOR_WINDOW_TITLE_NEW" desc="Window title of editor for new bookmark folders"> + <message name="IDS_BOOKMARK_FOLDER_EDITOR_WINDOW_TITLE_NEW" desc="Window title of editor for new bookmark folders"> New folder </message> <!-- bookmark info bubble messages --> - <message name="IDS_BOOMARK_BUBBLE_ADD_BOOKMARK" desc="Accessible title of the bubble before bookmarking something"> + <message name="IDS_BOOKMARK_BUBBLE_ADD_BOOKMARK" desc="Accessible title of the bubble before bookmarking something"> Add Bookmark </message> - <message name="IDS_BOOMARK_BUBBLE_PAGE_BOOKMARKED" desc="Title of the bubble after bookmarking something"> + <message name="IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARKED" desc="Title of the bubble after bookmarking something"> Bookmark Added! </message> - <message name="IDS_BOOMARK_BUBBLE_PAGE_BOOKMARK" desc="Title of the bubble when re-clicking on a bookmark"> + <message name="IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARK" desc="Title of the bubble when re-clicking on a bookmark"> Bookmark </message> - <message name="IDS_BOOMARK_BUBBLE_OPTIONS" desc="Title of the link the user can click to edit details of the bookmark"> + <message name="IDS_BOOKMARK_BUBBLE_OPTIONS" desc="Title of the link the user can click to edit details of the bookmark"> Edit... </message> - <message name="IDS_BOOMARK_BUBBLE_REMOVE_BOOKMARK" desc="Link for removing the bookmark"> + <message name="IDS_BOOKMARK_BUBBLE_REMOVE_BOOKMARK" desc="Link for removing the bookmark"> Remove </message> - <message name="IDS_BOOMARK_BUBBLE_TITLE_TEXT" desc="Text preceding the title of the page that was bookmarked"> + <message name="IDS_BOOKMARK_BUBBLE_TITLE_TEXT" desc="Text preceding the title of the page that was bookmarked"> Name: </message> - <message name="IDS_BOOMARK_BUBBLE_FOLDER_TEXT" desc="Text preceding the folder selector"> + <message name="IDS_BOOKMARK_BUBBLE_FOLDER_TEXT" desc="Text preceding the folder selector"> Folder: </message> <if expr="not pp_ifdef('use_titlecase')"> - <message name="IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER" desc="Text in the combobox allowing the user to choose another folder (by bringing up th editor)."> + <message name="IDS_BOOKMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER" desc="Text in the combobox allowing the user to choose another folder (by bringing up th editor)."> Choose another folder... </message> </if> <if expr="pp_ifdef('use_titlecase')"> - <message name="IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER" desc="In Title Case: Text in the combobox allowing the user to choose another folder (by bringing up th editor)."> + <message name="IDS_BOOKMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER" desc="In Title Case: Text in the combobox allowing the user to choose another folder (by bringing up th editor)."> Choose Another Folder... </message> </if> @@ -6320,32 +6320,32 @@ Keep your key file in a safe place. You will need it to create new versions of y </if> <!-- bookmark bar messages --> - <message name="IDS_BOOMARK_BAR_OTHER_BOOKMARKED" desc="Title of button showing other bookmarks"> + <message name="IDS_BOOKMARK_BAR_OTHER_BOOKMARKED" desc="Title of button showing other bookmarks"> Other bookmarks </message> <if expr="not pp_ifdef('use_titlecase')"> - <message name="IDS_BOOMARK_BAR_OPEN_IN_NEW_TAB" desc="Menu description for loading bookmark in a new tab"> + <message name="IDS_BOOKMARK_BAR_OPEN_IN_NEW_TAB" desc="Menu description for loading bookmark in a new tab"> &Open in new tab </message> - <message name="IDS_BOOMARK_BAR_OPEN_IN_NEW_WINDOW" desc="Menu description for loading bookmark in a new window"> + <message name="IDS_BOOKMARK_BAR_OPEN_IN_NEW_WINDOW" desc="Menu description for loading bookmark in a new window"> Open in &new window </message> - <message name="IDS_BOOMARK_BAR_OPEN_INCOGNITO" desc="Menu description for opening bookmark in incognito window"> + <message name="IDS_BOOKMARK_BAR_OPEN_INCOGNITO" desc="Menu description for opening bookmark in incognito window"> Open in &incognito window </message> - <message name="IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK" desc="Menu title for adding a new bookmark entry"> + <message name="IDS_BOOKMARK_BAR_ADD_NEW_BOOKMARK" desc="Menu title for adding a new bookmark entry"> Add pa&ge... </message> - <message name="IDS_BOOMARK_BAR_NEW_FOLDER" desc="Menu title for adding a new folder"> + <message name="IDS_BOOKMARK_BAR_NEW_FOLDER" desc="Menu title for adding a new folder"> Add &folder... </message> - <message name="IDS_BOOMARK_BAR_OPEN_ALL" desc="Menu title for opening all urls in a bookmark folder"> + <message name="IDS_BOOKMARK_BAR_OPEN_ALL" desc="Menu title for opening all urls in a bookmark folder"> &Open all bookmarks </message> - <message name="IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW" desc="Menu title for opening all urls in a bookmark folder in a new window"> + <message name="IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW" desc="Menu title for opening all urls in a bookmark folder in a new window"> Open all bookmarks in &new window </message> - <message name="IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO" desc="Menu description for opening all urls in a bookmark folder in an incognito window"> + <message name="IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO" desc="Menu description for opening all urls in a bookmark folder in an incognito window"> Open all bookmarks in &incognito window </message> <message name="IDS_BOOKMARK_BAR_REMOVE" desc="Menu title for removing/unstarring a bookmark"> @@ -6353,35 +6353,35 @@ Keep your key file in a safe place. You will need it to create new versions of y </message> </if> <if expr="pp_ifdef('use_titlecase')"> - <message name="IDS_BOOMARK_BAR_OPEN_IN_NEW_TAB" desc="In Title Case: Menu description for loading bookmark in a new tab"> + <message name="IDS_BOOKMARK_BAR_OPEN_IN_NEW_TAB" desc="In Title Case: Menu description for loading bookmark in a new tab"> &Open in New Tab </message> - <message name="IDS_BOOMARK_BAR_OPEN_IN_NEW_WINDOW" desc="In Title Case: Menu description for loading bookmark in a new window"> + <message name="IDS_BOOKMARK_BAR_OPEN_IN_NEW_WINDOW" desc="In Title Case: Menu description for loading bookmark in a new window"> Open in &New Window </message> - <message name="IDS_BOOMARK_BAR_OPEN_INCOGNITO" desc="In Title Case: Menu description for opening bookmark in incognito window"> + <message name="IDS_BOOKMARK_BAR_OPEN_INCOGNITO" desc="In Title Case: Menu description for opening bookmark in incognito window"> Open in &Incognito Window </message> - <message name="IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK" desc="In Title Case: Menu title for adding a new bookmark entry"> + <message name="IDS_BOOKMARK_BAR_ADD_NEW_BOOKMARK" desc="In Title Case: Menu title for adding a new bookmark entry"> Add Pa&ge... </message> - <message name="IDS_BOOMARK_BAR_NEW_FOLDER" desc="In Title Case: Menu title for adding a new folder"> + <message name="IDS_BOOKMARK_BAR_NEW_FOLDER" desc="In Title Case: Menu title for adding a new folder"> Add &Folder... </message> - <message name="IDS_BOOMARK_BAR_OPEN_ALL" desc="In Title Case: Menu title for opening all urls in a bookmark folder"> + <message name="IDS_BOOKMARK_BAR_OPEN_ALL" desc="In Title Case: Menu title for opening all urls in a bookmark folder"> &Open All Bookmarks </message> - <message name="IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW" desc="In Title Case: Menu title for opening all urls in a bookmark folder in a new window"> + <message name="IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW" desc="In Title Case: Menu title for opening all urls in a bookmark folder in a new window"> Open All Bookmarks in &New Window </message> - <message name="IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO" desc="In Title Case: Menu description for opening all urls in a bookmark folder in an incognito window"> + <message name="IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO" desc="In Title Case: Menu description for opening all urls in a bookmark folder in an incognito window"> Open All Bookmarks in &Incognito Window </message> <message name="IDS_BOOKMARK_BAR_REMOVE" desc="In Title Case: Menu title for removing/unstarring a bookmark"> &Delete </message> </if> - <message name="IDS_BOOMARK_BAR_EDIT_FOLDER_LABEL" desc="Title of label before text field in edit folder dialog"> + <message name="IDS_BOOKMARK_BAR_EDIT_FOLDER_LABEL" desc="Title of label before text field in edit folder dialog"> Name: </message> <if expr="not pp_ifdef('use_titlecase')"> diff --git a/chrome/app/nibs/BookmarkAllTabs.xib b/chrome/app/nibs/BookmarkAllTabs.xib index c417b40..dc9fa87 100644 --- a/chrome/app/nibs/BookmarkAllTabs.xib +++ b/chrome/app/nibs/BookmarkAllTabs.xib @@ -121,7 +121,7 @@ <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> + <string key="NSContents">^IDS_BOOKMARK_EDITOR_NAME_LABEL</string> <reference key="NSSupport" ref="899171858"/> <reference key="NSControlView" ref="1036501322"/> <object class="NSColor" key="NSBackgroundColor" id="460527477"> @@ -163,7 +163,7 @@ <object class="NSButtonCell" key="NSCell" id="732374144"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134217728</int> - <string key="NSContents">^IDS_BOOMARK_EDITOR_NEW_FOLDER_BUTTON</string> + <string key="NSContents">^IDS_BOOKMARK_EDITOR_NEW_FOLDER_BUTTON</string> <reference key="NSSupport" ref="899171858"/> <reference key="NSControlView" ref="631907363"/> <int key="NSButtonFlags">-2038284033</int> diff --git a/chrome/app/nibs/BookmarkBar.xib b/chrome/app/nibs/BookmarkBar.xib index c2260aaf..88acbbe 100644 --- a/chrome/app/nibs/BookmarkBar.xib +++ b/chrome/app/nibs/BookmarkBar.xib @@ -155,7 +155,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMenuItem" id="6422781"> <reference key="NSMenu" ref="183701277"/> - <string key="NSTitle">^IDS_BOOMARK_BAR_OPEN_ALL</string> + <string key="NSTitle">^IDS_BOOKMARK_BAR_OPEN_ALL</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <object class="NSCustomResource" key="NSOnImage" id="214171346"> @@ -169,7 +169,7 @@ </object> <object class="NSMenuItem" id="115646576"> <reference key="NSMenu" ref="183701277"/> - <string key="NSTitle">^IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW</string> + <string key="NSTitle">^IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="214171346"/> @@ -177,7 +177,7 @@ </object> <object class="NSMenuItem" id="509003741"> <reference key="NSMenu" ref="183701277"/> - <string key="NSTitle">^IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO</string> + <string key="NSTitle">^IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="214171346"/> @@ -265,7 +265,7 @@ </object> <object class="NSMenuItem" id="926809071"> <reference key="NSMenu" ref="183701277"/> - <string key="NSTitle">^IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK</string> + <string key="NSTitle">^IDS_BOOKMARK_BAR_ADD_NEW_BOOKMARK</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="214171346"/> @@ -273,7 +273,7 @@ </object> <object class="NSMenuItem" id="90793013"> <reference key="NSMenu" ref="183701277"/> - <string key="NSTitle">^IDS_BOOMARK_BAR_NEW_FOLDER</string> + <string key="NSTitle">^IDS_BOOKMARK_BAR_NEW_FOLDER</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="214171346"/> @@ -315,7 +315,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMenuItem" id="1071747565"> <reference key="NSMenu" ref="672481054"/> - <string key="NSTitle">^IDS_BOOMARK_BAR_OPEN_IN_NEW_TAB</string> + <string key="NSTitle">^IDS_BOOKMARK_BAR_OPEN_IN_NEW_TAB</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="214171346"/> @@ -323,7 +323,7 @@ </object> <object class="NSMenuItem" id="308357419"> <reference key="NSMenu" ref="672481054"/> - <string key="NSTitle">^IDS_BOOMARK_BAR_OPEN_IN_NEW_WINDOW</string> + <string key="NSTitle">^IDS_BOOKMARK_BAR_OPEN_IN_NEW_WINDOW</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="214171346"/> @@ -331,7 +331,7 @@ </object> <object class="NSMenuItem" id="300791080"> <reference key="NSMenu" ref="672481054"/> - <string key="NSTitle">^IDS_BOOMARK_BAR_OPEN_INCOGNITO</string> + <string key="NSTitle">^IDS_BOOKMARK_BAR_OPEN_INCOGNITO</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="214171346"/> @@ -419,7 +419,7 @@ </object> <object class="NSMenuItem" id="527115352"> <reference key="NSMenu" ref="672481054"/> - <string key="NSTitle">^IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK</string> + <string key="NSTitle">^IDS_BOOKMARK_BAR_ADD_NEW_BOOKMARK</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="214171346"/> @@ -427,7 +427,7 @@ </object> <object class="NSMenuItem" id="595609715"> <reference key="NSMenu" ref="672481054"/> - <string key="NSTitle">^IDS_BOOMARK_BAR_NEW_FOLDER</string> + <string key="NSTitle">^IDS_BOOKMARK_BAR_NEW_FOLDER</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> <reference key="NSOnImage" ref="214171346"/> diff --git a/chrome/app/nibs/BookmarkBubble.xib b/chrome/app/nibs/BookmarkBubble.xib index ebf5d84..7e5fc20 100644 --- a/chrome/app/nibs/BookmarkBubble.xib +++ b/chrome/app/nibs/BookmarkBubble.xib @@ -72,7 +72,7 @@ <object class="NSTextFieldCell" key="NSCell" id="368795405"> <int key="NSCellFlags">68288064</int> <int key="NSCellFlags2">272630784</int> - <string key="NSContents">^IDS_BOOMARK_BUBBLE_PAGE_BOOKMARK</string> + <string key="NSContents">^IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARK</string> <object class="NSFont" key="NSSupport"> <string key="NSName">LucidaGrande</string> <double key="NSSize">13</double> @@ -137,7 +137,7 @@ <object class="NSButtonCell" key="NSCell" id="562929863"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134348800</int> - <string key="NSContents">^IDS_BOOMARK_BUBBLE_OPTIONS</string> + <string key="NSContents">^IDS_BOOKMARK_BUBBLE_OPTIONS</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="430629007"/> <int key="NSButtonFlags">-2038284033</int> @@ -167,7 +167,7 @@ <object class="NSButtonCell" key="NSCell" id="1066753170"> <int key="NSCellFlags">-2080244224</int> <int key="NSCellFlags2">134348800</int> - <string key="NSContents">^IDS_BOOMARK_BUBBLE_REMOVE_BOOKMARK</string> + <string key="NSContents">^IDS_BOOKMARK_BUBBLE_REMOVE_BOOKMARK</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="177936093"/> <int key="NSButtonFlags">-2038021889</int> @@ -202,7 +202,7 @@ <object class="NSTextFieldCell" key="NSCell" id="628112279"> <int key="NSCellFlags">68288064</int> <int key="NSCellFlags2">272761856</int> - <string key="NSContents">^IDS_BOOMARK_BUBBLE_TITLE_TEXT</string> + <string key="NSContents">^IDS_BOOKMARK_BUBBLE_TITLE_TEXT</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="303910295"/> <reference key="NSBackgroundColor" ref="152587692"/> @@ -218,7 +218,7 @@ <object class="NSTextFieldCell" key="NSCell" id="295393049"> <int key="NSCellFlags">68288064</int> <int key="NSCellFlags2">272761856</int> - <string key="NSContents">^IDS_BOOMARK_BUBBLE_FOLDER_TEXT</string> + <string key="NSContents">^IDS_BOOKMARK_BUBBLE_FOLDER_TEXT</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="228609717"/> <reference key="NSBackgroundColor" ref="152587692"/> diff --git a/chrome/app/nibs/BookmarkEditor.xib b/chrome/app/nibs/BookmarkEditor.xib index f5a505f..52d6dc7 100644 --- a/chrome/app/nibs/BookmarkEditor.xib +++ b/chrome/app/nibs/BookmarkEditor.xib @@ -121,7 +121,7 @@ <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> + <string key="NSContents">^IDS_BOOKMARK_EDITOR_NAME_LABEL</string> <reference key="NSSupport" ref="899171858"/> <reference key="NSControlView" ref="1036501322"/> <object class="NSColor" key="NSBackgroundColor" id="519536938"> @@ -153,7 +153,7 @@ <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> + <string key="NSContents">^IDS_BOOKMARK_EDITOR_URL_LABEL</string> <reference key="NSSupport" ref="899171858"/> <reference key="NSControlView" ref="209927002"/> <reference key="NSBackgroundColor" ref="519536938"/> @@ -266,7 +266,7 @@ <object class="NSButtonCell" key="NSCell" id="732374144"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134217728</int> - <string key="NSContents">^IDS_BOOMARK_EDITOR_NEW_FOLDER_BUTTON</string> + <string key="NSContents">^IDS_BOOKMARK_EDITOR_NEW_FOLDER_BUTTON</string> <reference key="NSSupport" ref="899171858"/> <reference key="NSControlView" ref="631907363"/> <int key="NSButtonFlags">-2038284033</int> diff --git a/chrome/app/nibs/BookmarkNameFolder.xib b/chrome/app/nibs/BookmarkNameFolder.xib index b5d8e6c..50e50f5 100644 --- a/chrome/app/nibs/BookmarkNameFolder.xib +++ b/chrome/app/nibs/BookmarkNameFolder.xib @@ -153,7 +153,7 @@ <object class="NSTextFieldCell" key="NSCell" id="383706794"> <int key="NSCellFlags">68288064</int> <int key="NSCellFlags2">272630784</int> - <string key="NSContents">^IDS_BOOMARK_BAR_EDIT_FOLDER_LABEL</string> + <string key="NSContents">^IDS_BOOKMARK_BAR_EDIT_FOLDER_LABEL</string> <reference key="NSSupport" ref="11363697"/> <reference key="NSControlView" ref="1000877900"/> <object class="NSColor" key="NSBackgroundColor"> diff --git a/chrome/browser/bookmarks/bookmark_codec.cc b/chrome/browser/bookmarks/bookmark_codec.cc index dd0a576..55d1acb 100644 --- a/chrome/browser/bookmarks/bookmark_codec.cc +++ b/chrome/browser/bookmarks/bookmark_codec.cc @@ -189,11 +189,11 @@ bool BookmarkCodec::DecodeHelper(BookmarkNode* bb_node, bb_node->set_type(BookmarkNode::BOOKMARK_BAR); other_folder_node->set_type(BookmarkNode::OTHER_NODE); synced_folder_node->set_type(BookmarkNode::SYNCED); - bb_node->set_title(l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_FOLDER_NAME)); + bb_node->set_title(l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_FOLDER_NAME)); other_folder_node->set_title( - l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME)); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME)); synced_folder_node->set_title( - l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_SYNCED_FOLDER_NAME)); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_SYNCED_FOLDER_NAME)); return true; } diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc index 73820d8..0e92c12 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc @@ -51,17 +51,17 @@ BookmarkContextMenuController::~BookmarkContextMenuController() { void BookmarkContextMenuController::BuildMenu() { if (selection_.size() == 1 && selection_[0]->is_url()) { AddItem(IDC_BOOKMARK_BAR_OPEN_ALL, - IDS_BOOMARK_BAR_OPEN_IN_NEW_TAB); + IDS_BOOKMARK_BAR_OPEN_IN_NEW_TAB); AddItem(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, - IDS_BOOMARK_BAR_OPEN_IN_NEW_WINDOW); + IDS_BOOKMARK_BAR_OPEN_IN_NEW_WINDOW); AddItem(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, - IDS_BOOMARK_BAR_OPEN_INCOGNITO); + IDS_BOOKMARK_BAR_OPEN_INCOGNITO); } else { - AddItem(IDC_BOOKMARK_BAR_OPEN_ALL, IDS_BOOMARK_BAR_OPEN_ALL); + AddItem(IDC_BOOKMARK_BAR_OPEN_ALL, IDS_BOOKMARK_BAR_OPEN_ALL); AddItem(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, - IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW); + IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW); AddItem(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, - IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO); + IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO); } AddSeparator(); @@ -80,8 +80,8 @@ void BookmarkContextMenuController::BuildMenu() { AddItem(IDC_BOOKMARK_BAR_REMOVE, IDS_BOOKMARK_BAR_REMOVE); AddSeparator(); - AddItem(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK, IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK); - AddItem(IDC_BOOKMARK_BAR_NEW_FOLDER, IDS_BOOMARK_BAR_NEW_FOLDER); + AddItem(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK, IDS_BOOKMARK_BAR_ADD_NEW_BOOKMARK); + AddItem(IDC_BOOKMARK_BAR_NEW_FOLDER, IDS_BOOKMARK_BAR_NEW_FOLDER); AddSeparator(); AddItem(IDC_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER); diff --git a/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc b/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc index f3a0a31..ef5d8cb 100644 --- a/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc +++ b/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc @@ -42,12 +42,12 @@ BookmarkFolderEditorController::BookmarkFolderEditorController( model_->AddObserver(this); string16 title = is_new_ ? - l10n_util::GetStringUTF16(IDS_BOOMARK_FOLDER_EDITOR_WINDOW_TITLE_NEW) : - l10n_util::GetStringUTF16(IDS_BOOMARK_FOLDER_EDITOR_WINDOW_TITLE); + l10n_util::GetStringUTF16(IDS_BOOKMARK_FOLDER_EDITOR_WINDOW_TITLE_NEW) : + l10n_util::GetStringUTF16(IDS_BOOKMARK_FOLDER_EDITOR_WINDOW_TITLE); string16 label = - l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_EDIT_FOLDER_LABEL); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_EDIT_FOLDER_LABEL); string16 contents = is_new_ ? - l10n_util::GetStringUTF16(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME) : + l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME) : node_->GetTitle(); dialog_ = InputWindowDialog::Create(wnd, title, label, contents, this); diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc index 5117f85..8952d65 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -308,7 +308,7 @@ class Writer : public Task { if (folder_type == BookmarkNode::BOOKMARK_BAR) { if (!Write(kBookmarkBar)) return false; - title = l10n_util::GetStringUTF8(IDS_BOOMARK_BAR_FOLDER_NAME); + title = l10n_util::GetStringUTF8(IDS_BOOKMARK_BAR_FOLDER_NAME); } else if (!Write(kFolderAttributeEnd)) { return false; } diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc index 6b236f0..eba8cec 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc @@ -245,7 +245,7 @@ TEST_F(BookmarkHTMLWriterTest, Test) { ASSERT_EQ(8U, parsed_bookmarks.size()); // Windows and ChromeOS builds use Sentence case. string16 bookmark_folder_name = - l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_FOLDER_NAME); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_FOLDER_NAME); AssertBookmarkEntryEquals(parsed_bookmarks[0], true, url1, url1_title, t1, bookmark_folder_name, f1_title, string16()); AssertBookmarkEntryEquals(parsed_bookmarks[1], true, url2, url2_title, t2, diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index 4e6ec46..e96eb8c 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -722,13 +722,13 @@ BookmarkNode* BookmarkModel::CreatePermanentNode(BookmarkNode::Type type) { BookmarkNode* node = new BookmarkNode(generate_next_node_id(), GURL()); node->set_type(type); if (type == BookmarkNode::BOOKMARK_BAR) { - node->set_title(l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_FOLDER_NAME)); + node->set_title(l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_FOLDER_NAME)); } else if (type == BookmarkNode::OTHER_NODE) { node->set_title( - l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME)); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME)); } else { node->set_title( - l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_SYNCED_FOLDER_NAME)); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_SYNCED_FOLDER_NAME)); } return node; } diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 40bc1ea..fcb3dc8 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -733,7 +733,7 @@ bool ConfirmDeleteBookmarkNode(const BookmarkNode* node, DCHECK(node && node->is_folder() && !node->empty()); return browser::ShowYesNoBox(window, l10n_util::GetStringUTF16(IDS_DELETE), - l10n_util::GetStringFUTF16Int(IDS_BOOMARK_EDITOR_CONFIRM_DELETE, + l10n_util::GetStringFUTF16Int(IDS_BOOKMARK_EDITOR_CONFIRM_DELETE, ChildURLCountTotal(node))); } diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc index 828be49..ba1b830 100644 --- a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc +++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc @@ -60,7 +60,8 @@ int RecentlyUsedFoldersComboModel::GetItemCount() { string16 RecentlyUsedFoldersComboModel::GetItemAt(int index) { if (index == static_cast<int>(nodes_.size())) - return l10n_util::GetStringUTF16(IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER); + return + l10n_util::GetStringUTF16(IDS_BOOKMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER); return nodes_[index]->GetTitle(); } diff --git a/chrome/browser/extensions/extension_bookmark_manager_api.cc b/chrome/browser/extensions/extension_bookmark_manager_api.cc index 2d80191..fb28876 100644 --- a/chrome/browser/extensions/extension_bookmark_manager_api.cc +++ b/chrome/browser/extensions/extension_bookmark_manager_api.cc @@ -316,21 +316,21 @@ bool BookmarkManagerGetStringsFunction::RunImpl() { localized_strings->SetString("should_open_all", l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_SHOULD_OPEN_ALL)); localized_strings->SetString("open_incognito", - l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OPEN_INCOGNITO)); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_OPEN_INCOGNITO)); localized_strings->SetString("open_in_new_tab", - l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OPEN_IN_NEW_TAB)); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_OPEN_IN_NEW_TAB)); localized_strings->SetString("open_in_new_window", - l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OPEN_IN_NEW_WINDOW)); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_OPEN_IN_NEW_WINDOW)); localized_strings->SetString("add_new_bookmark", - l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK)); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_ADD_NEW_BOOKMARK)); localized_strings->SetString("new_folder", - l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_NEW_FOLDER)); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_NEW_FOLDER)); localized_strings->SetString("open_all", - l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OPEN_ALL)); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_OPEN_ALL)); localized_strings->SetString("open_all_new_window", - l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW)); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW)); localized_strings->SetString("open_all_incognito", - l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO)); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO)); localized_strings->SetString("remove", l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_REMOVE)); localized_strings->SetString("copy", @@ -342,7 +342,7 @@ bool BookmarkManagerGetStringsFunction::RunImpl() { localized_strings->SetString("delete", l10n_util::GetStringUTF16(IDS_CONTENT_CONTEXT_DELETE)); localized_strings->SetString("new_folder_name", - l10n_util::GetStringUTF16(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME)); + l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME)); localized_strings->SetString("name_input_placeholder", l10n_util::GetStringUTF16(IDS_BOOKMARK_MANAGER_NAME_INPUT_PLACE_HOLDER)); localized_strings->SetString("url_input_placeholder", diff --git a/chrome/browser/importer/profile_import_process_host.cc b/chrome/browser/importer/profile_import_process_host.cc index 70350cf..51d339d 100644 --- a/chrome/browser/importer/profile_import_process_host.cc +++ b/chrome/browser/importer/profile_import_process_host.cc @@ -54,8 +54,8 @@ bool ProfileImportProcessHost::StartProfileImportProcess( base::IntToString(IDS_IMPORT_FROM_SAFARI), l10n_util::GetStringUTF8(IDS_IMPORT_FROM_SAFARI)); localized_strings.SetString( - base::IntToString(IDS_BOOMARK_BAR_FOLDER_NAME), - l10n_util::GetStringUTF8(IDS_BOOMARK_BAR_FOLDER_NAME)); + base::IntToString(IDS_BOOKMARK_BAR_FOLDER_NAME), + l10n_util::GetStringUTF8(IDS_BOOKMARK_BAR_FOLDER_NAME)); Send(new ProfileImportProcessMsg_StartImport(source_profile, items, localized_strings)); diff --git a/chrome/browser/importer/safari_importer.mm b/chrome/browser/importer/safari_importer.mm index 93e4a5e..095fa54 100644 --- a/chrome/browser/importer/safari_importer.mm +++ b/chrome/browser/importer/safari_importer.mm @@ -99,7 +99,7 @@ void SafariImporter::StartImport(const importer::SourceProfile& source_profile, void SafariImporter::ImportBookmarks() { string16 toolbar_name = - bridge_->GetLocalizedString(IDS_BOOMARK_BAR_FOLDER_NAME); + bridge_->GetLocalizedString(IDS_BOOKMARK_BAR_FOLDER_NAME); std::vector<ProfileWriter::BookmarkEntry> bookmarks; ParseBookmarks(toolbar_name, &bookmarks); diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm index 47dab5d..0c0cd6a 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm @@ -33,7 +33,7 @@ - (void)awakeFromNib { [self setInitialName: - l10n_util::GetNSStringWithFixup(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME)]; + l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME)]; [super awakeFromNib]; } diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm index fa8dca6..0f63781 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm @@ -197,11 +197,11 @@ void BookmarkBubbleNotificationBridge::Observe( origin.x -= bubbleArrowtip.x; [window setFrameOrigin:origin]; [parentWindow_ addChildWindow:window ordered:NSWindowAbove]; - // Default is IDS_BOOMARK_BUBBLE_PAGE_BOOKMARK; "Bookmark". + // Default is IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARK; "Bookmark". // If adding for the 1st time the string becomes "Bookmark Added!" if (!alreadyBookmarked_) { NSString* title = - l10n_util::GetNSString(IDS_BOOMARK_BUBBLE_PAGE_BOOKMARKED); + l10n_util::GetNSString(IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARKED); [bigTitle_ setStringValue:title]; } @@ -370,7 +370,7 @@ void BookmarkBubbleNotificationBridge::Observe( + (NSString*)chooseAnotherFolderString { return l10n_util::GetNSStringWithFixup( - IDS_BOOMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER); + IDS_BOOKMARK_BUBBLE_CHOOSER_ANOTHER_FOLDER); } // For the given folder node, walk the tree and add folder names to diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm index b780784..6d37efd 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm @@ -543,7 +543,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver { if (parentInfo) { NSIndexPath* selection = [self selectedIndexPath]; NSString* newFolderName = - l10n_util::GetNSStringWithFixup(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME); + l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME); BookmarkFolderInfo* folderInfo = [BookmarkFolderInfo bookmarkFolderInfoWithFolderName:newFolderName]; [self willChangeValueForKey:@"folderTreeArray"]; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm index 989bd10..6c35175 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm @@ -150,7 +150,7 @@ TEST_F(BookmarkEditorBaseControllerTest, CreateFolder) { EXPECT_EQ(2, folder_b_3_->child_count()); [controller_ selectTestNodeInBrowser:folder_b_3_]; NSString* expectedName = - l10n_util::GetNSStringWithFixup(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME); + l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME); [controller_ setDisplayName:expectedName]; [controller_ newFolder:nil]; NSArray* selectionPaths = [controller_ tableSelectionPaths]; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm index 3b1ddd1..d982d4c 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm @@ -97,7 +97,7 @@ void BookmarkMenuBridge::UpdateMenuInternal(NSMenu* bookmark_menu, // and fill it in. if (!model->other_node()->empty()) { NSString* other_items_title = - l10n_util::GetNSString(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME); + l10n_util::GetNSString(IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME); [bookmark_menu addItem:[NSMenuItem separatorItem]]; AddNodeAsSubmenu(bookmark_menu, model->other_node(), @@ -259,13 +259,13 @@ void BookmarkMenuBridge::AddNodeToMenu(const BookmarkNode* node, NSMenu* menu, [menu addItem:[NSMenuItem separatorItem]]; bool enabled = child_count != 0; AddItemToMenu(IDC_BOOKMARK_BAR_OPEN_ALL, - IDS_BOOMARK_BAR_OPEN_ALL, + IDS_BOOKMARK_BAR_OPEN_ALL, node, menu, enabled); AddItemToMenu(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, - IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW, + IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, node, menu, enabled); AddItemToMenu(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, - IDS_BOOMARK_BAR_OPEN_INCOGNITO, + IDS_BOOKMARK_BAR_OPEN_INCOGNITO, node, menu, enabled); } } diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm index a75629b..d973a6a 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm @@ -253,26 +253,26 @@ TEST_F(BookmarkMenuBridgeTest, TestAddItemToMenu) { EXPECT_EQ(0, [menu numberOfItems]); AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL, - IDS_BOOMARK_BAR_OPEN_ALL, root, menu, true); + IDS_BOOKMARK_BAR_OPEN_ALL, root, menu, true); AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, - IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW, root, menu, true); + IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, root, menu, true); AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, - IDS_BOOMARK_BAR_OPEN_INCOGNITO, root, menu, true); + IDS_BOOKMARK_BAR_OPEN_INCOGNITO, root, menu, true); EXPECT_EQ(3, [menu numberOfItems]); - title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_ALL); + title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_ALL); item = [menu itemWithTitle:title]; EXPECT_TRUE(item); EXPECT_EQ(@selector(openAllBookmarks:), [item action]); EXPECT_TRUE([item isEnabled]); - title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW); + title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW); item = [menu itemWithTitle:title]; EXPECT_TRUE(item); EXPECT_EQ(@selector(openAllBookmarksNewWindow:), [item action]); EXPECT_TRUE([item isEnabled]); - title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_INCOGNITO); + title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_INCOGNITO); item = [menu itemWithTitle:title]; EXPECT_TRUE(item); EXPECT_EQ(@selector(openAllBookmarksIncognitoWindow:), [item action]); @@ -282,26 +282,26 @@ TEST_F(BookmarkMenuBridgeTest, TestAddItemToMenu) { EXPECT_EQ(0, [menu numberOfItems]); AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL, - IDS_BOOMARK_BAR_OPEN_ALL, root, menu, false); + IDS_BOOKMARK_BAR_OPEN_ALL, root, menu, false); AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, - IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW, root, menu, false); + IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, root, menu, false); AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, - IDS_BOOMARK_BAR_OPEN_INCOGNITO, root, menu, false); + IDS_BOOKMARK_BAR_OPEN_INCOGNITO, root, menu, false); EXPECT_EQ(3, [menu numberOfItems]); - title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_ALL); + title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_ALL); item = [menu itemWithTitle:title]; EXPECT_TRUE(item); EXPECT_EQ(nil, [item action]); EXPECT_FALSE([item isEnabled]); - title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW); + title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW); item = [menu itemWithTitle:title]; EXPECT_TRUE(item); EXPECT_EQ(nil, [item action]); EXPECT_FALSE([item isEnabled]); - title = l10n_util::GetNSStringWithFixup(IDS_BOOMARK_BAR_OPEN_INCOGNITO); + title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_INCOGNITO); item = [menu itemWithTitle:title]; EXPECT_TRUE(item); EXPECT_EQ(nil, [item action]); diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm index e988c56..a4c4d0c 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm @@ -4,12 +4,12 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h" -#include "ui/base/l10n/l10n_util.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_mac.h" @implementation BookmarkNameFolderController @@ -36,7 +36,7 @@ initialName_.reset([base::SysUTF16ToNSString(node_->GetTitle()) retain]); } else { NSString* newString = - l10n_util::GetNSStringWithFixup(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME); + l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME); initialName_.reset([newString retain]); } } diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc index a27505b..7b616af 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.cc @@ -95,13 +95,13 @@ BookmarkBubbleGtk::BookmarkBubbleGtk(GtkWidget* anchor, apply_edits_(true), remove_bookmark_(false) { GtkWidget* label = gtk_label_new(l10n_util::GetStringUTF8( - newly_bookmarked_ ? IDS_BOOMARK_BUBBLE_PAGE_BOOKMARKED : - IDS_BOOMARK_BUBBLE_PAGE_BOOKMARK).c_str()); + newly_bookmarked_ ? IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARKED : + IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARK).c_str()); labels_.push_back(label); remove_button_ = theme_service_->BuildChromeLinkButton( - l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_REMOVE_BOOKMARK)); + l10n_util::GetStringUTF8(IDS_BOOKMARK_BUBBLE_REMOVE_BOOKMARK)); GtkWidget* edit_button = gtk_button_new_with_label( - l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_OPTIONS).c_str()); + l10n_util::GetStringUTF8(IDS_BOOKMARK_BUBBLE_OPTIONS).c_str()); GtkWidget* close_button = gtk_button_new_with_label( l10n_util::GetStringUTF8(IDS_DONE).c_str()); @@ -130,9 +130,9 @@ BookmarkBubbleGtk::BookmarkBubbleGtk(GtkWidget* anchor, // with the entry and folder combo lining up. GtkWidget* table = gtk_util::CreateLabeledControlsGroup( &labels_, - l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_TITLE_TEXT).c_str(), + l10n_util::GetStringUTF8(IDS_BOOKMARK_BUBBLE_TITLE_TEXT).c_str(), name_entry_, - l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_FOLDER_TEXT).c_str(), + l10n_util::GetStringUTF8(IDS_BOOKMARK_BUBBLE_FOLDER_TEXT).c_str(), folder_combo_, NULL); diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc index 6b357b1..21699a7 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc @@ -104,7 +104,7 @@ class BookmarkEditorGtk::ContextMenuController menu_model_->AddItemWithStringId(COMMAND_DELETE, IDS_DELETE); menu_model_->AddItemWithStringId( COMMAND_NEW_FOLDER, - IDS_BOOMARK_EDITOR_NEW_FOLDER_MENU_ITEM); + IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM); #if defined(TOOLKIT_VIEWS) menu_.reset(new views::Menu2(menu_model_.get())); #else @@ -298,7 +298,7 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) { bb_model_->AddObserver(this); dialog_ = gtk_dialog_new_with_buttons( - l10n_util::GetStringUTF8(IDS_BOOMARK_EDITOR_TITLE).c_str(), + l10n_util::GetStringUTF8(IDS_BOOKMARK_EDITOR_TITLE).c_str(), parent_window, GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, @@ -309,7 +309,8 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) { if (show_tree_) { GtkWidget* action_area = GTK_DIALOG(dialog_)->action_area; new_folder_button_ = gtk_button_new_with_label( - l10n_util::GetStringUTF8(IDS_BOOMARK_EDITOR_NEW_FOLDER_BUTTON).c_str()); + l10n_util::GetStringUTF8( + IDS_BOOKMARK_EDITOR_NEW_FOLDER_BUTTON).c_str()); g_signal_connect(new_folder_button_, "clicked", G_CALLBACK(OnNewFolderClickedThunk), this); gtk_container_add(GTK_CONTAINER(action_area), new_folder_button_); @@ -355,7 +356,7 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) { title = UTF16ToUTF8(details_.existing_node->GetTitle()); url = details_.existing_node->url(); } else if (details_.type == EditDetails::NEW_FOLDER) { - title = l10n_util::GetStringUTF8(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME); + title = l10n_util::GetStringUTF8(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME); } else if (details_.type == EditDetails::NEW_URL) { string16 title16; bookmark_utils::GetURLAndTitleToBookmarkFromCurrentTab(profile_, @@ -375,16 +376,16 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) { G_CALLBACK(OnEntryChangedThunk), this); gtk_entry_set_activates_default(GTK_ENTRY(url_entry_), TRUE); table = gtk_util::CreateLabeledControlsGroup(NULL, - l10n_util::GetStringUTF8(IDS_BOOMARK_EDITOR_NAME_LABEL).c_str(), + l10n_util::GetStringUTF8(IDS_BOOKMARK_EDITOR_NAME_LABEL).c_str(), name_entry_, - l10n_util::GetStringUTF8(IDS_BOOMARK_EDITOR_URL_LABEL).c_str(), + l10n_util::GetStringUTF8(IDS_BOOKMARK_EDITOR_URL_LABEL).c_str(), url_entry_, NULL); } else { url_entry_ = NULL; table = gtk_util::CreateLabeledControlsGroup(NULL, - l10n_util::GetStringUTF8(IDS_BOOMARK_EDITOR_NAME_LABEL).c_str(), + l10n_util::GetStringUTF8(IDS_BOOKMARK_EDITOR_NAME_LABEL).c_str(), name_entry_, NULL); } @@ -588,7 +589,7 @@ void BookmarkEditorGtk::AddNewFolder(GtkTreeIter* parent, GtkTreeIter* child) { tree_store_, child, bookmark_utils::FOLDER_ICON, GtkThemeService::GetFolderIcon(true), bookmark_utils::FOLDER_NAME, - l10n_util::GetStringUTF8(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME).c_str(), + l10n_util::GetStringUTF8(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME).c_str(), bookmark_utils::ITEM_ID, static_cast<int64>(0), bookmark_utils::IS_EDITABLE, TRUE, -1); diff --git a/chrome/browser/ui/gtk/global_bookmark_menu.cc b/chrome/browser/ui/gtk/global_bookmark_menu.cc index 5aea00a..7cd4f47 100644 --- a/chrome/browser/ui/gtk/global_bookmark_menu.cc +++ b/chrome/browser/ui/gtk/global_bookmark_menu.cc @@ -112,7 +112,7 @@ void GlobalBookmarkMenu::RebuildMenu() { AddBookmarkMenuItem(bookmark_menu_.get(), gtk_separator_menu_item_new()); GtkWidget* menu_item = gtk_image_menu_item_new_with_label( - l10n_util::GetStringUTF8(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME).c_str()); + l10n_util::GetStringUTF8(IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME).c_str()); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), submenu); gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM(menu_item), diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index c701e65..24cf4b4 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -1199,7 +1199,7 @@ int BookmarkBarView::GetFirstHiddenNodeIndex() { MenuButton* BookmarkBarView::CreateOtherBookmarkedButton() { MenuButton* button = new BookmarkFolderButton( this, - UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OTHER_BOOKMARKED)), + UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_OTHER_BOOKMARKED)), this, false); button->set_id(VIEW_ID_OTHER_BOOKMARKS); @@ -1207,7 +1207,7 @@ MenuButton* BookmarkBarView::CreateOtherBookmarkedButton() { button->set_context_menu_controller(this); button->set_tag(kOtherFolderButtonTag); button->SetAccessibleName( - l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OTHER_BOOKMARKED)); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_OTHER_BOOKMARKED)); return button; } diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc index e79ef8f..77580f4 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc @@ -187,18 +187,19 @@ void BookmarkBubbleView::Init() { } remove_link_ = new views::Link(UTF16ToWide(l10n_util::GetStringUTF16( - IDS_BOOMARK_BUBBLE_REMOVE_BOOKMARK))); + IDS_BOOKMARK_BUBBLE_REMOVE_BOOKMARK))); remove_link_->set_listener(this); edit_button_ = new views::NativeTextButton( - this, UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOMARK_BUBBLE_OPTIONS))); + this, + UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOKMARK_BUBBLE_OPTIONS))); close_button_ = new views::NativeTextButton( this, UTF16ToWide(l10n_util::GetStringUTF16(IDS_DONE))); close_button_->SetIsDefault(true); views::Label* combobox_label = new views::Label( - UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOMARK_BUBBLE_FOLDER_TEXT))); + UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOKMARK_BUBBLE_FOLDER_TEXT))); parent_combobox_ = new views::Combobox(&parent_model_); parent_combobox_->SetSelectedItem(parent_model_.node_parent_index()); @@ -208,8 +209,8 @@ void BookmarkBubbleView::Init() { views::Label* title_label = new views::Label( UTF16ToWide(l10n_util::GetStringUTF16( - newly_bookmarked_ ? IDS_BOOMARK_BUBBLE_PAGE_BOOKMARKED : - IDS_BOOMARK_BUBBLE_PAGE_BOOKMARK))); + newly_bookmarked_ ? IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARKED : + IDS_BOOKMARK_BUBBLE_PAGE_BOOKMARK))); title_label->SetFont( ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont)); title_label->SetColor(kTitleColor); @@ -253,7 +254,7 @@ void BookmarkBubbleView::Init() { layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing); layout->StartRow(0, 2); layout->AddView(new views::Label(UTF16ToWide( - l10n_util::GetStringUTF16(IDS_BOOMARK_BUBBLE_TITLE_TEXT)))); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BUBBLE_TITLE_TEXT)))); title_tf_ = new views::Textfield(); title_tf_->SetText(GetTitle()); layout->AddView(title_tf_); @@ -340,7 +341,7 @@ bool BookmarkBubbleView::FadeInOnShow() { std::wstring BookmarkBubbleView::accessible_name() { return UTF16ToWide( - l10n_util::GetStringUTF16(IDS_BOOMARK_BUBBLE_ADD_BOOKMARK)); + l10n_util::GetStringUTF16(IDS_BOOKMARK_BUBBLE_ADD_BOOKMARK)); } void BookmarkBubbleView::Close() { diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc index 2bfcdc8..94dd345 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc @@ -15,9 +15,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" -#include "content/browser/user_metrics.h" #include "chrome/common/pref_names.h" #include "content/browser/tab_contents/page_navigator.h" +#include "content/browser/user_metrics.h" #include "grit/generated_resources.h" #include "views/widget/widget.h" @@ -48,18 +48,18 @@ BookmarkContextMenuControllerViews::~BookmarkContextMenuControllerViews() { void BookmarkContextMenuControllerViews::BuildMenu() { if (selection_.size() == 1 && selection_[0]->is_url()) { delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL, - IDS_BOOMARK_BAR_OPEN_IN_NEW_TAB); + IDS_BOOKMARK_BAR_OPEN_IN_NEW_TAB); delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, - IDS_BOOMARK_BAR_OPEN_IN_NEW_WINDOW); + IDS_BOOKMARK_BAR_OPEN_IN_NEW_WINDOW); delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, - IDS_BOOMARK_BAR_OPEN_INCOGNITO); + IDS_BOOKMARK_BAR_OPEN_INCOGNITO); } else { delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL, - IDS_BOOMARK_BAR_OPEN_ALL); + IDS_BOOKMARK_BAR_OPEN_ALL); delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, - IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW); + IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW); delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO, - IDS_BOOMARK_BAR_OPEN_ALL_INCOGNITO); + IDS_BOOKMARK_BAR_OPEN_ALL_INCOGNITO); } delegate_->AddSeparator(); @@ -82,9 +82,9 @@ void BookmarkContextMenuControllerViews::BuildMenu() { delegate_->AddSeparator(); delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_ADD_NEW_BOOKMARK, - IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK); + IDS_BOOKMARK_BAR_ADD_NEW_BOOKMARK); delegate_->AddItemWithStringId(IDC_BOOKMARK_BAR_NEW_FOLDER, - IDS_BOOMARK_BAR_NEW_FOLDER); + IDS_BOOKMARK_BAR_NEW_FOLDER); delegate_->AddSeparator(); delegate_->AddItemWithStringId(IDC_BOOKMARK_MANAGER, IDS_BOOKMARK_MANAGER); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index a0d5601..aed2f47 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -106,7 +106,7 @@ bool BookmarkEditorView::CanResize() const { } std::wstring BookmarkEditorView::GetWindowTitle() const { - return UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOMARK_EDITOR_TITLE)); + return UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_TITLE)); } bool BookmarkEditorView::Accept() { @@ -209,7 +209,7 @@ bool BookmarkEditorView::IsCommandIdEnabled(int command_id) const { case IDS_EDIT: case IDS_DELETE: return !running_menu_for_root_; - case IDS_BOOMARK_EDITOR_NEW_FOLDER_MENU_ITEM: + case IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM: return true; default: NOTREACHED(); @@ -243,7 +243,7 @@ void BookmarkEditorView::ExecuteCommand(int command_id) { } tree_model_->Remove(node->parent(), node); } else { - DCHECK(command_id == IDS_BOOMARK_EDITOR_NEW_FOLDER_MENU_ITEM); + DCHECK(command_id == IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM); NewFolder(); } } @@ -279,8 +279,8 @@ void BookmarkEditorView::ShowContextMenuForView(View* source, context_menu_contents_->AddItemWithStringId(IDS_EDIT, IDS_EDIT); context_menu_contents_->AddItemWithStringId(IDS_DELETE, IDS_DELETE); context_menu_contents_->AddItemWithStringId( - IDS_BOOMARK_EDITOR_NEW_FOLDER_MENU_ITEM, - IDS_BOOMARK_EDITOR_NEW_FOLDER_MENU_ITEM); + IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM, + IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM); context_menu_.reset(new views::Menu2(context_menu_contents_.get())); } context_menu_->RunContextMenuAt(p); @@ -300,7 +300,7 @@ void BookmarkEditorView::Init() { url = details_.existing_node->url(); } else if (details_.type == EditDetails::NEW_FOLDER) { title = UTF16ToWide( - l10n_util::GetStringUTF16(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME)); + l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME)); } else if (details_.type == EditDetails::NEW_URL) { string16 title16; bookmark_utils::GetURLAndTitleToBookmarkFromCurrentTab(profile_, @@ -311,7 +311,7 @@ void BookmarkEditorView::Init() { title_tf_.SetController(this); title_label_ = new views::Label( - UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOMARK_EDITOR_NAME_LABEL))); + UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_NAME_LABEL))); title_tf_.SetAccessibleName(WideToUTF16Hack(title_label_->GetText())); if (show_tree_) { @@ -320,7 +320,7 @@ void BookmarkEditorView::Init() { new_folder_button_.reset(new views::NativeTextButton( this, UTF16ToWide(l10n_util::GetStringUTF16( - IDS_BOOMARK_EDITOR_NEW_FOLDER_BUTTON)))); + IDS_BOOKMARK_EDITOR_NEW_FOLDER_BUTTON)))); new_folder_button_->set_parent_owned(false); tree_view_->set_context_menu_controller(this); @@ -366,7 +366,7 @@ void BookmarkEditorView::Init() { if (details_.type != EditDetails::NEW_FOLDER) { url_label_ = new views::Label( - UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOMARK_EDITOR_URL_LABEL))); + UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_URL_LABEL))); std::string languages = profile_ ? profile_->GetPrefs()->GetString(prefs::kAcceptLanguages) @@ -496,7 +496,7 @@ void BookmarkEditorView::NewFolder() { BookmarkEditorView::EditorNode* BookmarkEditorView::AddNewFolder( EditorNode* parent) { EditorNode* new_node = new EditorNode( - l10n_util::GetStringUTF16(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME), 0); + l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_NEW_FOLDER_NAME), 0); // |new_node| is now owned by |parent|. tree_model_->Add(parent, new_node, parent->child_count()); return new_node; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc index 20873a5..35073ff 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc @@ -399,7 +399,7 @@ void BookmarkMenuDelegate::BuildOtherFolderMenu( GetBitmapNamed(IDR_BOOKMARK_BAR_FOLDER); MenuItemView* submenu = menu->AppendSubMenuWithIcon( id, UTF16ToWide( - l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OTHER_BOOKMARKED)), + l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_OTHER_BOOKMARKED)), *folder_icon); BuildMenu(other_folder, 0, submenu, next_menu_id); menu_id_to_node_map_[id] = other_folder; |