Modernize WebKit nibs and lprojs for localization's sake
authortimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Oct 2018 21:22:44 +0000 (21:22 +0000)
committertimothy_horton@apple.com <timothy_horton@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 29 Oct 2018 21:22:44 +0000 (21:22 +0000)
https://bugs.webkit.org/show_bug.cgi?id=190911
<rdar://problem/45349466>

Reviewed by Dan Bernstein.

Source/JavaScriptCore:

* JavaScriptCore.xcodeproj/project.pbxproj:
English->en

Source/WebCore:

* PlatformGTK.cmake:
* PlatformWPE.cmake:
* PlatformWin.cmake:
* WebCore.xcodeproj/project.pbxproj:
* en.lproj/Localizable.strings: Renamed from Source/WebCore/English.lproj/Localizable.strings.
* en.lproj/Localizable.stringsdict: Renamed from Source/WebCore/English.lproj/Localizable.stringsdict.
* en.lproj/mediaControlsLocalizedStrings.js: Renamed from Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js.
* en.lproj/modern-media-controls-localized-strings.js: Renamed from Source/WebCore/English.lproj/modern-media-controls-localized-strings.js.
English->en

Source/WebCore/PAL:

* PAL.xcodeproj/project.pbxproj:
English->en

Source/WebInspectorUI:

* WebInspectorUI.xcodeproj/project.pbxproj:
English->en

Source/WebKit:

* Resources/WebContentProcess.xib:
* WebKit.xcodeproj/project.pbxproj:
* en.lproj/InfoPlist.strings: Renamed from Source/WebKit/English.lproj/InfoPlist.strings.
English->en

Source/WebKitLegacy:

* English.lproj/WebJavaScriptTextInputPanel.nib/designable.nib: Removed.
* English.lproj/WebJavaScriptTextInputPanel.nib/keyedobjects.nib: Removed.
* WebKitLegacy.xcodeproj/project.pbxproj:
* en.lproj/WebJavaScriptTextInputPanel.xib: Added.
NIB->XIB, English->en

Source/WebKitLegacy/mac:

* Misc/WebNSControlExtras.m:
(-[NSControl sizeToFitAndAdjustWindowHeight]):
NSWindow and its contents are both in the same scale space these days; avoid
double-applying the scale factor, or you can't see the prompt.

* Panels/English.lproj/WebAuthenticationPanel.nib/designable.nib: Removed.
* Panels/English.lproj/WebAuthenticationPanel.nib/keyedobjects.nib: Removed.
* Panels/en.lproj/WebAuthenticationPanel.xib: Added.
NIB->XIB

Source/WTF:

* WTF.xcodeproj/project.pbxproj:
English->en

Tools:

* Scripts/check-inspector-strings:
* Scripts/update-webkit-localizable-strings:
* gtk/manifest.txt.in:
* wpe/manifest.txt.in:
English->en

LayoutTests:

* media/modern-media-controls/localized-strings/replaced-string.html:
English->en

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237566 268f45cc-cd09-0410-ab3c-d52691b4dbfc

41 files changed:
LayoutTests/ChangeLog
LayoutTests/media/modern-media-controls/localized-strings/replaced-string.html
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
Source/WTF/ChangeLog
Source/WTF/WTF.xcodeproj/project.pbxproj
Source/WebCore/ChangeLog
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
Source/WebCore/PlatformGTK.cmake
Source/WebCore/PlatformWPE.cmake
Source/WebCore/PlatformWin.cmake
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebCore/en.lproj/Localizable.strings [moved from Source/WebCore/English.lproj/Localizable.strings with 100% similarity]
Source/WebCore/en.lproj/Localizable.stringsdict [moved from Source/WebCore/English.lproj/Localizable.stringsdict with 100% similarity]
Source/WebCore/en.lproj/mediaControlsLocalizedStrings.js [moved from Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js with 100% similarity]
Source/WebCore/en.lproj/modern-media-controls-localized-strings.js [moved from Source/WebCore/English.lproj/modern-media-controls-localized-strings.js with 100% similarity]
Source/WebInspectorUI/ChangeLog
Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj
Source/WebKit/ChangeLog
Source/WebKit/Resources/WebContentProcess.xib
Source/WebKit/WebKit.xcodeproj/project.pbxproj
Source/WebKit/en.lproj/InfoPlist.strings [moved from Source/WebKit/English.lproj/InfoPlist.strings with 100% similarity]
Source/WebKitLegacy/ChangeLog
Source/WebKitLegacy/English.lproj/WebJavaScriptTextInputPanel.nib/designable.nib [deleted file]
Source/WebKitLegacy/English.lproj/WebJavaScriptTextInputPanel.nib/keyedobjects.nib [deleted file]
Source/WebKitLegacy/WebKitLegacy.xcodeproj/project.pbxproj
Source/WebKitLegacy/en.lproj/WebJavaScriptTextInputPanel.xib [new file with mode: 0644]
Source/WebKitLegacy/mac/ChangeLog
Source/WebKitLegacy/mac/Configurations/WebKitLegacy.xcconfig
Source/WebKitLegacy/mac/Misc/WebNSControlExtras.m
Source/WebKitLegacy/mac/Panels/English.lproj/WebAuthenticationPanel.nib/designable.nib [deleted file]
Source/WebKitLegacy/mac/Panels/English.lproj/WebAuthenticationPanel.nib/keyedobjects.nib [deleted file]
Source/WebKitLegacy/mac/Panels/en.lproj/WebAuthenticationPanel.xib [new file with mode: 0644]
Tools/ChangeLog
Tools/Scripts/check-inspector-strings
Tools/Scripts/update-webkit-localizable-strings
Tools/Scripts/webkitpy/style/checkers/xcodeproj.py
Tools/Scripts/webkitpy/style/checkers/xcodeproj_unittest.py
Tools/gtk/manifest.txt.in
Tools/wpe/manifest.txt.in

index e1aceb57ffbb432578971beab13fb8173b734f04..4988c093957c0b1b49a04de5736456e3b528fe55 100644 (file)
@@ -1,3 +1,14 @@
+2018-10-29  Tim Horton  <timothy_horton@apple.com>
+
+        Modernize WebKit nibs and lprojs for localization's sake
+        https://bugs.webkit.org/show_bug.cgi?id=190911
+        <rdar://problem/45349466>
+
+        Reviewed by Dan Bernstein.
+
+        * media/modern-media-controls/localized-strings/replaced-string.html:
+        English->en
+
 2018-10-29  Youenn Fablet  <youenn@apple.com>
 
         Invalid ssrc value in the stats of type 'inbound-rtp'
index 0a6745f019afa3d795b75e6fa1de3c7e5280b375..a2d98de86920f6a465dfe3d64e7101c4c9e9c28b 100644 (file)
@@ -1,5 +1,5 @@
 <script src="../../../resources/js-test-pre.js"></script>
-<script src="../../../../Source/WebCore/English.lproj/modern-media-controls-localized-strings.js" type="text/javascript"></script>
+<script src="../../../../Source/WebCore/en.lproj/modern-media-controls-localized-strings.js" type="text/javascript"></script>
 <script src="../../../../Source/WebCore/Modules/modern-media-controls/main.js" type="text/javascript"></script>
 <script type="text/javascript">
 
index 70cef8962629df323ffd2912904915517415d5bf..88925e5d481a9ebc7d4a1ec21478c66d464275bc 100644 (file)
@@ -1,3 +1,14 @@
+2018-10-29  Tim Horton  <timothy_horton@apple.com>
+
+        Modernize WebKit nibs and lprojs for localization's sake
+        https://bugs.webkit.org/show_bug.cgi?id=190911
+        <rdar://problem/45349466>
+
+        Reviewed by Dan Bernstein.
+
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        English->en
+
 2018-10-29  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r237492.
index d75888160ffe195d91d7531725f75ffe0c75a497..b1f291dc4a41b4f3aff12b67f9ac3243f9e1fc14 100644 (file)
                        };
                        buildConfigurationList = 149C277108902AFE008A9EFC /* Build configuration list for PBXProject "JavaScriptCore" */;
                        compatibilityVersion = "Xcode 3.2";
-                       developmentRegion = English;
+                       developmentRegion = en;
                        hasScannedForEncodings = 1;
                        knownRegions = (
-                               English,
-                               Japanese,
-                               French,
-                               German,
+                               en,
                        );
                        mainGroup = 0867D691FE84028FC02AAC07 /* JavaScriptCore */;
                        productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
index 2b3cbf7bba9d313f46c362ce2a0718489f100b92..5faedb0c5db5b2a5f29bcc265e6f3652d6852478 100644 (file)
@@ -1,3 +1,14 @@
+2018-10-29  Tim Horton  <timothy_horton@apple.com>
+
+        Modernize WebKit nibs and lprojs for localization's sake
+        https://bugs.webkit.org/show_bug.cgi?id=190911
+        <rdar://problem/45349466>
+
+        Reviewed by Dan Bernstein.
+
+        * WTF.xcodeproj/project.pbxproj:
+        English->en
+
 2018-10-29  Tadeu Zagallo  <tzagallo@apple.com>
 
         New bytecode format for JSC
index 62fadfba541bb9fc3f0dcff61473bd237f895c50..c8afe37c017b995734a04795d9a27cbd956f6b56 100644 (file)
                        };
                        buildConfigurationList = 5D247B5C14689B8600E78B76 /* Build configuration list for PBXProject "WTF" */;
                        compatibilityVersion = "Xcode 3.2";
-                       developmentRegion = English;
+                       developmentRegion = en;
                        hasScannedForEncodings = 0;
                        knownRegions = (
                                en,
index c6a31d5f1544fd9e4dad7b78954e35de9e6a4d56..b2a746bae7762024e5112654dceeaa8ab3169d68 100644 (file)
@@ -1,3 +1,21 @@
+2018-10-29  Tim Horton  <timothy_horton@apple.com>
+
+        Modernize WebKit nibs and lprojs for localization's sake
+        https://bugs.webkit.org/show_bug.cgi?id=190911
+        <rdar://problem/45349466>
+
+        Reviewed by Dan Bernstein.
+
+        * PlatformGTK.cmake:
+        * PlatformWPE.cmake:
+        * PlatformWin.cmake:
+        * WebCore.xcodeproj/project.pbxproj:
+        * en.lproj/Localizable.strings: Renamed from Source/WebCore/English.lproj/Localizable.strings.
+        * en.lproj/Localizable.stringsdict: Renamed from Source/WebCore/English.lproj/Localizable.stringsdict.
+        * en.lproj/mediaControlsLocalizedStrings.js: Renamed from Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js.
+        * en.lproj/modern-media-controls-localized-strings.js: Renamed from Source/WebCore/English.lproj/modern-media-controls-localized-strings.js.
+        English->en
+
 2018-10-29  Tim Horton  <timothy_horton@apple.com>
 
         Make FindOptionsShowOverlay work on iOS
index e41bf9b5b42f1365813b5ef3107c29d366e97ccd..e01076d8f973474211659cd44515838950aeb4f3 100644 (file)
@@ -1,3 +1,14 @@
+2018-10-29  Tim Horton  <timothy_horton@apple.com>
+
+        Modernize WebKit nibs and lprojs for localization's sake
+        https://bugs.webkit.org/show_bug.cgi?id=190911
+        <rdar://problem/45349466>
+
+        Reviewed by Dan Bernstein.
+
+        * PAL.xcodeproj/project.pbxproj:
+        English->en
+
 2018-10-26  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r237458.
index 1e52c95b165a7fc7d06757501ebf761fa7c34c99..9d14456f4177bccee27918925e6005c2b8e1e2db 100644 (file)
                        };
                        buildConfigurationList = 1C09D0381E31C32800725F18 /* Build configuration list for PBXProject "PAL" */;
                        compatibilityVersion = "Xcode 3.2";
-                       developmentRegion = English;
+                       developmentRegion = en;
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
index 4eb05cd06db3daa6684c8a8f32de341f6d1e0e85..c41caa5fcbdda12ea81e035d6eb7259f4e2cbfc1 100644 (file)
@@ -91,7 +91,7 @@ list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
 )
 
 set(WebCore_USER_AGENT_SCRIPTS
-    ${WEBCORE_DIR}/English.lproj/mediaControlsLocalizedStrings.js
+    ${WEBCORE_DIR}/en.lproj/mediaControlsLocalizedStrings.js
     ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsBase.js
     ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsGtk.js
 )
index 1e388f2c046d9550363aaefe0cf1ae4dcaa4e62c..467ac3d7246ead74cde33d2f8a7b9a6fafd0bc69 100644 (file)
@@ -38,7 +38,7 @@ list(APPEND WebCore_USER_AGENT_STYLE_SHEETS
 )
 
 set(WebCore_USER_AGENT_SCRIPTS
-    ${WEBCORE_DIR}/English.lproj/mediaControlsLocalizedStrings.js
+    ${WEBCORE_DIR}/en.lproj/mediaControlsLocalizedStrings.js
     ${WEBCORE_DIR}/Modules/mediacontrols/mediaControlsBase.js
 )
 
