Title: [195316] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 195316
- Author
- [email protected]
- Date
- 2016-01-19 14:37:02 -0800 (Tue, 19 Jan 2016)
Log Message
Merge r194920. rdar://problem/24208104
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (195315 => 195316)
--- 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)
@@ -1,3 +1,27 @@
+2016-01-19 Timothy Hatcher <[email protected]>
+
+ Merge r194920. rdar://problem/24208104
+
+ 2016-01-12 Brian Burg <[email protected]>
+
+ 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):
+
2016-01-14 Timothy Hatcher <[email protected]>
<rdar://problem/24189668> REGRESSION: The Web Inspector isn't visible when its associated menu item is selected via the "Develop" menu
Modified: branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (195315 => 195316)
--- 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)
@@ -64,8 +64,8 @@
localizedStrings["All Resources"] = "All Resources";
localizedStrings["All Storage"] = "All Storage";
localizedStrings["All Uncaught Exceptions"] = "All Uncaught Exceptions";
-localizedStrings["An error occured trying to\nread the %s table."] = "An error occured trying to\nread the %s table.";
localizedStrings["An error occurred trying to load the resource."] = "An error occurred trying to load the resource.";
+localizedStrings["An error occurred trying to read the %s table."] = "An error occurred trying to read the %s table.";
localizedStrings["An unexpected error %s occurred."] = "An unexpected error %s occurred.";
localizedStrings["An unexpected error occurred."] = "An unexpected error occurred.";
localizedStrings["Angle"] = "Angle";
@@ -609,7 +609,7 @@
localizedStrings["Total Time"] = "Total Time";
localizedStrings["Total number of resources, click to show the Resources tab"] = "Total number of resources, click to show the Resources tab";
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";
-localizedStrings["Transfered"] = "Transfered";
+localizedStrings["Transferred"] = "Transferred";
localizedStrings["Transform"] = "Transform";
localizedStrings["Transition"] = "Transition";
localizedStrings["Triggered Breakpoint"] = "Triggered Breakpoint";
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/DatabaseTableContentView.js (195315 => 195316)
--- 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)
@@ -109,7 +109,7 @@
if (this._messageTextViewElement)
this._messageTextViewElement.remove();
- this._messageTextViewElement = WebInspector.createMessageTextView(WebInspector.UIString("An error occured trying to\nread the “%s” table.").format(this.representedObject.name), true);
+ this._messageTextViewElement = WebInspector.createMessageTextView(WebInspector.UIString("An error occurred trying to read the “%s” table.").format(this.representedObject.name), true);
this.element.appendChild(this._messageTextViewElement);
}
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NetworkGridContentView.js (195315 => 195316)
--- 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)
@@ -61,7 +61,7 @@
columns.size.width = "8%";
columns.size.aligned = "right";
- columns.transferSize.title = WebInspector.UIString("Transfered");
+ columns.transferSize.title = WebInspector.UIString("Transferred");
columns.transferSize.width = "8%";
columns.transferSize.aligned = "right";
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/NetworkTimelineView.js (195315 => 195316)
--- 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)
@@ -67,7 +67,7 @@
columns.size.width = "8%";
columns.size.aligned = "right";
- columns.transferSize.title = WebInspector.UIString("Transfered");
+ columns.transferSize.title = WebInspector.UIString("Transferred");
columns.transferSize.width = "8%";
columns.transferSize.aligned = "right";
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js (195315 => 195316)
--- 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)
@@ -74,7 +74,7 @@
this._encodedSizeRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Encoded"));
this._decodedSizeRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Decoded"));
- this._transferSizeRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Transfered"));
+ this._transferSizeRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Transferred"));
this._compressedRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Compressed"));
this._compressionRow = new WebInspector.DetailsSectionSimpleRow(WebInspector.UIString("Compression"));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
