| Index: chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.cc
|
| index 6b357b138e6dcaae6aefa6605fa8c6803ae3ad7f..21699a79011a84b9cb0dfcb1b08300c6427f58d8 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);
|
|
|