diff --git a/libcef/browser/menu_manager.cc b/libcef/browser/menu_manager.cc index 302762d60..d783a6b5d 100644 --- a/libcef/browser/menu_manager.cc +++ b/libcef/browser/menu_manager.cc @@ -318,17 +318,18 @@ void CefMenuManager::CreateDefaultModel() { if (params_.is_editable) { // Editable node. - model_->AddItem(MENU_ID_UNDO, GetLabel(IDS_MENU_UNDO)); - model_->AddItem(MENU_ID_REDO, GetLabel(IDS_MENU_REDO)); + model_->AddItem(MENU_ID_UNDO, GetLabel(IDS_CONTENT_CONTEXT_UNDO)); + model_->AddItem(MENU_ID_REDO, GetLabel(IDS_CONTENT_CONTEXT_REDO)); model_->AddSeparator(); - model_->AddItem(MENU_ID_CUT, GetLabel(IDS_MENU_CUT)); - model_->AddItem(MENU_ID_COPY, GetLabel(IDS_MENU_COPY)); - model_->AddItem(MENU_ID_PASTE, GetLabel(IDS_MENU_PASTE)); - model_->AddItem(MENU_ID_DELETE, GetLabel(IDS_MENU_DELETE)); + model_->AddItem(MENU_ID_CUT, GetLabel(IDS_CONTENT_CONTEXT_CUT)); + model_->AddItem(MENU_ID_COPY, GetLabel(IDS_CONTENT_CONTEXT_COPY)); + model_->AddItem(MENU_ID_PASTE, GetLabel(IDS_CONTENT_CONTEXT_PASTE)); + model_->AddItem(MENU_ID_DELETE, GetLabel(IDS_CONTENT_CONTEXT_DELETE)); model_->AddSeparator(); - model_->AddItem(MENU_ID_SELECT_ALL, GetLabel(IDS_MENU_SELECT_ALL)); + model_->AddItem(MENU_ID_SELECT_ALL, + GetLabel(IDS_CONTENT_CONTEXT_SELECTALL)); if (!(params_.edit_flags & CM_EDITFLAG_CAN_UNDO)) model_->SetEnabled(MENU_ID_UNDO, false); @@ -376,15 +377,16 @@ void CefMenuManager::CreateDefaultModel() { } } else if (!params_.selection_text.empty()) { // Something is selected. - model_->AddItem(MENU_ID_COPY, GetLabel(IDS_MENU_COPY)); + model_->AddItem(MENU_ID_COPY, GetLabel(IDS_CONTENT_CONTEXT_COPY)); } else if (!params_.page_url.is_empty() || !params_.frame_url.is_empty()) { // Page or frame. - model_->AddItem(MENU_ID_BACK, GetLabel(IDS_MENU_BACK)); - model_->AddItem(MENU_ID_FORWARD, GetLabel(IDS_MENU_FORWARD)); + model_->AddItem(MENU_ID_BACK, GetLabel(IDS_CONTENT_CONTEXT_BACK)); + model_->AddItem(MENU_ID_FORWARD, GetLabel(IDS_CONTENT_CONTEXT_FORWARD)); model_->AddSeparator(); - model_->AddItem(MENU_ID_PRINT, GetLabel(IDS_MENU_PRINT)); - model_->AddItem(MENU_ID_VIEW_SOURCE, GetLabel(IDS_MENU_VIEW_SOURCE)); + model_->AddItem(MENU_ID_PRINT, GetLabel(IDS_CONTENT_CONTEXT_PRINT)); + model_->AddItem(MENU_ID_VIEW_SOURCE, + GetLabel(IDS_CONTENT_CONTEXT_VIEWPAGESOURCE)); if (!browser_->CanGoBack()) model_->SetEnabled(MENU_ID_BACK, false); diff --git a/libcef/browser/native/file_dialog_runner_mac.mm b/libcef/browser/native/file_dialog_runner_mac.mm index 3e3a608ef..f255e2fc4 100644 --- a/libcef/browser/native/file_dialog_runner_mac.mm +++ b/libcef/browser/native/file_dialog_runner_mac.mm @@ -17,6 +17,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "cef/grit/cef_strings.h" +#include "chrome/grit/generated_resources.h" #include "content/public/common/file_chooser_params.h" #include "net/base/mime_util.h" #include "ui/base/l10n/l10n_util.h" @@ -30,10 +31,10 @@ base::string16 GetDescriptionFromMimeType(const std::string& mime_type) { const char* mime_type; int string_id; } kWildCardMimeTypes[] = { - { "audio", IDS_APP_AUDIO_FILES }, - { "image", IDS_APP_IMAGE_FILES }, - { "text", IDS_APP_TEXT_FILES }, - { "video", IDS_APP_VIDEO_FILES }, + { "audio", IDS_AUDIO_FILES }, + { "image", IDS_IMAGE_FILES }, + { "text", IDS_TEXT_FILES }, + { "video", IDS_VIDEO_FILES }, }; for (size_t i = 0; i < arraysize(kWildCardMimeTypes); ++i) { diff --git a/libcef/browser/native/file_dialog_runner_win.cc b/libcef/browser/native/file_dialog_runner_win.cc index 14247a089..3920eacd9 100644 --- a/libcef/browser/native/file_dialog_runner_win.cc +++ b/libcef/browser/native/file_dialog_runner_win.cc @@ -17,6 +17,7 @@ #include "base/win/registry.h" #include "base/win/scoped_comptr.h" #include "cef/grit/cef_strings.h" +#include "chrome/grit/generated_resources.h" #include "net/base/mime_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/win/shell.h" @@ -131,10 +132,10 @@ std::wstring GetDescriptionFromMimeType(const std::string& mime_type) { const char* mime_type; int string_id; } kWildCardMimeTypes[] = { - { "audio", IDS_APP_AUDIO_FILES }, - { "image", IDS_APP_IMAGE_FILES }, - { "text", IDS_APP_TEXT_FILES }, - { "video", IDS_APP_VIDEO_FILES }, + { "audio", IDS_AUDIO_FILES }, + { "image", IDS_IMAGE_FILES }, + { "text", IDS_TEXT_FILES }, + { "video", IDS_VIDEO_FILES }, }; for (size_t i = 0; i < arraysize(kWildCardMimeTypes); ++i) { diff --git a/libcef/resources/cef_strings.grd b/libcef/resources/cef_strings.grd index f481d60a7..22e0e280f 100644 --- a/libcef/resources/cef_strings.grd +++ b/libcef/resources/cef_strings.grd @@ -111,63 +111,10 @@ need to be translated for each locale.--> element). You can also use the 'grit add' tool to help you identify nontranslateable parts and create placeholders for them. --> - - &Back - - - &Forward - - - Re&load - - - Reload no cache - - - &Stop - - - &Undo - - - &Redo - - - Cu&t - - - &Copy - - - &Paste - - - &Delete - - - Select &all - - - &Find... - - - &Print... - - - View s&ource - - - Audio Files - - - Image Files - - + + Text Files - - Video Files -