summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 16:18:20 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 16:18:20 +0000
commita25802de384b5571971f773fcb6e70c4ccb80b5d (patch)
tree2986d6c59487e97a3e694bd46eee5535b3011414
parenta50a5c23654fc5b8d49279a06c441353ad7c8a7e (diff)
downloadchromium_src-a25802de384b5571971f773fcb6e70c4ccb80b5d.zip
chromium_src-a25802de384b5571971f773fcb6e70c4ccb80b5d.tar.gz
chromium_src-a25802de384b5571971f773fcb6e70c4ccb80b5d.tar.bz2
Fix spelling of Flickr.
BUG=none TEST=make sure file uploading to Flickr still works. Review URL: http://codereview.chromium.org/1718005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45195 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd6
-rw-r--r--chrome/browser/dom_ui/filebrowse_ui.cc4
-rw-r--r--chrome/browser/resources/filebrowse.html8
3 files changed, 9 insertions, 9 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 80798ae..ef65d13 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4354,7 +4354,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_NOTIFICATIONS_SETTING_LABEL" desc="Label on top of the radio buttons for Notifications tab of Content Settings dialog.">
Desktop Notifications Settings:
</message>
-
+
<!-- Cookie/Images/JavaScript/Plugins/Pop-ups/Location exception dialogs -->
<message name="IDS_COOKIE_EXCEPTION_TITLE" desc="Title for cookie exceptions dialog">
Cookie Exceptions
@@ -7285,8 +7285,8 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FILEBROWSER_UPLOAD_PICASAWEB" desc="Upload to picasaweb menu item">
Picasa Web
</message>
- <message name="IDS_FILEBROWSER_UPLOAD_FLIKR" desc="Upload to Flikr menu item">
- Flikr
+ <message name="IDS_FILEBROWSER_UPLOAD_FLICKR" desc="Upload to Flickr menu item">
+ Flickr
</message>
<message name="IDS_FILEBROWSER_UPLOAD_EMAIL" desc="Upload to email menu item">
Email
diff --git a/chrome/browser/dom_ui/filebrowse_ui.cc b/chrome/browser/dom_ui/filebrowse_ui.cc
index 95143b7..36f588f 100644
--- a/chrome/browser/dom_ui/filebrowse_ui.cc
+++ b/chrome/browser/dom_ui/filebrowse_ui.cc
@@ -274,8 +274,8 @@ void FileBrowseUIHTMLSource::StartDataRequest(const std::string& path,
l10n_util::GetString(IDS_FILEBROWSER_OPEN));
localized_strings.SetString(L"picasaweb",
l10n_util::GetString(IDS_FILEBROWSER_UPLOAD_PICASAWEB));
- localized_strings.SetString(L"flikr",
- l10n_util::GetString(IDS_FILEBROWSER_UPLOAD_FLIKR));
+ localized_strings.SetString(L"flickr",
+ l10n_util::GetString(IDS_FILEBROWSER_UPLOAD_FLICKR));
localized_strings.SetString(L"email",
l10n_util::GetString(IDS_FILEBROWSER_UPLOAD_EMAIL));
localized_strings.SetString(L"delete",
diff --git a/chrome/browser/resources/filebrowse.html b/chrome/browser/resources/filebrowse.html
index b57c458..53adc98 100644
--- a/chrome/browser/resources/filebrowse.html
+++ b/chrome/browser/resources/filebrowse.html
@@ -1431,17 +1431,17 @@ function createNewItem(title, path, isDirectory) {
menu.className = 'menu';
if (pathIsImageFile(path)) {
var picasaitem = document.createElement('div');
- var flikritem = document.createElement('div');
+ var flickritem = document.createElement('div');
var emailitem = document.createElement('div');
picasaitem.textContent = localStrings.getString('picasaweb');
- flikritem.textContent = localStrings.getString('flikr');
+ flickritem.textContent = localStrings.getString('flickr');
emailitem.textContent = localStrings.getString('email');
picasaitem.className = 'menuitem';
- flikritem.className = 'menuitemdisabled';
+ flickritem.className = 'menuitemdisabled';
emailitem.className = 'menuitemdisabled';
picasaitem.onclick = partial(uploadImage, path);
menu.appendChild(picasaitem);
- menu.appendChild(flikritem);
+ menu.appendChild(flickritem);
menu.appendChild(emailitem);
}
var deleteitem = document.createElement('div');