Changeset 84158 in webkit

Timestamp:

Apr 18, 2011 10:29:50 AM (13 years ago)

Author:

timothy@apple.com

Message:

Make update-webkit-localizable-strings put WebKit/win strings in WebCore
now that all localized strings in WebKit/win use WEB_UI_STRING.

​https://webkit.org/b/58747

Reviewed by Dan Bernstein.

Source/WebCore:

• English.lproj/Localizable.strings: Updated with strings from WebKit/win.

Source/WebKit:

• English.lproj/Localizable.strings: Removed.

Tools:

• Scripts/update-webkit-localizable-strings: Remove the code that updated WebKit/win differently.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/English.lproj/Localizable.strings (modified) (19 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/English.lproj/Localizable.strings (deleted)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/update-webkit-localizable-strings (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-18  Timothy Hatcher  <timothy@apple.com>
+
+        Make update-webkit-localizable-strings put WebKit/win strings in WebCore
+        now that all localized strings in WebKit/win use WEB_UI_STRING.
+
+        https://webkit.org/b/58747
+
+        Reviewed by Dan Bernstein.
+
+        * English.lproj/Localizable.strings: Updated with strings from WebKit/win.
+
 2011-04-15  MORITA Hajime  <morrita@google.com>
 

trunk/Source/WebCore/English.lproj/Localizable.strings

@@ -152 +152 @@
 "Hide Substitutions" = "Hide Substitutions";
 
+/* The default, default character encoding */
+"ISO-8859-1" = "ISO-8859-1";
+
 /* Ignore Grammar context menu item */
 "Ignore Grammar" = "Ignore Grammar";
@@ -485 +488 @@
 "Your password will be sent unencrypted." = "Your password will be sent unencrypted.";
 
+/* HTTP result code string */
+"accepted" = "accepted";
+
 /* Verb stating the action that will occur when a text field is selected, as used by accessibility */
 "activate" = "activate";
@@ -512 +518 @@
 "back 30 seconds" = "back 30 seconds";
 
+/* HTTP result code string */
+"bad gateway" = "bad gateway";
+
+/* HTTP result code string */
+"bad request" = "bad request";
+
 /* An ARIA accessibility group that acts as a banner. */
 "banner" = "banner";
@@ -521 +533 @@
 "check" = "check";
 
+/* HTTP result code string */
+"client error" = "client error";
+
 /* An ARIA accessibility group that acts as a region of complementary information. */
 "complementary" = "complementary";
 
+/* HTTP result code string */
+"conflict" = "conflict";
+
 /* An ARIA accessibility group that contains content. */
 "content" = "content";
 
+/* HTTP result code string */
+"continue" = "continue";
+
+/* HTTP result code string */
+"created" = "created";
+
 /* accessibility help text for movie status display */
 "current movie status" = "current movie status";
@@ -545 +569 @@
 "elapsed time" = "elapsed time";
 
+/* HTTP result code string */
+"expectation failed" = "expectation failed";
+
 /* accessibility role description for fast forward button */
 "fast forward" = "fast forward";
@@ -551 +578 @@
 "fast reverse" = "fast reverse";
 
+/* HTTP result code string */
+"forbidden" = "forbidden";
+
+/* HTTP result code string */
+"found" = "found";
+
 /* accessibility role description for enter fullscreen button */
 "fullscreen" = "fullscreen";
 
+/* HTTP result code string */
+"gateway timed out" = "gateway timed out";
+
 /* accessibility role description for headings */
 "heading" = "heading";
@@ -566 +602 @@
 "indefinite time" = "indefinite time";
 
+/* HTTP result code string */
+"informational" = "informational";
+
+/* HTTP result code string */
+"internal server error" = "internal server error";
+
 /* Verb stating the action that will occur when a link is clicked, as used by accessibility */
 "jump" = "jump";
 
+/* HTTP result code string */
+"length required" = "length required";
+
 /* accessibility role description for link */
 "link" = "link";
@@ -587 +632 @@
 "math" = "math";
 
+/* HTTP result code string */
+"method not allowed" = "method not allowed";
+
+/* HTTP result code string */
+"moved permanently" = "moved permanently";
+
 /* accessibility role description for timeline slider */
 "movie time" = "movie time";
@@ -596 +647 @@
 "movie time scrubber thumb" = "movie time scrubber thumb";
 
+/* HTTP result code string */
+"multiple choices" = "multiple choices";
+
 /* accessibility role description for mute button */
 "mute" = "mute";
@@ -605 +659 @@
 "navigation" = "navigation";
 
+/* HTTP result code string */
+"needs proxy" = "needs proxy";
+
+/* HTTP result code string */
+"no content" = "no content";
+
+/* HTTP result code string */
+"no error" = "no error";
+
 /* text to display in file button used in HTML forms when no file is selected */
 "no file selected" = "no file selected";
 
+/* HTTP result code string */
+"no longer exists" = "no longer exists";
+
+/* HTTP result code string */
+"non-authoritative information" = "non-authoritative information";
+
+/* HTTP result code string */
+"not found" = "not found";
+
+/* HTTP result code string */
+"not modified" = "not modified";
+
 /* An ARIA accessibility group that acts as a note in a document. */
 "note" = "note";
@@ -614 +689 @@
 "number of seconds of movie remaining" = "number of seconds of movie remaining";
 
+/* HTTP result code string */
+"partial content" = "partial content";
+
 /* Validation message for input form controls requiring a constrained value according to pattern */
 "pattern mismatch" = "pattern mismatch";
@@ -623 +701 @@
 "pause playback" = "pause playback";
 
+/* HTTP result code string */
+"payment required" = "payment required";
+
 /* accessibility role description for play button */
 "play" = "play";
 
+/* HTTP result code string */
+"precondition failed" = "precondition failed";
+
 /* Verb stating the action that will occur when a button is pressed, as used by accessibility */
 "press" = "press";
 
+/* HTTP result code string */
+"proxy authentication required" = "proxy authentication required";
+
 /* Validation message for input form controls with value higher than allowed maximum */
 "range overflow" = "range overflow";
@@ -635 +722 @@
 "range underflow" = "range underflow";
 
+/* HTTP result code string */
+"redirected" = "redirected";
+
 /* An ARIA accessibility group that acts as a distinct region in a document. */
 "region" = "region";
@@ -641 +731 @@
 "remaining time" = "remaining time";
 
+/* HTTP result code string */
+"request timed out" = "request timed out";
+
+/* HTTP result code string */
+"request too large" = "request too large";
+
+/* HTTP result code string */
+"requested URL too long" = "requested URL too long";
+
+/* HTTP result code string */
+"requested range not satisfiable" = "requested range not satisfiable";
+
+/* HTTP result code string */
+"reset content" = "reset content";
+
 /* accessibility help text for return streaming movie to real time button */
 "return streaming movie to real time" = "return streaming movie to real time";
@@ -650 +755 @@
 "search" = "search";
 
+/* HTTP result code string */
+"see other" = "see other";
+
 /* accessibility help text for jump back 30 seconds button */
 "seek movie back 30 seconds" = "seek movie back 30 seconds";
@@ -662 +770 @@
 "select" = "select";
 
+/* HTTP result code string */
+"server error" = "server error";
+
+/* HTTP result code string */
+"service unavailable" = "service unavailable";
+
 /* accessibility role description for show closed captions button */
 "show closed captions" = "show closed captions";
@@ -677 +791 @@
 "stop displaying closed captions" = "stop displaying closed captions";
 
+/* HTTP result code string */
+"success" = "success";
+
+/* HTTP result code string */
+"switching protocols" = "switching protocols";
+
 /* An ARIA accessibility group that contains the content of a tab. */
 "tab panel" = "tab panel";
 
+/* HTTP result code string */
+"temporarily redirected" = "temporarily redirected";
+
 /* term word of a definition */
 "term" = "term";
@@ -698 +821 @@
 "type mismatch" = "type mismatch";
 
+/* HTTP result code string */
+"unacceptable" = "unacceptable";
+
+/* HTTP result code string */
+"unauthorized" = "unauthorized";
+
 /* Verb stating the action that will occur when a checked checkbox is clicked, as used by accessibility */
 "uncheck" = "uncheck";
 
+/* HTTP result code string */
+"unimplemented" = "unimplemented";
+
 /* Unknown filename */
 "unknown" = "unknown";
@@ -710 +842 @@
 "unmute audio tracks" = "unmute audio tracks";
 
+/* HTTP result code string */
+"unsupported media type" = "unsupported media type";
+
+/* HTTP result code string */
+"unsupported version" = "unsupported version";
+
 /* Validation message for required form control elements that have no value */
 "value missing" = "value missing";

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2011-04-18  Timothy Hatcher  <timothy@apple.com>
+
+        Make update-webkit-localizable-strings put WebKit/win strings in WebCore
+        now that all localized strings in WebKit/win use WEB_UI_STRING.
+
+        https://webkit.org/b/58747
+
+        Reviewed by Dan Bernstein.
+
+        * English.lproj/Localizable.strings: Removed.
+
 2011-04-17  Joseph Pecoraro  <joepeck@webkit.org>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-18  Timothy Hatcher  <timothy@apple.com>
+
+        Make update-webkit-localizable-strings put WebKit/win strings in WebCore
+        now that all localized strings in WebKit/win use WEB_UI_STRING.
+
+        https://webkit.org/b/58747
+
+        Reviewed by Dan Bernstein.
+
+        * Scripts/update-webkit-localizable-strings: Remove the code that updated WebKit/win differently.
+
 2011-04-18  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Tools/Scripts/update-webkit-localizable-strings

@@ -36 +36 @@
 
 # WebKit and WebKit2 strings go into WebCore's Localizable.strings.
-my @directoriesToScan = ("Source/WebCore", "Source/WebKit/mac", "Source/WebKit2", "-Source/WebCore/icu", "-Source/WebKit/mac/icu");
+my @directoriesToScan = ("Source/WebCore", "Source/WebKit/mac", "Source/WebKit/win", "Source/WebKit2", "-Source/WebCore/icu", "-Source/WebKit/mac/icu");
 my $fileToUpdate = "Source/WebCore/English.lproj/Localizable.strings";
 
@@ -44 +44 @@
 
 system "Tools/Scripts/extract-localizable-strings", "-", $fileToUpdate, @directoriesToScan;
-
-# FIXME: the following can be removed and "Source/WebKit/win" added above once Windows uses WebCore's Localizable.strings. <rdar://problem/9119405>
-my @webKitDirectoriesToScan = ("Source/WebKit/win");
-my $webKitFileToUpdate = "Source/WebKit/English.lproj/Localizable.strings";
-
-system "Tools/Scripts/extract-localizable-strings", "-", $webKitFileToUpdate, @webKitDirectoriesToScan;