index 5867c95fba631778c2a50c561fa39d7970b36f46..5d39f6d1099f33e005a31437961ecb0599b17399 100644 (file)
@@ -291,8 +291,8 @@ endif ()
 
 make_directory(${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/en.lproj)
 file(COPY
-    "${WEBCORE_DIR}/English.lproj/Localizable.strings"
-    "${WEBCORE_DIR}/English.lproj/mediaControlsLocalizedStrings.js"
+    "${WEBCORE_DIR}/en.lproj/Localizable.strings"
+    "${WEBCORE_DIR}/en.lproj/mediaControlsLocalizedStrings.js"
     DESTINATION
     ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit.resources/en.lproj
 )
index 0e1ec021c83f9890c3a4579d529ae8e15ff998ec..837a57485ed6122cb080860180ff56eae8d6f309 100644 (file)
                718675461DF101C60033D7F3 /* seek-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "seek-support.js"; sourceTree = "<group>"; };
                718C7F561DD385C500B733C8 /* status-label.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = "status-label.css"; sourceTree = "<group>"; };
                718C7F571DD385C500B733C8 /* status-label.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "status-label.js"; sourceTree = "<group>"; };
-               71A1B6071DEE5A820073BCFB /* English */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; name = English; path = "English.lproj/modern-media-controls-localized-strings.js"; sourceTree = SOURCE_ROOT; };
+               71A1B6071DEE5A820073BCFB /* en */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; name = en; path = "en.lproj/modern-media-controls-localized-strings.js"; sourceTree = SOURCE_ROOT; };
                71A57DEF154BE25C0009D120 /* SVGPathUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPathUtilities.cpp; sourceTree = "<group>"; };
                71A57DF0154BE25C0009D120 /* SVGPathUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathUtilities.h; sourceTree = "<group>"; };
                71B0460A1DD3C2EE00EE19CF /* status-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "status-support.js"; sourceTree = "<group>"; };
                7A0E770D10C00A8800A0276E /* InspectorFrontendHost.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = InspectorFrontendHost.idl; sourceTree = "<group>"; };
                7A0E771C10C00DB100A0276E /* JSInspectorFrontendHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSInspectorFrontendHost.cpp; sourceTree = "<group>"; };
                7A0E771D10C00DB100A0276E /* JSInspectorFrontendHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSInspectorFrontendHost.h; sourceTree = "<group>"; };
-               7A1D7FCA18F85F0F00C385AD /* English */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; name = English; path = English.lproj/mediaControlsLocalizedStrings.js; sourceTree = SOURCE_ROOT; };
+               7A1D7FCA18F85F0F00C385AD /* en */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; name = en; path = en.lproj/mediaControlsLocalizedStrings.js; sourceTree = SOURCE_ROOT; };
                7A1F2B51126C61B20006A7E6 /* InspectorClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorClient.cpp; sourceTree = "<group>"; };
                7A22731E20C9F9D900DB1DEF /* WebKitNSImageExtras.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WebKitNSImageExtras.mm; sourceTree = "<group>"; };
                7A22731F20C9F9DA00DB1DEF /* WebKitNSImageExtras.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebKitNSImageExtras.h; sourceTree = "<group>"; };
                8379363C1FBBB0A400C8023C /* ServiceWorkerClientData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ServiceWorkerClientData.cpp; sourceTree = "<group>"; };
                8379363E1FBBB0A500C8023C /* ServiceWorkerClientData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServiceWorkerClientData.h; sourceTree = "<group>"; };
                837964CE1F8DB69A00218EA0 /* GeolocationPositionIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = GeolocationPositionIOS.mm; path = Modules/geolocation/ios/GeolocationPositionIOS.mm; sourceTree = SOURCE_ROOT; };
-               837A80121E1E127300026B9F /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = English; path = English.lproj/Localizable.stringsdict; sourceTree = SOURCE_ROOT; };
+               837A80121E1E127300026B9F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = en; path = en.lproj/Localizable.stringsdict; sourceTree = SOURCE_ROOT; };
                837B7D1F1DC3F54C00D051FC /* ValidationBubbleIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ValidationBubbleIOS.mm; sourceTree = "<group>"; };
                837D46251FA2A8C50054E1FA /* ServiceWorkerClientIdentifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServiceWorkerClientIdentifier.h; sourceTree = "<group>"; };
                837DFB341EBFEA7000601385 /* ElementCSSInlineStyle.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ElementCSSInlineStyle.idl; sourceTree = "<group>"; };
                BCAB418013E356E800D8AAF3 /* Region.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Region.h; sourceTree = "<group>"; };
                BCACF3BA1072921A00C0C8A3 /* UserContentURLPattern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserContentURLPattern.cpp; sourceTree = "<group>"; };
                BCACF3BB1072921A00C0C8A3 /* UserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserContentURLPattern.h; sourceTree = "<group>"; };
-               BCAD1809131C7A0D00990406 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
+               BCAD1809131C7A0D00990406 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = SOURCE_ROOT; };
                BCAE1FA512939DB7004CB026 /* ScrollAnimatorMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScrollAnimatorMac.h; sourceTree = "<group>"; };
                BCB16BFE0979C3BD00467741 /* MemoryCache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MemoryCache.cpp; sourceTree = "<group>"; };
                BCB16BFF0979C3BD00467741 /* MemoryCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MemoryCache.h; sourceTree = "<group>"; };
                        };
                        buildConfigurationList = 149C284308902B11008A9EFC /* Build configuration list for PBXProject "WebCore" */;
                        compatibilityVersion = "Xcode 3.2";
-                       developmentRegion = English;
+                       developmentRegion = en;
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
                71A1B6061DEE5A820073BCFB /* modern-media-controls-localized-strings.js */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               71A1B6071DEE5A820073BCFB /* English */,
+                               71A1B6071DEE5A820073BCFB /* en */,
                        );
                        name = "modern-media-controls-localized-strings.js";
                        sourceTree = "<group>";
                7A1D7FC918F85F0F00C385AD /* mediaControlsLocalizedStrings.js */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               7A1D7FCA18F85F0F00C385AD /* English */,
+                               7A1D7FCA18F85F0F00C385AD /* en */,
                        );
                        name = mediaControlsLocalizedStrings.js;
                        sourceTree = "<group>";
                837A80111E1E127300026B9F /* Localizable.stringsdict */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               837A80121E1E127300026B9F /* English */,
+                               837A80121E1E127300026B9F /* en */,
                        );
                        name = Localizable.stringsdict;
                        sourceTree = "<group>";
                BCAD1808131C7A0D00990406 /* Localizable.strings */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               BCAD1809131C7A0D00990406 /* English */,
+                               BCAD1809131C7A0D00990406 /* en */,
                        );
                        name = Localizable.strings;
                        sourceTree = "<group>";
index 9b205767732d9d54d12d7e126905b4ccac1d4a01..f9531adacd34841d61aa47b98aef501ae9866069 100644 (file)
@@ -1,3 +1,14 @@
+2018-10-29  Tim Horton  <timothy_horton@apple.com>
+
+        Modernize WebKit nibs and lprojs for localization's sake
+        https://bugs.webkit.org/show_bug.cgi?id=190911
+        <rdar://problem/45349466>
+
+        Reviewed by Dan Bernstein.
+
+        * WebInspectorUI.xcodeproj/project.pbxproj:
+        English->en
+
 2018-10-29  Devin Rousso  <drousso@apple.com>
 
         Web Inspector: prevent Canvas tab from listening for "space" when not visibile
index 7f40ba18f6ade3ca35d203d3dffee4eed9e13ac5..37c234fe5dadd0ed39db5b0d09afdd5578054ba9 100644 (file)
                        };
                        buildConfigurationList = A54C2250148B23DE00373FA3 /* Build configuration list for PBXProject "WebInspectorUI" */;
                        compatibilityVersion = "Xcode 3.2";
-                       developmentRegion = English;
+                       developmentRegion = en;
                        hasScannedForEncodings = 0;
                        knownRegions = (
                                en,
index ac9a485306b2816060caca109151fea711fff464..16a66533dc783cff75c85b02c535496fdf8f9c07 100644 (file)
@@ -1,3 +1,16 @@
+2018-10-29  Tim Horton  <timothy_horton@apple.com>
+
+        Modernize WebKit nibs and lprojs for localization's sake
+        https://bugs.webkit.org/show_bug.cgi?id=190911
+        <rdar://problem/45349466>
+
+        Reviewed by Dan Bernstein.
+
+        * Resources/WebContentProcess.xib:
+        * WebKit.xcodeproj/project.pbxproj:
+        * en.lproj/InfoPlist.strings: Renamed from Source/WebKit/English.lproj/InfoPlist.strings.
+        English->en
+
 2018-10-29  Tim Horton  <timothy_horton@apple.com>
 
         Make FindOptionsShowOverlay work on iOS
index 34ac6a294b312ba71b1359626f8947fd9ad05e92..3aba947c9509a91c36bf21e90901c6c816ec3ad3 100644 (file)
@@ -1,86 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-       <data>
-               <int key="IBDocument.SystemTarget">1070</int>
-               <string key="IBDocument.SystemVersion">11G63b</string>
-               <string key="IBDocument.InterfaceBuilderVersion">3084</string>
-               <string key="IBDocument.AppKitVersion">1138.51</string>
-               <string key="IBDocument.HIToolboxVersion">569.00</string>
-               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                       <string key="NS.object.0">3084</string>
-               </object>
-               <array key="IBDocument.IntegratedClassDependencies">
-                       <string>NSCustomObject</string>
-               </array>
-               <array key="IBDocument.PluginDependencies">
-                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-               </array>
-               <object class="NSMutableDictionary" key="IBDocument.Metadata">
-                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-                       <integer value="1" key="NS.object.0"/>
-               </object>
-               <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-                       <object class="NSCustomObject" id="1001">
-                               <string key="NSClassName">NSObject</string>
-                       </object>
-                       <object class="NSCustomObject" id="1003">
-                               <string key="NSClassName">FirstResponder</string>
-                       </object>
-                       <object class="NSCustomObject" id="1004">
-                               <string key="NSClassName">NSApplication</string>
-                       </object>
-               </array>
-               <object class="IBObjectContainer" key="IBDocument.Objects">
-                       <bool key="usesAutoincrementingIDs">NO</bool>
-                       <array class="NSMutableArray" key="connectionRecords"/>
-                       <object class="IBMutableOrderedSet" key="objectRecords">
-                               <array key="orderedObjects">
-                                       <object class="IBObjectRecord">
-                                               <string key="id">0</string>
-                                               <array key="object" id="0"/>
-                                               <reference key="children" ref="1000"/>
-                                               <nil key="parent"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <string key="id">-2</string>
-                                               <reference key="object" ref="1001"/>
-                                               <reference key="parent" ref="0"/>
-                                               <string key="objectName">File's Owner</string>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <string key="id">-1</string>
-                                               <reference key="object" ref="1003"/>
-                                               <reference key="parent" ref="0"/>
-                                               <string key="objectName">First Responder</string>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <string key="id">-3</string>
-                                               <reference key="object" ref="1004"/>
-                                               <reference key="parent" ref="0"/>
-                                               <string key="objectName">Application</string>
-                                       </object>
-                               </array>
-                       </object>
-                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
-                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                       </dictionary>
-                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-                       <nil key="activeLocalization"/>
-                       <dictionary class="NSMutableDictionary" key="localizations"/>
-                       <nil key="sourceID"/>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes"/>
-               <int key="IBDocument.localizationMode">0</int>
-               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-                       <integer value="4600" key="NS.object.0"/>
-               </object>
-               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-               <int key="IBDocument.defaultPropertyAccessControl">3</int>
-               <bool key="IBDocument.UseAutolayout">YES</bool>
-       </data>
-</archive>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.15" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.15"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner"/>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application"/>
+    </objects>
+</document>
index e2f92d25aa1e90598bfb8465a56be648e7823076..b53d1b9a45ab8fa975047699628ae3985cea548f 100644 (file)
                07A5EBBA1C7BA43E00B9CA69 /* WKFrameHandleRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKFrameHandleRef.h; sourceTree = "<group>"; };
                07A8F3861E64A8F900B668E8 /* CelestialSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CelestialSPI.h; sourceTree = "<group>"; };
                0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
-               089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+               089C1667FE841158C02AAC07 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
                0E97D74C200E8FF300BF6643 /* SafeBrowsingSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SafeBrowsingSPI.h; sourceTree = "<group>"; };
                0EDE85022004E74900030560 /* WebsitePopUpPolicy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebsitePopUpPolicy.h; sourceTree = "<group>"; };
                0F08CF511D63C13A00B48DF1 /* WKFormSelectPicker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKFormSelectPicker.h; path = ios/forms/WKFormSelectPicker.h; sourceTree = "<group>"; };
                        };
                        buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "WebKit" */;
                        compatibilityVersion = "Xcode 3.2";
-                       developmentRegion = English;
+                       developmentRegion = en;
                        hasScannedForEncodings = 1;
                        knownRegions = (
-                               English,
-                               Japanese,
-                               French,
-                               German,
                                en,
                        );
                        mainGroup = 0867D691FE84028FC02AAC07 /* WebKit2 */;
                089C1666FE841158C02AAC07 /* InfoPlist.strings */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               089C1667FE841158C02AAC07 /* English */,
+                               089C1667FE841158C02AAC07 /* en */,
                        );
                        name = InfoPlist.strings;
                        sourceTree = "<group>";
