diff --git a/mozilla/camino/docs/ReleaseChecklist.txt b/mozilla/camino/docs/ReleaseChecklist.txt index 59b5ad95dd1..6a6b347b412 100644 --- a/mozilla/camino/docs/ReleaseChecklist.txt +++ b/mozilla/camino/docs/ReleaseChecklist.txt @@ -3,6 +3,7 @@ Checklist of things to do before releasing a new Camino version: - Update version number in project file (both Camino and CaminoStatic targets) - Update version number in all-camino.js - Update version number in ChimeraVersion.r +- Update version number in Credits.rtf - Update version number in InfoPlist.strings - Update version number in WebsiteDefaults.strings - Update version number in Info-Camino.plist, Info-CaminoStatic.plist diff --git a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib index c08ebb26a47..6d229bff237 100644 --- a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib +++ b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib @@ -7,19 +7,19 @@ IBEditorPositions 1014 - 3 585 169 68 0 0 1600 1002 + 3 585 179 68 0 0 1600 1002 1022 - 52 797 169 156 0 0 1600 1002 + 52 797 179 156 0 0 1600 1002 297 558 586 213 306 0 0 1600 1002 314 - 306 574 213 156 0 0 1600 1002 + 306 574 226 156 0 0 1600 1002 336 - 159 679 213 206 0 0 1600 1002 + 159 679 226 206 0 0 1600 1002 365 123 707 98 168 0 0 1600 1002 463 - 348 489 213 275 0 0 1600 1002 + 348 489 226 275 0 0 1600 1002 56 622 636 314 64 0 0 1600 1002 654 diff --git a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib index 9d35d190acb..8ed7def8b4a 100644 Binary files a/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib and b/mozilla/camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib differ diff --git a/mozilla/camino/resources/localized/English.lproj/Localizable.strings b/mozilla/camino/resources/localized/English.lproj/Localizable.strings index 40ddd7b9393..5b3e2fcad29 100644 Binary files a/mozilla/camino/resources/localized/English.lproj/Localizable.strings and b/mozilla/camino/resources/localized/English.lproj/Localizable.strings differ diff --git a/mozilla/camino/src/browser/BrowserWindowController.mm b/mozilla/camino/src/browser/BrowserWindowController.mm index 32b7bd36814..2c8018c4985 100644 --- a/mozilla/camino/src/browser/BrowserWindowController.mm +++ b/mozilla/camino/src/browser/BrowserWindowController.mm @@ -1267,7 +1267,7 @@ enum BWCOpenDest { } else if ([itemIdent isEqual:SendURLToolbarItemIdentifier]) { [toolbarItem setLabel:NSLocalizedString(@"SendLink", @"Send Link")]; - [toolbarItem setPaletteLabel:NSLocalizedString(@"SendLink", @"Send Link")]; + [toolbarItem setPaletteLabel:NSLocalizedString(@"SendLinkPaletteLabel", @"Email Page Location")]; [toolbarItem setToolTip:NSLocalizedString(@"SendLinkToolTip", @"Send current URL")]; [toolbarItem setImage:[NSImage imageNamed:@"sendLink.tif"]]; [toolbarItem setTarget:self];