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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@84158 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index da8fd221c1fd1f365d6a1ec76eb874b3d5c8c27e..98ba38a03d9e40892a3d53d35183f3e15efeabfe 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+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>
 
         Reviewed by Adam Barth.

diff --git a/Source/WebCore/English.lproj/Localizable.strings b/Source/WebCore/English.lproj/Localizable.strings
index af83cdb7a27a40aa533fa941272c9ed04deceec7..ec4d3401aff52f6aae9683c84cc73af43b2ddb48 100644 (file)
Binary files a/Source/WebCore/English.lproj/Localizable.strings and b/Source/WebCore/English.lproj/Localizable.strings differ

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 77da9e87201fff51d5726ac097df82c6efb34f65..ac05a544508b1ff6099354156bd06ebc1e206d86 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+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>
 
         Reviewed by Timothy Hatcher.

diff --git a/Source/WebKit/English.lproj/Localizable.strings b/Source/WebKit/English.lproj/Localizable.strings
deleted file mode 100644 (file)
index eebf03f..0000000
Binary files a/Source/WebKit/English.lproj/Localizable.strings and /dev/null differ

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index cd11b7bfd149266307f8d2b4f7288fefc830b77f..3ad09d52bccf494f4cd86072578cb16fa58b60a0 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+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>
 
         Reviewed by Adam Roben.

diff --git a/Tools/Scripts/update-webkit-localizable-strings b/Tools/Scripts/update-webkit-localizable-strings
index 0a0ada99ab079842d3779cb38a17c05696557f78..ceb25a58a39749d31f53ace48b82b37e57319901 100755 (executable)
--- a/Tools/Scripts/update-webkit-localizable-strings
+++ b/Tools/Scripts/update-webkit-localizable-strings
@@ -35,7 +35,7 @@ use lib $FindBin::Bin;
 use webkitdirs;
 
 # 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";
 
 @ARGV == 0 or die "Usage: " . basename($0) . "\n";
@@ -43,9 +43,3 @@ my $fileToUpdate = "Source/WebCore/English.lproj/Localizable.strings";
 chdirWebKit();
 
 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;