index 1abbe8a0bb06aa2a5820d8711baf974a29ef3ea2..72e426574838d029a6997ddb5b6d964f2336aada 100644 (file)
@@ -1,3 +1,17 @@
+2018-10-29  Tim Horton  <timothy_horton@apple.com>
+
+        Modernize WebKit nibs and lprojs for localization's sake
+        https://bugs.webkit.org/show_bug.cgi?id=190911
+        <rdar://problem/45349466>
+
+        Reviewed by Dan Bernstein.
+
+        * English.lproj/WebJavaScriptTextInputPanel.nib/designable.nib: Removed.
+        * English.lproj/WebJavaScriptTextInputPanel.nib/keyedobjects.nib: Removed.
+        * WebKitLegacy.xcodeproj/project.pbxproj:
+        * en.lproj/WebJavaScriptTextInputPanel.xib: Added.
+        NIB->XIB, English->en
+
 2018-10-25  Fujii Hironori  <Hironori.Fujii@sony.com>
 
         [CMake][Ninja][Win] midl.exe fails to create, open and write a temporary file in parallel build in Docker container
diff --git a/Source/WebKitLegacy/English.lproj/WebJavaScriptTextInputPanel.nib/designable.nib b/Source/WebKitLegacy/English.lproj/WebJavaScriptTextInputPanel.nib/designable.nib
deleted file mode 100644 (file)
index d6cb209..0000000
+++ /dev/null
@@ -1,440 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
-       <data>
-               <int key="IBDocument.SystemTarget">1050</int>
-               <string key="IBDocument.SystemVersion">11C57</string>
-               <string key="IBDocument.InterfaceBuilderVersion">1938</string>
-               <string key="IBDocument.AppKitVersion">1138.21</string>
-               <string key="IBDocument.HIToolboxVersion">567.00</string>
-               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                       <string key="NS.object.0">1938</string>
-               </object>
-               <array key="IBDocument.IntegratedClassDependencies">
-                       <string>NSTextField</string>
-                       <string>NSView</string>
-                       <string>NSWindowTemplate</string>
-                       <string>NSTextFieldCell</string>
-                       <string>NSButtonCell</string>
-                       <string>NSButton</string>
-                       <string>NSCustomObject</string>
-               </array>
-               <array key="IBDocument.PluginDependencies">
-                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-               </array>
-               <object class="NSMutableDictionary" key="IBDocument.Metadata">
-                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-                       <integer value="1" key="NS.object.0"/>
-               </object>
-               <array class="NSMutableArray" key="IBDocument.RootObjects" id="301070375">
-                       <object class="NSCustomObject" id="1016705975">
-                               <string key="NSClassName">WebJavaScriptTextInputPanel</string>
-                       </object>
-                       <object class="NSCustomObject" id="5139151">
-                               <string key="NSClassName">FirstResponder</string>
-                       </object>
-                       <object class="NSCustomObject" id="438418066">
-                               <string key="NSClassName">NSApplication</string>
-                       </object>
-                       <object class="NSWindowTemplate" id="9818130">
-                               <int key="NSWindowStyleMask">1</int>
-                               <int key="NSWindowBacking">2</int>
-                               <string key="NSWindowRect">{{531, 773}, {426, 161}}</string>
-                               <int key="NSWTFlags">1881669632</int>
-                               <string key="NSWindowTitle">JavaScript</string>
-                               <string key="NSWindowClass">WebNonBlockingPanel</string>
-                               <object class="NSMutableString" key="NSViewClass">
-                                       <characters key="NS.bytes">View</characters>
-                               </object>
-                               <nil key="NSUserInterfaceItemIdentifier"/>
-                               <string key="NSWindowContentMinSize">{94, 7}</string>
-                               <object class="NSView" key="NSWindowView" id="776027458">
-                                       <reference key="NSNextResponder"/>
-                                       <int key="NSvFlags">256</int>
-                                       <array class="NSMutableArray" key="NSSubviews">
-                                               <object class="NSButton" id="707055723">
-                                                       <reference key="NSNextResponder" ref="776027458"/>
-                                                       <int key="NSvFlags">289</int>
-                                                       <string key="NSFrame">{{232, 11}, {90, 34}}</string>
-                                                       <reference key="NSSuperview" ref="776027458"/>
-                                                       <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView" ref="547100070"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSButtonCell" key="NSCell" id="629849992">
-                                                               <int key="NSCellFlags">67239424</int>
-                                                               <int key="NSCellFlags2">134217728</int>
-                                                               <string key="NSContents">Cancel</string>
-                                                               <object class="NSFont" key="NSSupport" id="843310790">
-                                                                       <string key="NSName">LucidaGrande</string>
-                                                                       <double key="NSSize">13</double>
-                                                                       <int key="NSfFlags">1558</int>
-                                                               </object>
-                                                               <reference key="NSControlView" ref="707055723"/>
-                                                               <int key="NSButtonFlags">-2038284033</int>
-                                                               <int key="NSButtonFlags2">1</int>
-                                                               <object class="NSFont" key="NSAlternateImage" id="371630585">
-                                                                       <string key="NSName">Helvetica</string>
-                                                                       <double key="NSSize">13</double>
-                                                                       <int key="NSfFlags">16</int>
-                                                               </object>
-                                                               <string key="NSAlternateContents"/>
-                                                               <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
-                                                               <int key="NSPeriodicDelay">200</int>
-                                                               <int key="NSPeriodicInterval">25</int>
-                                                       </object>
-                                               </object>
-                                               <object class="NSButton" id="547100070">
-                                                       <reference key="NSNextResponder" ref="776027458"/>
-                                                       <int key="NSvFlags">289</int>
-                                                       <string key="NSFrame">{{322, 11}, {90, 34}}</string>
-                                                       <reference key="NSSuperview" ref="776027458"/>
-                                                       <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSButtonCell" key="NSCell" id="970096139">
-                                                               <int key="NSCellFlags">67239424</int>
-                                                               <int key="NSCellFlags2">134217728</int>
-                                                               <string key="NSContents">OK</string>
-                                                               <reference key="NSSupport" ref="843310790"/>
-                                                               <reference key="NSControlView" ref="547100070"/>
-                                                               <int key="NSButtonFlags">-2035924737</int>
-                                                               <int key="NSButtonFlags2">1</int>
-                                                               <reference key="NSAlternateImage" ref="371630585"/>
-                                                               <string key="NSAlternateContents"/>
-                                                               <object class="NSMutableString" key="NSKeyEquivalent">
-                                                                       <bytes key="NS.bytes">DQ</bytes>
-                                                               </object>
-                                                               <int key="NSPeriodicDelay">200</int>
-                                                               <int key="NSPeriodicInterval">25</int>
-                                                       </object>
-                                               </object>
-                                               <object class="NSTextField" id="111931878">
-                                                       <reference key="NSNextResponder" ref="776027458"/>
-                                                       <int key="NSvFlags">266</int>
-                                                       <string key="NSFrame">{{17, 107}, {392, 34}}</string>
-                                                       <reference key="NSSuperview" ref="776027458"/>
-                                                       <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView" ref="307071244"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="881353084">
-                                                               <int key="NSCellFlags">69336577</int>
-                                                               <int key="NSCellFlags2">0</int>
-                                                               <string type="base64-UTF8" key="NSContents">QSBtZXNzYWdlIGZyb20gSmF2YVNjcmlwdCB3aWxsIGJlIGhlcmUuCkl0IGNhbiBiZSBhbnkgbnVtYmVy
-IG9mIGxpbmVzIGxvbmcuA</string>
-                                                               <object class="NSFont" key="NSSupport" id="419708836">
-                                                                       <string key="NSName">LucidaGrande</string>
-                                                                       <double key="NSSize">13</double>
-                                                                       <int key="NSfFlags">1044</int>
-                                                               </object>
-                                                               <reference key="NSControlView" ref="111931878"/>
-                                                               <object class="NSColor" key="NSBackgroundColor">
-                                                                       <int key="NSColorSpace">6</int>
-                                                                       <string key="NSCatalogName">System</string>
-                                                                       <string key="NSColorName">controlColor</string>
-                                                                       <object class="NSColor" key="NSColor">
-                                                                               <int key="NSColorSpace">3</int>
-                                                                               <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-                                                                       </object>
-                                                               </object>
-                                                               <object class="NSColor" key="NSTextColor">
-                                                                       <int key="NSColorSpace">6</int>
-                                                                       <string key="NSCatalogName">System</string>
-                                                                       <string key="NSColorName">controlTextColor</string>
-                                                                       <object class="NSColor" key="NSColor">
-                                                                               <int key="NSColorSpace">3</int>
-                                                                               <bytes key="NSWhite">MAA</bytes>
-                                                                       </object>
-                                                               </object>
-                                                       </object>
-                                               </object>
-                                               <object class="NSTextField" id="307071244">
-                                                       <reference key="NSNextResponder" ref="776027458"/>
-                                                       <int key="NSvFlags">290</int>
-                                                       <string key="NSFrame">{{20, 60}, {386, 39}}</string>
-                                                       <reference key="NSSuperview" ref="776027458"/>
-                                                       <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView" ref="707055723"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="587231059">
-                                                               <int key="NSCellFlags">341966337</int>
-                                                               <int key="NSCellFlags2">0</int>
-                                                               <string key="NSContents"/>
-                                                               <reference key="NSSupport" ref="419708836"/>
-                                                               <reference key="NSControlView" ref="307071244"/>
-                                                               <bool key="NSDrawsBackground">YES</bool>
-                                                               <object class="NSColor" key="NSBackgroundColor">
-                                                                       <int key="NSColorSpace">1</int>
-                                                                       <bytes key="NSRGB">MSAxIDEAA</bytes>
-                                                               </object>
-                                                               <object class="NSColor" key="NSTextColor">
-                                                                       <int key="NSColorSpace">1</int>
-                                                                       <bytes key="NSRGB">MCAwIDAAA</bytes>
-                                                               </object>
-                                                       </object>
-                                               </object>
-                                       </array>
-                                       <string key="NSFrameSize">{426, 161}</string>
-                                       <reference key="NSSuperview"/>
-                                       <reference key="NSWindow"/>
-                                       <reference key="NSNextKeyView" ref="111931878"/>
-                               </object>
-                               <string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
-                               <string key="NSMinSize">{94, 29}</string>
-                               <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-                               <bool key="NSWindowIsRestorable">YES</bool>
-                       </object>
-               </array>
-               <object class="IBObjectContainer" key="IBDocument.Objects">
-                       <array class="NSMutableArray" key="connectionRecords">
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">window</string>
-                                               <reference key="source" ref="1016705975"/>
-                                               <reference key="destination" ref="9818130"/>
-                                       </object>
-                                       <int key="connectionID">52</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">pressedCancel:</string>
-                                               <reference key="source" ref="1016705975"/>
-                                               <reference key="destination" ref="707055723"/>
-                                       </object>
-                                       <int key="connectionID">53</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">pressedOK:</string>
-                                               <reference key="source" ref="1016705975"/>
-                                               <reference key="destination" ref="547100070"/>
-                                       </object>
-                                       <int key="connectionID">54</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">prompt</string>
-                                               <reference key="source" ref="1016705975"/>
-                                               <reference key="destination" ref="111931878"/>
-                                       </object>
-                                       <int key="connectionID">51</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">textInput</string>
-                                               <reference key="source" ref="1016705975"/>
-                                               <reference key="destination" ref="307071244"/>
-                                       </object>
-                                       <int key="connectionID">50</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="707055723"/>
-                                               <reference key="destination" ref="547100070"/>
-                                       </object>
-                                       <int key="connectionID">42</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">initialFirstResponder</string>
-                                               <reference key="source" ref="9818130"/>
-                                               <reference key="destination" ref="307071244"/>
-                                       </object>
-                                       <int key="connectionID">48</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">delegate</string>
-                                               <reference key="source" ref="9818130"/>
-                                               <reference key="destination" ref="1016705975"/>
-                                       </object>
-                                       <int key="connectionID">23</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="307071244"/>
-                                               <reference key="destination" ref="707055723"/>
-                                       </object>
-                                       <int key="connectionID">49</int>
-                               </object>
-                       </array>
-                       <object class="IBMutableOrderedSet" key="objectRecords">
-                               <array key="orderedObjects">
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
-                                               <array key="object" id="0"/>
-                                               <reference key="children" ref="301070375"/>
-                                               <nil key="parent"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
-                                               <reference key="object" ref="1016705975"/>
-                                               <reference key="parent" ref="0"/>
-                                               <string key="objectName">File's Owner</string>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
-                                               <reference key="object" ref="5139151"/>
-                                               <reference key="parent" ref="0"/>
-                                               <string key="objectName">First Responder</string>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">-3</int>
-                                               <reference key="object" ref="438418066"/>
-                                               <reference key="parent" ref="0"/>
-                                               <string key="objectName">Application</string>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">10</int>
-                                               <reference key="object" ref="9818130"/>
-                                               <array class="NSMutableArray" key="children">
-                                                       <reference ref="776027458"/>
-                                               </array>
-                                               <reference key="parent" ref="0"/>
-                                               <string key="objectName">Panel1</string>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">7</int>
-                                               <reference key="object" ref="776027458"/>
-                                               <array class="NSMutableArray" key="children">
-                                                       <reference ref="707055723"/>
-                                                       <reference ref="547100070"/>
-                                                       <reference ref="111931878"/>
-                                                       <reference ref="307071244"/>
-                                               </array>
-                                               <reference key="parent" ref="9818130"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">2</int>
-                                               <reference key="object" ref="707055723"/>
-                                               <array class="NSMutableArray" key="children">
-                                                       <reference ref="629849992"/>
-                                               </array>
-                                               <reference key="parent" ref="776027458"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">12</int>
-                                               <reference key="object" ref="547100070"/>
-                                               <array class="NSMutableArray" key="children">
-                                                       <reference ref="970096139"/>
-                                               </array>
-                                               <reference key="parent" ref="776027458"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">44</int>
-                                               <reference key="object" ref="111931878"/>
-                                               <array class="NSMutableArray" key="children">
-                                                       <reference ref="881353084"/>
-                                               </array>
-                                               <reference key="parent" ref="776027458"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">47</int>
-                                               <reference key="object" ref="307071244"/>
-                                               <array class="NSMutableArray" key="children">
-                                                       <reference ref="587231059"/>
-                                               </array>
-                                               <reference key="parent" ref="776027458"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">100002</int>
-                                               <reference key="object" ref="629849992"/>
-                                               <reference key="parent" ref="707055723"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">100012</int>
-                                               <reference key="object" ref="970096139"/>
-                                               <reference key="parent" ref="547100070"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">100044</int>
-                                               <reference key="object" ref="881353084"/>
-                                               <reference key="parent" ref="111931878"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">100047</int>
-                                               <reference key="object" ref="587231059"/>
-                                               <reference key="parent" ref="307071244"/>
-                                       </object>
-                               </array>
-                       </object>
-                       <dictionary class="NSMutableDictionary" key="flattenedProperties">
-                               <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="100002.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="100012.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="100044.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="100047.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="44.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="47.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                       </dictionary>
-                       <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-                       <nil key="activeLocalization"/>
-                       <dictionary class="NSMutableDictionary" key="localizations"/>
-                       <nil key="sourceID"/>
-                       <int key="maxID">100047</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <array class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">WebJavaScriptTextInputPanel</string>
-                                       <string key="superclassName">NSWindowController</string>
-                                       <dictionary class="NSMutableDictionary" key="actions">
-                                               <string key="pressedCancel:">id</string>
-                                               <string key="pressedOK:">id</string>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="actionInfosByName">
-                                               <object class="IBActionInfo" key="pressedCancel:">
-                                                       <string key="name">pressedCancel:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                               <object class="IBActionInfo" key="pressedOK:">
-                                                       <string key="name">pressedOK:</string>
-                                                       <string key="candidateClassName">id</string>
-                                               </object>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="outlets">
-                                               <string key="prompt">NSTextField</string>
-                                               <string key="textInput">NSTextField</string>
-                                       </dictionary>
-                                       <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <object class="IBToOneOutletInfo" key="prompt">
-                                                       <string key="name">prompt</string>
-                                                       <string key="candidateClassName">NSTextField</string>
-                                               </object>
-                                               <object class="IBToOneOutletInfo" key="textInput">
-                                                       <string key="name">textInput</string>
-                                                       <string key="candidateClassName">NSTextField</string>
-                                               </object>
-                                       </dictionary>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/WebJavaScriptTextInputPanel.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">WebNonBlockingPanel</string>
-                                       <string key="superclassName">NSPanel</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/WebNonBlockingPanel.h</string>
-                                       </object>
-                               </object>
-                       </array>
-               </object>
-               <int key="IBDocument.localizationMode">0</int>
-               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-                       <integer value="1050" key="NS.object.0"/>
-               </object>
-               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-               <int key="IBDocument.defaultPropertyAccessControl">3</int>
-       </data>
-</archive>
diff --git a/Source/WebKitLegacy/English.lproj/WebJavaScriptTextInputPanel.nib/keyedobjects.nib b/Source/WebKitLegacy/English.lproj/WebJavaScriptTextInputPanel.nib/keyedobjects.nib
deleted file mode 100644 (file)
index 0c8d442..0000000
Binary files a/Source/WebKitLegacy/English.lproj/WebJavaScriptTextInputPanel.nib/keyedobjects.nib and /dev/null differ
index 0d172a7863684359b8d4d4636310b81cc89646f4..defd17018f2bfabd70d7de673bc2195cb3611267 100644 (file)
                5CE44F4A206D70EA003EFD01 /* PingHandle.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE44F49206D70E9003EFD01 /* PingHandle.h */; };
                5D7BF8140C2A1D90008CE06D /* WebInspector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D7BF8120C2A1D90008CE06D /* WebInspector.h */; settings = {ATTRIBUTES = (Private, ); }; };
                5D7BF8150C2A1D90008CE06D /* WebInspector.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5D7BF8130C2A1D90008CE06D /* WebInspector.mm */; };
