[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:47:04 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f82b4c6668fc637593cdc6881245de4386fc0600
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 4 20:43:01 2002 +0000
Tools:
* Scripts/extract-localizable-strings: Add dprintf, NSLog, and
NSException to the list of tokens that introduce non-localizable
strings, and added handling for square brackets.
WebFoundation:
* CacheLoader.subproj/WebResourceLoad.m: (_loadSweeper):
* Database.subproj/WebFileDatabase.m: (-[WebFileReader initWithPath:]):
* ProtocolHandlers.subproj/WebSimpleHTTPProtocolHandler.m:
(-[WebSimpleHTTPProtocolHandler createHTTPRequest]):
Changed logging code to take advantage of the fact that we once-again support %@.
* ProtocolHandlers.subproj/WebCFNetworkHTTPProtocolHandler.m:
(-[WebCFNetworkHTTPProtocolHandler addRequestMessageBody:]):
* ProtocolHandlers.subproj/WebSimpleHTTPProtocolHandler.m:
(-[WebSimpleHTTPProtocolHandler _addRequestMessageBody:]):
Fixed logging code to eliminate a leak.
* ProtocolHandlers.subproj/WebHTTPProtocolHandler.m:
(-[WebHTTPProtocolHandler debugStringForCacheAttributeValue:]):
Changed this code to just call description instead of using string formatting.
* English.lproj/StringsNotToBeLocalized.txt: Add more exceptions. We now have a
completely-clean run of extract-localizable-strings in WebFoundation!
* English.lproj/Localizable.strings: Re-generated.
WebKit:
* Panels.subproj/WebAuthenticationPanel.m:
(-[WebAuthenticationPanel loadNib]): Use ERROR instead of NSLog here.
(-[WebAuthenticationPanel setUpForRequest:]): Mark some strings for localization.
* WebKit.pbproj/project.pbxproj: Change the encoding on a lot more files to UTF-8.
* English.lproj/StringsNotToBeLocalized.txt: Added some new exceptions.
* English.lproj/Localizable.strings: Re-generated.
WebBrowser:
More progress on localization.
* English.lproj/StringsNotToBeLocalized.txt: Added a few strings.
* GlobalHistory.m: (-[GlobalHistory outlineView:objectValueForTableColumn:byItem:]):
Marked a string for localization.
* FrameProgressEntry.m: (-[FrameProgressEntry updateKeyFrom:to:dataSource:]):
Added an assert in case we run into an issue like the one from earlier today.
* English.lproj/Localizable.strings: Re-generated.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2247 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b6cea65..2f1f59d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-10-04 Darin Adler <darin at apple.com>
+
+ * Panels.subproj/WebAuthenticationPanel.m:
+ (-[WebAuthenticationPanel loadNib]): Use ERROR instead of NSLog here.
+ (-[WebAuthenticationPanel setUpForRequest:]): Mark some strings for localization.
+
+ * WebKit.pbproj/project.pbxproj: Change the encoding on a lot more files to UTF-8.
+
+ * English.lproj/StringsNotToBeLocalized.txt: Added some new exceptions.
+ * English.lproj/Localizable.strings: Re-generated.
+
2002-10-04 Richard Williamson <rjw at apple.com>
Changed WebDOMNode name to WebDebugDOMNode to make room for
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b6cea65..2f1f59d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-10-04 Darin Adler <darin at apple.com>
+
+ * Panels.subproj/WebAuthenticationPanel.m:
+ (-[WebAuthenticationPanel loadNib]): Use ERROR instead of NSLog here.
+ (-[WebAuthenticationPanel setUpForRequest:]): Mark some strings for localization.
+
+ * WebKit.pbproj/project.pbxproj: Change the encoding on a lot more files to UTF-8.
+
+ * English.lproj/StringsNotToBeLocalized.txt: Added some new exceptions.
+ * English.lproj/Localizable.strings: Re-generated.
+
2002-10-04 Richard Williamson <rjw at apple.com>
Changed WebDOMNode name to WebDebugDOMNode to make room for
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 62cad89..fad4531 100644
Binary files a/WebKit/English.lproj/Localizable.strings and b/WebKit/English.lproj/Localizable.strings differ
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 2cc604c..d3c3acf 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -1,6 +1,7 @@
" "
" "
" >>>"
+"%@-%d"
"%@."
"%@/%@"
"%lf"
@@ -9,6 +10,7 @@
"."
"/Library/Internet Plug-Ins"
"/favicon.ico"
+"/tmp/%@"
"0x0"
"1.00"
"1000"
@@ -17,11 +19,15 @@
"6"
"7"
";"
+"="
"BufferTextDrawing"
+"DOCBASE"
+"IE"
"Joy!peff"
"Last-Modified"
"Library/Caches/com.apple.WebKit/Icons"
"Library/Internet Plug-Ins"
+"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US; rv:1.0.0) Gecko/20020715"
"NP_GetEntryPoints"
"NP_Initialize"
"NP_Shutdown"
@@ -51,11 +57,13 @@
"WebElementLinkLabel"
"WebElementLinkURL"
"WebElementString"
+"WebElementTargetFrame"
"WebFrameStateChangedNotification"
"WebFrameStateCommittedPage"
"WebFrameStateComplete"
"WebFrameStateLayoutAcceptable"
"WebFrameStateProvisional"
+"WebHTMLView"
"WebHistoryEntriesChangedNotification"
"WebHistoryItem %@"
"WebHostToSiteURLs"
@@ -98,6 +106,7 @@
"WebRuntimeError"
"WebSiteURLToIconURLKey"
"WebURLsWithTitlesPboardType"
+"\""
"\n"
"\n--------------------------------------------\n"
"_CGFontCacheSetMaxSize"
@@ -112,6 +121,7 @@
"application/x-java-applet"
"application/x-javascript"
"displayTitle"
+"getFountCount = %d, family = %s, traits = 0x%08x, size = %f\n"
"htm"
"html"
"http"
@@ -138,20 +148,5 @@ Misc.subproj/WebKitLogging.m
Plugins.subproj/WebPlugin.m:"main"
WebCoreSupport.subproj/WebCookieAdapter.m:"Cookie"
WebCoreSupport.subproj/WebTextRenderer.m:"YES"
-WebView.subproj/WebRenderNode.m
-"="
-"\""
-"WebElementTargetFrame"
-"/tmp/%@"
-"DOCBASE"
-"Optimization assumption violation: count and glyphID count not equal - for %@ %f"
WebView.subproj/WebPreferences.m:"latin1"
-"WebHTMLView"
-"Optimization assumption violation: unable to cache glyph widths - for %@ %f"
-"Failed to set font (%@) ATSUStyle 0x%X"
-"%@: Don't know how to pack glyphs for font %@ %f"
-"%@: Failed to alloc ATSUStyle %d"
-"%@: Failed to create attribute group from ATSUStyle 0x%X %d"
-"%@: Don't know how to deal with font %@"
-"Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-US; rv:1.0.0) Gecko/20020715"
-"CoreGraphics is missing call to disable glyph auto expiration. Pages will load more slowly."
+WebView.subproj/WebRenderNode.m
diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 7ab7ac0..9bf1e6b 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -194,15 +194,15 @@ static void URLFileReaderInit(void)
if (data) {
if (mappedBytes) {
- LOG(DiskCacheActivity, "mmaped disk cache file - %s", [path lossyCString]);
+ LOG(DiskCacheActivity, "mmaped disk cache file - %@", path);
}
else {
- LOG(DiskCacheActivity, "fs read disk cache file - %s", [path lossyCString]);
+ LOG(DiskCacheActivity, "fs read disk cache file - %@", path);
}
return self;
}
else {
- LOG(DiskCacheActivity, "no disk cache file - %s", [path lossyCString]);
+ LOG(DiskCacheActivity, "no disk cache file - %@", path);
[self dealloc];
return nil;
}
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index 417e691..0a60612 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -6,9 +6,11 @@
#import <WebKit/WebAuthenticationPanel.h>
-#import <WebKit/WebStandardPanelsPrivate.h>
+
#import <WebFoundation/WebAssertions.h>
+#import <WebFoundation/WebLocalizableStrings.h>
+#import <WebKit/WebStandardPanelsPrivate.h>
#define WebAuthenticationPanelNibName @"WebAuthenticationPanel"
@@ -75,8 +77,7 @@
nibLoaded = YES;
[imageView setImage:[NSImage imageNamed:@"NSApplicationIcon"]];
} else {
- NSLog(@"%s:%d %s: couldn't load nib named '%@'",
- __FILE__, __LINE__, __FUNCTION__,WebAuthenticationPanelNibName);
+ ERROR("couldn't load nib named '%@'", WebAuthenticationPanelNibName);
return FALSE;
}
}
@@ -85,7 +86,6 @@
// Methods related to displaying the panel
-
-(void)setUpForRequest:(WebAuthenticationRequest *)req
{
[self loadNib];
@@ -96,11 +96,18 @@
// failure count (if the user tried and failed, the dialog should
// explain possible reasons)
// FIXME Radar 2876446: need to automatically adjust height of main label
- [mainLabel setStringValue:[NSString stringWithFormat:@"To view this page, you need to log in to area \"%@\" on %@.", [resource realm], [[resource URL] host]]];
+ [mainLabel setStringValue:[NSString stringWithFormat:
+ UI_STRING("To view this page, you need to log in to area “%@” on %@.",
+ "prompt string in authentication panel"),
+ [resource realm], [[resource URL] host]]];
if ([resource receivesCredentialSecurely]) {
- [smallLabel setStringValue:@"Your log-in information will be sent securely."];
+ [smallLabel setStringValue:
+ UI_STRING("Your log-in information will be sent securely.",
+ "message in authentication panel")];
} else {
- [smallLabel setStringValue:@"Your password will be sent in the clear."];
+ [smallLabel setStringValue:
+ UI_STRING("Your password will be sent in the clear.",
+ "message in authentication panel")];
}
if ([resource username] != nil) {
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index d695772..4dea03c 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -474,7 +474,7 @@
shellScript = "if [ -f ../Tools/Scripts/embed-into-alex ]; then sh ../Tools/Scripts/embed-into-alex; fi";
};
2568C72C0174912D0ECA149E = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebKit.h;
refType = 4;
@@ -842,13 +842,13 @@
refType = 4;
};
3944607A020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebException.h;
refType = 4;
};
3944607B020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebException.m;
refType = 4;
@@ -1387,7 +1387,7 @@
//933
//934
931A72D203265920008635CE = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebBaseNetscapePluginViewPrivate.h;
refType = 4;
@@ -1660,13 +1660,13 @@
//F53
//F54
F501251B0302EA04018635CE = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebTestController.h;
refType = 4;
};
F501251C0302EA04018635CE = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebTestController.m;
refType = 4;
@@ -1821,13 +1821,13 @@
};
};
F508946902B71D59018A9CD4 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebNSViewExtras.h;
refType = 4;
};
F508946A02B71D59018A9CD4 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebNSViewExtras.m;
refType = 4;
@@ -1899,19 +1899,19 @@
};
};
F528E3E9031E91AD01CA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebIconDatabase.h;
refType = 4;
};
F528E3EA031E91AD01CA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebIconDatabase.m;
refType = 4;
};
F528E3EB031E91AD01CA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebIconDatabasePrivate.h;
refType = 4;
@@ -2018,13 +2018,13 @@
name = DeploymentFat;
};
F53444CE02E87CBA018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebKitStatistics.h;
refType = 4;
};
F53444CF02E87CBA018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebKitStatistics.m;
refType = 4;
@@ -2045,7 +2045,7 @@
};
};
F53444D202E87D4B018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebKitStatisticsPrivate.h;
refType = 4;
@@ -2081,13 +2081,13 @@
};
};
F560BEBC030DAF4401C1A526 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebSearchableTextView.h;
refType = 4;
};
F560BEBD030DAF4401C1A526 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebSearchableTextView.m;
refType = 4;
@@ -2147,13 +2147,13 @@
};
};
F5883BE0025E5E9D01000102 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebNullPluginView.h;
refType = 4;
};
F5883BE1025E5E9D01000102 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebNullPluginView.m;
refType = 4;
@@ -2187,7 +2187,7 @@
name = Mixed;
};
F5927D4E02D26C5E01CA2DBB = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebKitErrors.h;
refType = 4;
@@ -2202,13 +2202,13 @@
};
};
F5934C8802E894F50197FBCF = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebIconLoader.h;
refType = 4;
};
F5934C8902E894F50197FBCF = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebIconLoader.m;
refType = 4;
@@ -2229,13 +2229,13 @@
};
};
F59668C802AD2923018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebStringTruncator.h;
refType = 4;
};
F59668C902AD2923018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebStringTruncator.m;
refType = 4;
@@ -2256,7 +2256,7 @@
};
};
F59EAE3E0253C7EE018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebCoreStatistics.h;
refType = 4;
@@ -2271,7 +2271,7 @@
};
};
F59EAE410253C8DE018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebCoreStatistics.m;
refType = 4;
@@ -2295,25 +2295,25 @@
};
};
F5A672B70263866E01000102 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebPluginNullEventSender.h;
refType = 4;
};
F5A672B80263866E01000102 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebPluginNullEventSender.m;
refType = 4;
};
F5A672B90263866E01000102 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebPluginStream.h;
refType = 4;
};
F5A672BA0263866E01000102 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebPluginStream.m;
refType = 4;
@@ -2485,7 +2485,7 @@
};
};
F5C283730284676D018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
name = WebKitPrefix.h;
path = ../WebKitPrefix.h;
@@ -2686,13 +2686,13 @@
refType = 4;
};
F5EBC45502134BC301CA1520 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebBaseNetscapePluginView.h;
refType = 4;
};
F5EBC45602134BC301CA1520 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebBaseNetscapePluginView.m;
refType = 4;
@@ -2710,37 +2710,37 @@
};
};
F5F7171E0288493C018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebPlugin.h;
refType = 4;
};
F5F7171F0288493C018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebPlugin.m;
refType = 4;
};
F5F717200288493C018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebPluginDatabase.h;
refType = 4;
};
F5F717210288493C018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebPluginDatabase.m;
refType = 4;
};
F5F717220288493C018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = npapi.h;
refType = 4;
};
F5F717230288493C018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = npapi.m;
refType = 4;
@@ -2826,14 +2826,14 @@
};
};
F5F81C3902B67C26018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
name = WebRenderNode.h;
path = ../WebView.subproj/WebRenderNode.h;
refType = 4;
};
F5F81C3A02B67C26018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
name = WebRenderNode.m;
path = ../WebView.subproj/WebRenderNode.m;
@@ -2855,13 +2855,13 @@
};
};
F5FBAB8F02B88CBF01FF6074 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebDownloadHandler.h;
refType = 4;
};
F5FBAB9002B88CBF01FF6074 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebDownloadHandler.m;
refType = 4;
@@ -2965,7 +2965,7 @@
refType = 4;
};
F8CA15B6029A39D901000122 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebAuthenticationPanel.m;
refType = 4;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list