Title: [132289] trunk
- Revision
- 132289
- Author
- mrobin...@webkit.org
- Date
- 2012-10-23 18:48:10 -0700 (Tue, 23 Oct 2012)
Log Message
POTFILES.in/.skip need updates for translators
https://bugs.webkit.org/show_bug.cgi?id=67580
Reviewed by Xan Lopez.
.:
Now process POTFILES.in during configuration.
* configure.ac:
Source/WebKit/gtk/po:
Move POTFILES to POTFILES.in to satisfy intltools-update and also update
the list of files with translations. Since the way the path is calculated
is different now, we also need to change the gettext invocation in
GNUmakefile.am.
* GNUmakefile.am:
* POTFILES: Removed.
* POTFILES.in: Added.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/ChangeLog (132288 => 132289)
--- trunk/ChangeLog 2012-10-24 01:13:39 UTC (rev 132288)
+++ trunk/ChangeLog 2012-10-24 01:48:10 UTC (rev 132289)
@@ -1,3 +1,14 @@
+2012-10-23 Martin Robinson <mrobin...@igalia.com>
+
+ POTFILES.in/.skip need updates for translators
+ https://bugs.webkit.org/show_bug.cgi?id=67580
+
+ Reviewed by Xan Lopez.
+
+ Now process POTFILES.in during configuration.
+
+ * configure.ac:
+
2012-10-23 Kenneth Rohde Christiansen <kenn...@webkit.org>
Add support for resolution media query
Modified: trunk/Source/WebKit/gtk/po/ChangeLog (132288 => 132289)
--- trunk/Source/WebKit/gtk/po/ChangeLog 2012-10-24 01:13:39 UTC (rev 132288)
+++ trunk/Source/WebKit/gtk/po/ChangeLog 2012-10-24 01:48:10 UTC (rev 132289)
@@ -1,3 +1,19 @@
+2012-10-23 Martin Robinson <mrobin...@igalia.com>
+
+ POTFILES.in/.skip need updates for translators
+ https://bugs.webkit.org/show_bug.cgi?id=67580
+
+ Reviewed by Xan Lopez.
+
+ Move POTFILES to POTFILES.in to satisfy intltools-update and also update
+ the list of files with translations. Since the way the path is calculated
+ is different now, we also need to change the gettext invocation in
+ GNUmakefile.am.
+
+ * GNUmakefile.am:
+ * POTFILES: Removed.
+ * POTFILES.in: Added.
+
2012-06-11 Arnaud Renevier <a...@renevier.net>
Replace obsolete mkdir_p variables with MKDIR_P
Modified: trunk/Source/WebKit/gtk/po/GNUmakefile.am (132288 => 132289)
--- trunk/Source/WebKit/gtk/po/GNUmakefile.am 2012-10-24 01:13:39 UTC (rev 132288)
+++ trunk/Source/WebKit/gtk/po/GNUmakefile.am 2012-10-24 01:48:10 UTC (rev 132289)
@@ -69,7 +69,7 @@
# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/Source/WebKit/gtk/po/POTFILES
+$(DOMAIN).pot-update: $(POTFILES) $(top_builddir)/Source/WebKit/gtk/po/POTFILES
test -d Source/WebKit/gtk/po/ || mkdir -p Source/WebKit/gtk/po/
package_gnu=''; \
if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
@@ -79,22 +79,32 @@
fi; \
case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
'' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
- $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(srcdir) \
- --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
- --files-from=$(srcdir)/Source/WebKit/gtk/po/POTFILES \
- --copyright-holder='$(COPYRIGHT_HOLDER)' \
- --msgid-bugs-address="$$msgid_bugs_address" \
- --keyword=_ --keyword=N_ -o $(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot \
+ $(XGETTEXT) \
+ --default-domain=$(DOMAIN) \
+ --directory=$(srcdir) \
+ --directory=$(srcdir)/Source/WebKit/gtk \
+ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+ --files-from=$(top_builddir)/Source/WebKit/gtk/po/POTFILES \
+ --copyright-holder='$(COPYRIGHT_HOLDER)' \
+ --msgid-bugs-address="$$msgid_bugs_address" \
+ --keyword=_ \
+ --keyword=N_ \
+ -o $(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot \
;; \
*) \
- $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(srcdir) \
- --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
- --files-from=$(srcdir)/Source/WebKit/gtk/po/POTFILES \
- --copyright-holder='$(COPYRIGHT_HOLDER)' \
- --package-name="$${package_gnu}@PACKAGE@" \
- --package-version='@VERSION@' \
- --msgid-bugs-address="$$msgid_bugs_address" \
- --keyword=_ --keyword=N_ -o $(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot \
+ $(XGETTEXT) \
+ --default-domain=$(DOMAIN) \
+ --directory=$(srcdir) \
+ --directory=$(srcdir)/Source/WebKit/gtk \
+ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+ --files-from=$(top_builddir)/Source/WebKit/gtk/po/POTFILES \
+ --copyright-holder='$(COPYRIGHT_HOLDER)' \
+ --package-name="$${package_gnu}@PACKAGE@" \
+ --package-version='@VERSION@' \
+ --msgid-bugs-address="$$msgid_bugs_address" \
+ --keyword=_ \
+ --keyword=N_ \
+ -o $(top_builddir)/Source/WebKit/gtk/po/$(DOMAIN).pot \
;; \
esac
Deleted: trunk/Source/WebKit/gtk/po/POTFILES (132288 => 132289)
--- trunk/Source/WebKit/gtk/po/POTFILES 2012-10-24 01:13:39 UTC (rev 132288)
+++ trunk/Source/WebKit/gtk/po/POTFILES 2012-10-24 01:48:10 UTC (rev 132289)
@@ -1,14 +0,0 @@
-# List of source files which contain translatable strings.
-Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
-Source/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp
-Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp
-Source/WebKit/gtk/webkit/webkitdownload.cpp
-Source/WebKit/gtk/webkit/webkitsoupauthdialog.cpp
-Source/WebKit/gtk/webkit/webkitwebframe.cpp
-Source/WebKit/gtk/webkit/webkitwebhistoryitem.cpp
-Source/WebKit/gtk/webkit/webkitwebinspector.cpp
-Source/WebKit/gtk/webkit/webkitwebnavigationaction.cpp
-Source/WebKit/gtk/webkit/webkitwebsettings.cpp
-Source/WebKit/gtk/webkit/webkitwebview.cpp
-Source/WebCore/platform/gtk/ErrorsGtk.cpp
-Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
Added: trunk/Source/WebKit/gtk/po/POTFILES.in (0 => 132289)
--- trunk/Source/WebKit/gtk/po/POTFILES.in (rev 0)
+++ trunk/Source/WebKit/gtk/po/POTFILES.in 2012-10-24 01:48:10 UTC (rev 132289)
@@ -0,0 +1,26 @@
+# List of source files which contain translatable strings.
+../../WebCore/platform/gtk/ErrorsGtk.cpp
+../../WebCore/platform/gtk/GtkAuthenticationDialog.cpp
+../../WebCore/platform/gtk/LocalizedStringsGtk.cpp
+WebCoreSupport/ChromeClientGtk.cpp
+WebCoreSupport/ContextMenuClientGtk.cpp
+WebCoreSupport/FullscreenVideoController.cpp
+webkit/webkitdownload.cpp
+webkit/webkitfavicondatabase.cpp
+webkit/webkitfilechooserrequest.cpp
+webkit/webkithittestresult.cpp
+webkit/webkiticondatabase.cpp
+webkit/webkitnetworkrequest.cpp
+webkit/webkitnetworkresponse.cpp
+webkit/webkitsecurityorigin.cpp
+webkit/webkitsoupauthdialog.cpp
+webkit/webkitviewportattributes.cpp
+webkit/webkitwebdatabase.cpp
+webkit/webkitwebframe.cpp
+webkit/webkitwebhistoryitem.cpp
+webkit/webkitwebinspector.cpp
+webkit/webkitwebnavigationaction.cpp
+webkit/webkitwebplugin.cpp
+webkit/webkitwebresource.cpp
+webkit/webkitwebsettings.cpp
+webkit/webkitwebview.cpp
Modified: trunk/configure.ac (132288 => 132289)
--- trunk/configure.ac 2012-10-24 01:13:39 UTC (rev 132288)
+++ trunk/configure.ac 2012-10-24 01:48:10 UTC (rev 132289)
@@ -1194,6 +1194,7 @@
AC_CONFIG_FILES([
Source/WebKit/gtk/webkit/webkitversion.h
+Source/WebKit/gtk/po/POTFILES
DerivedSources/WebCore/UserAgentGtk.h:Source/WebCore/platform/gtk/UserAgentGtk.h.in
])
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