-               5DE83A7A0D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = 5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib */; };
+               5DE83A7A0D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.xib */; };
                65488DA1084FBCCB00831AD0 /* WebNSDictionaryExtras.h in Headers */ = {isa = PBXBuildFile; fileRef = 65488D9F084FBCCB00831AD0 /* WebNSDictionaryExtras.h */; };
                65488DA2084FBCCB00831AD0 /* WebNSDictionaryExtras.m in Sources */ = {isa = PBXBuildFile; fileRef = 65488DA0084FBCCB00831AD0 /* WebNSDictionaryExtras.m */; };
                656D333E0AF21AE900212169 /* WebResourceLoadDelegatePrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 656D333D0AF21AE900212169 /* WebResourceLoadDelegatePrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810AF0824BF01008DF038 /* WebFrameViewPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 93C6F14507920B93002449CD /* WebFrameViewPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810B00824BF01008DF038 /* WebPluginContainerPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 65836F5E07EE425900682F95 /* WebPluginContainerPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
                939810B10824BF01008DF038 /* WebPluginContainerCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = 65E1150307EFFEBF009B8BF7 /* WebPluginContainerCheck.h */; };
-               939810B50824BF01008DF038 /* WebAuthenticationPanel.nib in Resources */ = {isa = PBXBuildFile; fileRef = 9345D17B0365BF35008635CE /* WebAuthenticationPanel.nib */; };
+               939810B50824BF01008DF038 /* WebAuthenticationPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9345D17B0365BF35008635CE /* WebAuthenticationPanel.xib */; };
                939810B70824BF01008DF038 /* url_icon.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F5B67130023EDF8901C1A525 /* url_icon.tiff */; };
                939810BC0824BF01008DF038 /* WebBackForwardList.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3944607E020F50ED0ECA1767 /* WebBackForwardList.mm */; };
                939810BD0824BF01008DF038 /* WebHistoryItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 39446080020F50ED0ECA1767 /* WebHistoryItem.mm */; };
                5CE44F49206D70E9003EFD01 /* PingHandle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PingHandle.h; path = WebCoreSupport/PingHandle.h; sourceTree = SOURCE_ROOT; };
                5D7BF8120C2A1D90008CE06D /* WebInspector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebInspector.h; sourceTree = "<group>"; };
                5D7BF8130C2A1D90008CE06D /* WebInspector.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = WebInspector.mm; sourceTree = "<group>"; };
-               5DE83A750D0F7F9400CAD12A /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/WebJavaScriptTextInputPanel.nib; sourceTree = SOURCE_ROOT; };
+               5DE83A750D0F7F9400CAD12A /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/WebJavaScriptTextInputPanel.xib; sourceTree = SOURCE_ROOT; };
                65488D9F084FBCCB00831AD0 /* WebNSDictionaryExtras.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSDictionaryExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                65488DA0084FBCCB00831AD0 /* WebNSDictionaryExtras.m */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebNSDictionaryExtras.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                656D333D0AF21AE900212169 /* WebResourceLoadDelegatePrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebResourceLoadDelegatePrivate.h; sourceTree = "<group>"; };
                9321D5931A391DF9008052BE /* WebImmediateActionController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebImmediateActionController.mm; sourceTree = "<group>"; };
                933D659903413FF2008635CE /* WebClipView.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebClipView.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                933D659A03413FF2008635CE /* WebClipView.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; indentWidth = 4; path = WebClipView.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               9345D17C0365BF35008635CE /* English */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = wrapper.nib; name = English; path = Panels/English.lproj/WebAuthenticationPanel.nib; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+               9345D17C0365BF35008635CE /* en */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = file.xib; name = en; path = Panels/en.lproj/WebAuthenticationPanel.xib; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                9345D4EA0365C5B2008635CE /* WebJavaScriptTextInputPanel.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebJavaScriptTextInputPanel.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                9345D4EB0365C5B2008635CE /* WebJavaScriptTextInputPanel.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = WebJavaScriptTextInputPanel.m; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                9345DDAE0365FB27008635CE /* WebNSWindowExtras.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WebNSWindowExtras.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                        children = (
                                939811320824BF01008DF038 /* Info.plist */,
                                F5B67130023EDF8901C1A525 /* url_icon.tiff */,
-                               5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib */,
+                               5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.xib */,
                        );
                        name = Resources;
                        path = mac/Resources;
                        children = (
                                F8CA15B5029A39D901000122 /* WebAuthenticationPanel.h */,
                                F8CA15B6029A39D901000122 /* WebAuthenticationPanel.m */,
-                               9345D17B0365BF35008635CE /* WebAuthenticationPanel.nib */,
+                               9345D17B0365BF35008635CE /* WebAuthenticationPanel.xib */,
                                93154EF103A41270008635CE /* WebPanelAuthenticationHandler.h */,
                                93154EF203A41270008635CE /* WebPanelAuthenticationHandler.m */,
                        );
                        };
                        buildConfigurationList = 149C283208902B0F008A9EFC /* Build configuration list for PBXProject "WebKitLegacy" */;
                        compatibilityVersion = "Xcode 3.2";
-                       developmentRegion = English;
+                       developmentRegion = en;
                        hasScannedForEncodings = 1;
                        knownRegions = (
                                English,
                        files = (
                                29AEF960134C76FB00FE5096 /* OutlookQuirksUserScript.js in Resources */,
                                939810B70824BF01008DF038 /* url_icon.tiff in Resources */,
-                               939810B50824BF01008DF038 /* WebAuthenticationPanel.nib in Resources */,
-                               5DE83A7A0D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib in Resources */,
+                               939810B50824BF01008DF038 /* WebAuthenticationPanel.xib in Resources */,
+                               5DE83A7A0D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.xib in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXVariantGroup section */
-               5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.nib */ = {
+               5DE83A740D0F7F9400CAD12A /* WebJavaScriptTextInputPanel.xib */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               5DE83A750D0F7F9400CAD12A /* English */,
+                               5DE83A750D0F7F9400CAD12A /* en */,
                        );
-                       name = WebJavaScriptTextInputPanel.nib;
+                       name = WebJavaScriptTextInputPanel.xib;
                        path = mac/Resources;
                        sourceTree = SOURCE_ROOT;
                };
-               9345D17B0365BF35008635CE /* WebAuthenticationPanel.nib */ = {
+               9345D17B0365BF35008635CE /* WebAuthenticationPanel.xib */ = {
                        isa = PBXVariantGroup;
                        children = (
-                               9345D17C0365BF35008635CE /* English */,
+                               9345D17C0365BF35008635CE /* en */,
                        );
-                       name = WebAuthenticationPanel.nib;
+                       name = WebAuthenticationPanel.xib;
                        path = ..;
                        sourceTree = "<group>";
                };
diff --git a/Source/WebKitLegacy/en.lproj/WebJavaScriptTextInputPanel.xib b/Source/WebKitLegacy/en.lproj/WebJavaScriptTextInputPanel.xib
new file mode 100644 (file)
index 0000000..b439426
--- /dev/null
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.15" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.15"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="WebJavaScriptTextInputPanel">
+            <connections>
+                <outlet property="prompt" destination="44" id="51"/>
+                <outlet property="textInput" destination="47" id="50"/>
+                <outlet property="window" destination="10" id="52"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="JavaScript" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="10" userLabel="Panel1" customClass="WebNonBlockingPanel">
+            <windowStyleMask key="styleMask" titled="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" topStrut="YES"/>
+            <rect key="contentRect" x="531" y="773" width="426" height="161"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
+            <value key="minSize" type="size" width="94" height="7"/>
+            <view key="contentView" id="7">
+                <rect key="frame" x="0.0" y="0.0" width="426" height="161"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <button verticalHuggingPriority="750" imageHugsTitle="YES" id="2">
+                        <rect key="frame" x="232" y="11" width="90" height="34"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="100002">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+                        </buttonCell>
+                        <connections>
+                            <action selector="pressedCancel:" target="-2" id="53"/>
+                            <outlet property="nextKeyView" destination="12" id="42"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" imageHugsTitle="YES" id="12">
+                        <rect key="frame" x="322" y="11" width="90" height="34"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="100012">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+                        </buttonCell>
+                        <connections>
+                            <action selector="pressedOK:" target="-2" id="54"/>
+                        </connections>
+                    </button>
+                    <textField verticalHuggingPriority="750" id="44">
+                        <rect key="frame" x="17" y="107" width="392" height="34"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" selectable="YES" alignment="left" id="100044">
+                            <font key="font" metaFont="system"/>
+                            <string key="title">A message from JavaScript will be here.
+It can be any number of lines long.</string>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                    </textField>
+                    <textField verticalHuggingPriority="750" id="47">
+                        <rect key="frame" x="20" y="60" width="386" height="39"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                        <textFieldCell key="cell" selectable="YES" editable="YES" borderStyle="bezel" alignment="left" drawsBackground="YES" id="100047">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                        </textFieldCell>
+                        <connections>
+                            <outlet property="nextKeyView" destination="2" id="49"/>
+                        </connections>
+                    </textField>
+                </subviews>
+            </view>
+            <connections>
+                <outlet property="delegate" destination="-2" id="23"/>
+                <outlet property="initialFirstResponder" destination="47" id="48"/>
+            </connections>
+        </window>
+    </objects>
+</document>
index 44ef352a841e923103f9aa6a0729d03ca53ab406..8f6d6ef0dadeeba0d0bed7e08316564f9eb39e33 100644 (file)
@@ -1,3 +1,21 @@
+2018-10-29  Tim Horton  <timothy_horton@apple.com>
+
+        Modernize WebKit nibs and lprojs for localization's sake
+        https://bugs.webkit.org/show_bug.cgi?id=190911
+        <rdar://problem/45349466>
+
+        Reviewed by Dan Bernstein.
+
+        * Misc/WebNSControlExtras.m:
+        (-[NSControl sizeToFitAndAdjustWindowHeight]):
+        NSWindow and its contents are both in the same scale space these days; avoid
+        double-applying the scale factor, or you can't see the prompt.
+
+        * Panels/English.lproj/WebAuthenticationPanel.nib/designable.nib: Removed.
+        * Panels/English.lproj/WebAuthenticationPanel.nib/keyedobjects.nib: Removed.
+        * Panels/en.lproj/WebAuthenticationPanel.xib: Added.
+        NIB->XIB
+
 2018-10-25  Antoine Quint  <graouts@apple.com>
 
         [Web Animations] Turn Web Animations CSS Integration off by default
index 7c8142b45997a9197448b0bad6f908dfe20118e9..d422f161a16f9e562bbfaa2da2c43151b36f3c13 100644 (file)
@@ -25,7 +25,7 @@
 #include "Version.xcconfig"
 
 EXCLUDED_SOURCE_FILE_NAMES = $(EXCLUDED_SOURCE_FILE_NAMES_$(WK_COCOA_TOUCH));
-EXCLUDED_SOURCE_FILE_NAMES_cocoatouch = *.defs *.nib *.pdf *.tiff CarbonUtils.* CarbonWindowAdapter.* CarbonWindowContentView.* CarbonWindowFrame.* HIViewAdapter.* HIWebView.* OutlookQuirksUserScript.js PopupMenuMac.* SearchPopupMenuMac.* WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebInspectorClient.* WebJavaScriptTextInputPanel.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebStringTruncator.* WebTextCompletionController.*;
+EXCLUDED_SOURCE_FILE_NAMES_cocoatouch = *.defs *.xib *.pdf *.tiff CarbonUtils.* CarbonWindowAdapter.* CarbonWindowContentView.* CarbonWindowFrame.* HIViewAdapter.* HIWebView.* OutlookQuirksUserScript.js PopupMenuMac.* SearchPopupMenuMac.* WebClipView.* WebDashboardRegion.* WebDynamicScrollBarsView.* WebIconDatabase.* WebInspectorClient.* WebJavaScriptTextInputPanel.* WebNSEventExtras.* WebNSPasteboardExtras.* WebNSWindowExtras.* WebPanelAuthenticationHandler.* WebPluginsPrivate.* WebStringTruncator.* WebTextCompletionController.*;
 EXCLUDED_SOURCE_FILE_NAMES_ = *IOS.mm MemoryMeasure.h WebCaretChangeListener.h WebFixedPositionContent.h WebFrameIOS.h WebFrameIPhone.h WebGeolocationCoreLocationProvider.h WebGeolocationPrivate.h WebGeolocationProviderIOS.h WebMIMETypeRegistry.h WebNSStringExtrasIOS.h WebNSStringExtrasIPhone.h WebPDFViewIOS.h WebPDFViewIPhone.h WebPDFViewPlaceholder.h WebSelectionRect.h WebUIKitDelegate.h WebUIKitSupport.h WebVisiblePosition.h DOMHTMLTextAreaElementPrivate.h DOMUIKitExtensions.h;
 
 EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(WK_COCOA_TOUCH));
index 7fc93cf5d1fb29e24fdd8be9eaae797cad1fa145..566ebc1a3c700e60a627b9349bc0da97135439e3 100644 (file)
     NSWindow *window = [self window];
     NSRect windowFrame = [window frame];
 
-    CGFloat backingScaleFactor;
-    backingScaleFactor = [window backingScaleFactor];
-
-    windowFrame.size.height += heightDelta * backingScaleFactor;
+    windowFrame.size.height += heightDelta;
     [window setFrame:windowFrame display:NO];
 }
 
diff --git a/Source/WebKitLegacy/mac/Panels/English.lproj/WebAuthenticationPanel.nib/designable.nib b/Source/WebKitLegacy/mac/Panels/English.lproj/WebAuthenticationPanel.nib/designable.nib
deleted file mode 100644 (file)
index ec2c722..0000000
+++ /dev/null
@@ -1,1335 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-       <data>
-               <int key="IBDocument.SystemTarget">1050</int>
-               <string key="IBDocument.SystemVersion">11C57</string>
-               <string key="IBDocument.InterfaceBuilderVersion">1938</string>
-               <string key="IBDocument.AppKitVersion">1138.21</string>
-               <string key="IBDocument.HIToolboxVersion">567.00</string>
-               <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                       <string key="NS.object.0">1938</string>
-               </object>
-               <object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-                       <bool key="EncodedWithXMLCoder">YES</bool>
-                       <string>NSTextField</string>
-                       <string>NSView</string>
-                       <string>NSWindowTemplate</string>
-                       <string>NSTextFieldCell</string>
-                       <string>NSButtonCell</string>
-                       <string>NSImageCell</string>
-                       <string>NSImageView</string>
-                       <string>NSButton</string>
-                       <string>NSCustomObject</string>
-               </object>
-               <object class="NSArray" key="IBDocument.PluginDependencies">
-                       <bool key="EncodedWithXMLCoder">YES</bool>
-                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-               </object>
-               <object class="NSMutableDictionary" key="IBDocument.Metadata">
-                       <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-                       <integer value="1" key="NS.object.0"/>
-               </object>
-               <object class="NSMutableArray" key="IBDocument.RootObjects" id="563121920">
-                       <bool key="EncodedWithXMLCoder">YES</bool>
-                       <object class="NSCustomObject" id="238662661">
-                               <string key="NSClassName">WebAuthenticationPanel</string>
-                       </object>
-                       <object class="NSCustomObject" id="729335755">
-                               <string key="NSClassName">FirstResponder</string>
-                       </object>
-                       <object class="NSCustomObject" id="239643893">
-                               <string key="NSClassName">NSApplication</string>
-                       </object>
-                       <object class="NSWindowTemplate" id="118512579">
-                               <int key="NSWindowStyleMask">1</int>
-                               <int key="NSWindowBacking">2</int>
-                               <string key="NSWindowRect">{{93, 97}, {424, 254}}</string>
-                               <int key="NSWTFlags">1886912512</int>
-                               <string key="NSWindowTitle">Log In</string>
-                               <string key="NSWindowClass">WebNonBlockingPanel</string>
-                               <object class="NSMutableString" key="NSViewClass">
-                                       <characters key="NS.bytes">View</characters>
-                               </object>
-                               <nil key="NSUserInterfaceItemIdentifier"/>
-                               <object class="NSView" key="NSWindowView" id="327235052">
-                                       <reference key="NSNextResponder"/>
-                                       <int key="NSvFlags">256</int>
-                                       <object class="NSMutableArray" key="NSSubviews">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSTextField" id="705333610">
-                                                       <reference key="NSNextResponder" ref="327235052"/>
-                                                       <int key="NSvFlags">266</int>
-                                                       <string key="NSFrame">{{101, 200}, {306, 34}}</string>
-                                                       <reference key="NSSuperview" ref="327235052"/>
-                                                       <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView" ref="1000280557"/>
-                                                       <int key="NSTag">1</int>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="240004773">
-                                                               <int key="NSCellFlags">69336577</int>
-                                                               <int key="NSCellFlags2">4194304</int>
-                                                               <string key="NSContents">To view this page, you must log in to this area on www.server.com:</string>
-                                                               <object class="NSFont" key="NSSupport" id="897649771">
-                                                                       <string key="NSName">LucidaGrande</string>
-                                                                       <double key="NSSize">13</double>
-                                                                       <int key="NSfFlags">1044</int>
-                                                               </object>
-                                                               <reference key="NSControlView" ref="705333610"/>
-                                                               <int key="NSTag">1</int>
-                                                               <object class="NSColor" key="NSBackgroundColor" id="475108766">
-                                                                       <int key="NSColorSpace">6</int>
-                                                                       <string key="NSCatalogName">System</string>
-                                                                       <string key="NSColorName">controlColor</string>
-                                                                       <object class="NSColor" key="NSColor">
-                                                                               <int key="NSColorSpace">3</int>
-                                                                               <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-                                                                       </object>
-                                                               </object>
-                                                               <object class="NSColor" key="NSTextColor" id="644083014">
-                                                                       <int key="NSColorSpace">6</int>
-                                                                       <string key="NSCatalogName">System</string>
-                                                                       <string key="NSColorName">controlTextColor</string>
-                                                                       <object class="NSColor" key="NSColor" id="170747205">
-                                                                               <int key="NSColorSpace">3</int>
-                                                                               <bytes key="NSWhite">MAA</bytes>
-                                                                       </object>
-                                                               </object>
-                                                       </object>
-                                               </object>
-                                               <object class="NSTextField" id="199018347">
-                                                       <reference key="NSNextResponder" ref="327235052"/>
-                                                       <int key="NSvFlags">290</int>
-                                                       <string key="NSFrame">{{101, 147}, {306, 20}}</string>
-                                                       <reference key="NSSuperview" ref="327235052"/>
-                                                       <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView" ref="477300420"/>
-                                                       <int key="NSTag">2</int>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="213641065">
-                                                               <int key="NSCellFlags">69336577</int>
-                                                               <int key="NSCellFlags2">4194304</int>
-                                                               <string key="NSContents">Your password will be sent unencrypted.</string>
-                                                               <object class="NSFont" key="NSSupport">
-                                                                       <string key="NSName">LucidaGrande</string>
-                                                                       <double key="NSSize">11</double>
-                                                                       <int key="NSfFlags">3100</int>
-                                                               </object>
-                                                               <reference key="NSControlView" ref="199018347"/>
-                                                               <int key="NSTag">2</int>
-                                                               <reference key="NSBackgroundColor" ref="475108766"/>
-                                                               <reference key="NSTextColor" ref="644083014"/>
-                                                       </object>
-                                               </object>
-                                               <object class="NSButton" id="305175176">
-                                                       <reference key="NSNextResponder" ref="327235052"/>
-                                                       <int key="NSvFlags">289</int>
-                                                       <string key="NSFrame">{{326, 12}, {84, 32}}</string>
-                                                       <reference key="NSSuperview" ref="327235052"/>
-                                                       <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSButtonCell" key="NSCell" id="568224179">
-                                                               <int key="NSCellFlags">67239424</int>
-                                                               <int key="NSCellFlags2">137887744</int>
-                                                               <string key="NSContents">Log In</string>
-                                                               <reference key="NSSupport" ref="897649771"/>
-                                                               <reference key="NSControlView" ref="305175176"/>
-                                                               <int key="NSButtonFlags">-2038284033</int>
-                                                               <int key="NSButtonFlags2">1</int>
-                                                               <object class="NSFont" key="NSAlternateImage" id="784044296">
-                                                                       <string key="NSName">Helvetica</string>
-                                                                       <double key="NSSize">13</double>
-                                                                       <int key="NSfFlags">16</int>
-                                                               </object>
-                                                               <string key="NSAlternateContents"/>
-                                                               <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
-                                                               <int key="NSPeriodicDelay">200</int>
-                                                               <int key="NSPeriodicInterval">25</int>
-                                                       </object>
-                                               </object>
-                                               <object class="NSButton" id="494193237">
-                                                       <reference key="NSNextResponder" ref="327235052"/>
-                                                       <int key="NSvFlags">289</int>
-                                                       <string key="NSFrame">{{242, 12}, {84, 32}}</string>
-                                                       <reference key="NSSuperview" ref="327235052"/>
-                                                       <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView" ref="305175176"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSButtonCell" key="NSCell" id="55525334">
-                                                               <int key="NSCellFlags">67239424</int>
-                                                               <int key="NSCellFlags2">137887744</int>
-                                                               <string key="NSContents">Cancel</string>
-                                                               <reference key="NSSupport" ref="897649771"/>
-                                                               <reference key="NSControlView" ref="494193237"/>
-                                                               <int key="NSButtonFlags">-2038284033</int>
-                                                               <int key="NSButtonFlags2">1</int>
-                                                               <reference key="NSAlternateImage" ref="784044296"/>
-                                                               <string key="NSAlternateContents"/>
-                                                               <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
-                                                               <int key="NSPeriodicDelay">200</int>
-                                                               <int key="NSPeriodicInterval">25</int>
-                                                       </object>
-                                               </object>
-                                               <object class="NSTextField" id="71972597">
-                                                       <reference key="NSNextResponder" ref="327235052"/>
-                                                       <int key="NSvFlags">290</int>
-                                                       <string key="NSFrame">{{174, 117}, {230, 22}}</string>
-                                                       <reference key="NSSuperview" ref="327235052"/>
-                                                       <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView" ref="833115728"/>
-                                                       <int key="NSTag">3</int>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="439646453">
-                                                               <int key="NSCellFlags">-1804468671</int>
-                                                               <int key="NSCellFlags2">4195328</int>
-                                                               <string key="NSContents"/>
-                                                               <reference key="NSSupport" ref="897649771"/>
-                                                               <reference key="NSControlView" ref="71972597"/>
-                                                               <int key="NSTag">3</int>
-                                                               <bool key="NSDrawsBackground">YES</bool>
-                                                               <object class="NSColor" key="NSBackgroundColor" id="301231121">
-                                                                       <int key="NSColorSpace">6</int>
-                                                                       <string key="NSCatalogName">System</string>
-                                                                       <string key="NSColorName">textBackgroundColor</string>
-                                                                       <object class="NSColor" key="NSColor">
-                                                                               <int key="NSColorSpace">3</int>
-                                                                               <bytes key="NSWhite">MQA</bytes>
-                                                                       </object>
-                                                               </object>
-                                                               <object class="NSColor" key="NSTextColor" id="577315227">
-                                                                       <int key="NSColorSpace">6</int>
-                                                                       <string key="NSCatalogName">System</string>
-                                                                       <string key="NSColorName">textColor</string>
-                                                                       <reference key="NSColor" ref="170747205"/>
-                                                               </object>
-                                                       </object>
-                                               </object>
-                                               <object class="NSTextField" id="368270689">
-                                                       <reference key="NSNextResponder" ref="327235052"/>
-                                                       <int key="NSvFlags">290</int>
-                                                       <string key="NSFrame">{{174, 87}, {230, 22}}</string>
-                                                       <reference key="NSSuperview" ref="327235052"/>
-                                                       <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView" ref="657854151"/>
-                                                       <int key="NSTag">4</int>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="743913118">
-                                                               <int key="NSCellFlags">-1804468671</int>
-                                                               <int key="NSCellFlags2">4195328</int>
-                                                               <string key="NSContents"/>
-                                                               <reference key="NSSupport" ref="897649771"/>
-                                                               <reference key="NSControlView" ref="368270689"/>
-                                                               <int key="NSTag">4</int>
-                                                               <bool key="NSDrawsBackground">YES</bool>
-                                                               <reference key="NSBackgroundColor" ref="301231121"/>
-                                                               <reference key="NSTextColor" ref="577315227"/>
-                                                       </object>
-                                               </object>
-                                               <object class="NSTextField" id="477300420">
-                                                       <reference key="NSNextResponder" ref="327235052"/>
-                                                       <int key="NSvFlags">292</int>
-                                                       <string key="NSFrame">{{101, 119}, {68, 17}}</string>
-                                                       <reference key="NSSuperview" ref="327235052"/>
-                                                       <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView" ref="71972597"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="159596654">
-                                                               <int key="NSCellFlags">67239424</int>
-                                                               <int key="NSCellFlags2">4194304</int>
-                                                               <string key="NSContents">Name:</string>
-                                                               <reference key="NSSupport" ref="897649771"/>
-                                                               <reference key="NSControlView" ref="477300420"/>
-                                                               <reference key="NSBackgroundColor" ref="475108766"/>
-                                                               <reference key="NSTextColor" ref="644083014"/>
-                                                       </object>
-                                               </object>
-                                               <object class="NSTextField" id="833115728">
-                                                       <reference key="NSNextResponder" ref="327235052"/>
-                                                       <int key="NSvFlags">292</int>
-                                                       <string key="NSFrame">{{101, 89}, {68, 17}}</string>
-                                                       <reference key="NSSuperview" ref="327235052"/>
-                                                       <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView" ref="368270689"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="766878508">
-                                                               <int key="NSCellFlags">67239424</int>
-                                                               <int key="NSCellFlags2">4194304</int>
-                                                               <string key="NSContents">Password:</string>
-                                                               <reference key="NSSupport" ref="897649771"/>
-                                                               <reference key="NSControlView" ref="833115728"/>
-                                                               <reference key="NSBackgroundColor" ref="475108766"/>
-                                                               <reference key="NSTextColor" ref="644083014"/>
-                                                       </object>
-                                               </object>
-                                               <object class="NSImageView" id="285173040">
-                                                       <reference key="NSNextResponder" ref="327235052"/>
-                                                       <int key="NSvFlags">268</int>
-                                                       <object class="NSMutableSet" key="NSDragTypes">
-                                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                                               <object class="NSArray" key="set.sortedObjects">
-                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                       <string>Apple PDF pasteboard type</string>
-                                                                       <string>Apple PICT pasteboard type</string>
-                                                                       <string>Apple PNG pasteboard type</string>
-                                                                       <string>NSFilenamesPboardType</string>
-                                                                       <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
-                                                                       <string>NeXT TIFF v4.0 pasteboard type</string>
-                                                               </object>
-                                                       </object>
-                                                       <string key="NSFrame">{{20, 170}, {64, 64}}</string>
-                                                       <reference key="NSSuperview" ref="327235052"/>
-                                                       <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView" ref="705333610"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSImageCell" key="NSCell" id="375502905">
-                                                               <int key="NSCellFlags">130560</int>
-                                                               <int key="NSCellFlags2">33554432</int>
-                                                               <int key="NSAlign">0</int>
-                                                               <int key="NSScale">0</int>
-                                                               <int key="NSStyle">0</int>
-                                                               <bool key="NSAnimates">NO</bool>
-                                                       </object>
-                                                       <bool key="NSEditable">YES</bool>
-                                               </object>
-                                               <object class="NSButton" id="657854151">
-                                                       <reference key="NSNextResponder" ref="327235052"/>
-                                                       <int key="NSvFlags">292</int>
-                                                       <string key="NSFrame">{{102, 58}, {280, 18}}</string>
-                                                       <reference key="NSSuperview" ref="327235052"/>
-                                                       <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView" ref="494193237"/>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSButtonCell" key="NSCell" id="358614001">
-                                                               <int key="NSCellFlags">67239424</int>
-                                                               <int key="NSCellFlags2">0</int>
-                                                               <string key="NSContents">Remember this password in my keychain</string>
-                                                               <reference key="NSSupport" ref="897649771"/>
-                                                               <reference key="NSControlView" ref="657854151"/>
-                                                               <int key="NSButtonFlags">1211912703</int>
-                                                               <int key="NSButtonFlags2">2</int>
-                                                               <object class="NSButtonImageSource" key="NSAlternateImage">
-                                                                       <string key="NSImageName">NSSwitch</string>
-                                                               </object>
-                                                               <string key="NSAlternateContents"/>
-                                                               <string key="NSKeyEquivalent"/>
-                                                               <int key="NSPeriodicDelay">200</int>
-                                                               <int key="NSPeriodicInterval">25</int>
-                                                       </object>
-                                               </object>
-                                               <object class="NSTextField" id="1000280557">
-                                                       <reference key="NSNextResponder" ref="327235052"/>
-                                                       <int key="NSvFlags">290</int>
-                                                       <string key="NSFrame">{{113, 175}, {282, 17}}</string>
-                                                       <reference key="NSSuperview" ref="327235052"/>
-                                                       <reference key="NSWindow"/>
-                                                       <reference key="NSNextKeyView" ref="199018347"/>
-                                                       <int key="NSTag">3</int>
-                                                       <bool key="NSEnabled">YES</bool>
-                                                       <object class="NSTextFieldCell" key="NSCell" id="96725843">
-                                                               <int key="NSCellFlags">-2078147071</int>
-                                                               <int key="NSCellFlags2">4194560</int>
-                                                               <string key="NSContents">&lt;-- do not localize; will contain realm name --&gt;</string>
-                                                               <object class="NSFont" key="NSSupport">
-                                                                       <string key="NSName">LucidaGrande</string>
-                                                                       <double key="NSSize">11</double>
-                                                                       <int key="NSfFlags">16</int>
-                                                               </object>
-                                                               <reference key="NSControlView" ref="1000280557"/>
-                                                               <int key="NSTag">3</int>
-                                                               <reference key="NSBackgroundColor" ref="301231121"/>
-                                                               <reference key="NSTextColor" ref="577315227"/>
-                                                       </object>
-                                               </object>
-                                       </object>
-                                       <string key="NSFrameSize">{424, 254}</string>
-                                       <reference key="NSSuperview"/>
-                                       <reference key="NSWindow"/>
-                                       <reference key="NSNextKeyView" ref="285173040"/>
-                               </object>
-                               <string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
-                               <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-                               <string key="NSFrameAutosaveName">Authentication Panel</string>
-                               <bool key="NSWindowIsRestorable">YES</bool>
-                       </object>
-               </object>
-               <object class="IBObjectContainer" key="IBDocument.Objects">
-                       <object class="NSMutableArray" key="connectionRecords">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">panel</string>
-                                               <reference key="source" ref="238662661"/>
-                                               <reference key="destination" ref="118512579"/>
-                                       </object>
-                                       <int key="connectionID">27</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">username</string>
-                                               <reference key="source" ref="238662661"/>
-                                               <reference key="destination" ref="71972597"/>
-                                       </object>
-                                       <int key="connectionID">28</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">password</string>
-                                               <reference key="source" ref="238662661"/>
-                                               <reference key="destination" ref="368270689"/>
-                                       </object>
-                                       <int key="connectionID">29</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">logIn:</string>
-                                               <reference key="source" ref="238662661"/>
-                                               <reference key="destination" ref="305175176"/>
-                                       </object>
-                                       <int key="connectionID">30</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">cancel:</string>
-                                               <reference key="source" ref="238662661"/>
-                                               <reference key="destination" ref="494193237"/>
-                                       </object>
-                                       <int key="connectionID">31</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">mainLabel</string>
-                                               <reference key="source" ref="238662661"/>
-                                               <reference key="destination" ref="705333610"/>
-                                       </object>
-                                       <int key="connectionID">34</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">smallLabel</string>
-                                               <reference key="source" ref="238662661"/>
-                                               <reference key="destination" ref="199018347"/>
-                                       </object>
-                                       <int key="connectionID">35</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">imageView</string>
-                                               <reference key="source" ref="238662661"/>
-                                               <reference key="destination" ref="285173040"/>
-                                       </object>
-                                       <int key="connectionID">38</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">remember</string>
-                                               <reference key="source" ref="238662661"/>
-                                               <reference key="destination" ref="657854151"/>
-                                       </object>
-                                       <int key="connectionID">40</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">separateRealmLabel</string>
-                                               <reference key="source" ref="238662661"/>
-                                               <reference key="destination" ref="1000280557"/>
-                                       </object>
-                                       <int key="connectionID">100057</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">initialFirstResponder</string>
-                                               <reference key="source" ref="118512579"/>
-                                               <reference key="destination" ref="71972597"/>
-                                       </object>
-                                       <int key="connectionID">26</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="705333610"/>
-                                               <reference key="destination" ref="1000280557"/>
-                                       </object>
-                                       <int key="connectionID">100058</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="199018347"/>
-                                               <reference key="destination" ref="477300420"/>
-                                       </object>
-                                       <int key="connectionID">100060</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="305175176"/>
-                                               <reference key="destination" ref="705333610"/>
-                                       </object>
-                                       <int key="connectionID">100067</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="494193237"/>
-                                               <reference key="destination" ref="305175176"/>
-                                       </object>
-                                       <int key="connectionID">100066</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="71972597"/>
-                                               <reference key="destination" ref="833115728"/>
-                                       </object>
-                                       <int key="connectionID">100062</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="368270689"/>
-                                               <reference key="destination" ref="657854151"/>
-                                       </object>
-                                       <int key="connectionID">100064</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="477300420"/>
-                                               <reference key="destination" ref="71972597"/>
-                                       </object>
-                                       <int key="connectionID">100061</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="833115728"/>
-                                               <reference key="destination" ref="368270689"/>
-                                       </object>
-                                       <int key="connectionID">100063</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="657854151"/>
-                                               <reference key="destination" ref="494193237"/>
-                                       </object>
-                                       <int key="connectionID">100065</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBOutletConnection" key="connection">
-                                               <string key="label">nextKeyView</string>
-                                               <reference key="source" ref="1000280557"/>
-                                               <reference key="destination" ref="199018347"/>
-                                       </object>
-                                       <int key="connectionID">100059</int>
-                               </object>
-                       </object>
-                       <object class="IBMutableOrderedSet" key="objectRecords">
-                               <object class="NSArray" key="orderedObjects">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">0</int>
-                                               <object class="NSArray" key="object" id="498544300">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                               </object>
-                                               <reference key="children" ref="563121920"/>
-                                               <nil key="parent"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">-2</int>
-                                               <reference key="object" ref="238662661"/>
-                                               <reference key="parent" ref="498544300"/>
-                                               <string key="objectName">File's Owner</string>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">-1</int>
-                                               <reference key="object" ref="729335755"/>
-                                               <reference key="parent" ref="498544300"/>
-                                               <string key="objectName">First Responder</string>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">-3</int>
-                                               <reference key="object" ref="239643893"/>
-                                               <reference key="parent" ref="498544300"/>
-                                               <string key="objectName">Application</string>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">5</int>
-                                               <reference key="object" ref="118512579"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="327235052"/>
-                                               </object>
-                                               <reference key="parent" ref="498544300"/>
-                                               <string key="objectName">Panel</string>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">6</int>
-                                               <reference key="object" ref="327235052"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="305175176"/>
-                                                       <reference ref="494193237"/>
-                                                       <reference ref="71972597"/>
-                                                       <reference ref="368270689"/>
-                                                       <reference ref="477300420"/>
-                                                       <reference ref="833115728"/>
-                                                       <reference ref="285173040"/>
-                                                       <reference ref="657854151"/>
-                                                       <reference ref="705333610"/>
-                                                       <reference ref="199018347"/>
-                                                       <reference ref="1000280557"/>
-                                               </object>
-                                               <reference key="parent" ref="118512579"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">10</int>
-                                               <reference key="object" ref="705333610"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="240004773"/>
-                                               </object>
-                                               <reference key="parent" ref="327235052"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">11</int>
-                                               <reference key="object" ref="199018347"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="213641065"/>
-                                               </object>
-                                               <reference key="parent" ref="327235052"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">12</int>
-                                               <reference key="object" ref="305175176"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="568224179"/>
-                                               </object>
-                                               <reference key="parent" ref="327235052"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">13</int>
-                                               <reference key="object" ref="494193237"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="55525334"/>
-                                               </object>
-                                               <reference key="parent" ref="327235052"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">14</int>
-                                               <reference key="object" ref="71972597"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="439646453"/>
-                                               </object>
-                                               <reference key="parent" ref="327235052"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">15</int>
-                                               <reference key="object" ref="368270689"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="743913118"/>
-                                               </object>
-                                               <reference key="parent" ref="327235052"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">16</int>
-                                               <reference key="object" ref="477300420"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="159596654"/>
-                                               </object>
-                                               <reference key="parent" ref="327235052"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">17</int>
-                                               <reference key="object" ref="833115728"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="766878508"/>
-                                               </object>
-                                               <reference key="parent" ref="327235052"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">19</int>
-                                               <reference key="object" ref="285173040"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="375502905"/>
-                                               </object>
-                                               <reference key="parent" ref="327235052"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">39</int>
-                                               <reference key="object" ref="657854151"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="358614001"/>
-                                               </object>
-                                               <reference key="parent" ref="327235052"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">100010</int>
-                                               <reference key="object" ref="240004773"/>
-                                               <reference key="parent" ref="705333610"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">100011</int>
-                                               <reference key="object" ref="213641065"/>
-                                               <reference key="parent" ref="199018347"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">100012</int>
-                                               <reference key="object" ref="568224179"/>
-                                               <reference key="parent" ref="305175176"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">100013</int>
-                                               <reference key="object" ref="55525334"/>
-                                               <reference key="parent" ref="494193237"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">100014</int>
-                                               <reference key="object" ref="439646453"/>
-                                               <reference key="parent" ref="71972597"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">100015</int>
-                                               <reference key="object" ref="743913118"/>
-                                               <reference key="parent" ref="368270689"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">100016</int>
-                                               <reference key="object" ref="159596654"/>
-                                               <reference key="parent" ref="477300420"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">100017</int>
-                                               <reference key="object" ref="766878508"/>
-                                               <reference key="parent" ref="833115728"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">100019</int>
-                                               <reference key="object" ref="375502905"/>
-                                               <reference key="parent" ref="285173040"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">100039</int>
-                                               <reference key="object" ref="358614001"/>
-                                               <reference key="parent" ref="657854151"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">100047</int>
-                                               <reference key="object" ref="1000280557"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="96725843"/>
-                                               </object>
-                                               <reference key="parent" ref="327235052"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">100050</int>
-                                               <reference key="object" ref="96725843"/>
-                                               <reference key="parent" ref="1000280557"/>
-                                       </object>
-                               </object>
-                       </object>
-                       <object class="NSMutableDictionary" key="flattenedProperties">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <object class="NSArray" key="dict.sortedKeys">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                       <string>-1.IBPluginDependency</string>
-                                       <string>-2.IBPluginDependency</string>
-                                       <string>-3.IBPluginDependency</string>
-                                       <string>10.IBPluginDependency</string>
-                                       <string>100010.IBPluginDependency</string>
-                                       <string>100011.IBPluginDependency</string>
-                                       <string>100012.IBPluginDependency</string>
-                                       <string>100013.IBPluginDependency</string>
-                                       <string>100014.IBPluginDependency</string>
-                                       <string>100015.IBPluginDependency</string>
-                                       <string>100016.IBPluginDependency</string>
-                                       <string>100017.IBPluginDependency</string>
-                                       <string>100019.IBPluginDependency</string>
-                                       <string>100039.IBPluginDependency</string>
-                                       <string>100047.IBPluginDependency</string>
-                                       <string>100050.IBPluginDependency</string>
-                                       <string>11.IBPluginDependency</string>
-                                       <string>12.IBPluginDependency</string>
-                                       <string>13.IBPluginDependency</string>
-                                       <string>14.IBPluginDependency</string>
-                                       <string>15.CustomClassName</string>
-                                       <string>15.IBPluginDependency</string>
-                                       <string>16.IBPluginDependency</string>
-                                       <string>17.IBPluginDependency</string>
-                                       <string>19.IBPluginDependency</string>
-                                       <string>39.IBPluginDependency</string>
-                                       <string>5.IBPluginDependency</string>
-                                       <string>5.IBWindowTemplateEditedContentRect</string>
-                                       <string>6.IBPluginDependency</string>
-                               </object>
-                               <object class="NSMutableArray" key="dict.values">
-                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>NSSecureTextField</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>{{288, 843}, {424, 254}}</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               </object>
-                       </object>
-                       <object class="NSMutableDictionary" key="unlocalizedProperties">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <reference key="dict.sortedKeys" ref="498544300"/>
-                               <reference key="dict.values" ref="498544300"/>
-                       </object>
-                       <nil key="activeLocalization"/>
-                       <object class="NSMutableDictionary" key="localizations">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <reference key="dict.sortedKeys" ref="498544300"/>
-                               <reference key="dict.values" ref="498544300"/>
-                       </object>
-                       <nil key="sourceID"/>
-                       <int key="maxID">100067</int>
-               </object>
-               <object class="IBClassDescriber" key="IBDocument.Classes">
-                       <object class="NSMutableArray" key="referencedPartialClassDescriptions">
-                               <bool key="EncodedWithXMLCoder">YES</bool>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="NSMutableDictionary" key="actions">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>webViewClose:</string>
-                                                       <string>webViewFocus:</string>
-                                                       <string>webViewRunModal:</string>
-                                                       <string>webViewShow:</string>
-                                                       <string>webViewUnfocus:</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>WebView</string>
-                                                       <string>WebView</string>
-                                                       <string>WebView</string>
-                                                       <string>WebView</string>
-                                                       <string>WebView</string>
-                                               </object>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>webViewClose:</string>
-                                                       <string>webViewFocus:</string>
-                                                       <string>webViewRunModal:</string>
-                                                       <string>webViewShow:</string>
-                                                       <string>webViewUnfocus:</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">webViewClose:</string>
-                                                               <string key="candidateClassName">WebView</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">webViewFocus:</string>
-                                                               <string key="candidateClassName">WebView</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">webViewRunModal:</string>
-                                                               <string key="candidateClassName">WebView</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">webViewShow:</string>
-                                                               <string key="candidateClassName">WebView</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">webViewUnfocus:</string>
-                                                               <string key="candidateClassName">WebView</string>
-                                                       </object>
-                                               </object>
-                                       </object>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/NSObject.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">WebAuthenticationPanel</string>
-                                       <string key="superclassName">NSObject</string>
-                                       <object class="NSMutableDictionary" key="actions">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>cancel:</string>
-                                                       <string>logIn:</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                               </object>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>cancel:</string>
-                                                       <string>logIn:</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">cancel:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">logIn:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                               </object>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="outlets">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>callback</string>
-                                                       <string>imageView</string>
-                                                       <string>mainLabel</string>
-                                                       <string>panel</string>
-                                                       <string>password</string>
-                                                       <string>remember</string>
-                                                       <string>separateRealmLabel</string>
-                                                       <string>smallLabel</string>
-                                                       <string>username</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>NSTextField</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                               </object>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="toOneOutletInfosByName">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>callback</string>
-                                                       <string>imageView</string>
-                                                       <string>mainLabel</string>
-                                                       <string>panel</string>
-                                                       <string>password</string>
-                                                       <string>remember</string>
-                                                       <string>separateRealmLabel</string>
-                                                       <string>smallLabel</string>
-                                                       <string>username</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <object class="IBToOneOutletInfo">
-                                                               <string key="name">callback</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBToOneOutletInfo">
-                                                               <string key="name">imageView</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBToOneOutletInfo">
-                                                               <string key="name">mainLabel</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBToOneOutletInfo">
-                                                               <string key="name">panel</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBToOneOutletInfo">
-                                                               <string key="name">password</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBToOneOutletInfo">
-                                                               <string key="name">remember</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBToOneOutletInfo">
-                                                               <string key="name">separateRealmLabel</string>
-                                                               <string key="candidateClassName">NSTextField</string>
-                                                       </object>
-                                                       <object class="IBToOneOutletInfo">
-                                                               <string key="name">smallLabel</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBToOneOutletInfo">
-                                                               <string key="name">username</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                               </object>
-                                       </object>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/WebAuthenticationPanel.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">WebNonBlockingPanel</string>
-                                       <string key="superclassName">NSPanel</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/WebNonBlockingPanel.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">WebView</string>
-                                       <object class="NSMutableDictionary" key="actions">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>_openFrameInNewWindowFromMenu:</string>
-                                                       <string>_searchWithGoogleFromMenu:</string>
-                                                       <string>_searchWithSpotlightFromMenu:</string>
-                                                       <string>alignCenter:</string>
-                                                       <string>alignJustified:</string>
-                                                       <string>alignLeft:</string>
-                                                       <string>alignRight:</string>
-                                                       <string>changeAttributes:</string>
-                                                       <string>changeColor:</string>
-                                                       <string>changeDocumentBackgroundColor:</string>
-                                                       <string>changeFont:</string>
-                                                       <string>checkSpelling:</string>
-                                                       <string>copy:</string>
-                                                       <string>copyFont:</string>
-                                                       <string>cut:</string>
-                                                       <string>delete:</string>
-                                                       <string>moveToBeginningOfSentence:</string>
-                                                       <string>moveToBeginningOfSentenceAndModifySelection:</string>
-                                                       <string>moveToEndOfSentence:</string>
-                                                       <string>moveToEndOfSentenceAndModifySelection:</string>
-                                                       <string>outdent:</string>
-                                                       <string>paste:</string>
-                                                       <string>pasteAsPlainText:</string>
-                                                       <string>pasteAsRichText:</string>
-                                                       <string>pasteFont:</string>
-                                                       <string>performFindPanelAction:</string>
-                                                       <string>reloadFromOrigin:</string>
-                                                       <string>resetPageZoom:</string>
-                                                       <string>selectSentence:</string>
-                                                       <string>showGuessPanel:</string>
-                                                       <string>startSpeaking:</string>
-                                                       <string>stopSpeaking:</string>
-                                                       <string>toggleAutomaticDashSubstitution:</string>
-                                                       <string>toggleAutomaticLinkDetection:</string>
-                                                       <string>toggleAutomaticQuoteSubstitution:</string>
-                                                       <string>toggleAutomaticSpellingCorrection:</string>
-                                                       <string>toggleAutomaticTextReplacement:</string>
-                                                       <string>toggleGrammarChecking:</string>
-                                                       <string>zoomPageIn:</string>
-                                                       <string>zoomPageOut:</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>NSMenuItem</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                               </object>
-                                       </object>
-                                       <object class="NSMutableDictionary" key="actionInfosByName">
-                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" key="dict.sortedKeys">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>_openFrameInNewWindowFromMenu:</string>
-                                                       <string>_searchWithGoogleFromMenu:</string>
-                                                       <string>_searchWithSpotlightFromMenu:</string>
-                                                       <string>alignCenter:</string>
-                                                       <string>alignJustified:</string>
-                                                       <string>alignLeft:</string>
-                                                       <string>alignRight:</string>
-                                                       <string>changeAttributes:</string>
-                                                       <string>changeColor:</string>
-                                                       <string>changeDocumentBackgroundColor:</string>
-                                                       <string>changeFont:</string>
-                                                       <string>checkSpelling:</string>
-                                                       <string>copy:</string>
-                                                       <string>copyFont:</string>
-                                                       <string>cut:</string>
-                                                       <string>delete:</string>
-                                                       <string>moveToBeginningOfSentence:</string>
-                                                       <string>moveToBeginningOfSentenceAndModifySelection:</string>
-                                                       <string>moveToEndOfSentence:</string>
-                                                       <string>moveToEndOfSentenceAndModifySelection:</string>
-                                                       <string>outdent:</string>
-                                                       <string>paste:</string>
-                                                       <string>pasteAsPlainText:</string>
-                                                       <string>pasteAsRichText:</string>
-                                                       <string>pasteFont:</string>
-                                                       <string>performFindPanelAction:</string>
-                                                       <string>reloadFromOrigin:</string>
-                                                       <string>resetPageZoom:</string>
-                                                       <string>selectSentence:</string>
-                                                       <string>showGuessPanel:</string>
-                                                       <string>startSpeaking:</string>
-                                                       <string>stopSpeaking:</string>
-                                                       <string>toggleAutomaticDashSubstitution:</string>
-                                                       <string>toggleAutomaticLinkDetection:</string>
-                                                       <string>toggleAutomaticQuoteSubstitution:</string>
-                                                       <string>toggleAutomaticSpellingCorrection:</string>
-                                                       <string>toggleAutomaticTextReplacement:</string>
-                                                       <string>toggleGrammarChecking:</string>
-                                                       <string>zoomPageIn:</string>
-                                                       <string>zoomPageOut:</string>
-                                               </object>
-                                               <object class="NSMutableArray" key="dict.values">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">_openFrameInNewWindowFromMenu:</string>
-                                                               <string key="candidateClassName">NSMenuItem</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">_searchWithGoogleFromMenu:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">_searchWithSpotlightFromMenu:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">alignCenter:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">alignJustified:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">alignLeft:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">alignRight:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">changeAttributes:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">changeColor:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">changeDocumentBackgroundColor:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">changeFont:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">checkSpelling:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">copy:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">copyFont:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">cut:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">delete:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">moveToBeginningOfSentence:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">moveToBeginningOfSentenceAndModifySelection:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">moveToEndOfSentence:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">moveToEndOfSentenceAndModifySelection:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">outdent:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">paste:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">pasteAsPlainText:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">pasteAsRichText:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">pasteFont:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">performFindPanelAction:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">reloadFromOrigin:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">resetPageZoom:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">selectSentence:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">showGuessPanel:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">startSpeaking:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">stopSpeaking:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">toggleAutomaticDashSubstitution:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">toggleAutomaticLinkDetection:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">toggleAutomaticQuoteSubstitution:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">toggleAutomaticSpellingCorrection:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">toggleAutomaticTextReplacement:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">toggleGrammarChecking:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">zoomPageIn:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                                       <object class="IBActionInfo">
-                                                               <string key="name">zoomPageOut:</string>
-                                                               <string key="candidateClassName">id</string>
-                                                       </object>
-                                               </object>
-                                       </object>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">./Classes/WebView.h</string>
-                                       </object>
-                               </object>
-                       </object>
-               </object>
-               <int key="IBDocument.localizationMode">0</int>
-               <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-                       <integer value="1050" key="NS.object.0"/>
-               </object>
-               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-                       <integer value="3000" key="NS.object.0"/>
-               </object>
-               <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-               <int key="IBDocument.defaultPropertyAccessControl">3</int>
-       </data>
-</archive>
diff --git a/Source/WebKitLegacy/mac/Panels/English.lproj/WebAuthenticationPanel.nib/keyedobjects.nib b/Source/WebKitLegacy/mac/Panels/English.lproj/WebAuthenticationPanel.nib/keyedobjects.nib
deleted file mode 100644 (file)
index d6d591b..0000000
Binary files a/Source/WebKitLegacy/mac/Panels/English.lproj/WebAuthenticationPanel.nib/keyedobjects.nib and /dev/null differ
diff --git a/Source/WebKitLegacy/mac/Panels/en.lproj/WebAuthenticationPanel.xib b/Source/WebKitLegacy/mac/Panels/en.lproj/WebAuthenticationPanel.xib
new file mode 100644 (file)
index 0000000..bcdd717
--- /dev/null
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.15" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.15"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="WebAuthenticationPanel">
+            <connections>
+                <outlet property="imageView" destination="19" id="38"/>
+                <outlet property="mainLabel" destination="10" id="34"/>
+                <outlet property="panel" destination="5" id="27"/>
+                <outlet property="password" destination="15" id="29"/>
+                <outlet property="remember" destination="39" id="40"/>
+                <outlet property="separateRealmLabel" destination="100047" id="100057"/>
+                <outlet property="smallLabel" destination="11" id="35"/>
+                <outlet property="username" destination="14" id="28"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="Log In" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="Authentication Panel" animationBehavior="default" id="5" userLabel="Panel" customClass="WebNonBlockingPanel">
+            <windowStyleMask key="styleMask" titled="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="93" y="97" width="424" height="254"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
+            <view key="contentView" id="6">
+                <rect key="frame" x="0.0" y="0.0" width="424" height="254"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <textField verticalHuggingPriority="750" tag="1" id="10">
+                        <rect key="frame" x="101" y="200" width="306" height="34"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                        <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" alignment="left" tag="1" title="To view this page, you must log in to this area on www.server.com:" id="100010">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <outlet property="nextKeyView" destination="100047" id="100058"/>
+                        </connections>
+                    </textField>
+                    <textField verticalHuggingPriority="750" tag="2" id="11">
+                        <rect key="frame" x="101" y="147" width="306" height="20"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                        <textFieldCell key="cell" selectable="YES" sendsActionOnEndEditing="YES" alignment="left" tag="2" title="Your password will be sent unencrypted." id="100011">
+                            <font key="font" metaFont="smallSystem"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <outlet property="nextKeyView" destination="16" id="100060"/>
+                        </connections>
+                    </textField>
+                    <button verticalHuggingPriority="750" imageHugsTitle="YES" id="12">
+                        <rect key="frame" x="326" y="12" width="84" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="push" title="Log In" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="100012">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+                        </buttonCell>
+                        <connections>
+                            <action selector="logIn:" target="-2" id="30"/>
+                            <outlet property="nextKeyView" destination="10" id="100067"/>
+                        </connections>
+                    </button>
+                    <button verticalHuggingPriority="750" imageHugsTitle="YES" id="13">
+                        <rect key="frame" x="242" y="12" width="84" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="100013">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                            <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+                        </buttonCell>
+                        <connections>
+                            <action selector="cancel:" target="-2" id="31"/>
+                            <outlet property="nextKeyView" destination="12" id="100066"/>
+                        </connections>
+                    </button>
+                    <textField verticalHuggingPriority="750" tag="3" id="14">
+                        <rect key="frame" x="174" y="117" width="230" height="22"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" tag="3" drawsBackground="YES" id="100014">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <outlet property="nextKeyView" destination="17" id="100062"/>
+                        </connections>
+                    </textField>
+                    <textField verticalHuggingPriority="750" tag="4" id="15" customClass="NSSecureTextField">
+                        <rect key="frame" x="174" y="87" width="230" height="22"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" tag="4" drawsBackground="YES" id="100015">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <outlet property="nextKeyView" destination="39" id="100064"/>
+                        </connections>
+                    </textField>
+                    <textField verticalHuggingPriority="750" id="16">
+                        <rect key="frame" x="101" y="119" width="68" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Name:" id="100016">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <outlet property="nextKeyView" destination="14" id="100061"/>
+                        </connections>
+                    </textField>
+                    <textField verticalHuggingPriority="750" id="17">
+                        <rect key="frame" x="101" y="89" width="68" height="17"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Password:" id="100017">
+                            <font key="font" metaFont="system"/>
+                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <outlet property="nextKeyView" destination="15" id="100063"/>
+                        </connections>
+                    </textField>
+                    <imageView id="19">
+                        <rect key="frame" x="20" y="170" width="64" height="64"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="100019"/>
+                    </imageView>
+                    <button imageHugsTitle="YES" id="39">
+                        <rect key="frame" x="102" y="58" width="280" height="18"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <buttonCell key="cell" type="check" title="Remember this password in my keychain" bezelStyle="regularSquare" imagePosition="leading" alignment="left" inset="2" id="100039">
+                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <outlet property="nextKeyView" destination="13" id="100065"/>
+                        </connections>
+                    </button>
+                    <textField verticalHuggingPriority="750" tag="3" id="100047">
+                        <rect key="frame" x="113" y="175" width="282" height="17"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                        <textFieldCell key="cell" truncatesLastVisibleLine="YES" selectable="YES" sendsActionOnEndEditing="YES" state="on" alignment="left" tag="3" title="&lt;-- do not localize; will contain realm name --&gt;" id="100050">
+                            <font key="font" metaFont="smallSystem"/>
+                            <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                        </textFieldCell>
+                        <connections>
+                            <outlet property="nextKeyView" destination="11" id="100059"/>
+                        </connections>
+                    </textField>
+                </subviews>
+            </view>
+            <connections>
+                <outlet property="initialFirstResponder" destination="14" id="26"/>
+            </connections>
+        </window>
+    </objects>
+</document>
index 262b11fecc7177fbb5a20a1fb52471856ee098e1..9f728c33ef121b66a4ddab41cd64b5c8e6633bf4 100644 (file)
@@ -1,3 +1,17 @@
+2018-10-29  Tim Horton  <timothy_horton@apple.com>
+
+        Modernize WebKit nibs and lprojs for localization's sake
+        https://bugs.webkit.org/show_bug.cgi?id=190911
+        <rdar://problem/45349466>
+
+        Reviewed by Dan Bernstein.
+
+        * Scripts/check-inspector-strings:
+        * Scripts/update-webkit-localizable-strings:
+        * gtk/manifest.txt.in:
+        * wpe/manifest.txt.in:
+        English->en
+
 2018-10-29  Daniel Bates  <dabates@apple.com>
 
         [lldb-webkit] Last aliased enumerator in OptionSet is printed; should print first enumerator
