<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195316] branches/safari-601-branch/Source/WebInspectorUI</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195316">195316</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2016-01-19 14:37:02 -0800 (Tue, 19 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194920">r194920</a>. rdar://problem/24208104</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDatabaseTableContentViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsNetworkTimelineViewjs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsResourceDetailsSidebarPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (195315 => 195316)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2016-01-19 22:01:55 UTC (rev 195315)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2016-01-19 22:37:02 UTC (rev 195316)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-01-19 Timothy Hatcher <timothy@apple.com>
+
+ Merge r194920. rdar://problem/24208104
+
+ 2016-01-12 Brian Burg <bburg@apple.com>
+
+ Web Inspector: fix some common misspellings in localized strings
+ https://bugs.webkit.org/show_bug.cgi?id=153030
+ <rdar://problem/24153340>
+
+ Reviewed by Joseph Pecoraro.
+
+ Replace 'occured', 'transfered' with 'occurred' and 'transferred'.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Views/DatabaseTableContentView.js:
+ (WebInspector.DatabaseTableContentView.prototype._queryError):
+ * UserInterface/Views/NetworkGridContentView.js:
+ (WebInspector.NetworkGridContentView):
+ * UserInterface/Views/NetworkTimelineView.js:
+ (WebInspector.NetworkTimelineView):
+ * UserInterface/Views/ResourceDetailsSidebarPanel.js:
+ (WebInspector.ResourceDetailsSidebarPanel):
+
</ins><span class="cx"> 2016-01-14 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/24189668> REGRESSION: The Web Inspector isn't visible when its associated menu item is selected via the "Develop" menu
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (195315 => 195316)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-01-19 22:01:55 UTC (rev 195315)
+++ branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-01-19 22:37:02 UTC (rev 195316)
</span><span class="lines">@@ -64,8 +64,8 @@
</span><span class="cx"> localizedStrings["All Resources"] = "All Resources";
</span><span class="cx"> localizedStrings["All Storage"] = "All Storage";
</span><span class="cx"> localizedStrings["All Uncaught Exceptions"] = "All Uncaught Exceptions";
</span><del>-localizedStrings["An error occured trying to\nread the %s table."] = "An error occured trying to\nread the %s table.";
</del><span class="cx"> localizedStrings["An error occurred trying to load the resource."] = "An error occurred trying to load the resource.";
</span><ins>+localizedStrings["An error occurred trying to read the %s table."] = "An error occurred trying to read the %s table.";
</ins><span class="cx"> localizedStrings["An unexpected error %s occurred."] = "An unexpected error %s occurred.";
</span><span class="cx"> localizedStrings["An unexpected error occurred."] = "An unexpected error occurred.";
</span><span class="cx"> localizedStrings["Angle"] = "Angle";
</span><span class="lines">@@ -609,7 +609,7 @@
</span><span class="cx"> localizedStrings["Total Time"] = "Total Time";
</span><span class="cx"> localizedStrings["Total number of resources, click to show the Resources tab"] = "Total number of resources, click to show the Resources tab";
</span><span class="cx"> localizedStrings["Total size of all resources, click to show the Network Requests timeline"] = "Total size of all resources, click to show the Network Requests timeline";
</span><del>-localizedStrings["Transfered"] = "Transfered";
</del><ins>+localizedStrings["Transferred"] = "Transferred";
</ins><span class="cx"> localizedStrings["Transform"] = "Transform";
</span><span class="cx"> localizedStrings["Transition"] = "Transition";
</span><span class="cx"> localizedStrings["Triggered Breakpoint"] = "Triggered Breakpoint";
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsDatabaseTableContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js (195315 => 195316)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js 2016-01-19 22:01:55 UTC (rev 195315)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js 2016-01-19 22:37:02 UTC (rev 195316)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> if (this._messageTextViewElement)
</span><span class="cx"> this._messageTextViewElement.remove();
</span><span class="cx">
</span><del>- this._messageTextViewElement = WebInspector.createMessageTextView(WebInspector.UIString("An error occured trying to\nread the “%s” table.").format(this.representedObject.name), true);
</del><ins>+ this._messageTextViewElement = WebInspector.createMessageTextView(WebInspector.UIString("An error occurred trying to read the “%s” table.").format(this.representedObject.name), true);
</ins><span class="cx"> this.element.appendChild(this._messageTextViewElement);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsNetworkGridContentViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js (195315 => 195316)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2016-01-19 22:01:55 UTC (rev 195315)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js 2016-01-19 22:37:02 UTC (rev 195316)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> columns.size.width = "8%";
</span><span class="cx"> columns.size.aligned = "right";
</span><span class="cx">
</span><del>- columns.transferSize.title = WebInspector.UIString("Transfered");
</del><ins>+ columns.transferSize.title = WebInspector.UIString("Transferred");
</ins><span class="cx"> columns.transferSize.width = "8%";
</span><span class="cx"> columns.transferSize.aligned = "right";
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsNetworkTimelineViewjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js (195315 => 195316)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2016-01-19 22:01:55 UTC (rev 195315)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js 2016-01-19 22:37:02 UTC (rev 195316)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> columns.size.width = "8%";
</span><span class="cx"> columns.size.aligned = "right";
</span><span class="cx">
</span><del>- columns.transferSize.title = WebInspector.UIString("Transfered");
</del><ins>+ columns.transferSize.title = WebInspector.UIString("Transferred");
</ins><span class="cx"> columns.transferSize.width = "8%";
</span><span class="cx"> columns.transferSize.aligned = "right";
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsResourceDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js (195315 => 195316)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js 2016-01-19 22:01:55 UTC (rev 195315)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js 2016-01-19 22:37:02 UTC (rev 195316)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> this._encodedSizeRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Encoded"));
</span><span class="cx"> this._decodedSizeRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Decoded"));
</span><del>- this._transferSizeRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Transfered"));
</del><ins>+ this._transferSizeRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Transferred"));
</ins><span class="cx">
</span><span class="cx"> this._compressedRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Compressed"));
</span><span class="cx"> this._compressionRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Compression"));
</span></span></pre>
</div>
</div>
</body>
</html>