diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/generated_resources.grd | 22 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_html_writer_unittest.cc | 6 |
2 files changed, 22 insertions, 6 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index e1afa0a..b98d957 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -3365,12 +3365,22 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_BOOMARK_EDITOR_TITLE" desc="Title of the window the bookmark editor is in."> Edit Bookmark </message> - <message name="IDS_BOOMARK_BAR_FOLDER_NAME" desc="Name shown in the tree for the bookmarks bar folder"> - Bookmarks bar - </message> - <message name="IDS_BOOMARK_BAR_OTHER_FOLDER_NAME" desc="Name shown in the tree for the other bookmarks folder"> - Other bookmarks - </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"> + Bookmarks bar + </message> + <message name="IDS_BOOMARK_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"> + Bookmarks Bar + </message> + <message name="IDS_BOOMARK_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"> New folder </message> diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc index 49cf699..720c31d 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc @@ -159,7 +159,13 @@ TEST_F(BookmarkHTMLWriterTest, Test) { ASSERT_EQ(7U, parsed_bookmarks.size()); // Hardcode the value of IDS_BOOKMARK_BAR_FOLDER_NAME in en-US locale // because all the unit tests are run in en-US locale. +#if defined(OS_WIN) || defined(TOOLKIT_VIEWS) + // Windows and ChromeOS builds use Sentence case. const wchar_t* kBookmarkBarFolderName = L"Bookmarks bar"; +#else + // Mac and Linux + GTK uses Title Case. + const wchar_t* kBookmarkBarFolderName = L"Bookmarks Bar"; +#endif AssertBookmarkEntryEquals(parsed_bookmarks[0], false, url1, url1_title, t1, kBookmarkBarFolderName, f1_title, std::wstring()); AssertBookmarkEntryEquals(parsed_bookmarks[1], false, url2, url2_title, t2, |