index 19fe63d2d529be27026bb29de9c3912a25360a5e..9e8cfb8bb434c8b11b11a109760c069e19e3925c 100755 (executable)
@@ -44,7 +44,7 @@ from webkitpy.style.filereader import TextFileReader
 from webkitpy.style.main import change_directory
 
 _inspector_directory = "Source/WebCore/inspector/front-end"
-_localized_strings = "Source/WebCore/English.lproj/localizedStrings.js"
+_localized_strings = "Source/WebCore/en.lproj/localizedStrings.js"
 
 _log = logging.getLogger("check-inspector-strings")
 
index 164d00d1e4f2c3f3ed24d7afec59adfd9bbe11d7..eebfffa8501f13ee5f5dad3afab42d4d0ce46390 100755 (executable)
@@ -38,7 +38,7 @@ use webkitdirs;
 my @webKitDirectoriesToScan = ("Source/WebCore", "Source/WebKitLegacy/mac", "Source/WebKitLegacy/win", "Source/WebKit", "--skip", "Source/WebCore/icu", "--skip", "Source/WebKitLegacy/mac/icu");
 my @webInspectorUIDirectoriesToScan = ("Source/WebInspectorUI/UserInterface");
 
-my $webCoreFileToUpdate = "Source/WebCore/English.lproj/Localizable.strings";
+my $webCoreFileToUpdate = "Source/WebCore/en.lproj/Localizable.strings";
 my $webInspectorUIFileToUpdate = "Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js";
 
 @ARGV == 0 or die "Usage: " . basename($0) . "\n";
