Commit b279e76a authored by aurimas@chromium.org's avatar aurimas@chromium.org

Exclude bookmark import strings for Android.

Android has a custom UI and code for handing bookmark import.

BUG=326023

Review URL: https://codereview.chromium.org/167533002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252286 0039d316-1c4b-4281-b951-d872f2087c98
parent 2e644989
......@@ -23,6 +23,7 @@
</message>
</if>
<if expr="not is_android">
<!-- The following two strings are shown when the user has no bookmarks yet. -->
<message name="IDS_BOOKMARKS_NO_ITEMS" desc="Text shown when the user has no bookmarks">
For quick access, place your bookmarks here on the bookmarks bar.
......@@ -47,6 +48,7 @@
<message name="IDS_BOOKMARK_GROUP" desc="The group name of bookmarks imported from a file">
Imported
</message>
</if>
<if expr="not use_titlecase">
<message name="IDS_BOOKMARK_BAR_MOBILE_FOLDER_NAME" desc="Name shown in the tree for the mobile bookmarks folder">
......
......@@ -7785,6 +7785,8 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
</message>
</if>
<!-- Android uses custom UI for Bookmark importing -->
<if expr="not is_android">
<!-- Import Settings Dialog -->
<message name="IDS_IMPORT_SETTINGS_TITLE" desc="Dialog title for import dialog">
Import bookmarks and settings
......@@ -7846,7 +7848,6 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
Passwords saved in the Mac OS X Keychain will be used to help you sign in without typing.
</message>
<!-- Import progress popup -->
<message name="IDS_IMPORT_PROGRESS_TITLE" desc="Title for the importing progress dialog">
Importing
......@@ -7856,15 +7857,6 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
<message name="IDS_IMPORT_SETTINGS_MENU_MAC" desc="The text label for the Import menu item.">
Import Bookmarks and Settings...
</message>
<message name="IDS_IMPORT_PROGRESS_EXPLANATORY_TEXT_MAC" desc="Text displayed above status items in Import Dialog">
<ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> is now importing the following items from <ph name="IMPORT_BROWSER_NAME">$2<ex>Safari</ex></ph>:
</message>
<message name="IDS_IMPORT_IMPORTING_PROGRESS_TEXT_MAC" desc="Status text displayed when an item in the Import Progress Dialog is being imported.">
Importing...
</message>
<message name="IDS_IMPORT_IMPORTING_DONE_TEXT_MAC" desc="Status text displayed when an item in the Import Progress Dialog is done importing.">
Done
</message>
</if>
<message name="IDS_IMPORT_PROGRESS_STATUS_BOOKMARKS" desc="Import status for bookmarks">
......@@ -7885,6 +7877,7 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
<message name="IDS_IMPORT_PROGRESS_STATUS_CANCEL" desc="Button text for import cancellation">
Stop import
</message>
</if>
<!-- Confirm to quit panel -->
<message name="IDS_CONFIRM_TO_QUIT_DESCRIPTION" desc="Instructions for how the user should confirm quitting.">
......
......@@ -463,6 +463,9 @@
['OS=="android"', {
'sources/': [
['exclude', '^common/chrome_version_info_posix.cc'],
['exclude', '^common/importer/'],
['include', '^common/importer/imported_favicon_usage.cc$'],
['include', '^common/importer/imported_favicon_usage.h$'],
['exclude', '^common/service_'],
],
'sources!': [
......@@ -473,10 +476,6 @@
'common/extensions/manifest_handlers/minimum_chrome_version_checker.cc',
'common/extensions/manifest_handlers/nacl_modules_handler.cc',
'common/icon_with_badge_image_source.cc',
'common/importer/imported_bookmark_entry.cc',
'common/importer/importer_bridge.cc',
'common/importer/importer_data_types.cc',
'common/importer/importer_url_row.cc',
'common/net/url_util.cc',
'common/spellcheck_common.cc',
],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment