[prev in list] [next in list] [prev in thread] [next in thread]
List: webkit-changes
Subject: [webkit-changes] [82622] trunk/Source
From: weinig () apple ! com
Date: 2011-03-31 21:58:35
Message-ID: 20110331215836.D5BF2157D1CD () lists ! macosforge ! org
[Download RAW message or body]
[Attachment #2 (text/html)]
<!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>[82622] trunk/Source</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/82622">82622</a></dd> \
<dt>Author</dt> <dd>weinig@apple.com</dd> <dt>Date</dt> <dd>2011-03-31 14:58:33 -0700 \
(Thu, 31 Mar 2011)</dd> </dl>
<h3>Log Message</h3>
<pre>2011-03-31 Sam Weinig <sam@webkit.org>
Reviewed by Anders Carlsson.
Rename WebCore's UI_STRING to WEB_UI_STRING to not overlap with WebKit API
https://bugs.webkit.org/show_bug.cgi?id=57582
* platform/DefaultLocalizationStrategy.cpp:
* platform/LocalizedStrings.h:
2011-03-31 Sam Weinig <sam@webkit.org>
Reviewed by Anders Carlsson.
Rename WebCore's UI_STRING to WEB_UI_STRING to not overlap with WebKit API
https://bugs.webkit.org/show_bug.cgi?id=57582
* PluginProcess/mac/PluginProcessMac.mm:
(WebKit::PluginProcess::platformInitialize):
* UIProcess/mac/WebInspectorProxyMac.mm:
(WebKit::WebInspectorProxy::platformInspectedURLChanged):
* WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:
* WebProcess/mac/WebProcessMac.mm:
(WebKit::WebProcess::platformInitializeWebProcess):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformDefaultLocalizationStrategycpp">trunk/Source/WebCore/platform/DefaultLocalizationStrategy.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLocalizedStringsh">trunk/Source/WebCore/platform/LocalizedStrings.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessmacPluginProcessMacmm">trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebErrorsMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessmacWebProcessMacmm">trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (82621 => \
82622)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2011-03-31 21:47:35 UTC (rev \
82621)
+++ trunk/Source/WebCore/ChangeLog 2011-03-31 21:58:33 UTC (rev 82622)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2011-03-31 Sam Weinig <sam@webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ Rename WebCore's UI_STRING to WEB_UI_STRING to not overlap with WebKit API
+ https://bugs.webkit.org/show_bug.cgi?id=57582
+
+ * platform/DefaultLocalizationStrategy.cpp:
+ * platform/LocalizedStrings.h:
+
</ins><span class="cx"> 2011-03-31 Eric Seidel <eric@webkit.org>
</span><span class="cx">
</span><span class="cx"> Reviewed by Ryosuke Niwa.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDefaultLocalizationStrategycpp"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebCore/platform/DefaultLocalizationStrategy.cpp (82621 => 82622)</h4> \
<pre class="diff"><span> <span class="info">--- \
trunk/Source/WebCore/platform/DefaultLocalizationStrategy.cpp 2011-03-31 21:47:35 UTC \
(rev 82621)
+++ trunk/Source/WebCore/platform/DefaultLocalizationStrategy.cpp 2011-03-31 21:58:33 \
UTC (rev 82622) </span><span class="lines">@@ -74,44 +74,44 @@
</span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::inputElementAltText()
</span><span class="cx"> {
</span><del>- return UI_STRING_KEY("Submit", "Submit (input \
element)", "alt text for <input> elements with no alt, title, or \
value"); </del><ins>+ return WEB_UI_STRING_KEY("Submit", \
"Submit (input element)", "alt text for <input> elements with no \
alt, title, or value"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::resetButtonDefaultLabel() </span><span class="cx"> {
</span><del>- return UI_STRING("Reset", "default label for Reset \
buttons in forms on web pages"); </del><ins>+ return \
WEB_UI_STRING("Reset", "default label for Reset buttons in forms on \
web pages"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::searchableIndexIntroduction() </span><span class="cx"> {
</span><del>- return UI_STRING("This is a searchable index. Enter search \
keywords: ", </del><ins>+ return WEB_UI_STRING("This is a searchable \
index. Enter search keywords: ", </ins><span class="cx"> "text that \
appears at the start of nearly-obsolete web pages in the form of a 'searchable \
index'"); </span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::submitButtonDefaultLabel() </span><span class="cx"> {
</span><del>- return UI_STRING("Submit", "default label for Submit \
buttons in forms on web pages"); </del><ins>+ return \
WEB_UI_STRING("Submit", "default label for Submit buttons in forms on \
web pages"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::fileButtonChooseFileLabel() </span><span class="cx"> {
</span><del>- return UI_STRING("Choose File", "title for file \
button used in HTML forms"); </del><ins>+ return WEB_UI_STRING("Choose \
File", "title for file button used in HTML forms"); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::fileButtonNoFileSelectedLabel() </span><span class="cx"> \
{ </span><del>- return UI_STRING("no file selected", "text to \
display in file button used in HTML forms when no file is selected"); \
</del><ins>+ return WEB_UI_STRING("no file selected", "text to \
display in file button used in HTML forms when no file is selected"); \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::defaultDetailsSummaryText() </span><span class="cx"> {
</span><del>- return UI_STRING("Details", "text to display in \
<details> tag when it has no <summary> child"); </del><ins>+ \
return WEB_UI_STRING("Details", "text to display in <details> \
tag when it has no <summary> child"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> String \
DefaultLocalizationStrategy::copyImageUnknownFileLabel() </span><span class="cx"> {
</span><del>- return UI_STRING("unknown", "Unknown filename");
</del><ins>+ return WEB_UI_STRING("unknown", "Unknown \
filename"); </ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -119,129 +119,129 @@
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagOpenLinkInNewWindow() </span><span \
class="cx"> { </span><del>- return UI_STRING("Open Link in New Window", \
"Open in New Window context menu item"); </del><ins>+ return \
WEB_UI_STRING("Open Link in New Window", "Open in New Window context \
menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagDownloadLinkToDisk() </span><span \
class="cx"> { </span><del>- return UI_STRING("Download Linked File", \
"Download Linked File context menu item"); </del><ins>+ return \
WEB_UI_STRING("Download Linked File", "Download Linked File context \
menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagCopyLinkToClipboard() </span><span \
class="cx"> { </span><del>- return UI_STRING("Copy Link", "Copy \
Link context menu item"); </del><ins>+ return WEB_UI_STRING("Copy \
Link", "Copy Link context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagOpenImageInNewWindow() </span><span \
class="cx"> { </span><del>- return UI_STRING("Open Image in New Window", \
"Open Image in New Window context menu item"); </del><ins>+ return \
WEB_UI_STRING("Open Image in New Window", "Open Image in New Window \
context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagDownloadImageToDisk() </span><span \
class="cx"> { </span><del>- return UI_STRING("Download Image", \
"Download Image context menu item"); </del><ins>+ return \
WEB_UI_STRING("Download Image", "Download Image context menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagCopyImageToClipboard() </span><span \
class="cx"> { </span><del>- return UI_STRING("Copy Image", "Copy \
Image context menu item"); </del><ins>+ return WEB_UI_STRING("Copy \
Image", "Copy Image context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(QT)
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagCopyImageUrlToClipboard() </span><span \
class="cx"> { </span><del>- return UI_STRING("Copy Image Address", \
"Copy Image Address menu item"); </del><ins>+ return \
WEB_UI_STRING("Copy Image Address", "Copy Image Address menu \
item"); </ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagOpenVideoInNewWindow() </span><span \
class="cx"> { </span><del>- return UI_STRING("Open Video in New Window", \
"Open Video in New Window context menu item"); </del><ins>+ return \
WEB_UI_STRING("Open Video in New Window", "Open Video in New Window \
context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagOpenAudioInNewWindow() </span><span \
class="cx"> { </span><del>- return UI_STRING("Open Audio in New Window", \
"Open Audio in New Window context menu item"); </del><ins>+ return \
WEB_UI_STRING("Open Audio in New Window", "Open Audio in New Window \
context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagCopyVideoLinkToClipboard() \
</span><span class="cx"> { </span><del>- return UI_STRING("Copy Video \
Address", "Copy Video Address Location context menu item"); \
</del><ins>+ return WEB_UI_STRING("Copy Video Address", "Copy Video \
Address Location context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagCopyAudioLinkToClipboard() \
</span><span class="cx"> { </span><del>- return UI_STRING("Copy Audio \
Address", "Copy Audio Address Location context menu item"); \
</del><ins>+ return WEB_UI_STRING("Copy Audio Address", "Copy Audio \
Address Location context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagToggleMediaControls() </span><span \
class="cx"> { </span><del>- return UI_STRING("Controls", "Media \
Controls context menu item"); </del><ins>+ return \
WEB_UI_STRING("Controls", "Media Controls context menu item"); \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagToggleMediaLoop() </span><span \
class="cx"> { </span><del>- return UI_STRING("Loop", "Media Loop \
context menu item"); </del><ins>+ return WEB_UI_STRING("Loop", \
"Media Loop context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagEnterVideoFullscreen() </span><span \
class="cx"> { </span><del>- return UI_STRING("Enter Fullscreen", \
"Video Enter Fullscreen context menu item"); </del><ins>+ return \
WEB_UI_STRING("Enter Fullscreen", "Video Enter Fullscreen context menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagMediaPlay() </span><span class="cx"> {
</span><del>- return UI_STRING("Play", "Media Play context menu \
item"); </del><ins>+ return WEB_UI_STRING("Play", "Media Play \
context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagMediaPause() </span><span class="cx"> \
{ </span><del>- return UI_STRING("Pause", "Media Pause context menu \
item"); </del><ins>+ return WEB_UI_STRING("Pause", "Media \
Pause context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagMediaMute() </span><span class="cx"> {
</span><del>- return UI_STRING("Mute", "Media Mute context menu \
item"); </del><ins>+ return WEB_UI_STRING("Mute", "Media Mute \
context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagOpenFrameInNewWindow() </span><span \
class="cx"> { </span><del>- return UI_STRING("Open Frame in New Window", \
"Open Frame in New Window context menu item"); </del><ins>+ return \
WEB_UI_STRING("Open Frame in New Window", "Open Frame in New Window \
context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::contextMenuItemTagCopy()
</span><span class="cx"> {
</span><del>- return UI_STRING("Copy", "Copy context menu \
item"); </del><ins>+ return WEB_UI_STRING("Copy", "Copy \
context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagGoBack() </span><span class="cx"> {
</span><del>- return UI_STRING("Back", "Back context menu \
item"); </del><ins>+ return WEB_UI_STRING("Back", "Back \
context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagGoForward() </span><span class="cx"> {
</span><del>- return UI_STRING("Forward", "Forward context menu \
item"); </del><ins>+ return WEB_UI_STRING("Forward", "Forward \
context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::contextMenuItemTagStop()
</span><span class="cx"> {
</span><del>- return UI_STRING("Stop", "Stop context menu \
item"); </del><ins>+ return WEB_UI_STRING("Stop", "Stop \
context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagReload() </span><span class="cx"> {
</span><del>- return UI_STRING("Reload", "Reload context menu \
item"); </del><ins>+ return WEB_UI_STRING("Reload", "Reload \
context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::contextMenuItemTagCut()
</span><span class="cx"> {
</span><del>- return UI_STRING("Cut", "Cut context menu \
item"); </del><ins>+ return WEB_UI_STRING("Cut", "Cut context \
menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagPaste() </span><span class="cx"> {
</span><del>- return UI_STRING("Paste", "Paste context menu \
item"); </del><ins>+ return WEB_UI_STRING("Paste", "Paste \
context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="lines">@@ -278,218 +278,218 @@
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagNoGuessesFound() </span><span \
class="cx"> { </span><del>- return UI_STRING("No Guesses Found", \
"No Guesses Found context menu item"); </del><ins>+ return \
WEB_UI_STRING("No Guesses Found", "No Guesses Found context menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagIgnoreSpelling() </span><span \
class="cx"> { </span><del>- return UI_STRING("Ignore Spelling", \
"Ignore Spelling context menu item"); </del><ins>+ return \
WEB_UI_STRING("Ignore Spelling", "Ignore Spelling context menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagLearnSpelling() </span><span \
class="cx"> { </span><del>- return UI_STRING("Learn Spelling", \
"Learn Spelling context menu item"); </del><ins>+ return \
WEB_UI_STRING("Learn Spelling", "Learn Spelling context menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagSearchWeb() </span><span class="cx"> {
</span><del>- return UI_STRING("Search in Google", "Search in \
Google context menu item"); </del><ins>+ return WEB_UI_STRING("Search in \
Google", "Search in Google context menu item"); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagLookUpInDictionary(const String& \
selectedString) </span><span class="cx"> {
</span><span class="cx"> #if defined(BUILDING_ON_TIGER) || \
defined(BUILDING_ON_LEOPARD) || defined(BUILDING_ON_SNOW_LEOPARD) </span><span \
class="cx"> UNUSED_PARAM(selectedString); </span><del>- return \
UI_STRING("Look Up in Dictionary", "Look Up in Dictionary context menu \
item"); </del><ins>+ return WEB_UI_STRING("Look Up in Dictionary", \
"Look Up in Dictionary context menu item"); </ins><span class="cx"> #else
</span><del>- return UI_STRING("Look Up "<selection>"", "Look \
Up context menu item with selected word").replace("<selection>", \
selectedString); </del><ins>+ return WEB_UI_STRING("Look Up \
"<selection>"", "Look Up context menu item with selected \
word").replace("<selection>", selectedString); </ins><span \
class="cx"> #endif </span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagOpenLink() </span><span class="cx"> {
</span><del>- return UI_STRING("Open Link", "Open Link context menu \
item"); </del><ins>+ return WEB_UI_STRING("Open Link", "Open \
Link context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagIgnoreGrammar() </span><span \
class="cx"> { </span><del>- return UI_STRING("Ignore Grammar", \
"Ignore Grammar context menu item"); </del><ins>+ return \
WEB_UI_STRING("Ignore Grammar", "Ignore Grammar context menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagSpellingMenu() </span><span \
class="cx"> { </span><del>- return UI_STRING("Spelling and Grammar", \
"Spelling and Grammar context sub-menu item"); </del><ins>+ return \
WEB_UI_STRING("Spelling and Grammar", "Spelling and Grammar context \
sub-menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagShowSpellingPanel(bool show) \
</span><span class="cx"> { </span><span class="cx"> if (show)
</span><del>- return UI_STRING("Show Spelling and Grammar", \
"menu item title");
- return UI_STRING("Hide Spelling and Grammar", "menu item \
title"); </del><ins>+ return WEB_UI_STRING("Show Spelling and \
Grammar", "menu item title"); + return WEB_UI_STRING("Hide \
Spelling and Grammar", "menu item title"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagCheckSpelling() </span><span \
class="cx"> { </span><del>- return UI_STRING("Check Document Now", \
"Check spelling context menu item"); </del><ins>+ return \
WEB_UI_STRING("Check Document Now", "Check spelling context menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagCheckSpellingWhileTyping() \
</span><span class="cx"> { </span><del>- return UI_STRING("Check Spelling \
While Typing", "Check spelling while typing context menu item"); \
</del><ins>+ return WEB_UI_STRING("Check Spelling While Typing", \
"Check spelling while typing context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagCheckGrammarWithSpelling() \
</span><span class="cx"> { </span><del>- return UI_STRING("Check Grammar With \
Spelling", "Check grammar with spelling context menu item"); \
</del><ins>+ return WEB_UI_STRING("Check Grammar With Spelling", \
"Check grammar with spelling context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagFontMenu() </span><span class="cx"> {
</span><del>- return UI_STRING("Font", "Font context sub-menu \
item"); </del><ins>+ return WEB_UI_STRING("Font", "Font \
context sub-menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::contextMenuItemTagBold()
</span><span class="cx"> {
</span><del>- return UI_STRING("Bold", "Bold context menu \
item"); </del><ins>+ return WEB_UI_STRING("Bold", "Bold \
context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagItalic() </span><span class="cx"> {
</span><del>- return UI_STRING("Italic", "Italic context menu \
item"); </del><ins>+ return WEB_UI_STRING("Italic", "Italic \
context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagUnderline() </span><span class="cx"> {
</span><del>- return UI_STRING("Underline", "Underline context menu \
item"); </del><ins>+ return WEB_UI_STRING("Underline", \
"Underline context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagOutline() </span><span class="cx"> {
</span><del>- return UI_STRING("Outline", "Outline context menu \
item"); </del><ins>+ return WEB_UI_STRING("Outline", "Outline \
context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagWritingDirectionMenu() </span><span \
class="cx"> { </span><del>- return UI_STRING("Paragraph Direction", \
"Paragraph direction context sub-menu item"); </del><ins>+ return \
WEB_UI_STRING("Paragraph Direction", "Paragraph direction context \
sub-menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagTextDirectionMenu() </span><span \
class="cx"> { </span><del>- return UI_STRING("Selection Direction", \
"Selection direction context sub-menu item"); </del><ins>+ return \
WEB_UI_STRING("Selection Direction", "Selection direction context \
sub-menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagDefaultDirection() </span><span \
class="cx"> { </span><del>- return UI_STRING("Default", "Default \
writing direction context menu item"); </del><ins>+ return \
WEB_UI_STRING("Default", "Default writing direction context menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagLeftToRight() </span><span class="cx"> \
{ </span><del>- return UI_STRING("Left to Right", "Left to Right \
context menu item"); </del><ins>+ return WEB_UI_STRING("Left to \
Right", "Left to Right context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagRightToLeft() </span><span class="cx"> \
{ </span><del>- return UI_STRING("Right to Left", "Right to Left \
context menu item"); </del><ins>+ return WEB_UI_STRING("Right to \
Left", "Right to Left context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagSearchInSpotlight() </span><span \
class="cx"> { </span><del>- return UI_STRING("Search in Spotlight", \
"Search in Spotlight context menu item"); </del><ins>+ return \
WEB_UI_STRING("Search in Spotlight", "Search in Spotlight context menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagShowFonts() </span><span class="cx"> {
</span><del>- return UI_STRING("Show Fonts", "Show fonts context \
menu item"); </del><ins>+ return WEB_UI_STRING("Show Fonts", \
"Show fonts context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagStyles() </span><span class="cx"> {
</span><del>- return UI_STRING("Styles...", "Styles context menu \
item"); </del><ins>+ return WEB_UI_STRING("Styles...", "Styles \
context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagShowColors() </span><span class="cx"> \
{ </span><del>- return UI_STRING("Show Colors", "Show colors \
context menu item"); </del><ins>+ return WEB_UI_STRING("Show \
Colors", "Show colors context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagSpeechMenu() </span><span class="cx"> \
{ </span><del>- return UI_STRING("Speech", "Speech context sub-menu \
item"); </del><ins>+ return WEB_UI_STRING("Speech", "Speech \
context sub-menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagStartSpeaking() </span><span \
class="cx"> { </span><del>- return UI_STRING("Start Speaking", \
"Start speaking context menu item"); </del><ins>+ return \
WEB_UI_STRING("Start Speaking", "Start speaking context menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagStopSpeaking() </span><span \
class="cx"> { </span><del>- return UI_STRING("Stop Speaking", "Stop \
speaking context menu item"); </del><ins>+ return WEB_UI_STRING("Stop \
Speaking", "Stop speaking context menu item"); </ins><span class="cx"> \
} </span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagCorrectSpellingAutomatically() \
</span><span class="cx"> { </span><del>- return UI_STRING("Correct Spelling \
Automatically", "Correct Spelling Automatically context menu item"); \
</del><ins>+ return WEB_UI_STRING("Correct Spelling Automatically", \
"Correct Spelling Automatically context menu item"); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagSubstitutionsMenu() </span><span \
class="cx"> { </span><del>- return UI_STRING("Substitutions", \
"Substitutions context sub-menu item"); </del><ins>+ return \
WEB_UI_STRING("Substitutions", "Substitutions context sub-menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagShowSubstitutions(bool show) \
</span><span class="cx"> { </span><span class="cx"> if (show)
</span><del>- return UI_STRING("Show Substitutions", "menu item \
title");
- return UI_STRING("Hide Substitutions", "menu item title");
</del><ins>+ return WEB_UI_STRING("Show Substitutions", "menu \
item title"); + return WEB_UI_STRING("Hide Substitutions", \
"menu item title"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagSmartCopyPaste() </span><span \
class="cx"> { </span><del>- return UI_STRING("Smart Copy/Paste", \
"Smart Copy/Paste context menu item"); </del><ins>+ return \
WEB_UI_STRING("Smart Copy/Paste", "Smart Copy/Paste context menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagSmartQuotes() </span><span class="cx"> \
{ </span><del>- return UI_STRING("Smart Quotes", "Smart Quotes \
context menu item"); </del><ins>+ return WEB_UI_STRING("Smart \
Quotes", "Smart Quotes context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagSmartDashes() </span><span class="cx"> \
{ </span><del>- return UI_STRING("Smart Dashes", "Smart Dashes \
context menu item"); </del><ins>+ return WEB_UI_STRING("Smart \
Dashes", "Smart Dashes context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagSmartLinks() </span><span class="cx"> \
{ </span><del>- return UI_STRING("Smart Links", "Smart Links \
context menu item"); </del><ins>+ return WEB_UI_STRING("Smart \
Links", "Smart Links context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagTextReplacement() </span><span \
class="cx"> { </span><del>- return UI_STRING("Text Replacement", \
"Text Replacement context menu item"); </del><ins>+ return \
WEB_UI_STRING("Text Replacement", "Text Replacement context menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagTransformationsMenu() </span><span \
class="cx"> { </span><del>- return UI_STRING("Transformations", \
"Transformations context sub-menu item"); </del><ins>+ return \
WEB_UI_STRING("Transformations", "Transformations context sub-menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagMakeUpperCase() </span><span \
class="cx"> { </span><del>- return UI_STRING("Make Upper Case", \
"Make Upper Case context menu item"); </del><ins>+ return \
WEB_UI_STRING("Make Upper Case", "Make Upper Case context menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagMakeLowerCase() </span><span \
class="cx"> { </span><del>- return UI_STRING("Make Lower Case", \
"Make Lower Case context menu item"); </del><ins>+ return \
WEB_UI_STRING("Make Lower Case", "Make Lower Case context menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagCapitalize() </span><span class="cx"> \
{ </span><del>- return UI_STRING("Capitalize", "Capitalize context \
menu item"); </del><ins>+ return WEB_UI_STRING("Capitalize", \
"Capitalize context menu item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagChangeBack(const String& \
replacedString) </span><span class="lines">@@ -502,133 +502,133 @@
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::contextMenuItemTagInspectElement() </span><span \
class="cx"> { </span><del>- return UI_STRING("Inspect Element", \
"Inspect Element context menu item"); </del><ins>+ return \
WEB_UI_STRING("Inspect Element", "Inspect Element context menu \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(CONTEXT_MENUS)
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::searchMenuNoRecentSearchesText() </span><span \
class="cx"> { </span><del>- return UI_STRING("No recent searches", \
"Label for only item in menu that appears when clicking on the search field \
image, when no searches have been performed"); </del><ins>+ return \
WEB_UI_STRING("No recent searches", "Label for only item in menu that \
appears when clicking on the search field image, when no searches have been \
performed"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::searchMenuRecentSearchesText() </span><span class="cx"> \
{ </span><del>- return UI_STRING("Recent Searches", "label for \
first item in the menu that appears when clicking on the search field image, used as \
embedded menu title"); </del><ins>+ return WEB_UI_STRING("Recent \
Searches", "label for first item in the menu that appears when clicking on \
the search field image, used as embedded menu title"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::searchMenuClearRecentSearchesText() </span><span \
class="cx"> { </span><del>- return UI_STRING("Clear Recent Searches", \
"menu item in Recent Searches menu that empties menu's contents"); \
</del><ins>+ return WEB_UI_STRING("Clear Recent Searches", "menu \
item in Recent Searches menu that empties menu's contents"); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::AXWebAreaText()
</span><span class="cx"> {
</span><del>- return UI_STRING("HTML content", "accessibility role \
description for web area"); </del><ins>+ return WEB_UI_STRING("HTML \
content", "accessibility role description for web area"); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::AXLinkText()
</span><span class="cx"> {
</span><del>- return UI_STRING("link", "accessibility role \
description for link"); </del><ins>+ return WEB_UI_STRING("link", \
"accessibility role description for link"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::AXListMarkerText()
</span><span class="cx"> {
</span><del>- return UI_STRING("list marker", "accessibility role \
description for list marker"); </del><ins>+ return WEB_UI_STRING("list \
marker", "accessibility role description for list marker"); \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::AXImageMapText()
</span><span class="cx"> {
</span><del>- return UI_STRING("image map", "accessibility role \
description for image map"); </del><ins>+ return WEB_UI_STRING("image \
map", "accessibility role description for image map"); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::AXHeadingText()
</span><span class="cx"> {
</span><del>- return UI_STRING("heading", "accessibility role \
description for headings"); </del><ins>+ return \
WEB_UI_STRING("heading", "accessibility role description for \
headings"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::AXDefinitionListTermText() </span><span class="cx"> {
</span><del>- return UI_STRING("term", "term word of a \
definition"); </del><ins>+ return WEB_UI_STRING("term", "term \
word of a definition"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::AXDefinitionListDefinitionText() </span><span \
class="cx"> { </span><del>- return UI_STRING("definition", \
"definition phrase"); </del><ins>+ return \
WEB_UI_STRING("definition", "definition phrase"); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> String \
DefaultLocalizationStrategy::AXARIAContentGroupText(const String& ariaType) \
</span><span class="cx"> { </span><span class="cx"> if (ariaType == \
"ARIAApplicationAlert") </span><del>- return \
UI_STRING("alert", "An ARIA accessibility group that acts as an \
alert."); </del><ins>+ return WEB_UI_STRING("alert", "An \
ARIA accessibility group that acts as an alert."); </ins><span class="cx"> \
if (ariaType == "ARIAApplicationAlertDialog") </span><del>- return \
UI_STRING("alert dialog", "An ARIA accessibility group that acts as an \
alert dialog."); </del><ins>+ return WEB_UI_STRING("alert \
dialog", "An ARIA accessibility group that acts as an alert dialog."); \
</ins><span class="cx"> if (ariaType == "ARIAApplicationDialog") \
</span><del>- return UI_STRING("dialog", "An ARIA accessibility \
group that acts as an dialog."); </del><ins>+ return \
WEB_UI_STRING("dialog", "An ARIA accessibility group that acts as an \
dialog."); </ins><span class="cx"> if (ariaType == \
"ARIAApplicationLog") </span><del>- return \
UI_STRING("log", "An ARIA accessibility group that acts as a console \
log."); </del><ins>+ return WEB_UI_STRING("log", "An ARIA \
accessibility group that acts as a console log."); </ins><span class="cx"> \
if (ariaType == "ARIAApplicationMarquee") </span><del>- return \
UI_STRING("marquee", "An ARIA accessibility group that acts as a \
marquee."); </del><ins>+ return WEB_UI_STRING("marquee", \
"An ARIA accessibility group that acts as a marquee."); </ins><span \
class="cx"> if (ariaType == "ARIAApplicationStatus") </span><del>- \
return UI_STRING("application status", "An ARIA accessibility group \
that acts as a status update."); </del><ins>+ return \
WEB_UI_STRING("application status", "An ARIA accessibility group that \
acts as a status update."); </ins><span class="cx"> if (ariaType == \
"ARIAApplicationTimer") </span><del>- return \
UI_STRING("timer", "An ARIA accessibility group that acts as an \
updating timer."); </del><ins>+ return \
WEB_UI_STRING("timer", "An ARIA accessibility group that acts as an \
updating timer."); </ins><span class="cx"> if (ariaType == \
"ARIADocument") </span><del>- return UI_STRING("document", \
"An ARIA accessibility group that acts as a document."); </del><ins>+ \
return WEB_UI_STRING("document", "An ARIA accessibility group that \
acts as a document."); </ins><span class="cx"> if (ariaType == \
"ARIADocumentArticle") </span><del>- return \
UI_STRING("article", "An ARIA accessibility group that acts as an \
article."); </del><ins>+ return WEB_UI_STRING("article", \
"An ARIA accessibility group that acts as an article."); </ins><span \
class="cx"> if (ariaType == "ARIADocumentNote") </span><del>- \
return UI_STRING("note", "An ARIA accessibility group that acts as a \
note in a document."); </del><ins>+ return \
WEB_UI_STRING("note", "An ARIA accessibility group that acts as a note \
in a document."); </ins><span class="cx"> if (ariaType == \
"ARIADocumentRegion") </span><del>- return \
UI_STRING("region", "An ARIA accessibility group that acts as a \
distinct region in a document."); </del><ins>+ return \
WEB_UI_STRING("region", "An ARIA accessibility group that acts as a \
distinct region in a document."); </ins><span class="cx"> if (ariaType \
== "ARIALandmarkApplication") </span><del>- return \
UI_STRING("application", "An ARIA accessibility group that acts as an \
application."); </del><ins>+ return \
WEB_UI_STRING("application", "An ARIA accessibility group that acts as \
an application."); </ins><span class="cx"> if (ariaType == \
"ARIALandmarkBanner") </span><del>- return \
UI_STRING("banner", "An ARIA accessibility group that acts as a \
banner."); </del><ins>+ return WEB_UI_STRING("banner", \
"An ARIA accessibility group that acts as a banner."); </ins><span \
class="cx"> if (ariaType == "ARIALandmarkComplementary") </span><del>- \
return UI_STRING("complementary", "An ARIA accessibility group that \
acts as a region of complementary information."); </del><ins>+ return \
WEB_UI_STRING("complementary", "An ARIA accessibility group that acts \
as a region of complementary information."); </ins><span class="cx"> if \
(ariaType == "ARIALandmarkContentInfo") </span><del>- return \
UI_STRING("content", "An ARIA accessibility group that contains \
content."); </del><ins>+ return WEB_UI_STRING("content", \
"An ARIA accessibility group that contains content."); </ins><span \
class="cx"> if (ariaType == "ARIALandmarkMain") </span><del>- \
return UI_STRING("main", "An ARIA accessibility group that is the main \
portion of the website."); </del><ins>+ return \
WEB_UI_STRING("main", "An ARIA accessibility group that is the main \
portion of the website."); </ins><span class="cx"> if (ariaType == \
"ARIALandmarkNavigation") </span><del>- return \
UI_STRING("navigation", "An ARIA accessibility group that contains the \
main navigation elements of a website."); </del><ins>+ return \
WEB_UI_STRING("navigation", "An ARIA accessibility group that contains \
the main navigation elements of a website."); </ins><span class="cx"> if \
(ariaType == "ARIALandmarkSearch") </span><del>- return \
UI_STRING("search", "An ARIA accessibility group that contains a \
search feature of a website."); </del><ins>+ return \
WEB_UI_STRING("search", "An ARIA accessibility group that contains a \
search feature of a website."); </ins><span class="cx"> if (ariaType == \
"ARIAUserInterfaceTooltip") </span><del>- return \
UI_STRING("tooltip", "An ARIA accessibility group that acts as a \
tooltip."); </del><ins>+ return WEB_UI_STRING("tooltip", \
"An ARIA accessibility group that acts as a tooltip."); </ins><span \
class="cx"> if (ariaType == "ARIATabPanel") </span><del>- return \
UI_STRING("tab panel", "An ARIA accessibility group that contains the \
content of a tab."); </del><ins>+ return WEB_UI_STRING("tab \
panel", "An ARIA accessibility group that contains the content of a \
tab."); </ins><span class="cx"> if (ariaType == \
"ARIADocumentMath") </span><del>- return UI_STRING("math", \
"An ARIA accessibility group that contains mathematical symbols."); \
</del><ins>+ return WEB_UI_STRING("math", "An ARIA \
accessibility group that contains mathematical symbols."); </ins><span \
class="cx"> return String(); </span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::AXButtonActionVerb()
</span><span class="cx"> {
</span><del>- return UI_STRING("press", "Verb stating the action \
that will occur when a button is pressed, as used by accessibility"); \
</del><ins>+ return WEB_UI_STRING("press", "Verb stating the action \
that will occur when a button is pressed, as used by accessibility"); \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::AXRadioButtonActionVerb() </span><span class="cx"> {
</span><del>- return UI_STRING("select", "Verb stating the action \
that will occur when a radio button is clicked, as used by accessibility"); \
</del><ins>+ return WEB_UI_STRING("select", "Verb stating the \
action that will occur when a radio button is clicked, as used by \
accessibility"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::AXTextFieldActionVerb()
</span><span class="cx"> {
</span><del>- return UI_STRING("activate", "Verb stating the action \
that will occur when a text field is selected, as used by accessibility"); \
</del><ins>+ return WEB_UI_STRING("activate", "Verb stating the \
action that will occur when a text field is selected, as used by \
accessibility"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::AXCheckedCheckBoxActionVerb() </span><span class="cx"> {
</span><del>- return UI_STRING("uncheck", "Verb stating the action \
that will occur when a checked checkbox is clicked, as used by accessibility"); \
</del><ins>+ return WEB_UI_STRING("uncheck", "Verb stating the \
action that will occur when a checked checkbox is clicked, as used by \
accessibility"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::AXUncheckedCheckBoxActionVerb() </span><span class="cx"> \
{ </span><del>- return UI_STRING("check", "Verb stating the action \
that will occur when an unchecked checkbox is clicked, as used by \
accessibility"); </del><ins>+ return WEB_UI_STRING("check", \
"Verb stating the action that will occur when an unchecked checkbox is clicked, \
as used by accessibility"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::AXMenuListActionVerb()
</span><span class="lines">@@ -645,27 +645,27 @@
</span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::AXLinkActionVerb()
</span><span class="cx"> {
</span><del>- return UI_STRING("jump", "Verb stating the action \
that will occur when a link is clicked, as used by accessibility"); </del><ins>+ \
return WEB_UI_STRING("jump", "Verb stating the action that will occur \
when a link is clicked, as used by accessibility"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::missingPluginText()
</span><span class="cx"> {
</span><del>- return UI_STRING("Missing Plug-in", "Label text to be \
used when a plugin is missing"); </del><ins>+ return \
WEB_UI_STRING("Missing Plug-in", "Label text to be used when a plugin \
is missing"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::crashedPluginText()
</span><span class="cx"> {
</span><del>- return UI_STRING("Plug-in Failure", "Label text to be \
used if plugin host process has crashed"); </del><ins>+ return \
WEB_UI_STRING("Plug-in Failure", "Label text to be used if plugin host \
process has crashed"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::multipleFileUploadText(unsigned numberOfFiles) \
</span><span class="cx"> { </span><del>- return \
formatLocalizedString(UI_STRING("%d files", "Label to describe the \
number of files selected in a file upload control that allows multiple files"), \
numberOfFiles); </del><ins>+ return formatLocalizedString(WEB_UI_STRING("%d \
files", "Label to describe the number of files selected in a file upload \
control that allows multiple files"), numberOfFiles); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::unknownFileSizeText()
</span><span class="cx"> {
</span><del>- return UI_STRING("Unknown", "Unknown filesize FTP \
directory listing item"); </del><ins>+ return \
WEB_UI_STRING("Unknown", "Unknown filesize FTP directory listing \
item"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="lines">@@ -688,22 +688,22 @@
</span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::keygenMenuItem512()
</span><span class="cx"> {
</span><del>- return UI_STRING("512 (Low Grade)", "Menu item title \
for KEYGEN pop-up menu"); </del><ins>+ return WEB_UI_STRING("512 (Low \
Grade)", "Menu item title for KEYGEN pop-up menu"); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::keygenMenuItem1024()
</span><span class="cx"> {
</span><del>- return UI_STRING("1024 (Medium Grade)", "Menu item \
title for KEYGEN pop-up menu"); </del><ins>+ return WEB_UI_STRING("1024 \
(Medium Grade)", "Menu item title for KEYGEN pop-up menu"); \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> String DefaultLocalizationStrategy::keygenMenuItem2048()
</span><span class="cx"> {
</span><del>- return UI_STRING("2048 (High Grade)", "Menu item \
title for KEYGEN pop-up menu"); </del><ins>+ return WEB_UI_STRING("2048 \
(High Grade)", "Menu item title for KEYGEN pop-up menu"); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::keygenKeychainItemName(const String& host) \
</span><span class="cx"> { </span><del>- return UI_STRING("Key from \
<hostname>", "Name of keychain key generated by the KEYGEN \
tag").replace("<hostname>", host); </del><ins>+ return \
WEB_UI_STRING("Key from <hostname>", "Name of keychain key \
generated by the KEYGEN tag").replace("<hostname>", host); \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> #endif
</span><span class="lines">@@ -711,57 +711,57 @@
</span><span class="cx"> String DefaultLocalizationStrategy::imageTitle(const \
String& filename, const IntSize& size) </span><span class="cx"> {
</span><span class="cx"> // FIXME: This should format the numbers correctly. In \
Mac WebKit, we used +[NSNumberFormatter localizedStringFromNumber:numberStyle:]. \
</span><del>- return formatLocalizedString(UI_STRING("<filename> %d×%d \
pixels", "window title suffix for a standalone image (uses multiplication \
symbol, not x)"), size.width(), \
size.height()).replace("<filename>", filename); </del><ins>+ \
return formatLocalizedString(WEB_UI_STRING("<filename> %d×%d \
pixels", "window title suffix for a standalone image (uses multiplication \
symbol, not x)"), size.width(), \
size.height()).replace("<filename>", filename); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::mediaElementLoadingStateText() </span><span class="cx"> \
{ </span><del>- return UI_STRING("Loading...", "Media controller \
status message when the media is loading"); </del><ins>+ return \
WEB_UI_STRING("Loading...", "Media controller status message when the \
media is loading"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::mediaElementLiveBroadcastStateText() </span><span \
class="cx"> { </span><del>- return UI_STRING("Live Broadcast", \
"Media controller status message when watching a live broadcast"); \
</del><ins>+ return WEB_UI_STRING("Live Broadcast", "Media \
controller status message when watching a live broadcast"); </ins><span \
class="cx"> } </span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::localizedMediaControlElementString(const String& \
name) </span><span class="cx"> {
</span><span class="cx"> if (name == "AudioElement")
</span><del>- return UI_STRING("audio element controller", \
"accessibility role description for audio element controller"); \
</del><ins>+ return WEB_UI_STRING("audio element controller", \
"accessibility role description for audio element controller"); </ins><span \
class="cx"> if (name == "VideoElement") </span><del>- return \
UI_STRING("video element controller", "accessibility role description \
for video element controller"); </del><ins>+ return \
WEB_UI_STRING("video element controller", "accessibility role \
description for video element controller"); </ins><span class="cx"> if (name \
== "MuteButton") </span><del>- return UI_STRING("mute", \
"accessibility role description for mute button"); </del><ins>+ \
return WEB_UI_STRING("mute", "accessibility role description for mute \
button"); </ins><span class="cx"> if (name == "UnMuteButton")
</span><del>- return UI_STRING("unmute", "accessibility role \
description for turn mute off button"); </del><ins>+ return \
WEB_UI_STRING("unmute", "accessibility role description for turn mute \
off button"); </ins><span class="cx"> if (name == "PlayButton")
</span><del>- return UI_STRING("play", "accessibility role \
description for play button"); </del><ins>+ return \
WEB_UI_STRING("play", "accessibility role description for play \
button"); </ins><span class="cx"> if (name == "PauseButton")
</span><del>- return UI_STRING("pause", "accessibility role \
description for pause button"); </del><ins>+ return \
WEB_UI_STRING("pause", "accessibility role description for pause \
button"); </ins><span class="cx"> if (name == "Slider")
</span><del>- return UI_STRING("movie time", "accessibility \
role description for timeline slider"); </del><ins>+ return \
WEB_UI_STRING("movie time", "accessibility role description for \
timeline slider"); </ins><span class="cx"> if (name == \
"SliderThumb") </span><del>- return UI_STRING("timeline slider \
thumb", "accessibility role description for timeline thumb"); \
</del><ins>+ return WEB_UI_STRING("timeline slider thumb", \
"accessibility role description for timeline thumb"); </ins><span \
class="cx"> if (name == "RewindButton") </span><del>- return \
UI_STRING("back 30 seconds", "accessibility role description for seek \
back 30 seconds button"); </del><ins>+ return WEB_UI_STRING("back 30 \
seconds", "accessibility role description for seek back 30 seconds \
button"); </ins><span class="cx"> if (name == \
"ReturnToRealtimeButton") </span><del>- return \
UI_STRING("return to realtime", "accessibility role description for \
return to real time button"); </del><ins>+ return \
WEB_UI_STRING("return to realtime", "accessibility role description \
for return to real time button"); </ins><span class="cx"> if (name == \
"CurrentTimeDisplay") </span><del>- return UI_STRING("elapsed \
time", "accessibility role description for elapsed time display"); \
</del><ins>+ return WEB_UI_STRING("elapsed time", \
"accessibility role description for elapsed time display"); </ins><span \
class="cx"> if (name == "TimeRemainingDisplay") </span><del>- \
return UI_STRING("remaining time", "accessibility role description for \
time remaining display"); </del><ins>+ return \
WEB_UI_STRING("remaining time", "accessibility role description for \
time remaining display"); </ins><span class="cx"> if (name == \
"StatusDisplay") </span><del>- return UI_STRING("status", \
"accessibility role description for movie status"); </del><ins>+ \
return WEB_UI_STRING("status", "accessibility role description for \
movie status"); </ins><span class="cx"> if (name == \
"FullscreenButton") </span><del>- return \
UI_STRING("fullscreen", "accessibility role description for enter \
fullscreen button"); </del><ins>+ return \
WEB_UI_STRING("fullscreen", "accessibility role description for enter \
fullscreen button"); </ins><span class="cx"> if (name == \
"SeekForwardButton") </span><del>- return UI_STRING("fast \
forward", "accessibility role description for fast forward button"); \
</del><ins>+ return WEB_UI_STRING("fast forward", \
"accessibility role description for fast forward button"); </ins><span \
class="cx"> if (name == "SeekBackButton") </span><del>- return \
UI_STRING("fast reverse", "accessibility role description for fast \
reverse button"); </del><ins>+ return WEB_UI_STRING("fast \
reverse", "accessibility role description for fast reverse button"); \
</ins><span class="cx"> if (name == "ShowClosedCaptionsButton") \
</span><del>- return UI_STRING("show closed captions", \
"accessibility role description for show closed captions button"); \
</del><ins>+ return WEB_UI_STRING("show closed captions", \
"accessibility role description for show closed captions button"); \
</ins><span class="cx"> if (name == "HideClosedCaptionsButton") \
</span><del>- return UI_STRING("hide closed captions", \
"accessibility role description for hide closed captions button"); \
</del><ins>+ return WEB_UI_STRING("hide closed captions", \
"accessibility role description for hide closed captions button"); \
</ins><span class="cx"> </span><span class="cx"> // FIXME: the ControlsPanel \
container should never be visible in the accessibility hierarchy. </span><span \
class="cx"> if (name == "ControlsPanel") </span><span class="lines">@@ \
-774,41 +774,41 @@ </span><span class="cx"> String \
DefaultLocalizationStrategy::localizedMediaControlElementHelpText(const String& \
name) </span><span class="cx"> {
</span><span class="cx"> if (name == "AudioElement")
</span><del>- return UI_STRING("audio element playback controls and \
status display", "accessibility role description for audio element \
controller"); </del><ins>+ return WEB_UI_STRING("audio element \
playback controls and status display", "accessibility role description for \
audio element controller"); </ins><span class="cx"> if (name == \
"VideoElement") </span><del>- return UI_STRING("video element \
playback controls and status display", "accessibility role description for \
video element controller"); </del><ins>+ return WEB_UI_STRING("video \
element playback controls and status display", "accessibility role \
description for video element controller"); </ins><span class="cx"> if (name \
== "MuteButton") </span><del>- return UI_STRING("mute audio \
tracks", "accessibility help text for mute button"); </del><ins>+ \
return WEB_UI_STRING("mute audio tracks", "accessibility help text for \
mute button"); </ins><span class="cx"> if (name == "UnMuteButton")
</span><del>- return UI_STRING("unmute audio tracks", \
"accessibility help text for un mute button"); </del><ins>+ return \
WEB_UI_STRING("unmute audio tracks", "accessibility help text for un \
mute button"); </ins><span class="cx"> if (name == "PlayButton")
</span><del>- return UI_STRING("begin playback", "accessibility \
help text for play button"); </del><ins>+ return \
WEB_UI_STRING("begin playback", "accessibility help text for play \
button"); </ins><span class="cx"> if (name == "PauseButton")
</span><del>- return UI_STRING("pause playback", "accessibility \
help text for pause button"); </del><ins>+ return \
WEB_UI_STRING("pause playback", "accessibility help text for pause \
button"); </ins><span class="cx"> if (name == "Slider")
</span><del>- return UI_STRING("movie time scrubber", \
"accessibility help text for timeline slider"); </del><ins>+ return \
WEB_UI_STRING("movie time scrubber", "accessibility help text for \
timeline slider"); </ins><span class="cx"> if (name == \
"SliderThumb") </span><del>- return UI_STRING("movie time \
scrubber thumb", "accessibility help text for timeline slider thumb"); \
</del><ins>+ return WEB_UI_STRING("movie time scrubber thumb", \
"accessibility help text for timeline slider thumb"); </ins><span \
class="cx"> if (name == "RewindButton") </span><del>- return \
UI_STRING("seek movie back 30 seconds", "accessibility help text for \
jump back 30 seconds button"); </del><ins>+ return \
WEB_UI_STRING("seek movie back 30 seconds", "accessibility help text \
for jump back 30 seconds button"); </ins><span class="cx"> if (name == \
"ReturnToRealtimeButton") </span><del>- return \
UI_STRING("return streaming movie to real time", "accessibility help \
text for return streaming movie to real time button"); </del><ins>+ \
return WEB_UI_STRING("return streaming movie to real time", \
"accessibility help text for return streaming movie to real time button"); \
</ins><span class="cx"> if (name == "CurrentTimeDisplay") </span><del>- \
return UI_STRING("current movie time in seconds", "accessibility help \
text for elapsed time display"); </del><ins>+ return \
WEB_UI_STRING("current movie time in seconds", "accessibility help \
text for elapsed time display"); </ins><span class="cx"> if (name == \
"TimeRemainingDisplay") </span><del>- return UI_STRING("number \
of seconds of movie remaining", "accessibility help text for remaining time \
display"); </del><ins>+ return WEB_UI_STRING("number of seconds of \
movie remaining", "accessibility help text for remaining time \
display"); </ins><span class="cx"> if (name == "StatusDisplay")
</span><del>- return UI_STRING("current movie status", \
"accessibility help text for movie status display"); </del><ins>+ \
return WEB_UI_STRING("current movie status", "accessibility help text \
for movie status display"); </ins><span class="cx"> if (name == \
"SeekBackButton") </span><del>- return UI_STRING("seek quickly \
back", "accessibility help text for fast rewind button"); </del><ins>+ \
return WEB_UI_STRING("seek quickly back", "accessibility help text for \
fast rewind button"); </ins><span class="cx"> if (name == \
"SeekForwardButton") </span><del>- return UI_STRING("seek \
quickly forward", "accessibility help text for fast forward button"); \
</del><ins>+ return WEB_UI_STRING("seek quickly forward", \
"accessibility help text for fast forward button"); </ins><span class="cx"> \
if (name == "FullscreenButton") </span><del>- return \
UI_STRING("Play movie in fullscreen mode", "accessibility help text \
for enter fullscreen button"); </del><ins>+ return \
WEB_UI_STRING("Play movie in fullscreen mode", "accessibility help \
text for enter fullscreen button"); </ins><span class="cx"> if (name == \
"ShowClosedCaptionsButton") </span><del>- return \
UI_STRING("start displaying closed captions", "accessibility help text \
for show closed captions button"); </del><ins>+ return \
WEB_UI_STRING("start displaying closed captions", "accessibility help \
text for show closed captions button"); </ins><span class="cx"> if (name == \
"HideClosedCaptionsButton") </span><del>- return \
UI_STRING("stop displaying closed captions", "accessibility help text \
for hide closed captions button"); </del><ins>+ return \
WEB_UI_STRING("stop displaying closed captions", "accessibility help \
text for hide closed captions button"); </ins><span class="cx">
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return String();
</span><span class="lines">@@ -817,7 +817,7 @@
</span><span class="cx"> String \
DefaultLocalizationStrategy::localizedMediaTimeDescription(float time) </span><span \
class="cx"> { </span><span class="cx"> if (!isfinite(time))
</span><del>- return UI_STRING("indefinite time", \
"accessibility help text for an indefinite media controller time value"); \
</del><ins>+ return WEB_UI_STRING("indefinite time", \
"accessibility help text for an indefinite media controller time value"); \
</ins><span class="cx"> </span><span class="cx"> int seconds = \
static_cast<int>(fabsf(time)); </span><span class="cx"> int days = seconds \
/ (60 * 60 * 24); </span><span class="lines">@@ -826,47 +826,47 @@
</span><span class="cx"> seconds %= 60;
</span><span class="cx">
</span><span class="cx"> if (days)
</span><del>- return formatLocalizedString(UI_STRING("%1$d days %2$d \
hours %3$d minutes %4$d seconds", "accessibility help text for media \
controller time value >= 1 day"), days, hours, minutes, seconds); \
</del><ins>+ return formatLocalizedString(WEB_UI_STRING("%1$d days %2$d \
hours %3$d minutes %4$d seconds", "accessibility help text for media \
controller time value >= 1 day"), days, hours, minutes, seconds); </ins><span \
class="cx"> if (hours) </span><del>- return \
formatLocalizedString(UI_STRING("%1$d hours %2$d minutes %3$d seconds", \
"accessibility help text for media controller time value >= 60 \
minutes"), hours, minutes, seconds); </del><ins>+ return \
formatLocalizedString(WEB_UI_STRING("%1$d hours %2$d minutes %3$d seconds", \
"accessibility help text for media controller time value >= 60 \
minutes"), hours, minutes, seconds); </ins><span class="cx"> if (minutes)
</span><del>- return formatLocalizedString(UI_STRING("%1$d minutes %2$d \
seconds", "accessibility help text for media controller time value >= 60 \
seconds"), minutes, seconds);
- return formatLocalizedString(UI_STRING("%1$d seconds", \
"accessibility help text for media controller time value < 60 seconds"), \
seconds); </del><ins>+ return formatLocalizedString(WEB_UI_STRING("%1$d \
minutes %2$d seconds", "accessibility help text for media controller time \
value >= 60 seconds"), minutes, seconds); + return \
formatLocalizedString(WEB_UI_STRING("%1$d seconds", "accessibility \
help text for media controller time value < 60 seconds"), seconds); \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::validationMessageValueMissingText() </span><span \
class="cx"> { </span><del>- return UI_STRING("value missing", \
"Validation message for required form control elements that have no \
value"); </del><ins>+ return WEB_UI_STRING("value missing", \
"Validation message for required form control elements that have no \
value"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::validationMessageTypeMismatchText() </span><span \
class="cx"> { </span><del>- return UI_STRING("type mismatch", \
"Validation message for input form controls with a value not matching \
type"); </del><ins>+ return WEB_UI_STRING("type mismatch", \
"Validation message for input form controls with a value not matching \
type"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::validationMessagePatternMismatchText() </span><span \
class="cx"> { </span><del>- return UI_STRING("pattern mismatch", \
"Validation message for input form controls requiring a constrained value \
according to pattern"); </del><ins>+ return WEB_UI_STRING("pattern \
mismatch", "Validation message for input form controls requiring a \
constrained value according to pattern"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::validationMessageTooLongText() </span><span class="cx"> \
{ </span><del>- return UI_STRING("too long", "Validation message \
for form control elements with a value longer than maximum allowed length"); \
</del><ins>+ return WEB_UI_STRING("too long", "Validation message \
for form control elements with a value longer than maximum allowed length"); \
</ins><span class="cx"> } </span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::validationMessageRangeUnderflowText() </span><span \
class="cx"> { </span><del>- return UI_STRING("range underflow", \
"Validation message for input form controls with value lower than allowed \
minimum"); </del><ins>+ return WEB_UI_STRING("range underflow", \
"Validation message for input form controls with value lower than allowed \
minimum"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::validationMessageRangeOverflowText() </span><span \
class="cx"> { </span><del>- return UI_STRING("range overflow", \
"Validation message for input form controls with value higher than allowed \
maximum"); </del><ins>+ return WEB_UI_STRING("range overflow", \
"Validation message for input form controls with value higher than allowed \
maximum"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String \
DefaultLocalizationStrategy::validationMessageStepMismatchText() </span><span \
class="cx"> { </span><del>- return UI_STRING("step mismatch", \
"Validation message for input form controls with value not respecting the step \
attribute"); </del><ins>+ return WEB_UI_STRING("step mismatch", \
"Validation message for input form controls with value not respecting the step \
attribute"); </ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLocalizedStringsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LocalizedStrings.h \
(82621 => 82622)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LocalizedStrings.h 2011-03-31 \
21:47:35 UTC (rev 82621)
+++ trunk/Source/WebCore/platform/LocalizedStrings.h 2011-03-31 21:58:33 UTC (rev \
82622) </span><span class="lines">@@ -195,8 +195,8 @@
</span><span class="cx"> String validationMessageStepMismatchText(const \
String& base, const String& step); </span><span class="cx">
</span><span class="cx">
</span><del>-#define UI_STRING(string, description) WebCore::localizedString(string)
-#define UI_STRING_KEY(string, key, description) WebCore::localizedString(key)
</del><ins>+#define WEB_UI_STRING(string, description) \
WebCore::localizedString(string) +#define WEB_UI_STRING_KEY(string, key, description) \
WebCore::localizedString(key) </ins><span class="cx">
</span><span class="cx"> String localizedString(const char* key);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (82621 => \
82622)</h4> <pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2011-03-31 21:47:35 UTC (rev \
82621)
+++ trunk/Source/WebKit2/ChangeLog 2011-03-31 21:58:33 UTC (rev 82622)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2011-03-31 Sam Weinig <sam@webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ Rename WebCore's UI_STRING to WEB_UI_STRING to not overlap with WebKit API
+ https://bugs.webkit.org/show_bug.cgi?id=57582
+
+ * PluginProcess/mac/PluginProcessMac.mm:
+ (WebKit::PluginProcess::platformInitialize):
+ * UIProcess/mac/WebInspectorProxyMac.mm:
+ (WebKit::WebInspectorProxy::platformInspectedURLChanged):
+ * WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:
+ * WebProcess/mac/WebProcessMac.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
</ins><span class="cx"> 2011-03-31 Adam Roben <aroben@apple.com>
</span><span class="cx">
</span><span class="cx"> Specify both FILE_MAP_READ and FILE_MAP_WRITE when \
creating a read-write SharedMemory object </span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessmacPluginProcessMacmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm (82621 => 82622)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2011-03-31 21:47:35 UTC \
(rev 82621)
+++ trunk/Source/WebKit2/PluginProcess/mac/PluginProcessMac.mm 2011-03-31 21:58:33 \
UTC (rev 82622) </span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_compositingRenderServerPort = \
parameters.acceleratedCompositingPort.port(); </span><span class="cx">
</span><del>- NSString *applicationName = [NSString \
stringWithFormat:UI_STRING("%@ (%@ Internet plug-in)", </del><ins>+ \
NSString *applicationName = [NSString stringWithFormat:WEB_UI_STRING("%@ (%@ \
Internet plug-in)", </ins><span class="cx"> \
"visible name of the plug-in host process. The first argument is the plug-in \
name " </span><span class="cx"> \
"and the second argument is the application name."), </span><span \
class="cx"> [[(NSString *)parameters.pluginPath \
lastPathComponent] stringByDeletingPathExtension], </span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebInspectorProxyMacmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm (82621 => 82622)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2011-03-31 21:47:35 UTC \
(rev 82621)
+++ trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm 2011-03-31 21:58:33 \
UTC (rev 82622) </span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> void WebInspectorProxy::platformInspectedURLChanged(const \
String& urlString) </span><span class="cx"> {
</span><del>- NSString *title = [NSString stringWithFormat:UI_STRING("Web \
Inspector — %@", "Web Inspector window title"), (NSString \
*)urlString]; </del><ins>+ NSString *title = [NSString \
stringWithFormat:WEB_UI_STRING("Web Inspector — %@", "Web Inspector \
window title"), (NSString *)urlString]; </ins><span class="cx"> \
[m_inspectorWindow.get() setTitle:title]; </span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebErrorsMacmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm (82621 => \
82622)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm 2011-03-31 \
21:47:35 UTC (rev 82621)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm 2011-03-31 \
21:58:33 UTC (rev 82622) </span><span class="lines">@@ -43,17 +43,17 @@
</span><span class="cx"> static NSString * const WebKitErrorPlugInPageURLStringKey = \
@"WebKitErrorPlugInPageURLStringKey"; </span><span class="cx">
</span><span class="cx"> // Policy errors
</span><del>-#define WebKitErrorDescriptionCannotShowMIMEType UI_STRING("Content \
with specified MIME type can't be shown", "WebKitErrorCannotShowMIMEType \
description")
-#define WebKitErrorDescriptionCannotShowURL UI_STRING("The URL can't be \
shown", "WebKitErrorCannotShowURL description")
-#define WebKitErrorDescriptionFrameLoadInterruptedByPolicyChange \
UI_STRING("Frame load interrupted", \
"WebKitErrorFrameLoadInterruptedByPolicyChange \
description")
-#define WebKitErrorDescriptionCannotUseRestrictedPort UI_STRING("Not allowed to \
use restricted network port", "WebKitErrorCannotUseRestrictedPort \
description") </del><ins>+#define WebKitErrorDescriptionCannotShowMIMEType \
WEB_UI_STRING("Content with specified MIME type can't be shown", \
"WebKitErrorCannotShowMIMEType description") +#define \
WebKitErrorDescriptionCannotShowURL WEB_UI_STRING("The URL can't be shown", \
"WebKitErrorCannotShowURL description") +#define \
WebKitErrorDescriptionFrameLoadInterruptedByPolicyChange WEB_UI_STRING("Frame \
load interrupted", "WebKitErrorFrameLoadInterruptedByPolicyChange \
description") +#define WebKitErrorDescriptionCannotUseRestrictedPort \
WEB_UI_STRING("Not allowed to use restricted network port", \
"WebKitErrorCannotUseRestrictedPort description") </ins><span class="cx">
</span><span class="cx"> // Plug-in and java errors
</span><del>-#define WebKitErrorDescriptionCannotFindPlugin UI_STRING("The \
plug-in can't be found", "WebKitErrorCannotFindPlugin \
description")
-#define WebKitErrorDescriptionCannotLoadPlugin UI_STRING("The plug-in can't be \
loaded", "WebKitErrorCannotLoadPlugin description")
-#define WebKitErrorDescriptionJavaUnavailable UI_STRING("Java is \
unavailable", "WebKitErrorJavaUnavailable \
description")
-#define WebKitErrorDescriptionPlugInCancelledConnection UI_STRING("Plug-in \
cancelled", "WebKitErrorPlugInCancelledConnection \
description")
-#define WebKitErrorDescriptionPlugInWillHandleLoad UI_STRING("Plug-in handled \
load", "WebKitErrorPlugInWillHandleLoad description") \
</del><ins>+#define WebKitErrorDescriptionCannotFindPlugin WEB_UI_STRING("The \
plug-in can't be found", "WebKitErrorCannotFindPlugin description") \
+#define WebKitErrorDescriptionCannotLoadPlugin WEB_UI_STRING("The plug-in can't \
be loaded", "WebKitErrorCannotLoadPlugin description") +#define \
WebKitErrorDescriptionJavaUnavailable WEB_UI_STRING("Java is unavailable", \
"WebKitErrorJavaUnavailable description") +#define \
WebKitErrorDescriptionPlugInCancelledConnection WEB_UI_STRING("Plug-in \
cancelled", "WebKitErrorPlugInCancelledConnection description") \
+#define WebKitErrorDescriptionPlugInWillHandleLoad WEB_UI_STRING("Plug-in \
handled load", "WebKitErrorPlugInWillHandleLoad description") \
</ins><span class="cx"> </span><span class="cx"> static pthread_once_t \
registerErrorsControl = PTHREAD_ONCE_INIT; </span><span class="cx"> static void \
registerErrors(void); </span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessmacWebProcessMacmm"></a>
<div class="modfile"><h4>Modified: \
trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm (82621 => 82622)</h4> <pre \
class="diff"><span> <span class="info">--- \
trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2011-03-31 21:47:35 UTC (rev \
82621)
+++ trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm 2011-03-31 21:58:33 UTC (rev \
82622) </span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> initializeSandbox(parameters);
</span><span class="cx">
</span><span class="cx"> if (!parameters.parentProcessName.isNull()) {
</span><del>- NSString *applicationName = [NSString \
stringWithFormat:UI_STRING("%@ Web Content", "Visible name of the web \
process. The argument is the application name."), (NSString \
*)parameters.parentProcessName]; </del><ins>+ NSString *applicationName = \
[NSString stringWithFormat:WEB_UI_STRING("%@ Web Content", "Visible \
name of the web process. The argument is the application name."), (NSString \
*)parameters.parentProcessName]; </ins><span class="cx"> \
WKSetVisibleApplicationName((CFStringRef)applicationName); </span><span class="cx"> \
} </span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic