[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:46:49 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 2d169c908e0450e7e8d5bd2547a87a75f711ed1d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Oct 3 22:53:47 2002 +0000
Tools:
* Scripts/extract-localizable-strings: Do all the remaining TODO
items for this script.
WebFoundation:
* English.lproj/Localizable.strings: Added. Generated by script.
* English.lproj/StringsNotToBeLocalized.txt: Updated with many more entries.
* Misc.subproj/WebError.m:
Switch from NSLocalizedStringFromTable to UI_STRING.
* Misc.subproj/WebNSStringExtras.m:
Switch from dummy WebLocalizedStringWithKeyAndValue to UI_STRING.
* Misc.subproj/WebQueue.m: (+[WebQueue newNode]): Just use malloc.
* English.lproj/WebError.strings: Removed.
* Misc.subproj/WebMultipartForm.h: Removed.
* Misc.subproj/WebMultipartForm.m: Removed.
* WebFoundation.pbproj/project.pbxproj: Changed encoding of many files to UTF-8.
Removed files. Added Localizable.strings and StringsNotToBeLocalized.txt.
WebKit:
* English.lproj/Localizable.strings: Generated by the script.
* English.lproj/StringsNotToBeLocalized.txt: Added many more strings to ignore.
* English.lproj/WebError.strings: Removed.
* WebView.subproj/WebDefaultContextMenuDelegate.m:
* WebView.subproj/WebView.m:
Use UI_STRING instead of NSLocalizedString.
* WebKit.pbproj/project.pbxproj: Changed encodings of some files to UTF-8.
Removed WebError.strings.
WebBrowser:
* BrowserWebController.m:
(-[BrowserWebController mouseoverTextForElement:modifierFlags:]): Added.
Also put in strings for when the control key is down.
(-[BrowserWebController mouseDidMoveOverElement:modifierFlags:]): Factor
out the actual string change here. More work on this is required.
* ABHomePagesController.m:
* BookmarkToolbarItem.m:
* BookmarksController.m:
* BookmarksViewController.m:
* BookmarksWindowController.m:
* BrowserWebBookmarkExtras.m:
* BrowserWebController.m:
* BrowserWebErrorExtras.m:
* BrowserWindowController.m:
* ContextMenuHandler.m:
* DownloadMonitor.m:
* DownloadProgressEntry.m:
* FavoriteButton.m:
* FindPanelController.m:
* FrameProgressEntry.m:
* GlobalHistory.m:
* HTMLSourceDocument.m:
* LoadProgressMonitor.m:
* LocationChangeError.m:
* RendezvousController.m:
* Preferences.subproj/AppearancePreferences.m:
Switch from NSLocalizedString to UI_STRING
* DateCell.m: Replace the dummy NSLocalizedStringWithKeyAndValue with UI_STRING.
* ResourceProgressEntry.m: (-[ResourceProgressEntry _committedStatus]):
Got rid of FIXME: Localize, and put in use of UI_STRING.
* English.lproj/StringsNotToBeLocalized.txt: Add some more exceptions.
* English.lproj/Localizable.strings: Check in script-generated file for now.
* BrowserStrings.h: Removed.
* WebBrowser.pbproj/project.pbxproj: Changed encodings for many files to UTF-8.
Also added StringsNotToBeLocalized.txt, although not in any target.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2238 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d08424e..959713d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2002-10-03 Darin Adler <darin at apple.com>
+
+ * English.lproj/Localizable.strings: Generated by the script.
+ * English.lproj/StringsNotToBeLocalized.txt: Added many more strings to ignore.
+ * English.lproj/WebError.strings: Removed.
+
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ * WebView.subproj/WebView.m:
+ Use UI_STRING instead of NSLocalizedString.
+
+ * WebKit.pbproj/project.pbxproj: Changed encodings of some files to UTF-8.
+ Removed WebError.strings.
+
2002-10-03 Richard Williamson <rjw at apple.com>
Renamed WebResourceProgressDelegate.h to WebResourceLoadDelegate.h
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d08424e..959713d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,16 @@
+2002-10-03 Darin Adler <darin at apple.com>
+
+ * English.lproj/Localizable.strings: Generated by the script.
+ * English.lproj/StringsNotToBeLocalized.txt: Added many more strings to ignore.
+ * English.lproj/WebError.strings: Removed.
+
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ * WebView.subproj/WebView.m:
+ Use UI_STRING instead of NSLocalizedString.
+
+ * WebKit.pbproj/project.pbxproj: Changed encodings of some files to UTF-8.
+ Removed WebError.strings.
+
2002-10-03 Richard Williamson <rjw at apple.com>
Renamed WebResourceProgressDelegate.h to WebResourceLoadDelegate.h
diff --git a/WebKit/English.lproj/Localizable.strings b/WebKit/English.lproj/Localizable.strings
index 449f940..62cad89 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 92a8fd6..2cc604c 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -1,7 +1,12 @@
" "
+" "
" >>>"
+"%@."
+"%@/%@"
"%lf"
"%s renderFramePart %p (%f,%f) w %f, h %f\n"
+","
+"."
"/Library/Internet Plug-Ins"
"/favicon.ico"
"0x0"
@@ -11,7 +16,10 @@
"4096"
"6"
"7"
+";"
+"BufferTextDrawing"
"Joy!peff"
+"Last-Modified"
"Library/Caches/com.apple.WebKit/Icons"
"Library/Internet Plug-Ins"
"NP_GetEntryPoints"
@@ -24,6 +32,9 @@
"NSFileTypeDirectory"
"NSFileTypeRegular"
"POST"
+"Set-Cookie"
+"URIDictionary"
+"URLString"
"WebAuthenticationPanel"
"WebBackForwardList:\n"
"WebBookmarkChildrenChangedKey"
@@ -116,31 +127,31 @@
"text/rtf"
"text/xml"
"tiff"
-"url "
"url_icon"
-"urln"
-Bookmarks.subproj/WebBookmarkLeaf.m:"URIDictionary"
-Bookmarks.subproj/WebBookmarkLeaf.m:"URLString"
Bookmarks.subproj/WebBookmarkList.m:"Children"
Bookmarks.subproj/WebBookmarkList.m:"Title"
History.subproj/WebBackForwardList.m:" %d) "
History.subproj/WebHistoryItem.m:"title"
-Misc.subproj/WebIconDatabase.m:"%@."
-Misc.subproj/WebIconDatabase.m:"%@/%@"
-Misc.subproj/WebIconDatabase.m:"."
Misc.subproj/WebIconDatabase.m:"Experiments"
Misc.subproj/WebIconDatabase.m:"icon:%@"
Misc.subproj/WebKitLogging.m
-Misc.subproj/WebNSViewExtras.m:" "
-Plugins.subproj/WebPlugin.m:","
-Plugins.subproj/WebPlugin.m:";"
-Plugins.subproj/WebPlugin.m:"BRPL"
-Plugins.subproj/WebPlugin.m:"IEPL"
Plugins.subproj/WebPlugin.m:"main"
-Plugins.subproj/WebPluginStream.m:"Last-Modified"
WebCoreSupport.subproj/WebCookieAdapter.m:"Cookie"
-WebCoreSupport.subproj/WebCookieAdapter.m:"Set-Cookie"
-WebCoreSupport.subproj/WebTextRenderer.m:"BufferTextDrawing"
WebCoreSupport.subproj/WebTextRenderer.m:"YES"
-WebView.subproj/WebDOMNode.m
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."
diff --git a/WebKit/English.lproj/WebError.strings b/WebKit/English.lproj/WebError.strings
deleted file mode 100644
index 5bf105d..0000000
Binary files a/WebKit/English.lproj/WebError.strings and /dev/null differ
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 922609a..9dd473f 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -389,8 +389,9 @@
};
089C1665FE841158C02AAC07 = {
children = (
- 35F3577E0198AAB80ACA1520,
089C1666FE841158C02AAC07,
+ 35F3577E0198AAB80ACA1520,
+ 932399D7034CF7F6008635CE,
F5B67130023EDF8901C1A525,
F5883BDE025E5C6A01000102,
F5F732D202FF4D4F01A80180,
@@ -519,61 +520,61 @@
//353
//354
35081D9202B6D4D80ACA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebHTMLRepresentation.h;
refType = 4;
};
35081D9302B6D4D80ACA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebHTMLRepresentation.m;
refType = 4;
};
35081D9402B6D4D80ACA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebHTMLView.h;
refType = 4;
};
35081D9502B6D4D80ACA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebHTMLView.m;
refType = 4;
};
35081D9602B6D4D80ACA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebHTMLViewPrivate.h;
refType = 4;
};
35081D9702B6D4D80ACA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebHTMLViewPrivate.m;
refType = 4;
};
35081D9802B6D4D80ACA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebImageRepresentation.h;
refType = 4;
};
35081D9902B6D4D80ACA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebImageRepresentation.m;
refType = 4;
};
35081D9A02B6D4D80ACA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebImageView.h;
refType = 4;
};
35081D9B02B6D4D80ACA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebImageView.m;
refType = 4;
@@ -649,25 +650,25 @@
};
};
35081DA602B6D4E40ACA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebTextRepresentation.h;
refType = 4;
};
35081DA702B6D4E40ACA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebTextRepresentation.m;
refType = 4;
};
35081DA802B6D4E40ACA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebTextView.h;
refType = 4;
};
35081DA902B6D4E40ACA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebTextView.m;
refType = 4;
@@ -699,7 +700,7 @@
};
};
35081DAE02B6D4F50ACA2ACA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebDocument.h;
refType = 4;
@@ -746,97 +747,97 @@
//393
//394
39446064020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebController.m;
refType = 4;
};
39446065020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebControllerPrivate.h;
refType = 4;
};
39446066020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebControllerPrivate.m;
refType = 4;
};
3944606B020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebDynamicScrollBarsView.h;
refType = 4;
};
3944606C020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebDynamicScrollBarsView.m;
refType = 4;
};
3944606E020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebPreferences.h;
refType = 4;
};
3944606F020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebController.h;
refType = 4;
};
39446070020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebDataSource.h;
refType = 4;
};
39446071020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebDataSource.m;
refType = 4;
};
39446072020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebDataSourcePrivate.h;
refType = 4;
};
39446073020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebDataSourcePrivate.m;
refType = 4;
};
39446074020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebFrame.h;
refType = 4;
};
39446076020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebView.h;
refType = 4;
};
39446077020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebView.m;
refType = 4;
};
39446078020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebViewPrivate.h;
refType = 4;
};
39446079020F50ED0ECA1767 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebViewPrivate.m;
refType = 4;
@@ -1071,7 +1072,7 @@
//513
//514
511D5553033FD51000CA2ACD = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
name = WebWindowOperationsDelegate.h;
path = WebView.subproj/WebWindowOperationsDelegate.h;
@@ -1103,7 +1104,7 @@
};
};
5152FAD5033FC43400CA2ACD = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
name = WebContextMenuDelegate.h;
path = WebView.subproj/WebContextMenuDelegate.h;
@@ -1119,21 +1120,21 @@
};
};
5152FAD7033FC44A00CA2ACD = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
name = WebControllerPolicyDelegate.h;
path = WebView.subproj/WebControllerPolicyDelegate.h;
refType = 2;
};
5152FAD8033FC44A00CA2ACD = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
name = WebControllerPolicyDelegate.m;
path = WebView.subproj/WebControllerPolicyDelegate.m;
refType = 2;
};
5152FAD9033FC44A00CA2ACD = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
name = WebControllerPolicyDelegatePrivate.h;
path = WebView.subproj/WebControllerPolicyDelegatePrivate.h;
@@ -1161,28 +1162,28 @@
};
};
5152FADD033FC50400CA2ACD = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
name = WebDefaultContextMenuDelegate.h;
path = WebView.subproj/WebDefaultContextMenuDelegate.h;
refType = 2;
};
5152FADE033FC50400CA2ACD = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
name = WebDefaultContextMenuDelegate.m;
path = WebView.subproj/WebDefaultContextMenuDelegate.m;
refType = 2;
};
5152FADF033FC50400CA2ACD = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
name = WebDefaultPolicyDelegate.h;
path = WebView.subproj/WebDefaultPolicyDelegate.h;
refType = 2;
};
5152FAE0033FC50400CA2ACD = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
name = WebDefaultPolicyDelegate.m;
path = WebView.subproj/WebDefaultPolicyDelegate.m;
@@ -1219,14 +1220,14 @@
};
};
5152FAE5033FC52200CA2ACD = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
name = WebLocationChangeDelegate.h;
path = WebView.subproj/WebLocationChangeDelegate.h;
refType = 2;
};
5152FAE6033FC52200CA2ACD = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
name = WebLocationChangeDelegate.m;
path = WebView.subproj/WebLocationChangeDelegate.m;
@@ -1258,13 +1259,13 @@
//653
//654
6523FACF032DA06B005EFCFF = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebControllerSets.h;
refType = 4;
};
6523FAD0032DA06B005EFCFF = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebControllerSets.m;
refType = 4;
@@ -1398,6 +1399,22 @@
settings = {
};
};
+ 932399D7034CF7F6008635CE = {
+ children = (
+ 932399D8034CF7F6008635CE,
+ );
+ isa = PBXVariantGroup;
+ name = StringsNotToBeLocalized.txt;
+ path = "";
+ refType = 4;
+ };
+ 932399D8034CF7F6008635CE = {
+ fileEncoding = 4;
+ isa = PBXFileReference;
+ name = English;
+ path = English.lproj/StringsNotToBeLocalized.txt;
+ refType = 4;
+ };
933D659903413FF2008635CE = {
fileEncoding = 4;
isa = PBXFileReference;
@@ -1466,8 +1483,6 @@
35081DAE02B6D4F50ACA2ACA,
3944606B020F50ED0ECA1767,
3944606C020F50ED0ECA1767,
- F58BAB3A025036CA01C1A526,
- F58BAB380250363E01C1A526,
F5D538E802441F2601A80181,
F5D538EC02441FDD01A80181,
3944606E020F50ED0ECA1767,
@@ -1512,7 +1527,7 @@
refType = 4;
};
9CAE9D070252A4130ECA16EA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebPreferencesPrivate.h;
refType = 4;
@@ -1527,25 +1542,25 @@
};
};
9CE1F8A002A5C6F30ECA2ACD = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebImageRenderer.h;
refType = 4;
};
9CE1F8A102A5C6F30ECA2ACD = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebImageRenderer.m;
refType = 4;
};
9CE1F8A202A5C6F30ECA2ACD = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebImageRendererFactory.h;
refType = 4;
};
9CE1F8A302A5C6F30ECA2ACD = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebImageRendererFactory.m;
refType = 4;
@@ -1575,13 +1590,13 @@
};
};
9CF0E249021361B00ECA16EA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebFramePrivate.h;
refType = 4;
};
9CF0E24A021361B00ECA16EA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebFramePrivate.m;
refType = 4;
@@ -1846,7 +1861,7 @@
};
};
F5143A370221DCCE01A80181 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebFrame.m;
refType = 4;
@@ -2043,13 +2058,13 @@
};
};
F5488CF402CB04EE01FF6274 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebCookieAdapter.h;
refType = 4;
};
F5488CF502CB04EE01FF6274 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebCookieAdapter.m;
refType = 4;
@@ -2129,18 +2144,6 @@
settings = {
};
};
- F58BAB380250363E01C1A526 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebLoadProgress.m;
- refType = 4;
- };
- F58BAB3A025036CA01C1A526 = {
- fileEncoding = 30;
- isa = PBXFileReference;
- path = WebLoadProgress.h;
- refType = 4;
- };
F58C8A07025BD3BC018635CA = {
buildRules = (
);
@@ -2254,7 +2257,7 @@
};
};
F5A55DC702BAA2E8018635CC = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebHTMLRepresentationPrivate.h;
refType = 4;
@@ -2314,7 +2317,7 @@
};
};
F5AEBB3D024A527601C1A526 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebPreferences.m;
refType = 4;
@@ -2326,13 +2329,13 @@
};
};
F5AFB45E02B94DC8018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebBridge.h;
refType = 4;
};
F5AFB45F02B94DC8018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebBridge.m;
refType = 4;
@@ -2376,13 +2379,13 @@
refType = 4;
};
F5B36B410281DF55018635CB = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebTextRenderer.h;
refType = 4;
};
F5B36B420281DF55018635CB = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebTextRenderer.m;
refType = 4;
@@ -2402,13 +2405,13 @@
};
};
F5B36B450281DF9C018635CB = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebTextRendererFactory.h;
refType = 4;
};
F5B36B460281DF9C018635CB = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebTextRendererFactory.m;
refType = 4;
@@ -2529,7 +2532,7 @@
};
};
F5D538E802441F2601A80181 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebMainResourceClient.h;
refType = 4;
@@ -2541,7 +2544,7 @@
};
};
F5D538EC02441FDD01A80181 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebMainResourceClient.m;
refType = 4;
@@ -2580,13 +2583,13 @@
};
};
F5E0E10802BC45F8018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebSubresourceClient.h;
refType = 4;
};
F5E0E10902BC45F8018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebSubresourceClient.m;
refType = 4;
@@ -2604,14 +2607,14 @@
};
};
F5E7B24503025CE801A80180 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
name = WebGlyphBuffer.h;
path = WebCoreSupport.subproj/WebGlyphBuffer.h;
refType = 2;
};
F5E7B24603025CE801A80180 = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
name = WebGlyphBuffer.m;
path = WebCoreSupport.subproj/WebGlyphBuffer.m;
@@ -2761,13 +2764,13 @@
};
};
F5F7174C02885C5B018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebViewFactory.h;
refType = 4;
};
F5F7174D02885C5B018635CA = {
- fileEncoding = 30;
+ fileEncoding = 4;
isa = PBXFileReference;
path = WebViewFactory.m;
refType = 4;
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index a5f9a4d..9a83569 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -14,6 +14,7 @@
#import <WebKit/WebNSPasteboardExtras.h>
#import <WebKit/WebWindowOperationsDelegate.h>
+#import <WebFoundation/WebLocalizableStrings.h>
#import <WebFoundation/WebResourceHandle.h>
#import <WebFoundation/WebResourceRequest.h>
@@ -45,16 +46,16 @@
if(linkURL){
if([WebResourceHandle canInitWithRequest:[WebResourceRequest requestWithURL:linkURL]]){
- [[self class] addMenuItemWithTitle:NSLocalizedString(@"Open Link in New Window", @"Open in New Window context menu item") action:@selector(openLinkInNewWindow:)
+ [[self class] addMenuItemWithTitle:UI_STRING("Open Link in New Window", "Open in New Window context menu item") action:@selector(openLinkInNewWindow:)
target:self
toArray:menuItems];
- [[self class] addMenuItemWithTitle:NSLocalizedString(@"Download Link to Disk", @"Download Link to Disk context menu item") action:@selector(downloadLinkToDisk:)
+ [[self class] addMenuItemWithTitle:UI_STRING("Download Link to Disk", "Download Link to Disk context menu item") action:@selector(downloadLinkToDisk:)
target:self
toArray:menuItems];
}
- [[self class] addMenuItemWithTitle:NSLocalizedString(@"Copy Link to Clipboard", @"Copy Link to Clipboard context menu item") action:@selector(copyLinkToClipboard:)
+ [[self class] addMenuItemWithTitle:UI_STRING("Copy Link to Clipboard", "Copy Link to Clipboard context menu item") action:@selector(copyLinkToClipboard:)
target:self
toArray:menuItems];
}
@@ -67,16 +68,16 @@
[menuItems addObject:[NSMenuItem separatorItem]];
}
- [[self class] addMenuItemWithTitle:NSLocalizedString(@"Open Image in New Window", @"Open Image in New Window context menu item")
+ [[self class] addMenuItemWithTitle:UI_STRING("Open Image in New Window", "Open Image in New Window context menu item")
action:@selector(openImageInNewWindow:)
target:self
toArray:menuItems];
- [[self class] addMenuItemWithTitle:NSLocalizedString(@"Download Image To Disk", @"Download Image To Disk context menu item") action:@selector(downloadImageToDisk:)
+ [[self class] addMenuItemWithTitle:UI_STRING("Download Image To Disk", "Download Image To Disk context menu item") action:@selector(downloadImageToDisk:)
target:self
toArray:menuItems];
- [[self class] addMenuItemWithTitle:NSLocalizedString(@"Copy Image to Clipboard", @"Copy Image to Clipboard context menu item") action:@selector(copyImageToClipboard:)
+ [[self class] addMenuItemWithTitle:UI_STRING("Copy Image to Clipboard", "Copy Image to Clipboard context menu item") action:@selector(copyImageToClipboard:)
target:self
toArray:menuItems];
}
@@ -86,7 +87,7 @@
WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
if(webFrame != [[webFrame controller] mainFrame]){
- [[self class] addMenuItemWithTitle:NSLocalizedString(@"Open Frame in New Window", @"Open Frame in New Window context menu item") action:@selector(openFrameInNewWindow:)
+ [[self class] addMenuItemWithTitle:UI_STRING("Open Frame in New Window", "Open Frame in New Window context menu item") action:@selector(openFrameInNewWindow:)
target:self
toArray:menuItems];
}
diff --git a/WebKit/WebView.subproj/WebFrameView.m b/WebKit/WebView.subproj/WebFrameView.m
index 0582be2..6a8e421 100644
--- a/WebKit/WebView.subproj/WebFrameView.m
+++ b/WebKit/WebView.subproj/WebFrameView.m
@@ -26,6 +26,7 @@
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebError.h>
+#import <WebFoundation/WebLocalizableStrings.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
@@ -35,29 +36,18 @@ enum {
@implementation WebView
-#define WebErrorDescriptionCannotFindFile NSLocalizedStringFromTable (@"Cannot find file", @"WebError", @"WebErrorCannotFindFile description")
-
-#define WebErrorDescriptionCannotCreateFile NSLocalizedStringFromTable (@"Cannot create file", @"WebError", @"WebErrorCannotCreateFile description")
-
-#define WebErrorDescriptionCannotOpenFile NSLocalizedStringFromTable (@"Cannot open file", @"WebError", @"WebErrorCannotOpenFile description")
-
-#define WebErrorDescriptionCannotReadFile NSLocalizedStringFromTable (@"Cannot read file", @"WebError", @"WebErrorCannotReadFile description")
-
-#define WebErrorDescriptionCannotWriteToFile NSLocalizedStringFromTable (@"Cannot write file", @"WebError", @"WebErrorCannotWriteToFile description")
-
-#define WebErrorDescriptionCannotRemoveFile NSLocalizedStringFromTable (@"Cannot remove file", @"WebError", @"WebErrorCannotRemoveFile description")
-
-#define WebErrorDescriptionCannotFindApplicationForFile NSLocalizedStringFromTable (@"Cannot find application for file", @"WebError", @"WebErrorCannotFindApplicationForFile description")
-
-#define WebErrorDescriptionFinderCannotOpenDirectory NSLocalizedStringFromTable (@"Finder cannot open directory", @"WebError", @"WebErrorFinderCannotOpenDirectory description")
-
-#define WebErrorDescriptionCannotShowDirectory NSLocalizedStringFromTable (@"Cannot show a file directory", @"WebError", @"WebErrorCannotShowDirectory description")
-
-#define WebErrorDescriptionCannotShowMIMEType NSLocalizedStringFromTable (@"Cannot show content with specified mime type", @"WebError", @"WebErrorCannotShowMIMEType description")
-
-#define WebErrorDescriptionCannotShowURL NSLocalizedStringFromTable (@"Cannot show URL", @"WebError", @"WebErrorCannotShowURL description")
-
-#define WebErrorDescriptionCannotFindApplicationForURL NSLocalizedStringFromTable (@"Cannot find application for URL", @"WebError", @"WebErrorCannotNotFindApplicationForURL description")
+#define WebErrorDescriptionCannotFindFile UI_STRING("Cannot find file", "WebErrorCannotFindFile description")
+#define WebErrorDescriptionCannotCreateFile UI_STRING("Cannot create file", "WebErrorCannotCreateFile description")
+#define WebErrorDescriptionCannotOpenFile UI_STRING("Cannot open file", "WebErrorCannotOpenFile description")
+#define WebErrorDescriptionCannotReadFile UI_STRING("Cannot read file", "WebErrorCannotReadFile description")
+#define WebErrorDescriptionCannotWriteToFile UI_STRING("Cannot write file", "WebErrorCannotWriteToFile description")
+#define WebErrorDescriptionCannotRemoveFile UI_STRING("Cannot remove file", "WebErrorCannotRemoveFile description")
+#define WebErrorDescriptionCannotFindApplicationForFile UI_STRING("Cannot find application for file", "WebErrorCannotFindApplicationForFile description")
+#define WebErrorDescriptionFinderCannotOpenDirectory UI_STRING("Finder cannot open directory", "WebErrorFinderCannotOpenDirectory description")
+#define WebErrorDescriptionCannotShowDirectory UI_STRING("Cannot show a file directory", "WebErrorCannotShowDirectory description")
+#define WebErrorDescriptionCannotShowMIMEType UI_STRING("Cannot show content with specified mime type", "WebErrorCannotShowMIMEType description")
+#define WebErrorDescriptionCannotShowURL UI_STRING("Cannot show URL", "WebErrorCannotShowURL description")
+#define WebErrorDescriptionCannotFindApplicationForURL UI_STRING("Cannot find application for URL", "WebErrorCannotNotFindApplicationForURL description")
+ (void)initialize
{
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list