<!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>[182735] 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/182735">182735</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2015-04-13 08:41:40 -0700 (Mon, 13 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Localizable strings are inconsistent and need to be regenerated
https://bugs.webkit.org/show_bug.cgi?id=143661
Source/WebCore:
rdar://problem/19634388
Reviewed by Dan Bernstein.
* English.lproj/Localizable.strings: Updated by running the
update-webkit-localizable-strings script.
Source/WebKit/mac:
rdar://problem/19634388
Reviewed by Dan Bernstein.
* Misc/WebLocalizableStrings.mm:
(LoadWebLocalizedStringsTimerCallback): Moved the comment, useful for programmers but
not for localization, into a C++ source code comment, and made the localizer comment
consistent with the place this localizable string is used for actual localization.
* WebCoreSupport/WebEditorClient.mm:
(undoNameForEditAction): Changed the localizer comments for Delete and Dictation
to match the ones in WebKit2; no need to specify that these are iOS only, and if we do
want to specify that, we should not be using the term PLATFORM(IOS) since there is no
reason for us to expect localizers to understand that terminology. Also added a comment
about the fact that we have two copies of all the localizable strings.
Source/WebKit2:
Reviewed by Dan Bernstein.
* UIProcess/WebEditCommandProxy.cpp:
(WebKit::WebEditCommandProxy::nameForEditAction): Also added a comment
about the fact that we have two copies of all the localizable strings.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreEnglishlprojLocalizablestrings">trunk/Source/WebCore/English.lproj/Localizable.strings</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebLocalizableStringsmm">trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebEditCommandProxycpp">trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182734 => 182735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-13 15:40:42 UTC (rev 182734)
+++ trunk/Source/WebCore/ChangeLog 2015-04-13 15:41:40 UTC (rev 182735)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-12 Darin Adler <darin@apple.com>
+
+ [Cocoa] Localizable strings are inconsistent and need to be regenerated
+ https://bugs.webkit.org/show_bug.cgi?id=143661
+ rdar://problem/19634388
+
+ Reviewed by Dan Bernstein.
+
+ * English.lproj/Localizable.strings: Updated by running the
+ update-webkit-localizable-strings script.
+
</ins><span class="cx"> 2015-04-13 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove needless recreation of URL in NavigationScheduler::scheduleLocationChange
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojLocalizablestrings"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (182734 => 182735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/Localizable.strings 2015-04-13 15:40:42 UTC (rev 182734)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2015-04-13 15:41:40 UTC (rev 182735)
</span><span class="lines">@@ -91,9 +91,15 @@
</span><span class="cx"> /* WKErrorJavaScriptExceptionOccurred description */
</span><span class="cx"> "A JavaScript exception occurred" = "A JavaScript exception occurred";
</span><span class="cx">
</span><ins>+/* action menu item */
+"Add to Photos (action menu item)" = "Add to Photos";
+
</ins><span class="cx"> /* Title for Add to Reading List action button */
</span><span class="cx"> "Add to Reading List" = "Add to Reading List";
</span><span class="cx">
</span><ins>+/* action menu item */
+"Add to Reading List (action menu item)" = "Add to Reading List";
+
</ins><span class="cx"> /* Undo action name */
</span><span class="cx"> "Align Left (Undo action name)" = "Align Left";
</span><span class="cx">
</span><span class="lines">@@ -181,6 +187,15 @@
</span><span class="cx"> /* Copy context menu item */
</span><span class="cx"> "Copy" = "Copy";
</span><span class="cx">
</span><ins>+/* image action menu item */
+"Copy (image action menu item)" = "Copy";
+
+/* text action menu item */
+"Copy (text action menu item)" = "Copy";
+
+/* video action menu item */
+"Copy (video action menu item)" = "Copy";
+
</ins><span class="cx"> /* Title for Copy Link or Image action button */
</span><span class="cx"> "Copy ActionSheet Link" = "Copy";
</span><span class="cx">
</span><span class="lines">@@ -211,13 +226,13 @@
</span><span class="cx"> /* Default writing direction context menu item */
</span><span class="cx"> "Default" = "Default";
</span><span class="cx">
</span><del>-/* Undo action name (Used only by PLATFORM(IOS) code) */
</del><ins>+/* Undo action name */
</ins><span class="cx"> "Delete (Undo action name)" = "Delete";
</span><span class="cx">
</span><span class="cx"> /* text to display in <details> tag when it has no <summary> child */
</span><span class="cx"> "Details" = "Details";
</span><span class="cx">
</span><del>-/* Undo action name (Used only by PLATFORM(IOS) code) */
</del><ins>+/* Undo action name */
</ins><span class="cx"> "Dictation (Undo action name)" = "Dictation";
</span><span class="cx">
</span><span class="cx"> /* Download Audio To Disk context menu item */
</span><span class="lines">@@ -364,6 +379,9 @@
</span><span class="cx"> /* Menu item label for the track that represents disabling closed captions */
</span><span class="cx"> "Off" = "Off";
</span><span class="cx">
</span><ins>+/* action menu item */
+"Open (action menu item)" = "Open";
+
</ins><span class="cx"> /* Title for Open Link action button */
</span><span class="cx"> "Open ActionSheet Link" = "Open";
</span><span class="cx">
</span><span class="lines">@@ -406,6 +424,9 @@
</span><span class="cx"> /* Undo action name */
</span><span class="cx"> "Paste (Undo action name)" = "Paste";
</span><span class="cx">
</span><ins>+/* action menu item */
+"Paste (action menu item)" = "Paste";
+
</ins><span class="cx"> /* Undo action name */
</span><span class="cx"> "Paste Font (Undo action name)" = "Paste Font";
</span><span class="cx">
</span><span class="lines">@@ -457,6 +478,12 @@
</span><span class="cx"> /* Title for Save Image action button */
</span><span class="cx"> "Save Image" = "Save Image";
</span><span class="cx">
</span><ins>+/* image action menu item */
+"Save to Downloads (image action menu item)" = "Save to Downloads";
+
+/* video action menu item */
+"Save to Downloads (video action menu item)" = "Save to Downloads";
+
</ins><span class="cx"> /* Search in Spotlight context menu item */
</span><span class="cx"> "Search in Spotlight" = "Search in Spotlight";
</span><span class="cx">
</span><span class="lines">@@ -562,6 +589,9 @@
</span><span class="cx"> /* Menu section heading for subtitles */
</span><span class="cx"> "Subtitles" = "Subtitles";
</span><span class="cx">
</span><ins>+/* action menu item */
+"Suggestions (action menu item)" = "Suggestions";
+
</ins><span class="cx"> /* Undo action name */
</span><span class="cx"> "Superscript (Undo action name)" = "Superscript";
</span><span class="cx">
</span><span class="lines">@@ -628,7 +658,7 @@
</span><span class="cx"> /* Undo action name */
</span><span class="cx"> "Turn Off Ligatures (Undo action name)" = "Turn Off Ligatures";
</span><span class="cx">
</span><del>-/* We don't care if we find this string, but searching for it will load the plist and save the results. */
</del><ins>+/* Undo action name */
</ins><span class="cx"> "Typing (Undo action name)" = "Typing";
</span><span class="cx">
</span><span class="cx"> /* Underline context menu item */
</span><span class="lines">@@ -637,6 +667,9 @@
</span><span class="cx"> /* Undo action name */
</span><span class="cx"> "Underline (Undo action name)" = "Underline";
</span><span class="cx">
</span><ins>+/* Menu item label for an audio track that has no other name */
+"Unknown (audio track)" = "Unknown";
+
</ins><span class="cx"> /* Unknown filesize FTP directory listing item */
</span><span class="cx"> "Unknown (filesize)" = "Unknown";
</span><span class="cx">
</span><span class="lines">@@ -1075,38 +1108,3 @@
</span><span class="cx"> /* accessibility label for video element controller */
</span><span class="cx"> "video playback" = "video playback";
</span><span class="cx">
</span><del>-/* "Open Link in Default Browser" action menu item */
-"Open (action menu item)" = "Open";
-
-/* "Preview Link" action menu item */
-"Preview (action menu item)" = "Preview";
-
-/* "Add to Reading List" action menu item */
-"Add to Reading List (action menu item)" = "Add to Reading List";
-
-/* "Copy" action menu item in image menu */
-"Copy (image action menu item)" = "Copy";
-
-/* "Add to Photos" action menu item */
-"Add to Photos (action menu item)" = "Add to Photos";
-
-/* "Save to Downloads" action menu item in image menu */
-"Save to Downloads (image action menu item)" = "Save to Downloads";
-
-/* "Copy" action menu item in text menu */
-"Copy (text action menu item)" = "Copy";
-
-/* "Look Up" action menu item */
-"Look Up (action menu item)" = "Look Up";
-
-/* "Paste" action menu item */
-"Paste (action menu item)" = "Paste";
-
-/* "Suggestions" action menu item */
-"Suggestions (action menu item)" = "Suggestions";
-
-/* "Copy" action menu item in video menu */
-"Copy (video action menu item)" = "Copy";
-
-/* "Save to Downloads" action menu item in video menu */
-"Save to Downloads (video action menu item)" = "Save to Downloads";
</del></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (182734 => 182735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-04-13 15:40:42 UTC (rev 182734)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-13 15:41:40 UTC (rev 182735)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-04-12 Darin Adler <darin@apple.com>
+
+ [Cocoa] Localizable strings are inconsistent and need to be regenerated
+ https://bugs.webkit.org/show_bug.cgi?id=143661
+ rdar://problem/19634388
+
+ Reviewed by Dan Bernstein.
+
+ * Misc/WebLocalizableStrings.mm:
+ (LoadWebLocalizedStringsTimerCallback): Moved the comment, useful for programmers but
+ not for localization, into a C++ source code comment, and made the localizer comment
+ consistent with the place this localizable string is used for actual localization.
+ * WebCoreSupport/WebEditorClient.mm:
+ (undoNameForEditAction): Changed the localizer comments for Delete and Dictation
+ to match the ones in WebKit2; no need to specify that these are iOS only, and if we do
+ want to specify that, we should not be using the term PLATFORM(IOS) since there is no
+ reason for us to expect localizers to understand that terminology. Also added a comment
+ about the fact that we have two copies of all the localizable strings.
+
</ins><span class="cx"> 2015-04-11 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Enable Symbol in web pages
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebLocalizableStringsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.mm (182734 => 182735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.mm 2015-04-13 15:40:42 UTC (rev 182734)
+++ trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.mm 2015-04-13 15:41:40 UTC (rev 182735)
</span><span class="lines">@@ -74,11 +74,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+
</ins><span class="cx"> // See <rdar://problem/7902473> Optimize WebLocalizedString for why we do this on a background thread on a timer callback
</span><span class="cx"> static void LoadWebLocalizedStringsTimerCallback(CFRunLoopTimerRef timer, void *info)
</span><span class="cx"> {
</span><del>- dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
- UI_STRING_KEY_INTERNAL("Typing", "Typing (Undo action name)", "We don't care if we find this string, but searching for it will load the plist and save the results.");
</del><ins>+ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
+ // We don't care if we find this string, but searching for it will load the plist and save the results.
+ // FIXME: It would be nicer to do this in a more direct way.
+ UI_STRING_KEY_INTERNAL("Typing", "Typing (Undo action name)", "Undo action name");
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -88,4 +91,5 @@
</span><span class="cx"> CFRunLoopAddTimer(CFRunLoopGetCurrent(), timer, kCFRunLoopCommonModes);
</span><span class="cx"> CFRelease(timer);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (182734 => 182735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2015-04-13 15:40:42 UTC (rev 182734)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm 2015-04-13 15:41:40 UTC (rev 182735)
</span><span class="lines">@@ -543,6 +543,7 @@
</span><span class="cx">
</span><span class="cx"> static NSString* undoNameForEditAction(EditAction editAction)
</span><span class="cx"> {
</span><ins>+ // FIXME: This is identical to code in WebKit2's WebEditCommandProxy class; would be nice to share the strings instead of having two copies.
</ins><span class="cx"> switch (editAction) {
</span><span class="cx"> case EditActionUnspecified: return nil;
</span><span class="cx"> case EditActionSetColor: return UI_STRING_KEY_INTERNAL("Set Color", "Set Color (Undo action name)", "Undo action name");
</span><span class="lines">@@ -583,8 +584,8 @@
</span><span class="cx"> case EditActionOutdent: return UI_STRING_KEY_INTERNAL("Outdent", "Outdent (Undo action name)", "Undo action name");
</span><span class="cx"> case EditActionBold: return UI_STRING_KEY_INTERNAL("Bold", "Bold (Undo action name)", "Undo action name");
</span><span class="cx"> case EditActionItalics: return UI_STRING_KEY_INTERNAL("Italics", "Italics (Undo action name)", "Undo action name");
</span><del>- case EditActionDelete: return UI_STRING_KEY_INTERNAL("Delete", "Delete (Undo action name)", "Undo action name (Used only by PLATFORM(IOS) code)");
- case EditActionDictation: return UI_STRING_KEY_INTERNAL("Dictation", "Dictation (Undo action name)", "Undo action name (Used only by PLATFORM(IOS) code)");
</del><ins>+ case EditActionDelete: return UI_STRING_KEY_INTERNAL("Delete", "Delete (Undo action name)", "Undo action name");
+ case EditActionDictation: return UI_STRING_KEY_INTERNAL("Dictation", "Dictation (Undo action name)", "Undo action name");
</ins><span class="cx"> }
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182734 => 182735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-13 15:40:42 UTC (rev 182734)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-13 15:41:40 UTC (rev 182735)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-12 Darin Adler <darin@apple.com>
+
+ [Cocoa] Localizable strings are inconsistent and need to be regenerated
+ https://bugs.webkit.org/show_bug.cgi?id=143661
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/WebEditCommandProxy.cpp:
+ (WebKit::WebEditCommandProxy::nameForEditAction): Also added a comment
+ about the fact that we have two copies of all the localizable strings.
+
</ins><span class="cx"> 2015-04-12 Sungmann Cho <sungmann.cho@navercorp.com>
</span><span class="cx">
</span><span class="cx"> Fix trival typos related to the word "coordinate".
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebEditCommandProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp (182734 => 182735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp 2015-04-13 15:40:42 UTC (rev 182734)
+++ trunk/Source/WebKit2/UIProcess/WebEditCommandProxy.cpp 2015-04-13 15:41:40 UTC (rev 182735)
</span><span class="lines">@@ -70,6 +70,7 @@
</span><span class="cx">
</span><span class="cx"> String WebEditCommandProxy::nameForEditAction(EditAction editAction)
</span><span class="cx"> {
</span><ins>+ // FIXME: This is identical to code in WebKit's WebEditorClient class; would be nice to share the strings instead of having two copies.
</ins><span class="cx"> switch (editAction) {
</span><span class="cx"> case EditActionUnspecified:
</span><span class="cx"> return String();
</span></span></pre>
</div>
</div>
</body>
</html>