Index: chrome/browser/dom_ui/conflicts_ui.cc |
=================================================================== |
--- chrome/browser/dom_ui/conflicts_ui.cc (revision 70599) |
+++ chrome/browser/dom_ui/conflicts_ui.cc (working copy) |
@@ -79,8 +79,8 @@ |
l10n_util::GetStringUTF16(IDS_CONFLICTS_HEADER_SIGNED_BY)); |
localized_strings.SetString("headerLocation", |
l10n_util::GetStringUTF16(IDS_CONFLICTS_HEADER_LOCATION)); |
- localized_strings.SetString("headerWarning", |
- l10n_util::GetStringUTF16(IDS_CONFLICTS_HEADER_WARNING)); |
+ localized_strings.SetString("headerVersion", |
+ l10n_util::GetStringUTF16(IDS_CONFLICTS_HEADER_VERSION)); |
localized_strings.SetString("headerHelpTip", |
l10n_util::GetStringUTF16(IDS_CONFLICTS_HEADER_HELP_TIP)); |
@@ -108,7 +108,7 @@ |
// |
//////////////////////////////////////////////////////////////////////////////// |
-// The handler for Javascript messages for the about:flags page. |
+// The handler for JavaScript messages for the about:flags page. |
class ConflictsDOMHandler : public DOMMessageHandler, |
public NotificationObserver { |
public: |