diff options
Diffstat (limited to 'chrome/browser/bookmarks')
8 files changed, 23 insertions, 22 deletions
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(); } |