summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/app/chromium_strings.grd6
-rw-r--r--chrome/app/generated_resources.grd63
-rw-r--r--chrome/app/google_chrome_strings.grd6
-rw-r--r--chrome/browser/resources/options/import_data_overlay.html2
-rw-r--r--chrome/browser/resources/options/import_data_overlay.js4
-rw-r--r--chrome/browser/ui/webui/options/import_data_handler.cc2
6 files changed, 37 insertions, 46 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index b511eb3..ca46a32 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -345,9 +345,6 @@ name="DOMAIN">$1<ex>paypal.com</ex></ph>&lt;/strong&gt;, but the server presente
<message name="IDS_BROWSER_HUNGBROWSER_MESSAGE" desc="Content of the dialog box shown when the browser is hung">
Chromium is unresponsive. Relaunch now?
</message>
- <message name="IDS_IMPORT_PROGRESS_INFO" desc="Explanatory text for the importing progress dialog">
- Chromium is now importing the following items from <ph name="BROWSER_COMPONENT">$1<ex>History</ex></ph>:
- </message>
<message name="IDS_IMPORT_FIND_YOUR_BOOKMARKS" desc="Helpful reminder for where to find imported bookmarks">
Find your bookmarks in the Chromium menu or on the bookmarks bar.
</message>
@@ -539,9 +536,6 @@ Chromium is unable to recover your settings.
<message name="IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE" desc="The text in the options panel that describes how we use web services to improve browsing experience.">
Chromium may use web services to improve your browsing experience.
</message>
- <message name="IDS_IMPORT_BOOKMARKS" desc="Explanatory text for the importing progress dialog when importing a bookmarks.html file from the bookmark manager">
- Chromium is now importing Favorites/Bookmarks.
- </message>
<message name="IDS_OEM_MAIN_SHORTCUT_NAME" desc="Name of the desktop shortcut to start the application for OEM pre-installations.">
Internet Browser
</message>
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 50ccada..8e94f45 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7389,15 +7389,19 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
<message name="IDS_IMPORT_FROM_LABEL" desc="Label before profile select combo box">
From:
</message>
- <message name="IDS_IMPORT_FROM_IE" desc="browser combo box: Microsoft Internet Explorer">
- Microsoft Internet Explorer
- </message>
+ <if expr="is_win">
+ <message name="IDS_IMPORT_FROM_IE" desc="browser combo box: Microsoft Internet Explorer">
+ Microsoft Internet Explorer
+ </message>
+ </if>
<message name="IDS_IMPORT_FROM_FIREFOX" desc="browser combo box: Mozilla Firefox">
Mozilla Firefox
</message>
+ <!-- TODO(thestig) Should this be Linux only? Add #ifdefs to external_process_importer_client.cc -->
<message name="IDS_IMPORT_FROM_ICEWEASEL" desc="browser combo box: Iceweasel">
Iceweasel
</message>
+ <!-- TODO(thestig) Should this be Mac or Win+Mac only? -->
<message name="IDS_IMPORT_FROM_SAFARI" desc="browser combo box: Safari">
Safari
</message>
@@ -7433,46 +7437,37 @@ The following plug-in is unresponsive: <ph name="PLUGIN_NAME">$1
Choose File
</message>
- <message name="IDS_IMPORTER_GOOGLE_LOGIN_TEXT" desc="The message to be displayed on dialog">
- In order to import Toolbar bookmarks into Chrome, you must be signed in to your Google account. Please sign in and try to import again.
- </message>
<message name="IDS_IMPORT_NO_PROFILE_FOUND" desc="Message displayed when we do not find any supported browser to import from.">
No supported browser found
</message>
- <message name="IDS_IMPORT_PASSWORD_KEYCHAIN_WARNING" desc="Message displayed at the bottom of the Import Dialog for Safari on Mac OS">
- Passwords saved in the Mac OS X Keychain will be used to help you sign in without typing.
- </message>
+ <if expr="is_macosx">
+ <message name="IDS_IMPORT_PASSWORD_KEYCHAIN_WARNING" desc="Message displayed at the bottom of the Import Dialog for Safari on Mac OS">
+ Passwords saved in the Mac OS X Keychain will be used to help you sign in without typing.
+ </message>
+ </if>
<!-- Import progress popup -->
- <message name="IDS_IMPORT_PROGRESS_TITLE" desc="Title for the importing progress dialog">
- Importing
- </message>
-
<if expr="is_macosx">
+ <message name="IDS_IMPORT_PROGRESS_TITLE" desc="Title for the importing progress dialog">
+ Importing
+ </message>
<message name="IDS_IMPORT_SETTINGS_MENU_MAC" desc="The text label for the Import menu item.">
Import Bookmarks and Settings...
</message>
- </if>
-
- <message name="IDS_IMPORT_PROGRESS_STATUS_BOOKMARKS" desc="Import status for bookmarks">
- Favorites/Bookmarks
- </message>
- <message name="IDS_IMPORT_PROGRESS_STATUS_SEARCH" desc="Import status for search engines">
- Search settings
- </message>
- <message name="IDS_IMPORT_PROGRESS_STATUS_PASSWORDS" desc="Import status for passwords">
- Saved passwords
- </message>
- <message name="IDS_IMPORT_PROGRESS_STATUS_HISTORY" desc="Import status for history">
- Browsing history
- </message>
- <message name="IDS_IMPORT_PROGRESS_STATUS_COOKIES" desc="Import status for cookies">
- Cookies
- </message>
- <message name="IDS_IMPORT_PROGRESS_STATUS_CANCEL" desc="Button text for import cancellation">
- Stop import
- </message>
- </if>
+ <message name="IDS_IMPORT_PROGRESS_STATUS_BOOKMARKS" desc="Import status for bookmarks">
+ Favorites/Bookmarks
+ </message>
+ <message name="IDS_IMPORT_PROGRESS_STATUS_SEARCH" desc="Import status for search engines">
+ Search settings
+ </message>
+ <message name="IDS_IMPORT_PROGRESS_STATUS_PASSWORDS" desc="Import status for passwords">
+ Saved passwords
+ </message>
+ <message name="IDS_IMPORT_PROGRESS_STATUS_HISTORY" desc="Import status for history">
+ Browsing history
+ </message>
+ </if> <!-- is_macosx -->
+ </if> <!-- not is_android -->
<!-- Confirm to quit panel -->
<message name="IDS_CONFIRM_TO_QUIT_DESCRIPTION" desc="Instructions for how the user should confirm quitting.">
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 6bf8e9f..d31e971 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -268,9 +268,6 @@ name="DOMAIN">$1<ex>paypal.com</ex></ph>&lt;/strong&gt;, but the server presente
<message name="IDS_BROWSER_HUNGBROWSER_MESSAGE" desc="Content of the dialog box shown when the browser is hung">
Google Chrome is unresponsive. Relaunch now?
</message>
- <message name="IDS_IMPORT_PROGRESS_INFO" desc="Explanatory text for the importing progress dialog">
- Google Chrome is now importing the following items from <ph name="BROWSER_COMPONENT">$1<ex>History</ex></ph>:
- </message>
<message name="IDS_IMPORT_FIND_YOUR_BOOKMARKS" desc="Helpful reminder for where to find imported bookmarks">
Find your bookmarks in the Chrome menu or on the bookmarks bar.
</message>
@@ -463,9 +460,6 @@ Google Chrome is unable to recover your settings.
<message name="IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE" desc="The text in the options panel that describes how we use web services to improve browsing experience.">
Google Chrome may use web services to improve your browsing experience.
</message>
- <message name="IDS_IMPORT_BOOKMARKS" desc="Explanatory text for the importing progress dialog when importing a bookmarks.html file from the bookmark manager">
- Google Chrome is now importing Favorites/Bookmarks.
- </message>
<message name="IDS_OEM_MAIN_SHORTCUT_NAME" desc="Name of the desktop shortcut to start the application for OEM pre-installations.">
Internet Browser
</message>
diff --git a/chrome/browser/resources/options/import_data_overlay.html b/chrome/browser/resources/options/import_data_overlay.html
index 5721508..4aca7cf 100644
--- a/chrome/browser/resources/options/import_data_overlay.html
+++ b/chrome/browser/resources/options/import_data_overlay.html
@@ -116,7 +116,9 @@
</div>
</div>
</div>
+<if expr="is_macosx">
<div id="mac-password-keychain" class="gray-bottom-bar">
<span i18n-content="macPasswordKeychain"></span>
</div>
+</if>
</div>
diff --git a/chrome/browser/resources/options/import_data_overlay.js b/chrome/browser/resources/options/import_data_overlay.js
index 3cda00d..f6fb061 100644
--- a/chrome/browser/resources/options/import_data_overlay.js
+++ b/chrome/browser/resources/options/import_data_overlay.js
@@ -93,7 +93,9 @@ cr.define('options', function() {
this.setUpCheckboxState_(checkboxes[i], enabled);
$('import-data-commit').disabled = !enabled;
$('import-choose-file').hidden = !enabled;
+<if expr="is_macosx">
$('mac-password-keychain').hidden = !enabled;
+</if>
},
/**
@@ -140,7 +142,9 @@ cr.define('options', function() {
if (this.browserProfiles.length > index)
browserProfile = this.browserProfiles[index];
var enable = browserProfile && browserProfile['show_bottom_bar'];
+<if expr="is_macosx">
$('mac-password-keychain').hidden = !enable;
+</if>
},
/**
diff --git a/chrome/browser/ui/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc
index 8155030..d8e8fe6 100644
--- a/chrome/browser/ui/webui/options/import_data_handler.cc
+++ b/chrome/browser/ui/webui/options/import_data_handler.cc
@@ -68,7 +68,9 @@ void ImportDataHandler::GetLocalizedValues(
{ "noProfileFound", IDS_IMPORT_NO_PROFILE_FOUND },
{ "importSucceeded", IDS_IMPORT_SUCCEEDED },
{ "findYourImportedBookmarks", IDS_IMPORT_FIND_YOUR_BOOKMARKS },
+#if defined(OS_MACOSX)
{ "macPasswordKeychain", IDS_IMPORT_PASSWORD_KEYCHAIN_WARNING },
+#endif
};
RegisterStrings(localized_strings, resources, arraysize(resources));
generated by cgit v1.1 at 2025-02-13 23:07:06 +0000