[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 6beb36e64c0eb8192ffc91ae2521997d3c3d685a
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 14 00:57:27 2003 +0000

    WebKit:
    
            Reviewed by Trey.
    
            * English.lproj/StringsNotToBeLocalized.txt:
    	Removed all the bookmarks-related strings that I forgot
    	to remove in my previous checkin.
    
    WebBrowser:
    
    	- fixed 3192834 Bookmarks Bar and Menu titles should not be localized
    	in bookmarks.plist, for synching
    
            Reviewed by Trey.
    
            * WebBookmarkGroup.h:
    	changed _loading to _notificationsSuppressed
            * WebBookmarkGroup.m:
            (-[WebBookmarkGroup suppressNotifications]):
    	new method, sets _notificationsSuppressed (and asserts about reentrancy)
            (-[WebBookmarkGroup resumeNotifications]):
    	new method, clears _notificationsSuppressed (and asserts about reentrancy)
            (-[WebBookmarkGroup _sendNotification:forBookmark:children:]):
    	check _notificationsSuppressed instead of _loading
            (-[WebBookmarkGroup _loadBookmarkGroupGuts]):
    	call suppress/resumeNotifications instead of using _loading
    
            * BookmarksController.m:
            (+[BookmarksController _favoritesTitle]):
    	just tweaked localization comment
            (+[BookmarksController _menuRootTitle]):
    	ditto
            (+[BookmarksController historyProxyTitle]):
    	ditto
            (+[BookmarksController addressBookProxyTitle]):
    	ditto
            (+[BookmarksController rendezvousProxyTitle]):
    	ditto
            (-[BookmarksController savePendingChanges]):
    	temporarily change titles of bookmarks for bar and menu so that the special
    	well-known stored value is saved; guard with -[WebBookmarkGroup suppress/resumeNotifications].
            (-[BookmarksController findOrCreateBookmarkSourceWithStoredTitle:displayedTitle:atIndex:]):
    	modified to look first for well-known stored title and 2nd for displayed title; don't
    	look for special UUIDs anymore. Death to special UUIDs.
            (-[BookmarksController updateBookmarkSources]):
    	call findOrCreateBookmarkSourceWithStoredTitle:displayedTitle:atIndex: appropriately
    
            * English.lproj/Localizable.strings:
            * English.lproj/StringsNotToBeLocalized.txt:
    	updated for these changes and also for the big bookmark code-moving change earlier.
    
            * WebBrowser.pbproj/project.pbxproj:
    	change encoding of AutoFillPreferences.m to Unicode so I can use a curly quote in an
    	error message
    
            * Preferences.subproj/AutoFillPreferences.m:
            (-[AutoFillPreferences editMyCard:]):
    	return of the curly quote now that I changed the file encoding properly
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3826 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 91139ed..db4aa1a 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,13 @@
 2003-03-13  John Sullivan  <sullivan at apple.com>
 
+        Reviewed by Trey.
+
+        * English.lproj/StringsNotToBeLocalized.txt:
+	Removed all the bookmarks-related strings that I forgot
+	to remove in my previous checkin.
+
+2003-03-13  John Sullivan  <sullivan at apple.com>
+
 	Removed all the bookmarks code from WebKit; put it
 	in WebBrowser instead.
 
diff --git a/WebKit/English.lproj/StringsNotToBeLocalized.txt b/WebKit/English.lproj/StringsNotToBeLocalized.txt
index 7d36834..bf335af 100644
--- a/WebKit/English.lproj/StringsNotToBeLocalized.txt
+++ b/WebKit/English.lproj/StringsNotToBeLocalized.txt
@@ -10,7 +10,6 @@
 "%lf"
 "(This file must be converted with BinHex 4.0)"
 ","
-"-"
 "/"
 "/<!--frame%d-->-->"
 "/Library/Internet Plug-Ins"
@@ -29,12 +28,7 @@
 "9"
 ";"
 "<!--framePath "
-"</DL>"
-"<DT>"
-"<DT><A"
-"<DT><H"
 "="
-"?"
 "ANIMEXTS1"
 "Apple Chancery"
 "AppleFontSmoothing"
@@ -62,7 +56,6 @@
 "DirectionS"
 "DirectionWS"
 "Entries"
-"HREF=\""
 "Helvetica"
 "JoiningCausing"
 "JoiningDual"
@@ -71,7 +64,6 @@
 "Joy!peff"
 "Library/Caches/com.apple.WebKit/Icons"
 "Library/Internet Plug-Ins"
-"Library/Preferences/Explorer/Favorites.html"
 "Lucida Grande"
 "MP4 Audio"
 "MP4 Video"
@@ -92,8 +84,6 @@
 "QuickTime Plugin.plugin"
 "Set-Cookie"
 "Times New Roman"
-"URIDictionary"
-"URLString"
 "WebActionButtonKey"
 "WebActionElementKey"
 "WebActionModifierFlagsKey"
@@ -101,20 +91,6 @@
 "WebActionOriginalURLKey"
 "WebAuthenticationPanel"
 "WebBackForwardList:\n"
-"WebBookmarkChildrenKey"
-"WebBookmarkDidChangeNotification"
-"WebBookmarkGroupTag"
-"WebBookmarkIdentifier"
-"WebBookmarkType"
-"WebBookmarkTypeLeaf"
-"WebBookmarkTypeList"
-"WebBookmarkTypeProxy"
-"WebBookmarkUUID"
-"WebBookmarkWillChangeNotification"
-"WebBookmarksWereAddedNotification"
-"WebBookmarksWereReloadedNotification"
-"WebBookmarksWereRemovedNotification"
-"WebBookmarksWillBeReloadedNotification"
 "WebCorePageState"
 "WebCurrentFrameState"
 "WebElementFrame"
@@ -185,7 +161,6 @@
 "WebKitUserStyleSheetLocationPreferenceKey"
 "WebMethodNotYetImplemented"
 "WebModalDialogPretendWindow"
-"WebModifiedBookmarkKey"
 "WebPluginAttributes"
 "WebPluginBaseURL"
 "WebPluginContainer"
@@ -243,10 +218,6 @@
 "url_icon"
 "video/mp4"
 "x"
-Bookmarks.subproj/WebBookmarkLeaf.m:"%@: %@"
-Bookmarks.subproj/WebBookmarkList.m:"Children"
-Bookmarks.subproj/WebBookmarkList.m:"Title"
-Bookmarks.subproj/WebBookmarkProxy.m:"Title"
 History.subproj/WebHistoryItem.m:" in \"%@\""
 History.subproj/WebHistoryItem.m:"children"
 History.subproj/WebHistoryItem.m:"title"

-- 
WebKit Debian packaging