index 3de3d197f92efcc39f7831556fb242377e591f30..43ea2d7ce5df00cedf72970dc46305c9a661fafe 100644 (file)
@@ -41,10 +41,10 @@ class XcodeProjectFileChecker(object):
         matched = self._development_region_regex.search(line)
         if not matched:
             return False
-        if matched.group('region') != 'English':
+        if matched.group('region') != 'en':
             self.handle_style_error(line_index,
                                     'xcodeproj/settings', 5,
-                                    'developmentRegion is not English.')
+                                    'developmentRegion is not en.')
         return True
 
     def check(self, lines):
@@ -56,4 +56,4 @@ class XcodeProjectFileChecker(object):
         if not development_region_is_detected:
             self.handle_style_error(len(lines),
                                     'xcodeproj/settings', 5,
-                                    'Missing "developmentRegion = English".')
+                                    'Missing "developmentRegion = en".')
index 780ce8f62434a5ee34ba2b2ea1463f4f1d1a4301..75e7e23afbdc344e228b67ee8e4f223abfe4b91a 100644 (file)
@@ -63,7 +63,7 @@ class XcodeProjectFileCheckerTest(unittest.TestCase):
         self.assertTrue(self.had_error, '%s should have error: %s.' % (lines, expected_message))
 
     def test_detect_development_region(self):
-        self.assert_no_error(['developmentRegion = English;'])
-        self.assert_error([''], 'Missing "developmentRegion = English".')
+        self.assert_no_error(['developmentRegion = en;'])
+        self.assert_error([''], 'Missing "developmentRegion = en".')
         self.assert_error(['developmentRegion = Japanese;'],
-                          'developmentRegion is not English.')
+                          'developmentRegion is not en.')
index 37925a682191043d0c679885651f0425ac999e05..716f46b883ca47f98462ed966972fef64681171b 100644 (file)
@@ -67,7 +67,7 @@ exclude Source/WebKit/gtk/NEWS$
 # We do want to include the NEWS, but we want it to be in the root of the archive.
 file Source/WebKit/gtk/NEWS NEWS
 
-file Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js
+file Source/WebCore/en.lproj/mediaControlsLocalizedStrings.js Source/WebCore/en.lproj/mediaControlsLocalizedStrings.js
 file Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
 
 # Include only the resources we actually build
index 5264786203e2c37aad58802f7dfd556ce1c74b77..044929ecc6118453a6ade7ea91ccfa9a37814081 100644 (file)
@@ -66,7 +66,7 @@ exclude Source/WebKit/Resources
 # We do want to include the NEWS, but we want it to be in the root of the archive.
 file Source/WebKit/wpe/NEWS NEWS
 
-file Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js Source/WebCore/English.lproj/mediaControlsLocalizedStrings.js
+file Source/WebCore/en.lproj/mediaControlsLocalizedStrings.js Source/WebCore/en.lproj/mediaControlsLocalizedStrings.js
 file Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
 
 # Include only the resources we actually build