diff options
| author | abodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 20:56:54 +0000 |
|---|---|---|
| committer | abodenha@chromium.org <abodenha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-21 20:56:54 +0000 |
| commit | dae7325be35dfc3c955b2e1810dd3ce87102a467 (patch) | |
| tree | 6aea39beaaddbed0b6d241ca415577ee27351c03 /chrome/service | |
| parent | e820c4535802af911e9a9f84b9d021475e0d902e (diff) | |
| download | chromium_src-dae7325be35dfc3c955b2e1810dd3ce87102a467.zip chromium_src-dae7325be35dfc3c955b2e1810dd3ce87102a467.tar.gz chromium_src-dae7325be35dfc3c955b2e1810dd3ce87102a467.tar.bz2 | |
Delete me
Localize Google Cloud Print in strings.
Change UI interaction points to reference connector instead of proxy.
Fix strings for connector in options to be more clearly about the connector.
BUG=107252,107592
TEST=
Review URL: http://codereview.chromium.org/8936013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service')
| -rw-r--r-- | chrome/service/cloud_print/cloud_print_connector.cc | 6 | ||||
| -rw-r--r-- | chrome/service/cloud_print/print_system_win.cc | 5 | ||||
| -rw-r--r-- | chrome/service/service_process.cc | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/chrome/service/cloud_print/cloud_print_connector.cc b/chrome/service/cloud_print/cloud_print_connector.cc index a2b5f81..ec02d2a 100644 --- a/chrome/service/cloud_print/cloud_print_connector.cc +++ b/chrome/service/cloud_print/cloud_print_connector.cc @@ -168,7 +168,8 @@ CloudPrintConnector::HandlePrinterListResponse( if (!result.succeeded()) { std::string message = result.message(); if (message.empty()) - message = l10n_util::GetStringUTF8(IDS_CLOUD_PRINT_ENUM_FAILED); + message = l10n_util::GetStringFUTF8(IDS_CLOUD_PRINT_ENUM_FAILED, + l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)); // There was a failure enumerating printers. Send a message to the server. ReportUserMessage(kEnumPrintersFailedMessageId, message); } @@ -483,7 +484,8 @@ void CloudPrintConnector::OnReceivePrinterCaps( string16 printer_name_utf16 = UTF8ToUTF16(printer_name); std::string status_message = l10n_util::GetStringFUTF8( IDS_CLOUD_PRINT_REGISTER_PRINTER_FAILED, - printer_name_utf16); + printer_name_utf16, + l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)); ReportUserMessage(kGetPrinterCapsFailedMessageId, status_message); ContinuePendingTaskProcessing(); // Skip this printer registration. diff --git a/chrome/service/cloud_print/print_system_win.cc b/chrome/service/cloud_print/print_system_win.cc index d3bfc03..b72d0cb 100644 --- a/chrome/service/cloud_print/print_system_win.cc +++ b/chrome/service/cloud_print/print_system_win.cc @@ -729,8 +729,9 @@ PrintSystemWin::PrintSystemWin() { PrintSystem::PrintSystemResult PrintSystemWin::Init() { if (!printing::XPSModule::Init()) { - std::string message = l10n_util::GetStringUTF8( - IDS_CLOUD_PRINT_XPS_UNAVAILABLE); + std::string message = l10n_util::GetStringFUTF8( + IDS_CLOUD_PRINT_XPS_UNAVAILABLE, + l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT)); return PrintSystemResult(false, message); } return PrintSystemResult(true, std::string()); diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc index 4bd18a5..d2fa127 100644 --- a/chrome/service/service_process.cc +++ b/chrome/service/service_process.cc @@ -95,7 +95,8 @@ void PrepareRestartOnCrashEnviroment( string16 dlg_strings(l10n_util::GetStringUTF16(IDS_CRASH_RECOVERY_TITLE)); dlg_strings.push_back('|'); string16 adjusted_string( - l10n_util::GetStringUTF16(IDS_SERVICE_CRASH_RECOVERY_CONTENT)); + l10n_util::GetStringFUTF16(IDS_SERVICE_CRASH_RECOVERY_CONTENT, + l10n_util::GetStringUTF16(IDS_GOOGLE_CLOUD_PRINT))); base::i18n::AdjustStringForLocaleDirection(&adjusted_string); dlg_strings.append(adjusted_string); dlg_strings.push_back('|'); |