[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1377-g4a36339 |
|
Date: |
Sun, 01 Jan 2012 16:28:36 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 4a3633996518ec7baea980260447ab93e2e5f240 (commit)
via 49037e524fe4f4214e883260df072c0f90fd40fa (commit)
via b72f169df7427c15dc7bccf0403696c280dfd581 (commit)
via 9cf41121ed34485dda9d32135e9299724f6a04af (commit)
from 5244e4e87138d62ab99dddb1f2e90dac1de43968 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=4a3633996518ec7baea980260447ab93e2e5f240
commit 4a3633996518ec7baea980260447ab93e2e5f240
Author: Rob Savoye <address@hidden>
Date: Sun Jan 1 09:28:30 2012 -0700
updated with new strings
diff --git a/po/gnash.pot b/po/gnash.pot
index 4033475..a287ce1 100644
--- a/po/gnash.pot
+++ b/po/gnash.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-31 13:03-0700\n"
+"POT-Creation-Date: 2012-01-01 09:28-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -294,17 +294,17 @@ msgstr ""
#: libbase/curl_adapter.cpp:672
#, c-format
-msgid "FIXME: Timeout (%u milliseconds) while loading from url %s"
+msgid "FIXME: Timeout (%u milliseconds) while loading from URL %s"
msgstr ""
#: libbase/curl_adapter.cpp:720
#, c-format
-msgid "Timeout (%u milliseconds) while loading from url %s"
+msgid "Timeout (%u milliseconds) while loading from URL %s"
msgstr ""
#: libbase/curl_adapter.cpp:763
#, c-format
-msgid "HTTP response %ld from url %s"
+msgid "HTTP response %ld from URL %s"
msgstr ""
#: libbase/curl_adapter.cpp:774
@@ -563,7 +563,7 @@ msgstr ""
#: libbase/URLAccessManager.cpp:147
#, c-format
-msgid "Load of file %s forbidden (starting url %s is not a local resource)"
+msgid "Load of file %s forbidden (starting URL %s is not a local resource)"
msgstr ""
#: libbase/URLAccessManager.cpp:164
@@ -2857,7 +2857,7 @@ msgstr ""
#: libcore/asobj/NetConnection_as.cpp:440
#, c-format
-msgid "Gnash is not allowed to open this url: %s"
+msgid "Gnash is not allowed to open this URL: %s"
msgstr ""
#: libcore/asobj/NetConnection_as.cpp:496
@@ -3568,7 +3568,7 @@ msgstr ""
#: libcore/asobj/Sound_as.cpp:581
#, c-format
-msgid "Gnash could not open this url: %s"
+msgid "Gnash could not open this URL: %s"
msgstr ""
#: libcore/asobj/Sound_as.cpp:592
@@ -4962,7 +4962,7 @@ msgid "Getter for textformat_tabStops"
msgstr ""
#: libcore/asobj/TextFormat_as.cpp:562
-msgid "TextFormat.getTextExtent requires at least oneargument"
+msgid "TextFormat.getTextExtent requires at least one argument"
msgstr ""
#: libcore/asobj/TextFormat_as.cpp:726
@@ -5105,7 +5105,7 @@ msgid "sendAndLoad() requires at least two arguments"
msgstr ""
#: libcore/asobj/LoadableObject.cpp:312
-msgid "sendAndLoad(): invalid empty url"
+msgid "sendAndLoad(): invalid empty URL"
msgstr ""
#: libcore/asobj/LoadableObject.cpp:319
@@ -5114,7 +5114,7 @@ msgstr ""
#: libcore/asobj/LoadableObject.cpp:397
#, c-format
-msgid "Loading from url: '%s'"
+msgid "Loading from URL: '%s'"
msgstr ""
#: libcore/asobj/LoadableObject.cpp:417
@@ -5122,7 +5122,7 @@ msgid "load() requires at least one argument"
msgstr ""
#: libcore/asobj/LoadableObject.cpp:426
-msgid "load(): invalid empty url"
+msgid "load(): invalid empty URL"
msgstr ""
#: libcore/DisplayObjectContainer.cpp:75
@@ -5273,14 +5273,14 @@ msgstr ""
#: libcore/LineStyle.cpp:186
msgid ""
-"UNTESTED: Dunno how to interpolate line styles with different vertical "
+"UNTESTED: Do not know how to interpolate line styles with different vertical "
"thickness scaling"
msgstr ""
-#: libcore/LineStyle.cpp:190
+#: libcore/LineStyle.cpp:191
msgid ""
-"UNTESTED: Dunno how to interpolate line styles with different horizontal "
-"thickness scaling"
+"UNTESTED: Do not know how to interpolate line styles with different "
+"horizontal thickness scaling"
msgstr ""
#: libcore/DisplayObject.cpp:121
@@ -5482,29 +5482,9 @@ msgstr ""
msgid "%s: CHECKME: was broken"
msgstr ""
-#: libcore/vm/ASHandlers.cpp:468
-msgid "ActionNextFrame: as_environment target is null or not a sprite"
-msgstr ""
-
-#: libcore/vm/ASHandlers.cpp:485
-msgid "ActionPrevFrame: as_environment target is null or not a sprite"
-msgstr ""
-
-#: libcore/vm/ASHandlers.cpp:500
-msgid "ActionPlay: as_environment target is null or not a sprite"
-msgstr ""
-
-#: libcore/vm/ASHandlers.cpp:515
-msgid "ActionStop: as_environment target is null or not a sprite"
-msgstr ""
-
-#: libcore/vm/ASHandlers.cpp:561
-msgid "ActionGotoFrame: as_environment target is null or not a sprite"
-msgstr ""
-
#: libcore/vm/ASHandlers.cpp:595
#, c-format
-msgid "GetUrl: target=%s url=%s"
+msgid "GetUrl: target=%s URL=%s"
msgstr ""
#: libcore/vm/ASHandlers.cpp:615
@@ -5659,6 +5639,21 @@ msgstr ""
msgid "Prototype of interface object for IMPLEMENTSOP is not an object (%s)."
msgstr ""
+#: libcore/vm/ASHandlers.cpp:1392
+#, c-format
+msgid "%s (with .prototype %p) implements %s (with .prototype %p)"
+msgstr ""
+
+#: libcore/vm/ASHandlers.cpp:1427
+#, c-format
+msgid "fscommand2:%s"
+msgstr ""
+
+#: libcore/vm/ASHandlers.cpp:1558
+#, c-format
+msgid " ActionMbSubString(%s, %d, %d)"
+msgstr ""
+
#: libcore/vm/ASHandlers.cpp:1580
msgid "Base is less then 1 in ActionMbSubString, setting to 1."
msgstr ""
@@ -5676,7 +5671,7 @@ msgid ""
"based on length:%d and start:%d"
msgstr ""
-#: libcore/vm/ASHandlers.cpp:1648
+#: libcore/vm/ASHandlers.cpp:1623 libcore/vm/ASHandlers.cpp:1648
msgid "Not properly implemented for SWF5"
msgstr ""
@@ -5717,7 +5712,7 @@ msgid "\t%d) type=%s, value=%s"
msgstr ""
#: libcore/vm/ASHandlers.cpp:1917
-msgid "Undefined GetUrl2 url on stack, skipping"
+msgid "Undefined GetUrl2 URL on stack, skipping"
msgstr ""
#: libcore/vm/ASHandlers.cpp:1949
@@ -5797,11 +5792,6 @@ msgid ""
"Top of stack doesn't evaluate to an object (%s) at ActionEnumerate execution"
msgstr ""
-#: libcore/vm/ASHandlers.cpp:2521 libcore/vm/ASHandlers.cpp:2528
-#, c-format
-msgid "to_primitive(%s) threw an ActionTypeError %s"
-msgstr ""
-
#: libcore/vm/ASHandlers.cpp:2581
#, c-format
msgid "getMember called against a value that does not cast to an as_object: %s"
@@ -5954,7 +5944,7 @@ msgid "Unsupported action handler invoked, code at pc is
%#x"
msgstr ""
#: libcore/vm/ASHandlers.cpp:3500
-msgid "Bogus empty GetUrl url in SWF file, skipping"
+msgid "Bogus empty GetUrl URL in SWF file, skipping"
msgstr ""
#: libcore/vm/ASHandlers.cpp:3512
@@ -5963,17 +5953,6 @@ msgid ""
"Using GET"
msgstr ""
-#: libcore/vm/ASHandlers.cpp:3559
-#, c-format
-msgid ""
-"get url: target=%s, url=%s, method=%x (sendVars:%X, loadTarget:%d, "
-"loadVariable:%d)"
-msgstr ""
-
-#: libcore/vm/ASHandlers.cpp:3568
-msgid "getURL2 loadVariable"
-msgstr ""
-
#: libcore/vm/ASHandlers.cpp:3571
#, c-format
msgid "getURL: target %s not found"
@@ -5988,15 +5967,6 @@ msgstr ""
msgid "commonGetURL: current target is undefined"
msgstr ""
-#: libcore/vm/ASHandlers.cpp:3604
-msgid "getURL2 target load"
-msgstr ""
-
-#: libcore/vm/ASHandlers.cpp:3610 libcore/vm/ASHandlers.cpp:3664
-#, c-format
-msgid "Testing _level loading (level %u)"
-msgstr ""
-
#: libcore/vm/ASHandlers.cpp:3616
#, c-format
msgid "Unknown loadMovie target: %s"
@@ -6055,6 +6025,17 @@ msgid ""
"codeVersion=%d"
msgstr ""
+#: libcore/vm/ActionExec.cpp:152 libcore/vm/ActionExec.cpp:285
+#: libcore/vm/ActionExec.cpp:296
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: libcore/vm/ActionExec.cpp:222
+#, c-format
+msgid "PC:%d - EX: %s"
+msgstr ""
+
#: libcore/vm/ActionExec.cpp:239
#, c-format
msgid ""
@@ -6105,11 +6086,6 @@ msgstr ""
msgid "Recursion limit reached (%u)"
msgstr ""
-#: libcore/vm/VM.cpp:372
-#, c-format
-msgid "(%s + %s) [primitive conversion done]"
-msgstr ""
-
#: libcore/Button.cpp:477
#, c-format
msgid "Unhandled button event %s"
@@ -6279,10 +6255,38 @@ msgid ""
"[0..1048575], won't remove"
msgstr ""
+#: libcore/parser/TypesParser.cpp:145
+#, c-format
+msgid "Invalid rectangle: minx=%g maxx=%g miny=%g maxy=%g"
+msgstr ""
+
+#: libcore/parser/TypesParser.cpp:161
+#, c-format
+msgid " FillStyle read type = 0x%X"
+msgstr ""
+
+#: libcore/parser/TypesParser.cpp:207
+#, c-format
+msgid " gradients count: %d"
+msgstr ""
+
#: libcore/parser/TypesParser.cpp:212
msgid "No gradients!"
msgstr ""
+#: libcore/parser/TypesParser.cpp:266
+msgid "Illegal spread mode in gradient definition."
+msgstr ""
+
+#: libcore/parser/TypesParser.cpp:283
+msgid "Illegal interpolation mode in gradient definition."
+msgstr ""
+
+#: libcore/parser/TypesParser.cpp:408
+#, c-format
+msgid " color: %s"
+msgstr ""
+
#: libcore/parser/sprite_definition.cpp:64
#, c-format
msgid " frames = %d"
@@ -6299,6 +6303,11 @@ msgstr ""
msgid " -- sprite END --"
msgstr ""
+#: libcore/parser/filter_factory.cpp:53
+#, c-format
+msgid " number of filters: %d"
+msgstr ""
+
#: libcore/parser/filter_factory.cpp:91
#, c-format
msgid "Invalid filter type %d."
@@ -6309,6 +6318,46 @@ msgstr ""
msgid "Filter %d could not read."
msgstr ""
+#: libcore/parser/filter_factory.cpp:133
+#, c-format
+msgid " DropShadowFilter: blurX=%f blurY=%f"
+msgstr ""
+
+#: libcore/parser/filter_factory.cpp:152
+#, c-format
+msgid " BlurFilter: blurX=%f blurY=%f quality=%d"
+msgstr ""
+
+#: libcore/parser/filter_factory.cpp:179
+msgid " GlowFilter "
+msgstr ""
+
+#: libcore/parser/filter_factory.cpp:217
+msgid " BevelFilter "
+msgstr ""
+
+#: libcore/parser/filter_factory.cpp:264
+msgid " GradientGlowFilter "
+msgstr ""
+
+#: libcore/parser/filter_factory.cpp:300
+msgid " ConvolutionFilter "
+msgstr ""
+
+#: libcore/parser/filter_factory.cpp:317
+msgid " ColorMatrixFilter: "
+msgstr ""
+
+#: libcore/parser/filter_factory.cpp:318 libcore/parser/filter_factory.cpp:321
+#: libcore/parser/filter_factory.cpp:324 libcore/parser/filter_factory.cpp:327
+#, c-format
+msgid " %g, %g, %g, %g, %g"
+msgstr ""
+
+#: libcore/parser/filter_factory.cpp:374
+msgid " GradientBevelFilter "
+msgstr ""
+
#: libcore/parser/action_buffer.cpp:57
#, c-format
msgid "Empty action buffer starting at offset %lu"
@@ -6327,6 +6376,10 @@ msgstr ""
msgid "Native double floating point format not recognised"
msgstr ""
+#: libcore/parser/SWFParser.cpp:90
+msgid "SHOWFRAME tag"
+msgstr ""
+
#: libcore/parser/SWFParser.cpp:100
#, c-format
msgid ""
@@ -6334,6 +6387,11 @@ msgid ""
"not affect playback"
msgstr ""
+#: libcore/parser/SWFParser.cpp:105
+#, c-format
+msgid "tag dump follows: %s"
+msgstr ""
+
#: libcore/parser/SWFParser.cpp:113
#, c-format
msgid "Parsing exception: %s"
@@ -6364,6 +6422,10 @@ msgstr ""
msgid "file is compressed"
msgstr ""
+#: libcore/parser/SWFMovieDefinition.cpp:320
+msgid "non-finite movie bounds"
+msgstr ""
+
#: libcore/parser/SWFMovieDefinition.cpp:336
#, c-format
msgid "frame size = %s, frame rate = %f, frames = %d"
@@ -6515,7 +6577,7 @@ msgstr ""
#: libcore/movie_root.cpp:2153
#, c-format
-msgid "Fork failed launching url opener '%s'"
+msgid "Fork failed launching URL opener '%s'"
msgstr ""
#: libcore/movie_root.cpp:2200
@@ -6820,7 +6882,7 @@ msgstr ""
#: libdevice/egl/eglDevice.cpp:209 libdevice/egl/eglDevice.cpp:544
#: gui/gtk/gtk_glue_ovg.cpp:383
#, c-format
-msgid "eglGetConfigs() failed to retrive the number of configs (error %s)"
+msgid "eglGetConfigs() failed to retrieve the number of configs (error %s)"
msgstr ""
#: libdevice/egl/eglDevice.cpp:214 libdevice/egl/eglDevice.cpp:549
@@ -6895,15 +6957,20 @@ msgstr ""
msgid "Initializing EGL for OpenGLES2"
msgstr ""
-#: libdevice/egl/eglDevice.cpp:342 libdevice/egl/eglDevice.cpp:352
+#: libdevice/egl/eglDevice.cpp:342 libdevice/egl/eglDevice.cpp:362
#, c-format
-msgid "eglBindAPI() failed to retrive the number of configs (error %s)"
+msgid "eglBindAPI() failed to retrieve the number of configs (error %s)"
msgstr ""
#: libdevice/egl/eglDevice.cpp:350
msgid "Initializing EGL for OpenGLES1"
msgstr ""
+#: libdevice/egl/eglDevice.cpp:352
+#, c-format
+msgid "eglBindAPI() failed to retrive the number of configs (error %s)"
+msgstr ""
+
#: libdevice/egl/eglDevice.cpp:360
msgid "Initializing EGL for OpenVG"
msgstr ""
@@ -7852,7 +7919,7 @@ msgid "Gnash soldumper version: %s, Gnash version: %s\n"
msgstr ""
#: utilities/soldumper.cpp:121 utilities/processor.cpp:276
-#: utilities/flvdumper.cpp:154 cygnal/cvm.cpp:268 cygnal/cygnal.cpp:475
+#: utilities/flvdumper.cpp:154 cygnal/cygnal.cpp:475
#: cygnal/cgi-bin/echo/echo.cpp:144 cygnal/cgi-bin/echo/gateway.cpp:119
#: cygnal/cgi-bin/fitcDemo/fitcDemo.cpp:149
#: cygnal/cgi-bin/oflaDemo/oflaDemo.cpp:216
@@ -7878,12 +7945,12 @@ msgstr ""
msgid "List .sol files in the default directory"
msgstr ""
-#: utilities/processor.cpp:148 cygnal/cvm.cpp:145
+#: utilities/processor.cpp:148
#, c-format
msgid "fs_callback(%p): %s %s"
msgstr ""
-#: utilities/processor.cpp:166 cygnal/cvm.cpp:157
+#: utilities/processor.cpp:166
#, c-format
msgid "eventCallback: %s %s"
msgstr ""
@@ -7905,9 +7972,8 @@ msgstr ""
msgid "Verbose parsing disabled at compile time"
msgstr ""
-#: utilities/processor.cpp:456 utilities/processor.cpp:459 cygnal/cvm.cpp:407
-#: cygnal/cvm.cpp:410 gui/pythonmod/gnash-view.cpp:438
-#: gui/pythonmod/gnash-view.cpp:441
+#: utilities/processor.cpp:456 utilities/processor.cpp:459
+#: gui/pythonmod/gnash-view.cpp:438 gui/pythonmod/gnash-view.cpp:441
#, c-format
msgid "%s appended to local sandboxes"
msgstr ""
@@ -8345,21 +8411,11 @@ msgstr ""
msgid "Creating %d errors in the buffer"
msgstr ""
-#: cygnal/handler.cpp:104
-#, c-format
-msgid "Adding %d to the client array."
-msgstr ""
-
#: cygnal/handler.cpp:128
#, c-format
msgid "Protocol %d for Handler::AddClient()"
msgstr ""
-#: cygnal/handler.cpp:168 cygnal/handler.cpp:193
-#, c-format
-msgid "HTTP key is: %s"
-msgstr ""
-
#: cygnal/handler.cpp:171 cygnal/handler.cpp:196
msgid "HTTP key couldn't be read!"
msgstr ""
@@ -8369,11 +8425,6 @@ msgstr ""
msgid "FD #%d has no protocol handler registered"
msgstr ""
-#: cygnal/handler.cpp:261
-#, c-format
-msgid "Removing %d from the client array."
-msgstr ""
-
#: cygnal/handler.cpp:319
#, c-format
msgid "No %s symbol in plugin"
@@ -8389,62 +8440,15 @@ msgstr ""
msgid "Couldn't get %s symbol"
msgstr ""
-#: cygnal/handler.cpp:462
-#, c-format
-msgid "FILENAME: %s"
-msgstr ""
-
-#: cygnal/cvm.cpp:274
-msgid "Setting debugger ON"
-msgstr ""
-
#: cygnal/cvm.cpp:276
msgid "The debugger has been disabled at configuration time"
msgstr ""
-#: cygnal/cvm.cpp:430
-#, c-format
-msgid ""
-"Will sleep %ld microseconds between iterations - fps is %g, clockAdvance is "
-"%lu"
-msgstr ""
-
-#: cygnal/cvm.cpp:451 cygnal/cvm.cpp:542
-#, c-format
-msgid "iteration, timer: %lu, localDelay: %ld\n"
-msgstr ""
-
-#: cygnal/cvm.cpp:487
-#, c-format
-msgid "exiting after %d advances"
-msgstr ""
-
-#: cygnal/cvm.cpp:497
-#, c-format
-msgid "exiting after %d times last frame was reached"
-msgstr ""
-
-#: cygnal/cvm.cpp:531
-#, c-format
-msgid "%d loop backs; jumping one-after latest frame (%d)"
-msgstr ""
-
-#: cygnal/http_server.cpp:150
-#, c-format
-msgid "FIXME: found filestream %s in cache!"
-msgstr ""
-
#: cygnal/http_server.cpp:154 cygnal/http_server.cpp:211
#, c-format
msgid "New filestream %s"
msgstr ""
-#: cygnal/http_server.cpp:193 cygnal/http_server.cpp:287
-#: cygnal/libnet/http.cpp:422 cygnal/libnet/http.cpp:521
-#, c-format
-msgid "Que empty, net connection dropped for fd #%d"
-msgstr ""
-
#: cygnal/http_server.cpp:213
#, c-format
msgid "Reusing filestream %s"
@@ -8454,14 +8458,6 @@ msgstr ""
msgid "couldn't read data!"
msgstr ""
-#: cygnal/http_server.cpp:312 cygnal/libnet/http.cpp:542
-msgid "Got file data in POST"
-msgstr ""
-
-#: cygnal/http_server.cpp:319 cygnal/libnet/http.cpp:549
-msgid "Got AMF data in POST"
-msgstr ""
-
#: cygnal/http_server.cpp:373 cygnal/libnet/http.cpp:592
msgid "PUT request"
msgstr ""
@@ -8486,53 +8482,6 @@ msgstr ""
msgid "TRACE request"
msgstr ""
-#: cygnal/http_server.cpp:488 cygnal/http_server.cpp:520
-msgid "Sent GET Reply"
-msgstr ""
-
-#: cygnal/http_server.cpp:492
-msgid "Couldn't send GET Reply, no header data"
-msgstr ""
-
-#: cygnal/http_server.cpp:524
-msgid "Couldn't send POST Reply, no header data"
-msgstr ""
-
-#: cygnal/http_server.cpp:557 cygnal/http_server.cpp:578
-#, c-format
-msgid "Caught corrupted string! length was %d, null at %d"
-msgstr ""
-
-#: cygnal/http_server.cpp:874 cygnal/http_server.cpp:969
-#: cygnal/libnet/http.cpp:216 cygnal/libnet/http.cpp:1295
-#, c-format
-msgid "Parameters for file: \"%s\""
-msgstr ""
-
-#: cygnal/http_server.cpp:918
-#, c-format
-msgid "Setting Max Requests for Keep-Alive to %d"
-msgstr ""
-
-#: cygnal/http_server.cpp:929 cygnal/libnet/http.cpp:176
-#, c-format
-msgid "Setting Content Length to %d"
-msgstr ""
-
-#: cygnal/http_server.cpp:942 cygnal/libnet/http.cpp:189
-#, c-format
-msgid "Setting Content Type to %d"
-msgstr ""
-
-#: cygnal/http_server.cpp:952 cygnal/libnet/http.cpp:199
-#, c-format
-msgid "Got a request, parsing \"%s\""
-msgstr ""
-
-#: cygnal/http_server.cpp:978 cygnal/libnet/http.cpp:225
-msgid "Enabling Keep Alive by default for HTTP > 1.0"
-msgstr ""
-
#: cygnal/http_server.cpp:1013
#, c-format
msgid "Processing HTTP data for fd #%d"
@@ -8546,34 +8495,6 @@ msgstr ""
msgid "FIXME: No existing data in packet!"
msgstr ""
-#: cygnal/http_server.cpp:1027
-#, c-format
-msgid "Net HTTP server failed to read from fd #%d..."
-msgstr ""
-
-#: cygnal/http_server.cpp:1035
-#, c-format
-msgid "No active DiskStreams for fd #%d: %s..."
-msgstr ""
-
-#: cygnal/http_server.cpp:1039
-#, c-format
-msgid "Found active DiskStream! for fd #%d: %s"
-msgstr ""
-
-#: cygnal/http_server.cpp:1073
-msgid "Keep-Alive is off"
-msgstr ""
-
-#: cygnal/http_server.cpp:1075
-msgid "Keep-Alive is on"
-msgstr ""
-
-#: cygnal/http_server.cpp:1080
-#, c-format
-msgid "Processing time for GET request was %f seconds"
-msgstr ""
-
#: cygnal/libnet/cache.cpp:62
msgid "using this constructor is only allowed for testing purposes."
msgstr ""
@@ -8642,12 +8563,12 @@ msgstr ""
msgid "RTMP %s: channel: %d, head size %d, body size: %d"
msgstr ""
-#: cygnal/libnet/rtmp.cpp:482 cygnal/rtmp_server.cpp:435
+#: cygnal/libnet/rtmp.cpp:482
#, c-format
msgid "The Header size is: %d"
msgstr ""
-#: cygnal/libnet/rtmp.cpp:483 cygnal/rtmp_server.cpp:436
+#: cygnal/libnet/rtmp.cpp:483
#, c-format
msgid "The AMF index is: 0x%x"
msgstr ""
@@ -8657,16 +8578,16 @@ msgstr ""
msgid "END is %x"
msgstr ""
-#: cygnal/libnet/rtmp.cpp:510 cygnal/rtmp_server.cpp:489
+#: cygnal/libnet/rtmp.cpp:510
msgid "Reading AMF packets till we're done..."
msgstr ""
-#: cygnal/libnet/rtmp.cpp:519 cygnal/rtmp_server.cpp:499
+#: cygnal/libnet/rtmp.cpp:519
#, c-format
msgid "Total size in header is %d, buffer size is: %d"
msgstr ""
-#: cygnal/libnet/rtmp.cpp:523 cygnal/rtmp_server.cpp:503
+#: cygnal/libnet/rtmp.cpp:523
msgid "FIXME: MERGING"
msgstr ""
@@ -8851,8 +8772,8 @@ msgstr ""
msgid "unable to get protocol entry for %s"
msgstr ""
-#: cygnal/libnet/network.cpp:201 cygnal/libnet/network.cpp:424
-#: cygnal/libnet/network.cpp:582
+#: cygnal/libnet/network.cpp:201 cygnal/libnet/network.cpp:425
+#: cygnal/libnet/network.cpp:583
#, c-format
msgid "unable to create socket: %s"
msgstr ""
@@ -8881,21 +8802,6 @@ msgstr ""
msgid "Waiting to accept net traffic on fd #%d for port %d"
msgstr ""
-#: cygnal/libnet/network.cpp:326
-msgid "Have a SIGINT interupt waiting!"
-msgstr ""
-
-#: cygnal/libnet/network.cpp:330 cygnal/libnet/network.cpp:922
-#: cygnal/libnet/network.cpp:1103 cygnal/libnet/network.cpp:1301
-#: cygnal/libnet/network.cpp:1431
-msgid "Have a pending SIGINT interupt waiting!"
-msgstr ""
-
-#: cygnal/libnet/network.cpp:335 cygnal/libnet/network.cpp:928
-#: cygnal/libnet/network.cpp:1436
-msgid "Have a pending SIGPIPE interupt waiting!"
-msgstr ""
-
#: cygnal/libnet/network.cpp:351
msgid "There is a new network connection request."
msgstr ""
@@ -8905,252 +8811,242 @@ msgstr ""
msgid "The accept() socket for fd #%d was interrupted by a system call"
msgstr ""
-#: cygnal/libnet/network.cpp:362
-#, c-format
-msgid "The accept() socket for fd #%d never was available"
-msgstr ""
-
-#: cygnal/libnet/network.cpp:368
-#, c-format
-msgid "The accept() socket for fd #%d timed out waitingfor data"
-msgstr ""
-
-#: cygnal/libnet/network.cpp:381
+#: cygnal/libnet/network.cpp:382
#, c-format
msgid "unable to accept: %s"
msgstr ""
-#: cygnal/libnet/network.cpp:386
+#: cygnal/libnet/network.cpp:387
#, c-format
-msgid "Accepting tcp/ip connection on fd #%d for port %d"
+msgid "Accepting TCP/IP connection on fd #%d for port %d"
msgstr ""
-#: cygnal/libnet/network.cpp:445 cygnal/libnet/network.cpp:603
+#: cygnal/libnet/network.cpp:446 cygnal/libnet/network.cpp:604
#, c-format
msgid "The connect() socket for fd %d was interrupted by a system call"
msgstr ""
-#: cygnal/libnet/network.cpp:451 cygnal/libnet/network.cpp:476
-#: cygnal/libnet/network.cpp:609 cygnal/libnet/network.cpp:649
+#: cygnal/libnet/network.cpp:452 cygnal/libnet/network.cpp:477
+#: cygnal/libnet/network.cpp:610 cygnal/libnet/network.cpp:650
#, c-format
msgid "The connect() socket for fd %d never was available for writing"
msgstr ""
-#: cygnal/libnet/network.cpp:462 cygnal/libnet/network.cpp:627
+#: cygnal/libnet/network.cpp:463 cygnal/libnet/network.cpp:628
#, c-format
msgid "The connect() socket for fd %d timed out waiting to write"
msgstr ""
-#: cygnal/libnet/network.cpp:470
+#: cygnal/libnet/network.cpp:471
#, c-format
msgid "\tsocket name %s for fd %d"
msgstr ""
-#: cygnal/libnet/network.cpp:552
+#: cygnal/libnet/network.cpp:553
#, c-format
msgid "%s: to host %s at port %d"
msgstr ""
-#: cygnal/libnet/network.cpp:558
+#: cygnal/libnet/network.cpp:559
#, c-format
msgid "The hostname for this machine is %s"
msgstr ""
-#: cygnal/libnet/network.cpp:560
+#: cygnal/libnet/network.cpp:561
msgid "Couldn't get the hostname for this machine"
msgstr ""
-#: cygnal/libnet/network.cpp:575
+#: cygnal/libnet/network.cpp:576
#, c-format
msgid "The IP address for this client socket is %s"
msgstr ""
-#: cygnal/libnet/network.cpp:642
+#: cygnal/libnet/network.cpp:643
#, c-format
msgid "\tport %d at IP %s for fd %d"
msgstr ""
-#: cygnal/libnet/network.cpp:729
+#: cygnal/libnet/network.cpp:730
#, c-format
msgid "Unable to close the socket for fd #%d: %s"
msgstr ""
-#: cygnal/libnet/network.cpp:737
+#: cygnal/libnet/network.cpp:738
#, c-format
msgid "Closed the socket on fd #%d"
msgstr ""
-#: cygnal/libnet/network.cpp:766
+#: cygnal/libnet/network.cpp:767
#, c-format
msgid "%s: Closed fd #%d"
msgstr ""
-#: cygnal/libnet/network.cpp:878
+#: cygnal/libnet/network.cpp:879
#, c-format
msgid "Trying to read %d bytes from fd #%d"
msgstr ""
-#: cygnal/libnet/network.cpp:942 cygnal/libnet/network.cpp:1116
+#: cygnal/libnet/network.cpp:943 cygnal/libnet/network.cpp:1117
#, c-format
msgid "The socket for fd #%d was interrupted by a system call"
msgstr ""
-#: cygnal/libnet/network.cpp:946
+#: cygnal/libnet/network.cpp:947
#, c-format
msgid "The socket for fd #%d was never available for reading"
msgstr ""
-#: cygnal/libnet/network.cpp:952
+#: cygnal/libnet/network.cpp:953
#, c-format
msgid "The socket for #fd %d timed out waiting to read"
msgstr ""
-#: cygnal/libnet/network.cpp:969
+#: cygnal/libnet/network.cpp:970
#, c-format
msgid "The socket for fd #%d was never available for reading data"
msgstr ""
-#: cygnal/libnet/network.cpp:975
+#: cygnal/libnet/network.cpp:976
#, c-format
msgid "The socket for #fd %d timed out waiting to read data"
msgstr ""
-#: cygnal/libnet/network.cpp:981
+#: cygnal/libnet/network.cpp:982
#, c-format
msgid "read %d bytes from fd #%d from port %d"
msgstr ""
-#: cygnal/libnet/network.cpp:985
+#: cygnal/libnet/network.cpp:986
#, c-format
msgid ""
"%s: Read packet data from fd #%d (%d bytes): \n"
"%s"
msgstr ""
-#: cygnal/libnet/network.cpp:1120
+#: cygnal/libnet/network.cpp:1121
#, c-format
msgid "The socket for fd #%d was never available for writing"
msgstr ""
-#: cygnal/libnet/network.cpp:1124
+#: cygnal/libnet/network.cpp:1125
#, c-format
msgid "The socket for fd #%d timed out waiting to write"
msgstr ""
-#: cygnal/libnet/network.cpp:1138
+#: cygnal/libnet/network.cpp:1139
#, c-format
msgid "Wrote zero out of %d bytes to fd #%d: %s"
msgstr ""
-#: cygnal/libnet/network.cpp:1143
+#: cygnal/libnet/network.cpp:1144
#, c-format
msgid "Couldn't write %d bytes to fd #%d: %s"
msgstr ""
-#: cygnal/libnet/network.cpp:1151
+#: cygnal/libnet/network.cpp:1152
#, c-format
msgid "wrote %d bytes to fd #%d, expected %d"
msgstr ""
-#: cygnal/libnet/network.cpp:1156
+#: cygnal/libnet/network.cpp:1157
#, c-format
msgid "wrote %d bytes to fd #%d for port %d"
msgstr ""
-#: cygnal/libnet/network.cpp:1164
+#: cygnal/libnet/network.cpp:1165
#, c-format
msgid ""
"%s: Wrote packet data to fd #%d: \n"
"%s"
msgstr ""
-#: cygnal/libnet/network.cpp:1178
+#: cygnal/libnet/network.cpp:1179
#, c-format
msgid "took %d usec to write (%d bytes)"
msgstr ""
-#: cygnal/libnet/network.cpp:1193 cygnal/libnet/network.cpp:1204
+#: cygnal/libnet/network.cpp:1194 cygnal/libnet/network.cpp:1205
#, c-format
msgid "%s: adding fd #%d to pollfds"
msgstr ""
-#: cygnal/libnet/network.cpp:1230
+#: cygnal/libnet/network.cpp:1231
#, c-format
msgid "%s: erasing fd #%d from pollfds"
msgstr ""
-#: cygnal/libnet/network.cpp:1278
+#: cygnal/libnet/network.cpp:1279
#, c-format
msgid "%s: waiting for %d fds"
msgstr ""
-#: cygnal/libnet/network.cpp:1317
+#: cygnal/libnet/network.cpp:1318
#, c-format
msgid "Poll returned: %d, timeout is: %d"
msgstr ""
-#: cygnal/libnet/network.cpp:1448
+#: cygnal/libnet/network.cpp:1449
msgid "Waiting for data was interrupted by a system call"
msgstr ""
-#: cygnal/libnet/network.cpp:1452
+#: cygnal/libnet/network.cpp:1453
msgid "Waiting for data for fdset, was never available for reading"
msgstr ""
-#: cygnal/libnet/network.cpp:1466
+#: cygnal/libnet/network.cpp:1467
#, c-format
msgid "select() got an error: %s."
msgstr ""
-#: cygnal/libnet/network.cpp:1470
+#: cygnal/libnet/network.cpp:1471
#, c-format
msgid "select() saw activity on %d file descriptors."
msgstr ""
-#: cygnal/libnet/network.cpp:1546
+#: cygnal/libnet/network.cpp:1547
#, c-format
msgid "Can't connect to server %s"
msgstr ""
-#: cygnal/libnet/network.cpp:1558
+#: cygnal/libnet/network.cpp:1559
#, c-format
msgid "Using default hostname: \"%s\""
msgstr ""
-#: cygnal/libnet/network.cpp:1563
+#: cygnal/libnet/network.cpp:1564
#, c-format
msgid "Using default keyfile: \"%s\""
msgstr ""
-#: cygnal/libnet/network.cpp:1568
+#: cygnal/libnet/network.cpp:1569
#, c-format
msgid "Using default CA List: \"%s\""
msgstr ""
-#: cygnal/libnet/network.cpp:1574
+#: cygnal/libnet/network.cpp:1575
#, c-format
msgid "Using default Password: \"%s\""
msgstr ""
-#: cygnal/libnet/network.cpp:1579
+#: cygnal/libnet/network.cpp:1580
#, c-format
msgid "Using default Root Path to PEM files: \"%s\""
msgstr ""
-#: cygnal/libnet/network.cpp:1584
+#: cygnal/libnet/network.cpp:1585
msgid "Connected to SSL server"
msgstr ""
-#: cygnal/libnet/network.cpp:1586
+#: cygnal/libnet/network.cpp:1587
msgid "Couldn't connect to SSL server"
msgstr ""
-#: cygnal/libnet/network.cpp:1619
+#: cygnal/libnet/network.cpp:1620
#, c-format
msgid "#%d bytes waiting in kernel network buffer."
msgstr ""
-#: cygnal/libnet/network.cpp:1630
+#: cygnal/libnet/network.cpp:1631
#, c-format
msgid "Got an %d interrupt while blocked on pselect()"
msgstr ""
@@ -9485,11 +9381,40 @@ msgstr ""
msgid "err %i:%s\n"
msgstr ""
+#: cygnal/libnet/http.cpp:176
+#, c-format
+msgid "Setting Content Length to %d"
+msgstr ""
+
+#: cygnal/libnet/http.cpp:189
+#, c-format
+msgid "Setting Content Type to %d"
+msgstr ""
+
+#: cygnal/libnet/http.cpp:199
+#, c-format
+msgid "Got a request, parsing \"%s\""
+msgstr ""
+
+#: cygnal/libnet/http.cpp:216 cygnal/libnet/http.cpp:1295
+#, c-format
+msgid "Parameters for file: \"%s\""
+msgstr ""
+
#: cygnal/libnet/http.cpp:220
#, c-format
msgid "Requesting file: \"%s\""
msgstr ""
+#: cygnal/libnet/http.cpp:225
+msgid "Enabling Keep Alive by default for HTTP > 1.0"
+msgstr ""
+
+#: cygnal/libnet/http.cpp:422 cygnal/libnet/http.cpp:521
+#, c-format
+msgid "Que empty, net connection dropped for fd #%d"
+msgstr ""
+
#: cygnal/libnet/http.cpp:433
msgid "FIXME: found file in cache!"
msgstr ""
@@ -9499,6 +9424,14 @@ msgstr ""
msgid "http_handler all done transferring requested file \"%s\"."
msgstr ""
+#: cygnal/libnet/http.cpp:542
+msgid "Got file data in POST"
+msgstr ""
+
+#: cygnal/libnet/http.cpp:549
+msgid "Got AMF data in POST"
+msgstr ""
+
#: cygnal/libnet/http.cpp:564
msgid "Got CGI echo request in POST"
msgstr ""
@@ -9984,17 +9917,7 @@ msgstr ""
msgid "Restarting loop for next connection for port %d..."
msgstr ""
-#: cygnal/cygnal.cpp:1009
-#, c-format
-msgid "Handler has %d clients attached, %d threads"
-msgstr ""
-
-#: cygnal/cygnal.cpp:1014
-#, c-format
-msgid "Handler client[%d] is: %d"
-msgstr ""
-
-#: cygnal/cygnal.cpp:1027 cygnal/rtmp_server.cpp:1388
+#: cygnal/cygnal.cpp:1027
#, c-format
msgid "%d active disk streams"
msgstr ""
@@ -10064,27 +9987,14 @@ msgstr ""
msgid "Gnash media file name: %s"
msgstr ""
-#: cygnal/rtmp_server.cpp:99
-#, c-format
-msgid "Processing RTMP Handshake for fd #%d"
-msgstr ""
-
#: cygnal/rtmp_server.cpp:124
msgid "Failed to read the handshake from the client."
msgstr ""
-#: cygnal/rtmp_server.cpp:127
-msgid "Read first handshake from the client."
-msgstr ""
-
#: cygnal/rtmp_server.cpp:139
msgid "failed to read the handshake from the client."
msgstr ""
-#: cygnal/rtmp_server.cpp:142
-msgid "Read second handshake from the client."
-msgstr ""
-
#: cygnal/rtmp_server.cpp:149
msgid "Didn't receive any data in handshake!"
msgstr ""
@@ -10098,64 +10008,26 @@ msgstr ""
msgid "NetConnection unusually large! %d"
msgstr ""
-#: cygnal/rtmp_server.cpp:185
-msgid "De chunkifying the NetConnection packet."
-msgstr ""
-
#: cygnal/rtmp_server.cpp:202
msgid "failed to read the body of the handshake data from the client."
msgstr ""
-#: cygnal/rtmp_server.cpp:205
-msgid "Read handshake data body from the client."
-msgstr ""
-
#: cygnal/rtmp_server.cpp:210
msgid "Didn't receive NetConnection object in handshake!"
msgstr ""
-#: cygnal/rtmp_server.cpp:213
-msgid "Got NetConnection ::connect() INVOKE."
-msgstr ""
-
-#: cygnal/rtmp_server.cpp:232
-msgid "Sent onBWDone to client"
-msgstr ""
-
#: cygnal/rtmp_server.cpp:234
msgid "Couldn't send onBWDone to client!"
msgstr ""
-#: cygnal/rtmp_server.cpp:247
-msgid "Sent set Client Window Size to client"
-msgstr ""
-
-#: cygnal/rtmp_server.cpp:249
-msgid "Couldn't send set Client Window Size to client!"
-msgstr ""
-
-#: cygnal/rtmp_server.cpp:259 cygnal/rtmp_server.cpp:1700
-msgid "Sent Ping to client"
-msgstr ""
-
#: cygnal/rtmp_server.cpp:261 cygnal/rtmp_server.cpp:1702
msgid "Couldn't send Ping to client!"
msgstr ""
-#: cygnal/rtmp_server.cpp:273 cygnal/rtmp_server.cpp:1657
-#: cygnal/rtmp_server.cpp:1680
-msgid "Sent response to client."
-msgstr ""
-
#: cygnal/rtmp_server.cpp:275
msgid "Couldn't send response to client!"
msgstr ""
-#: cygnal/rtmp_server.cpp:336
-#, c-format
-msgid "Sent RTMP Handshake response at %d"
-msgstr ""
-
#: cygnal/rtmp_server.cpp:338
#, c-format
msgid "Couldn't sent RTMP Handshake response at %d!"
@@ -10169,20 +10041,11 @@ msgstr ""
msgid "No data in response handshake buffer."
msgstr ""
-#: cygnal/rtmp_server.cpp:385
-msgid "Handshake Finish Data matched"
-msgstr ""
-
#: cygnal/rtmp_server.cpp:387
#, c-format
msgid "Handshake Finish Data didn't match by %d bytes"
msgstr ""
-#: cygnal/rtmp_server.cpp:397
-#, c-format
-msgid "Got AMF data in handshake, %d bytes for fd #%d"
-msgstr ""
-
#: cygnal/rtmp_server.cpp:555
msgid "Route"
msgstr ""
@@ -10208,18 +10071,9 @@ msgstr ""
msgid "Couldn't reliably extract the echo data!"
msgstr ""
-#: cygnal/rtmp_server.cpp:1361
-#, c-format
-msgid "Starting RTMP Handler for fd #%d, cgi-bin is \"%s\""
-msgstr ""
-
#: cygnal/rtmp_server.cpp:1400
#, c-format
-msgid "ERROR: No stream for client %d"
-msgstr ""
-
-#: cygnal/rtmp_server.cpp:1411
-msgid "data left from previous packet"
+msgid "No stream for client %d"
msgstr ""
#: cygnal/rtmp_server.cpp:1442
@@ -10239,31 +10093,10 @@ msgstr ""
msgid "Stream Set Buffer: %d"
msgstr ""
-#: cygnal/rtmp_server.cpp:1460
-#, c-format
-msgid "Processed Ping message from client, type %d"
-msgstr ""
-
#: cygnal/rtmp_server.cpp:1465
msgid "Stream Pong"
msgstr ""
-#: cygnal/rtmp_server.cpp:1471
-msgid "Got the 1st Audio packet!"
-msgstr ""
-
-#: cygnal/rtmp_server.cpp:1473
-msgid "Got the 1st Video packet!"
-msgstr ""
-
-#: cygnal/rtmp_server.cpp:1475
-msgid "Got the Window Set Size packet!"
-msgstr ""
-
-#: cygnal/rtmp_server.cpp:1477
-msgid "Got unknown system message!"
-msgstr ""
-
#: cygnal/rtmp_server.cpp:1484
msgid "Set Chunk Size"
msgstr ""
@@ -10280,11 +10113,6 @@ msgstr ""
msgid "Set Bandwidth"
msgstr ""
-#: cygnal/rtmp_server.cpp:1505
-#, c-format
-msgid "SharedObject name is \"%s\""
-msgstr ""
-
#: cygnal/rtmp_server.cpp:1509 cygnal/rtmp_server.cpp:1512
#: cygnal/rtmp_server.cpp:1515 cygnal/rtmp_server.cpp:1518
#: cygnal/rtmp_server.cpp:1665
@@ -10297,25 +10125,6 @@ msgstr ""
msgid "Error INVOKING method \"%s\"!"
msgstr ""
-#: cygnal/rtmp_server.cpp:1528
-#, c-format
-msgid "INVOKEing method \"%s\""
-msgstr ""
-
-#: cygnal/rtmp_server.cpp:1537
-#, c-format
-msgid "The Transaction ID from the client is: %g"
-msgstr ""
-
-#: cygnal/rtmp_server.cpp:1621
-#, c-format
-msgid "Sending %s to client"
-msgstr ""
-
-#: cygnal/rtmp_server.cpp:1627
-msgid "Sent first page to client"
-msgstr ""
-
#: cygnal/rtmp_server.cpp:1648
msgid "Received an _error message from the client!"
msgstr ""
@@ -10325,11 +10134,6 @@ msgstr ""
msgid "ERROR: Unidentified AMF header data type 0x%x"
msgstr ""
-#: cygnal/rtmp_server.cpp:1692
-#, c-format
-msgid "Never read any data from fd #%d"
-msgstr ""
-
#: cygnal/testsuite/libnet.all/test_handler.cpp:113
#: cygnal/testsuite/libnet.all/generate_amfbins.cpp:112
#: cygnal/testsuite/libnet.all/test_rtmp.cpp:120
@@ -10396,31 +10200,11 @@ msgstr ""
msgid "Usage: test_buffer [options...]"
msgstr ""
-#: cygnal/proc.cpp:106
-#, c-format
-msgid "Document Root for CGI files is: %s"
-msgstr ""
-
-#: cygnal/proc.cpp:115
-#, c-format
-msgid "Starting \"%s\""
-msgstr ""
-
#: cygnal/proc.cpp:119
#, c-format
msgid "Invalid filespec for CGI: \"%s\""
msgstr ""
-#: cygnal/proc.cpp:187
-#, c-format
-msgid "Finding \"%s\""
-msgstr ""
-
-#: cygnal/proc.cpp:207
-#, c-format
-msgid "Stopping \"%s\""
-msgstr ""
-
#: gui/fb/fb.cpp:229
#, c-format
msgid "No renderer! %s not supported."
http://git.savannah.gnu.org/cgit//commit/?id=49037e524fe4f4214e883260df072c0f90fd40fa
commit 49037e524fe4f4214e883260df072c0f90fd40fa
Author: Rob Savoye <address@hidden>
Date: Sun Jan 1 09:28:15 2012 -0700
fix typos
diff --git a/gui/gtk/gtk_glue_ovg.cpp b/gui/gtk/gtk_glue_ovg.cpp
index 001d03e..d2f2ba9 100644
--- a/gui/gtk/gtk_glue_ovg.cpp
+++ b/gui/gtk/gtk_glue_ovg.cpp
@@ -380,7 +380,7 @@ GtkOvgGlue::queryEGLConfig(EGLDisplay display)
// Get the number of supported configurations
if ( EGL_FALSE == eglGetConfigs(display, 0, 0, &max_num_config) ) {
- log_error(_("eglGetConfigs() failed to retrive the number of configs
(error %s)"),
+ log_error(_("eglGetConfigs() failed to retrieve the number of configs
(error %s)"),
getErrorString(eglGetError()));
return 0;
}
diff --git a/libcore/LineStyle.cpp b/libcore/LineStyle.cpp
index e5a7f76..563696b 100644
--- a/libcore/LineStyle.cpp
+++ b/libcore/LineStyle.cpp
@@ -183,11 +183,13 @@ LineStyle::set_lerp(const LineStyle& ls1, const
LineStyle& ls2, float ratio)
m_color = lerp(ls1.get_color(), ls2.get_color(), ratio);
if ( ls1._scaleVertically != ls2._scaleVertically )
{
- LOG_ONCE(log_error(_("UNTESTED: Dunno how to interpolate line styles
with different vertical thickness scaling")));
+ LOG_ONCE(log_error(_("UNTESTED: Do not know how to interpolate"
+ " line styles with different vertical thickness scaling")));
}
if ( ls1._scaleHorizontally != ls2._scaleHorizontally )
{
- LOG_ONCE(log_error(_("UNTESTED: Dunno how to interpolate line styles
with different horizontal thickness scaling")));
+ LOG_ONCE(log_error(_("UNTESTED: Do not know how to interpolate"
+ " line styles with different horizontal thickness scaling")));
}
}
diff --git a/libcore/TextField.cpp b/libcore/TextField.cpp
index 428e1d2..f92dd1b 100644
--- a/libcore/TextField.cpp
+++ b/libcore/TextField.cpp
@@ -1764,7 +1764,7 @@ TextField::handleChar(std::wstring::const_iterator& it,
// of each glyph, even if we don't display it
m_text_bounding_box.expand_to_point(x, y + fontDescent);
#ifdef GNASH_DEBUG_TEXT_FORMATTING
- log_debug("Text bbox expanded to %s (width: %f)",
+ log_debug("Text box expanded to %s (width: %f)",
m_text_bounding_box, m_text_bounding_box.width());
#endif
diff --git a/libcore/asobj/TextFormat_as.cpp b/libcore/asobj/TextFormat_as.cpp
index 37d16c9..9168de6 100644
--- a/libcore/asobj/TextFormat_as.cpp
+++ b/libcore/asobj/TextFormat_as.cpp
@@ -560,7 +560,7 @@ textformat_getTextExtent(const fn_call& fn)
if (!fn.nargs) {
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("TextFormat.getTextExtent requires at least one"
- "argument"));
+ " argument"));
);
return as_value();
}
diff --git a/libdevice/egl/eglDevice.cpp b/libdevice/egl/eglDevice.cpp
index 48ee8a1..9658e52 100644
--- a/libdevice/egl/eglDevice.cpp
+++ b/libdevice/egl/eglDevice.cpp
@@ -206,7 +206,7 @@ EGLDevice::initDevice(int /* argc */, char **/*argv[] */)
// Get the number of supported configurations
if ( EGL_FALSE == eglGetConfigs(_eglDisplay, 0, 0, &max_num_config) ) {
- log_error(_("eglGetConfigs() failed to retrive the number of configs
(error %s)"),
+ log_error(_("eglGetConfigs() failed to retrieve the number of configs
(error %s)"),
getErrorString(eglGetError()));
return 0;
}
@@ -339,7 +339,7 @@ EGLDevice::bindClient(rtype_t rtype)
{
log_debug(_("Initializing EGL for OpenGLES2"));
if(EGL_FALSE == eglBindAPI(EGL_OPENGL_ES_API)) {
- log_error(_("eglBindAPI() failed to retrive the number of
configs (error %s)"),
+ log_error(_("eglBindAPI() failed to retrieve the number of
configs (error %s)"),
getErrorString(eglGetError()));
return false;
}
@@ -359,7 +359,7 @@ EGLDevice::bindClient(rtype_t rtype)
{
log_debug(_("Initializing EGL for OpenVG"));
if(EGL_FALSE == eglBindAPI(EGL_OPENVG_API)) {
- log_error(("eglBindAPI() failed to retrive the number of configs
(error %s)"),
+ log_error(_("eglBindAPI() failed to retrieve the number of
configs (error %s)"),
getErrorString(eglGetError()));
return false;
}
@@ -541,7 +541,7 @@ EGLDevice::queryEGLConfig(EGLDisplay display)
// Get the number of supported configurations
if ( EGL_FALSE == eglGetConfigs(display, 0, 0, &max_num_config) ) {
- log_error(_("eglGetConfigs() failed to retrive the number of configs
(error %s)"),
+ log_error(_("eglGetConfigs() failed to retrieve the number of configs
(error %s)"),
getErrorString(eglGetError()));
return 0;
}
http://git.savannah.gnu.org/cgit//commit/?id=b72f169df7427c15dc7bccf0403696c280dfd581
commit b72f169df7427c15dc7bccf0403696c280dfd581
Author: Rob Savoye <address@hidden>
Date: Sun Jan 1 09:27:01 2012 -0700
print messages cleaned up for translations
diff --git a/cygnal/cvm.cpp b/cygnal/cvm.cpp
index dd9d0d7..3140440 100644
--- a/cygnal/cvm.cpp
+++ b/cygnal/cvm.cpp
@@ -142,7 +142,7 @@ class FsCommandExecutor: public
movie_root::AbstractFsCallback {
public:
void notify(const std::string& command, const std::string& args)
{
- log_debug(_("fs_callback(%p): %s %s"), command, args);
+ log_debug("fs_callback(%p): %s %s", command, args);
StringNoCaseEqual ncasecomp;
@@ -154,7 +154,7 @@ class EventCallback: public
movie_root::AbstractIfaceCallback {
public:
std::string call(const std::string& event, const std::string& arg)
{
- log_debug(_("eventCallback: %s %s"), event, arg);
+ log_debug("eventCallback: %s %s", event, arg);
static bool mouseShown = true;
@@ -265,13 +265,13 @@ vm_main(int argc, char *argv[])
break;
case 'v':
dbglogfile.setVerbosity();
- log_debug (_("Verbose output turned on"));
+ log_debug ("Verbose output turned on");
break;
case 'g':
#ifdef USE_DEBUGGER
debugger.enabled(true);
debugger.console();
- log_debug (_("Setting debugger ON"));
+ log_debug ("Setting debugger ON");
#else
log_error (_("The debugger has been disabled at configuration
time"));
#endif
@@ -404,10 +404,10 @@ play_movie(const std::string& filename, const
RunResources& runResources)
size_t lastSlash = path.find_last_of('/');
std::string dir = path.substr(0, lastSlash+1);
rcfile.addLocalSandboxPath(dir);
- log_debug(_("%s appended to local sandboxes"), dir.c_str());
+ log_debug("%s appended to local sandboxes", dir.c_str());
#else // add the *file* to be loaded to the local sandbox path
rcfile.addLocalSandboxPath(path);
- log_debug(_("%s appended to local sandboxes"), path.c_str());
+ log_debug("%s appended to local sandboxes", path.c_str());
#endif
}
md = gnash::MovieFactory::makeMovie(url, runResources, NULL, false);
@@ -427,8 +427,8 @@ play_movie(const std::string& filename, const RunResources&
runResources)
long clockAdvance = fpsDelay/1000;
long localDelay = delay == -1 ? fpsDelay : delay; // microseconds
- log_debug(_("Will sleep %ld microseconds between iterations - "
- "fps is %g, clockAdvance is %lu"), localDelay, fps,
clockAdvance);
+ log_debug("Will sleep %ld microseconds between iterations - "
+ "fps is %g, clockAdvance is %lu", localDelay, fps,
clockAdvance);
// Use a clock advanced at every iteration to match exact FPS speed.
@@ -448,7 +448,7 @@ play_movie(const std::string& filename, const RunResources&
runResources)
return md;
}
- log_debug(_("iteration, timer: %lu, localDelay: %ld\n"),
+ log_debug("iteration, timer: %lu, localDelay: %ld\n",
cl.elapsed(), localDelay);
gnashSleep(localDelay);
@@ -484,7 +484,7 @@ play_movie(const std::string& filename, const RunResources&
runResources)
m.display(); // FIXME: for which reason are we calling display here ??
++nadvances;
if ( limit_advances && nadvances >= limit_advances) {
- log_debug(_("exiting after %d advances"), nadvances);
+ log_debug("exiting after %d advances", nadvances);
break;
}
@@ -494,8 +494,8 @@ play_movie(const std::string& filename, const RunResources&
runResources)
if (curr_frame >= md->get_frame_count() - 1 ) {
if ( allowed_end_hits && ++end_hitcount >= allowed_end_hits )
{
- log_debug(_("exiting after %d"
- " times last frame was reached"), end_hitcount);
+ log_debug("exiting after %d"
+ " times last frame was reached", end_hitcount);
break;
}
}
@@ -528,8 +528,8 @@ play_movie(const std::string& filename, const RunResources&
runResources)
else if (m.get_current_frame() < last_frame) {
if ( last_frame > latest_frame ) latest_frame = last_frame;
if ( ++loop_back_count > allowloopbacks ) {
- log_debug(_("%d loop backs; jumping one-after "
- "latest frame (%d)"),
+ log_debug("%d loop backs; jumping one-after "
+ "latest frame (%d)",
loop_back_count, latest_frame+1);
m.goto_frame(latest_frame + 1);
loop_back_count = 0;
@@ -539,7 +539,7 @@ play_movie(const std::string& filename, const RunResources&
runResources)
resetLastAdvanceTimer();
}
- log_debug(_("iteration, timer: %lu, localDelay: %ld\n"),
+ log_debug("iteration, timer: %lu, localDelay: %ld\n",
cl.elapsed(), localDelay);
gnashSleep(localDelay);
}
diff --git a/cygnal/cygnal.cpp b/cygnal/cygnal.cpp
index 0dfc7f0..8265e66 100644
--- a/cygnal/cygnal.cpp
+++ b/cygnal/cygnal.cpp
@@ -1006,12 +1006,12 @@ event_handler(Network::thread_params_t *args)
// for select. We may want to do this elsewhere, as it could
// be a performance hit as the number of file descriptors gets
// larger.
- log_debug(_("Handler has %d clients attached, %d threads"),
+ log_debug("Handler has %d clients attached, %d threads",
hand->getClients().size(), tids.num_of_tids());
int max = 0;
for (size_t i = 0; i<hand->getClients().size(); i++) {
- log_debug(_("Handler client[%d] is: %d"), i, hand->getClient(i));
+ log_debug("Handler client[%d] is: %d", i, hand->getClient(i));
if (hand->getClient(i) >= max) {
max = hand->getClient(i);
// hand->dump();
diff --git a/cygnal/handler.cpp b/cygnal/handler.cpp
index 9d0e0b5..eb0f095 100644
--- a/cygnal/handler.cpp
+++ b/cygnal/handler.cpp
@@ -101,7 +101,7 @@ Handler::addClient(int fd, Network::protocols_supported_e
proto)
boost::mutex::scoped_lock lock(_mutex);
- log_debug(_("Adding %d to the client array."), fd);
+ log_debug("Adding %d to the client array.", fd);
switch (proto) {
case Network::NONE:
break;
@@ -165,7 +165,7 @@ Handler::parseFirstRequest(int fd,
gnash::Network::protocols_supported_e proto)
}
path = _http[fd]->getFilespec();
key = hostname + path;
- log_debug(_("HTTP key is: %s"), key);
+ log_debug("HTTP key is: %s", key);
_keys[fd] = key;
} else {
log_error(_("HTTP key couldn't be read!"));
@@ -190,7 +190,7 @@ Handler::parseFirstRequest(int fd,
gnash::Network::protocols_supported_e proto)
}
path = http.getFilespec();
key = hostname + path;
- log_debug(_("HTTP key is: %s"), key);
+ log_debug("HTTP key is: %s", key);
_keys[fd] = key;
} else {
log_error(_("HTTP key couldn't be read!"));
@@ -258,7 +258,7 @@ Handler::removeClient(int x)
vector<int>::iterator it;
for (it = _clients.begin(); it < _clients.end(); ++it) {
if (*it == x) {
- log_debug(_("Removing %d from the client array."), *it);
+ log_debug("Removing %d from the client array.", *it);
_clients.erase(it);
}
}
@@ -459,7 +459,7 @@ Handler::playStream(const std::string &filespec)
string fullpath = crcfile.getDocumentRoot();
fullpath += "/";
fullpath += filespec;
- log_debug(_("FILENAME: %s"), fullpath);
+ log_debug("FILENAME: %s", fullpath);
// gnash::DiskStream &ds = findStream(filespec);
if (ds->getState() == DiskStream::CREATED) {
diff --git a/cygnal/http_server.cpp b/cygnal/http_server.cpp
index 6365ff0..92f519b 100644
--- a/cygnal/http_server.cpp
+++ b/cygnal/http_server.cpp
@@ -147,7 +147,7 @@ HTTPServer::processClientRequest(Handler *hand, int fd,
cygnal::Buffer *buf)
// See if the file is in the cache and already opened.
boost::shared_ptr<DiskStream> filestream(cache.findFile(_filespec));
if (filestream) {
- log_debug(_("FIXME: found filestream %s in cache!"), _filespec);
+ log_debug("FIXME: found filestream %s in cache!", _filespec);
filestream->dump();
} else {
filestream.reset(new DiskStream);
@@ -189,8 +189,8 @@ HTTPServer::processGetRequest(Handler *hand, int fd,
cygnal::Buffer *buf)
// cerr << hexify(buf->reference(), buf->allocated(), false) << endl;
if (buf == 0) {
- // log_debug(_("Que empty, net connection dropped for fd #%d"),
getFileFd());
- log_debug(_("Que empty, net connection dropped for fd #%d"), fd);
+ // log_debug("Queue empty, net connection dropped for fd #%d",
getFileFd());
+ log_debug("Queue empty, net connection dropped for fd #%d", fd);
// cygnal::Buffer buf;
return _buf;
}
@@ -284,7 +284,7 @@ HTTPServer::processPostRequest(int fd, cygnal::Buffer * /*
bufFIXME */)
buf = _que.pop();
if (buf == 0) {
- log_debug(_("Que empty, net connection dropped for fd #%d"),
+ log_debug("Queue empty, net connection dropped for fd #%d",
getFileFd());
return buf;
}
@@ -309,14 +309,14 @@ HTTPServer::processPostRequest(int fd, cygnal::Buffer *
/* bufFIXME */)
}
if (getField("content-type") == "application/x-www-form-urlencoded") {
- log_debug(_("Got file data in POST"));
+ log_debug("Got file data in POST");
string url = _docroot + _filespec;
DiskStream ds(url, *content);
ds.writeToDisk();
// ds.close();
// oh boy, we got ourselves some encoded AMF objects instead of a
boring file.
} else if (getField("content-type") == "application/x-amf") {
- log_debug(_("Got AMF data in POST"));
+ log_debug("Got AMF data in POST");
#if 0
amf::AMF amf;
boost::shared_ptr<cygnal::Element> el =
amf.extractAMF(content.reference(), content.end());
@@ -485,11 +485,11 @@ HTTPServer::formatGetReply(size_t size, http_status_e
code)
#if 0
if (_header.str().size()) {
- log_debug (_("Sent GET Reply"));
+ log_debug ("Sent GET Reply");
return _buffer;
} else {
clearHeader();
- log_debug (_("Couldn't send GET Reply, no header data"));
+ log_debug ("Couldn't send GET Reply, no header data");
}
#endif
@@ -517,11 +517,11 @@ HTTPServer::formatPostReply(rtmpt_cmd_e /* code */)
buf->copy(str);
_handler->pushout(buf);
_handler->notifyout();
- log_debug (_("Sent GET Reply"));
+ log_debug ("Sent GET Reply");
return true; // Default to true
} else {
clearHeader();
- log_debug (_("Couldn't send POST Reply, no header data"));
+ log_debug ("Couldn't send POST Reply, no header data");
}
#endif
@@ -554,7 +554,7 @@ HTTPServer::parseEchoRequest(boost::uint8_t *data, size_t
size)
// reduces memory errors caused by some of the corrupted tes cases.
boost::uint8_t *endstr = std::find(tmpptr, tmpptr+length, '\0');
if (endstr != tmpptr+length) {
- log_debug(_("Caught corrupted string! length was %d, null at %d"),
+ log_debug("Caught corrupted string! length was %d, null at %d",
length, endstr-tmpptr);
length = endstr-tmpptr;
}
@@ -575,7 +575,7 @@ HTTPServer::parseEchoRequest(boost::uint8_t *data, size_t
size)
// reduces memory errors caused by some of the corrupted tes cases.
endstr = std::find(tmpptr, tmpptr+length, '\0');
if (endstr != tmpptr+length) {
- log_debug(_("Caught corrupted string! length was %d, null at %d"),
+ log_debug("Caught corrupted string! length was %d, null at %d",
length, endstr-tmpptr);
length = endstr-tmpptr;
}
@@ -871,12 +871,12 @@ HTTPServer::extractCommand(boost::uint8_t *data)
if (params != end) {
_params = std::string(params+1, end);
_filespec = std::string(start, params);
- log_debug(_("Parameters for file: \"%s\""), _params);
+ log_debug("Parameters for file: \"%s\"", _params);
} else {
// This is fine as long as end is within the buffer.
_filespec = std::string(start, end);
}
- // log_debug(_("Requesting file: \"%s\""), _filespec);
+ // log_debug("Requesting file: \"%s\"", _filespec);
// The third field is always the HTTP version
// The version is the last field and is the protocol name
@@ -885,7 +885,7 @@ HTTPServer::extractCommand(boost::uint8_t *data)
// in it. It's actually two separate integers.
_version.major = *(end+6) - '0';
_version.minor = *(end+8) - '0';
- // log_debug(_("Version: %d.%d"), _version.major, _version.minor);
+ // log_debug("Version: %d.%d", _version.major, _version.minor);
}
return cmd;
@@ -915,7 +915,7 @@ HTTPServer::processHeaderFields(cygnal::Buffer &buf)
_keepalive = true;
if ((value != "on") && (value != "off")) {
_max_requests = strtol(value.c_str(), NULL, 0);
- log_debug(_("Setting Max Requests for Keep-Alive to %d"),
+ log_debug("Setting Max Requests for Keep-Alive to %d",
_max_requests);
}
}
@@ -926,20 +926,20 @@ HTTPServer::processHeaderFields(cygnal::Buffer &buf)
}
if (name == "content-length") {
_filesize = strtol(value.c_str(), NULL, 0);
- log_debug(_("Setting Content Length to %d"), _filesize);
+ log_debug("Setting Content Length to %d", _filesize);
}
if (name == "content-type") {
// This is the type used by flash when sending a AMF data via
POST
if (value == "application/x-amf") {
-// log_debug(_("Got AMF data in the POST request!"));
+// log_debug("Got AMF data in the POST request!");
_filetype = DiskStream::FILETYPE_AMF;
}
// This is the type used by wget when sending a file via POST
if (value == "application/x-www-form-urlencoded") {
-// log_debug(_("Got file data in the POST request"));
+// log_debug("Got file data in the POST request");
_filetype = DiskStream::FILETYPE_ENCODED;
}
- log_debug(_("Setting Content Type to %d"), _filetype);
+ log_debug("Setting Content Type to %d", _filetype);
}
// cerr << "FIXME: " << (void *)i << " : " << dec << end << endl;
@@ -949,7 +949,7 @@ HTTPServer::processHeaderFields(cygnal::Buffer &buf)
break;
#if 1
} else {
- log_debug(_("Got a request, parsing \"%s\""), *i);
+ log_debug("Got a request, parsing \"%s\"", *i);
string::size_type start = i->find(" ");
string::size_type params = i->find("?");
string::size_type pos = i->find("HTTP/");
@@ -960,13 +960,13 @@ HTTPServer::processHeaderFields(cygnal::Buffer &buf)
// in it. It's actually two separate integers.
_version.major = i->at(pos+5) - '0';
_version.minor = i->at(pos+7) - '0';
- // log_debug (_("Version: %d.%d"), _version.major,
_version.minor);
+ // log_debug ("Version: %d.%d", _version.major,
_version.minor);
// the filespec in the request is the middle field,
deliminated
// by a space on each end.
if (params != string::npos) {
_params = i->substr(params+1, end);
_filespec = i->substr(start+1, params);
- log_debug(_("Parameters for file: \"%s\""), _params);
+ log_debug("Parameters for file: \"%s\"", _params);
} else {
_filespec = i->substr(start+1, pos-start-2);
}
@@ -975,7 +975,7 @@ HTTPServer::processHeaderFields(cygnal::Buffer &buf)
// HTTP 1.1 enables persistent network connections
// by default.
if (_version.minor > 0) {
- log_debug(_("Enabling Keep Alive by default for HTTP >
1.0"));
+ log_debug("Enabling Keep Alive by default for HTTP >
1.0");
_keepalive = true;
}
}
@@ -1024,7 +1024,7 @@ HTTPServer::http_handler(Handler *hand, int netfd,
cygnal::Buffer *buf)
log_network(_("FIXME: No existing data in packet!"));
// See if we have any messages waiting
if (recvMsg(netfd) == 0) {
- log_debug(_("Net HTTP server failed to read from fd #%d..."),
netfd);
+ log_debug("Net HTTP server failed to read from fd #%d...", netfd);
return false;
}
}
@@ -1032,11 +1032,11 @@ HTTPServer::http_handler(Handler *hand, int netfd,
cygnal::Buffer *buf)
// Process incoming messages
HTTP::http_method_e cmd = processClientRequest(hand, netfd, buf);
if (cmd != HTTP::HTTP_GET) {
- log_debug(_("No active DiskStreams for fd #%d: %s..."), netfd,
+ log_debug("No active DiskStreams for fd #%d: %s...", netfd,
_filespec);
} else {
if (_diskstream) {
- log_debug(_("Found active DiskStream! for fd #%d: %s"), netfd,
+ log_debug("Found active DiskStream! for fd #%d: %s", netfd,
_filespec);
hand->setDiskStream(netfd, _diskstream);
cache.addFile(_filespec, _diskstream);
@@ -1070,14 +1070,14 @@ HTTPServer::http_handler(Handler *hand, int netfd,
cygnal::Buffer *buf)
// Unless the Keep-Alive flag is set, this isn't a persisant network
// connection.
if (!keepAlive()) {
- log_debug(_("Keep-Alive is off"), keepAlive());
+ log_debug("Keep-Alive is off", keepAlive());
} else {
- log_debug(_("Keep-Alive is on"), keepAlive());
+ log_debug("Keep-Alive is on", keepAlive());
}
#ifdef USE_STATISTICS
struct timespec end;
clock_gettime (CLOCK_REALTIME, &end);
- log_debug(_("Processing time for GET request was %f seconds"),
+ log_debug("Processing time for GET request was %f seconds",
static_cast<float>(((end.tv_sec - start.tv_sec) +
((end.tv_nsec - start.tv_nsec)/1e9))));
#endif
diff --git a/cygnal/libnet/network.cpp b/cygnal/libnet/network.cpp
index 7b95ee6..86cda2e 100644
--- a/cygnal/libnet/network.cpp
+++ b/cygnal/libnet/network.cpp
@@ -323,16 +323,16 @@ Network::newConnection(bool block, int fd)
ret = pselect(fd+1, &fdset, NULL, NULL, &tval, &blockset);
}
if (sig_number) {
- log_debug(_("Have a SIGINT interupt waiting!"));
+ log_debug("Have a SIGINT interrupt waiting!");
}
sigpending(&pending);
if (sigismember(&pending, SIGINT)) {
- log_debug(_("Have a pending SIGINT interupt waiting!"));
+ log_debug("Have a pending SIGINT interrupt waiting!");
int sig;
sigwait(&blockset, &sig);
}
if (sigismember(&pending, SIGPIPE)) {
- log_debug(_("Have a pending SIGPIPE interupt waiting!"));
+ log_debug("Have a pending SIGPIPE interrupt waiting!");
int sig;
sigwait(&blockset, &sig);
}
@@ -359,13 +359,14 @@ Network::newConnection(bool block, int fd)
}
if (ret == -1) {
- log_debug(_("The accept() socket for fd #%d never was available"),
fd);
+ log_debug("The accept() socket for fd #%d never was available",
fd);
return -1;
}
if (ret == 0) {
if (_debug) {
- log_debug(_("The accept() socket for fd #%d timed out
waitingfor data"), fd);
+ log_debug("The accept() socket for fd #%d timed out"
+ " waitingfor data", fd);
return 0;
}
}
@@ -383,7 +384,7 @@ Network::newConnection(bool block, int fd)
}
if (_debug) {
- log_debug(_("Accepting tcp/ip connection on fd #%d for port %d"),
_sockfd, _port);
+ log_debug(_("Accepting TCP/IP connection on fd #%d for port %d"),
_sockfd, _port);
}
return _sockfd;
@@ -919,13 +920,13 @@ Network::readNet(int fd, byte_t *buffer, int nbytes, int
timeout)
ret = pselect(fd+1, &fdset, NULL, NULL, &tval, &blockset);
sigpending(&pending);
if (sigismember(&pending, SIGINT)) {
- log_debug(_("Have a pending SIGINT interupt waiting!"));
+ log_debug("Have a pending SIGINT interrupt waiting!");
int sig;
sigwait(&blockset, &sig);
cntrlc_handler(SIGINT);
}
if (sigismember(&pending, SIGPIPE)) {
- log_debug(_("Have a pending SIGPIPE interupt waiting!"));
+ log_debug("Have a pending SIGPIPE interrupt waiting!");
int sig;
sigwait(&blockset, &sig);
cntrlc_handler(SIGINT);
@@ -1100,7 +1101,7 @@ Network::writeNet(int fd, const byte_t *buffer, int
nbytes, int timeout)
ret = pselect(fd+1, NULL, &fdset, NULL, &tval, &blockset);
sigpending(&pending);
if (sigismember(&pending, SIGINT)) {
- log_debug(_("Have a pending SIGINT interupt waiting!"));
+ log_debug("Have a pending SIGINT interrupt waiting!");
int sig;
sigwait(&blockset, &sig);
cntrlc_handler(SIGINT);
@@ -1298,7 +1299,7 @@ Network::waitForNetData(int limit, struct pollfd *fds)
int ret = ppoll(fds, limit, &tval, &blockset);
sigpending(&pending);
if (sigismember(&pending, SIGINT)) {
- log_debug(_("Have a pending SIGINT interupt waiting!"));
+ log_debug("Have a pending SIGINT interrupt waiting!");
int sig;
sigwait(&blockset, &sig);
}
@@ -1428,12 +1429,12 @@ Network::waitForNetData(int limit, fd_set files)
int ret = pselect(limit+1, &fdset, NULL, NULL, &tval, &sigmask);
sigpending(&pending);
if (sigismember(&pending, SIGINT)) {
- log_debug(_("Have a pending SIGINT interupt waiting!"));
+ log_debug("Have a pending SIGINT interrupt waiting!");
int sig;
sigwait(&sigmask, &sig);
}
if (sigismember(&pending, SIGPIPE)) {
- log_debug(_("Have a pending SIGPIPE interupt waiting!"));
+ log_debug("Have a pending SIGPIPE interrupt waiting!");
int sig;
sigwait(&sigmask, &sig);
}
@@ -1635,5 +1636,5 @@ cntrlc_handler (int sig)
// Local Variables:
// mode: C++
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
// End:
diff --git a/cygnal/proc.cpp b/cygnal/proc.cpp
index bb361b1..1e13c31 100644
--- a/cygnal/proc.cpp
+++ b/cygnal/proc.cpp
@@ -103,7 +103,7 @@ Proc::startCGI(const string &filespec, bool outflag,
boost::uint16_t port)
string path;
if (crcfile.getCgiRoot().size() > 0) {
path = crcfile.getCgiRoot().c_str();
- log_debug(_("Document Root for CGI files is: %s"), path);
+ log_debug("Document Root for CGI files is: %s", path);
} else {
// Yes, I know this is a hack.
path = "/var/www/html/cygnal/cgi-bin";
@@ -112,7 +112,7 @@ Proc::startCGI(const string &filespec, bool outflag,
boost::uint16_t port)
path += filespec;
// simple debug junk
- log_debug(_("Starting \"%s\""), path);
+ log_debug("Starting \"%s\"", path);
// See if the file actually exists, otherwise we can't spawn it
if (stat(path.c_str(), &procstats) == -1) {
@@ -184,7 +184,7 @@ int
Proc::findCGI(const string &filespec)
{
// GNASH_REPORT_FUNCTION;
- log_debug(_("Finding \"%s\""), filespec);
+ log_debug("Finding \"%s\"", filespec);
boost::mutex::scoped_lock lock(_mutex);
return _pids[filespec];
@@ -204,7 +204,7 @@ bool
Proc::stopCGI(const string &filespec)
{
// GNASH_REPORT_FUNCTION;
- log_debug(_("Stopping \"%s\""), filespec);
+ log_debug("Stopping \"%s\"", filespec);
boost::mutex::scoped_lock lock(_mutex);
pid_t pid = _pids[filespec];
diff --git a/cygnal/rtmp_server.cpp b/cygnal/rtmp_server.cpp
index c4cfd37..5e11e8b 100644
--- a/cygnal/rtmp_server.cpp
+++ b/cygnal/rtmp_server.cpp
@@ -96,7 +96,7 @@ RTMPServer::processClientHandShake(int fd)
{
GNASH_REPORT_FUNCTION;
- log_network(_("Processing RTMP Handshake for fd #%d"), fd);
+ log_network("Processing RTMP Handshake for fd #%d", fd);
#ifdef USE_STATISTICS
struct timespec start;
@@ -124,7 +124,7 @@ RTMPServer::processClientHandShake(int fd)
log_error(_("Failed to read the handshake from the client."));
return tcurl; // nc is empty
} else {
- log_network(_("Read first handshake from the client."));
+ log_network("Read first handshake from the client.");
}
// Send our response to the handshake, which primarily is the bytes
@@ -139,7 +139,7 @@ RTMPServer::processClientHandShake(int fd)
log_error(_("failed to read the handshake from the client."));
return tcurl; // nc is empty
} else {
- log_network(_("Read second handshake from the client."));
+ log_network("Read second handshake from the client.");
}
// Don't assume the data we just read is a handshake.
@@ -182,7 +182,7 @@ RTMPServer::processClientHandShake(int fd)
// are 1 byte ones.
boost::scoped_ptr<cygnal::Buffer> newptr(new
cygnal::Buffer(qhead->bodysize));
if (qhead->bodysize > RTMP_VIDEO_PACKET_SIZE) {
- log_network(_("De chunkifying the NetConnection packet."));
+ log_network("De chunkifying the NetConnection packet.");
int nbytes = 0;
while (nbytes < qhead->bodysize) {
size_t chunk = RTMP_VIDEO_PACKET_SIZE;
@@ -202,7 +202,7 @@ RTMPServer::processClientHandShake(int fd)
log_error(_("failed to read the body of the handshake data from the
client."));
return tcurl; // nc is empty
} else {
- log_network(_("Read handshake data body from the client."));
+ log_network("Read handshake data body from the client.");
}
// make sure this is actually a NetConnection packet.
@@ -210,7 +210,7 @@ RTMPServer::processClientHandShake(int fd)
log_error(_("Didn't receive NetConnection object in handshake!"));
return tcurl; // nc is empty
} else {
- log_network(_("Got NetConnection ::connect() INVOKE."));
+ log_network("Got NetConnection ::connect() INVOKE.");
_netconnect->dump(); // FIXME: debug crap
}
@@ -229,7 +229,7 @@ RTMPServer::processClientHandShake(int fd)
boost::shared_ptr<cygnal::Buffer> bwdone = encodeBWDone(2.0);
if (RTMP::sendMsg(fd, qhead->channel, RTMP::HEADER_8,
bwdone->size(), RTMP::INVOKE, RTMPMsg::FROM_SERVER,
*bwdone)) {
- log_network(_("Sent onBWDone to client"));
+ log_network("Sent onBWDone to client");
} else {
log_error(_("Couldn't send onBWDone to client!"));
tcurl.reset();
@@ -244,9 +244,9 @@ RTMPServer::processClientHandShake(int fd)
*winsize += swapped;
if (RTMP::sendMsg(fd, RTMP_SYSTEM_CHANNEL, RTMP::HEADER_12,
winsize->size(), RTMP::WINDOW_SIZE, RTMPMsg::FROM_CLIENT,
*winsize)) {
- log_network(_("Sent set Client Window Size to client"));
+ log_network("Sent set Client Window Size to client");
} else {
- log_error(_("Couldn't send set Client Window Size to client!"));
+ log_error("Couldn't send set Client Window Size to client!");
tcurl.reset();
return tcurl; // nc is empty
}
@@ -256,7 +256,7 @@ RTMPServer::processClientHandShake(int fd)
encodePing(RTMP::PING_RESET, 0);
if (RTMP::sendMsg(fd, RTMP_SYSTEM_CHANNEL, RTMP::HEADER_8,
ping_reset->size(), RTMP::USER, RTMPMsg::FROM_SERVER,
*ping_reset)) {
- log_network(_("Sent Ping to client"));
+ log_network("Sent Ping to client");
} else {
log_error(_("Couldn't send Ping to client!"));
tcurl.reset();
@@ -270,7 +270,7 @@ RTMPServer::processClientHandShake(int fd)
encodeResult(RTMPMsg::NC_CONNECT_SUCCESS);
if (RTMP::sendMsg(fd, 3, RTMP::HEADER_8, response->allocated(),
RTMP::INVOKE, RTMPMsg::FROM_SERVER, *response)) {
- log_network(_("Sent response to client."));
+ log_network("Sent response to client.");
} else {
log_error(_("Couldn't send response to client!"));
tcurl.reset();
@@ -333,7 +333,7 @@ RTMPServer::handShakeResponse(int fd, cygnal::Buffer
&handshake)
size_t ret = writeNet(fd, *zeros);
if (ret == zeros->allocated()) {
- log_network(_("Sent RTMP Handshake response at %d"), timestamp);
+ log_network("Sent RTMP Handshake response at %d", timestamp);
} else {
log_error(_("Couldn't sent RTMP Handshake response at %d!"), timestamp);
}
@@ -382,7 +382,7 @@ RTMPServer::serverFinish(int fd, cygnal::Buffer
&handshake1, cygnal::Buffer &han
+ pkt_size + RTMP_HANDSHAKE_HEADER_SIZE,
RTMP_RANDOM_SIZE);
if (diff <= 1) {
- log_network (_("Handshake Finish Data matched"));
+ log_network ("Handshake Finish Data matched");
} else {
log_error (_("Handshake Finish Data didn't match by %d bytes"), diff);
// return buf; // return empty buffer
@@ -394,7 +394,7 @@ RTMPServer::serverFinish(int fd, cygnal::Buffer
&handshake1, cygnal::Buffer &han
// real performance hit from it.
size_t amf_size = handshake2.allocated() - pkt_size;
if (handshake2.allocated() >= pkt_size) {
- log_network(_("Got AMF data in handshake, %d bytes for fd #%d"),
+ log_network("Got AMF data in handshake, %d bytes for fd #%d",
amf_size, fd);
buf.reset(new Buffer(amf_size));
// populate the buffer with the AMF data
@@ -432,13 +432,13 @@ RTMPServer::packetRead(cygnal::Buffer &buf)
amf_index = *ptr & RTMP_INDEX_MASK;
headersize = headerSize(*ptr);
- log_network(_("The Header size is: %d"), headersize);
- log_network(_("The AMF index is: 0x%x"), amf_index);
+ log_network("The Header size is: %d", headersize);
+ log_network("The AMF index is: 0x%x", amf_index);
// if (headersize > 1) {
// packetsize = parseHeader(ptr);
// if (packetsize) {
-// log_network (_("Read first RTMP packet header of size %d"),
packetsize);
+// log_network ("Read first RTMP packet header of size %d",
packetsize);
// } else {
// log_error (_("Couldn't read first RTMP packet header"));
// return false;
@@ -486,7 +486,7 @@ RTMPServer::packetRead(cygnal::Buffer &buf)
el.dump();
ptr = amf.extractElement(&el, ptr) + 1;
el.dump();
- log_network(_("Reading AMF packets till we're done..."));
+ log_network("Reading AMF packets till we're done...");
// buf->dump();
while (ptr < end) {
boost::shared_ptr<cygnal::Element> el(new cygnal::Element);
@@ -496,11 +496,11 @@ RTMPServer::packetRead(cygnal::Buffer &buf)
}
ptr += 1;
size_t actual_size = _total_size - RTMP_HEADER_SIZE;
- log_network(_("Total size in header is %d, buffer size is: %d"),
+ log_network("Total size in header is %d, buffer size is: %d",
_total_size, buf->size());
// buf->dump();
if (buf->size() < actual_size) {
- log_network(_("FIXME: MERGING"));
+ log_network("FIXME: MERGING");
buf = _que->merge(buf);
}
while ((ptr - buf->begin()) < static_cast<int>(actual_size)) {
@@ -1358,7 +1358,7 @@ rtmp_handler(Network::thread_params_t *args)
boost::shared_ptr<RTMPMsg> body;
// static bool initialize = true;
// bool sendfile = false;
- log_network(_("Starting RTMP Handler for fd #%d, cgi-bin is \"%s\""),
+ log_network("Starting RTMP Handler for fd #%d, cgi-bin is \"%s\"",
args->netfd, args->filespec);
#ifdef USE_STATISTICS
@@ -1385,7 +1385,7 @@ rtmp_handler(Network::thread_params_t *args)
// If we have active disk streams, send those packets first.
// 0 is a reserved stream, so we start with 1, as the reserved
// stream isn't one we care about here.
- log_network(_("%d active disk streams"), hand->getActiveDiskStreams());
+ log_network("%d active disk streams", hand->getActiveDiskStreams());
for (int i=1; i <= hand->getActiveDiskStreams(); i++) {
hand->getDiskStream(i)->dump();
if (hand->getDiskStream(i)->getState() == DiskStream::PLAY) {
@@ -1397,7 +1397,7 @@ rtmp_handler(Network::thread_params_t *args)
ptr, 4096)) {
}
} else {
- log_network(_("ERROR: No stream for client %d"), i);
+ log_error(_("No stream for client %d"), i);
}
}
}
@@ -1408,7 +1408,7 @@ rtmp_handler(Network::thread_params_t *args)
// If there is no data left from the previous chunk, process
// that before reading more data.
if (pkt != 0) {
- log_network(_("data left from previous packet"));
+ log_network("data left from previous packet");
} else {
pkt = rtmp->recvMsg(args->netfd);
}
@@ -1457,7 +1457,7 @@ rtmp_handler(Network::thread_params_t *args)
{
boost::shared_ptr<RTMP::rtmp_ping_t> ping
= rtmp->decodePing(tmpptr);
- log_network(_("Processed Ping message
from client, type %d"),
+ log_network("Processed Ping message from
client, type %d",
ping->type);
break;
}
@@ -1468,13 +1468,13 @@ rtmp_handler(Network::thread_params_t *args)
break;
};
} else if (qhead->type == RTMP::AUDIO_DATA) {
- log_network(_("Got the 1st Audio packet!"));
+ log_network("Got the 1st Audio packet!");
} else if (qhead->type == RTMP::VIDEO_DATA) {
- log_network(_("Got the 1st Video packet!"));
+ log_network("Got the 1st Video packet!");
} else if (qhead->type == RTMP::WINDOW_SIZE) {
- log_network(_("Got the Window Set Size
packet!"));
+ log_network("Got the Window Set Size packet!");
} else {
- log_network(_("Got unknown system message!"));
+ log_network("Got unknown system message!");
bufptr->dump();
}
}
@@ -1502,7 +1502,7 @@ rtmp_handler(Network::thread_params_t *args)
case RTMP::VIDEO_DATA:
case RTMP::SHARED_OBJ:
body = rtmp->decodeMsgBody(tmpptr, qhead->bodysize);
- log_network(_("SharedObject name is \"%s\""),
+ log_network("SharedObject name is \"%s\"",
body->getMethodName());
break;
case RTMP::AMF3_NOTIFY:
@@ -1525,7 +1525,7 @@ rtmp_handler(Network::thread_params_t *args)
body->getMethodName());
continue;
}
- log_network(_("INVOKEing method \"%s\""),
+ log_network("INVOKEing method \"%s\"",
body->getMethodName());
// log_network("%s", hexify(tmpptr, qhead->bodysize,
true));
@@ -1534,7 +1534,7 @@ rtmp_handler(Network::thread_params_t *args)
// is a speacial one handled directly by the
// server instead of any cgi-bin plugins.
double transid = body->getTransactionID();
- log_network(_("The Transaction ID from the client is:
%g"), transid);
+ log_network("The Transaction ID from the client is:
%g", transid);
if (body->getMethodName() == "createStream") {
hand->createStream(transid);
response =
rtmp->encodeResult(RTMPMsg::NS_CREATE_STREAM, transid);
@@ -1618,13 +1618,13 @@ rtmp_handler(Network::thread_params_t *args)
int active_stream = hand->getActiveDiskStreams();
boost::uint8_t *ptr =
hand->getDiskStream(active_stream)->get();
if (ptr) {
- log_network(_("Sending %s to client"),
+ log_network("Sending %s to client",
hand->getDiskStream(active_stream)->getFilespec());
if (rtmp->sendMsg(args->netfd, 5,
RTMP::HEADER_12, 400,
RTMP::NOTIFY, RTMPMsg::FROM_SERVER,
ptr, 400)) {
- log_network(_("Sent first page to
client"));
+ log_network("Sent first page to client");
}
}
} else if (body->getMethodName() == "seek") {
@@ -1654,7 +1654,7 @@ rtmp_handler(Network::thread_params_t *args)
RTMP::HEADER_8,
result->allocated(),
RTMP::INVOKE,
RTMPMsg::FROM_SERVER,
*result)) {
- log_network(_("Sent response to
client."));
+ log_network("Sent response to client.");
}
}
done = true;
@@ -1677,11 +1677,11 @@ rtmp_handler(Network::thread_params_t *args)
if (result) { // FIXME: this needs a real channel number
if (rtmp->sendMsg(args->netfd, 0x3, RTMP::HEADER_8, ret,
RTMP::INVOKE, RTMPMsg::FROM_SERVER,
*result)) {
- log_network(_("Sent response to client."));
+ log_network("Sent response to client.");
}
}
#endif
-// log_network(_("RET is: %d"), ret);
+// log_network("RET is: %d", ret);
} // end of processing all the messages in the que
// we're done processing these packets, so get rid of them
@@ -1689,7 +1689,7 @@ rtmp_handler(Network::thread_params_t *args)
} else {
- log_network(_("Never read any data from fd #%d"), args->netfd);
+ log_network("Never read any data from fd #%d", args->netfd);
#if 0
// Send a ping to reset the new stream
boost::shared_ptr<cygnal::Buffer> ping_reset =
@@ -1697,7 +1697,7 @@ rtmp_handler(Network::thread_params_t *args)
if (rtmp->sendMsg(args->netfd, RTMP_SYSTEM_CHANNEL,
RTMP::HEADER_12, ping_reset->size(),
RTMP::PING, RTMPMsg::FROM_SERVER, *ping_reset)) {
- log_network(_("Sent Ping to client"));
+ log_network("Sent Ping to client");
} else {
log_error(_("Couldn't send Ping to client!"));
}
diff --git a/cygnal/serverSO.cpp b/cygnal/serverSO.cpp
index 726ba8e..6eca79f 100644
--- a/cygnal/serverSO.cpp
+++ b/cygnal/serverSO.cpp
@@ -72,6 +72,6 @@ ServerSO::dump(std::ostream& os) const
// local Variables:
// mode: C++
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
// End:
diff --git a/libcore/parser/SWFMovieDefinition.cpp
b/libcore/parser/SWFMovieDefinition.cpp
index 84df363..207d06e 100644
--- a/libcore/parser/SWFMovieDefinition.cpp
+++ b/libcore/parser/SWFMovieDefinition.cpp
@@ -317,7 +317,7 @@ SWFMovieDefinition::readHeader(std::auto_ptr<IOChannel> in,
// the error are better context.
if (m_frame_size.is_null()) {
IF_VERBOSE_MALFORMED_SWF(
- log_swferror("non-finite movie bounds");
+ log_swferror(_("non-finite movie bounds"));
);
}
diff --git a/libcore/parser/SWFParser.cpp b/libcore/parser/SWFParser.cpp
index 7993630..666e0a0 100644
--- a/libcore/parser/SWFParser.cpp
+++ b/libcore/parser/SWFParser.cpp
@@ -87,7 +87,7 @@ SWFParser::read(std::streamsize bytes)
if (_tag == SWF::SHOWFRAME) {
// show frame tag -- advance to the next frame.
- IF_VERBOSE_PARSE(log_parse("SHOWFRAME tag"));
+ IF_VERBOSE_PARSE(log_parse(_("SHOWFRAME tag")));
_md->incrementLoadedFrames();
}
else if (tagLoaders.get(_tag, lf)) {
@@ -102,7 +102,7 @@ SWFParser::read(std::streamsize bytes)
IF_VERBOSE_PARSE(
std::ostringstream ss;
dumpTagBytes(_stream, ss);
- log_error("tag dump follows: %s", ss.str());
+ log_error(_("tag dump follows: %s"), ss.str());
);
}
diff --git a/libcore/parser/TypesParser.cpp b/libcore/parser/TypesParser.cpp
index 2a28018..3e4220d 100644
--- a/libcore/parser/TypesParser.cpp
+++ b/libcore/parser/TypesParser.cpp
@@ -142,8 +142,8 @@ readRect(SWFStream& in)
// want to actually swap the values if the proprietary player
// does so. TODO: check it out.
IF_VERBOSE_MALFORMED_SWF(
- log_swferror("Invalid rectangle: "
- "minx=%g maxx=%g miny=%g maxy=%g", minx, maxx, miny, maxy);
+ log_swferror(_("Invalid rectangle: "
+ "minx=%g maxx=%g miny=%g maxy=%g"), minx, maxx,
miny, maxy);
);
return SWFRect();
}
@@ -158,7 +158,7 @@ readFills(SWFStream& in, SWF::TagType t, movie_definition&
md, bool readMorph)
const SWF::FillType type = static_cast<SWF::FillType>(in.read_u8());
IF_VERBOSE_PARSE(
- log_parse(" FillStyle read type = 0x%X", +type);
+ log_parse(_(" FillStyle read type = 0x%X"), +type);
);
switch (type) {
@@ -204,7 +204,7 @@ readFills(SWFStream& in, SWF::TagType t, movie_definition&
md, bool readMorph)
const boost::uint8_t num_gradients = grad_props & 0xF;
IF_VERBOSE_PARSE(
- log_parse(" gradients count: %d", +num_gradients);
+ log_parse(_(" gradients count: %d"), +num_gradients);
);
if (!num_gradients) {
@@ -263,8 +263,8 @@ readFills(SWFStream& in, SWF::TagType t, movie_definition&
md, bool readMorph)
break;
default:
IF_VERBOSE_MALFORMED_SWF(
- log_swferror("Illegal spread mode in gradient "
- "definition.");
+ log_swferror(_("Illegal spread mode in gradient "
+ "definition."));
);
}
@@ -280,8 +280,8 @@ readFills(SWFStream& in, SWF::TagType t, movie_definition&
md, bool readMorph)
break;
default:
IF_VERBOSE_MALFORMED_SWF(
- log_swferror("Illegal interpolation mode in "
- "gradient definition.");
+ log_swferror(_("Illegal interpolation mode in "
+ "gradient definition."));
);
}
}
@@ -405,7 +405,7 @@ readSolidFill(SWFStream& in, SWF::TagType t, bool readMorph)
}
IF_VERBOSE_PARSE(
- log_parse(" color: %s", color);
+ log_parse(_(" color: %s"), color);
);
return std::make_pair(SolidFill(color), morph);
}
diff --git a/libcore/parser/action_buffer.cpp b/libcore/parser/action_buffer.cpp
index 9802737..37d14d0 100644
--- a/libcore/parser/action_buffer.cpp
+++ b/libcore/parser/action_buffer.cpp
@@ -623,5 +623,5 @@ convert_double_wacky(const void *p)
// Local Variables:
// mode: C++
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
// End:
diff --git a/libcore/parser/filter_factory.cpp
b/libcore/parser/filter_factory.cpp
index e1853a2..15291de 100644
--- a/libcore/parser/filter_factory.cpp
+++ b/libcore/parser/filter_factory.cpp
@@ -50,7 +50,7 @@ filter_factory::read(SWFStream& in, bool read_multiple,
Filters* store)
}
IF_VERBOSE_PARSE(
- log_parse(" number of filters: %d", count);
+ log_parse(_(" number of filters: %d"), count);
);
for (int i = 0; i < count; ++i)
@@ -130,7 +130,7 @@ bool DropShadowFilter::read(SWFStream& in)
static_cast<void> (in.read_uint(5)); // Throw these away on purpose.
IF_VERBOSE_PARSE(
- log_parse(" DropShadowFilter: blurX=%f blurY=%f",
+ log_parse(_(" DropShadowFilter: blurX=%f blurY=%f"),
m_blurX, m_blurY);
);
@@ -149,7 +149,7 @@ bool BlurFilter::read(SWFStream& in)
static_cast<void> (in.read_uint(3)); // Throw these away.
IF_VERBOSE_PARSE(
- log_parse(" BlurFilter: blurX=%f blurY=%f quality=%d",
+ log_parse(_(" BlurFilter: blurX=%f blurY=%f quality=%d"),
m_blurX, m_blurY, m_quality);
);
@@ -176,7 +176,7 @@ bool GlowFilter::read(SWFStream& in)
static_cast<void> (in.read_uint(6)); // Throw these away.
IF_VERBOSE_PARSE(
- log_parse(" GlowFilter ");
+ log_parse(_(" GlowFilter "));
);
return true;
@@ -214,7 +214,7 @@ bool BevelFilter::read(SWFStream& in)
static_cast<void> (in.read_uint(4)); // Throw these away.
IF_VERBOSE_PARSE(
- log_parse(" BevelFilter ");
+ log_parse(_(" BevelFilter "));
);
return true;
@@ -261,7 +261,7 @@ bool GradientGlowFilter::read(SWFStream& in)
m_quality = static_cast<boost::uint8_t> (in.read_uint(4));
IF_VERBOSE_PARSE(
- log_parse(" GradientGlowFilter ");
+ log_parse(_(" GradientGlowFilter "));
);
return true;
@@ -297,7 +297,7 @@ ConvolutionFilter::read(SWFStream& in)
_preserveAlpha = in.read_bit();
IF_VERBOSE_PARSE(
- log_parse(" ConvolutionFilter ");
+ log_parse(_(" ConvolutionFilter "));
);
return true;
@@ -314,15 +314,19 @@ bool ColorMatrixFilter::read(SWFStream& in)
}
IF_VERBOSE_PARSE(
- log_parse(" ColorMatrixFilter: ");
- log_parse(" %g, %g, %g, %g, %g",
- m_matrix[0], m_matrix[1], m_matrix[2], m_matrix[3], m_matrix[4]);
- log_parse(" %g, %g, %g, %g, %g",
- m_matrix[5], m_matrix[6], m_matrix[7], m_matrix[8], m_matrix[9]);
- log_parse(" %g, %g, %g, %g, %g",
- m_matrix[10], m_matrix[11], m_matrix[12], m_matrix[13], m_matrix[14]);
- log_parse(" %g, %g, %g, %g, %g",
- m_matrix[15], m_matrix[16], m_matrix[17], m_matrix[18], m_matrix[19]);
+ log_parse(_(" ColorMatrixFilter: "));
+ log_parse(_(" %g, %g, %g, %g, %g"),
+ m_matrix[0], m_matrix[1], m_matrix[2],
+ m_matrix[3], m_matrix[4]);
+ log_parse(_(" %g, %g, %g, %g, %g"),
+ m_matrix[5], m_matrix[6], m_matrix[7],
+ m_matrix[8], m_matrix[9]);
+ log_parse(_(" %g, %g, %g, %g, %g"),
+ m_matrix[10], m_matrix[11], m_matrix[12],
+ m_matrix[13], m_matrix[14]);
+ log_parse(_(" %g, %g, %g, %g, %g"),
+ m_matrix[15], m_matrix[16], m_matrix[17],
+ m_matrix[18], m_matrix[19]);
);
return true;
@@ -367,7 +371,7 @@ bool GradientBevelFilter::read(SWFStream& in)
m_quality = static_cast<boost::uint8_t> (in.read_uint(4));
IF_VERBOSE_PARSE(
- log_parse(" GradientBevelFilter ");
+ log_parse(_(" GradientBevelFilter "));
);
return true;
diff --git a/libcore/vm/ASHandlers.cpp b/libcore/vm/ASHandlers.cpp
index 851b7e9..1816242 100644
--- a/libcore/vm/ASHandlers.cpp
+++ b/libcore/vm/ASHandlers.cpp
@@ -465,8 +465,8 @@ ActionNextFrame(ActionExec& thread)
MovieClip* tgt = tgtch ? tgtch->to_movie() : 0;
if (tgt) tgt->goto_frame(tgt->get_current_frame() + 1);
else {
- log_debug(_("ActionNextFrame: as_environment target is null "
- "or not a sprite"));
+ log_debug("ActionNextFrame: as_environment target is null "
+ "or not a sprite");
}
}
@@ -482,7 +482,7 @@ ActionPrevFrame(ActionExec& thread)
DisplayObject* tgtch = env.target();
MovieClip* tgt = tgtch ? tgtch->to_movie() : 0;
if (tgt) tgt->goto_frame(tgt->get_current_frame() - 1);
- else log_debug(_("ActionPrevFrame: as_environment target is null or not a
sprite"));
+ else log_debug("ActionPrevFrame: as_environment target is null or not a
sprite");
}
void
@@ -497,7 +497,7 @@ ActionPlay(ActionExec& thread)
DisplayObject* tgtch = env.target();
MovieClip* tgt = tgtch ? tgtch->to_movie() : 0;
if (tgt) tgt->setPlayState(MovieClip::PLAYSTATE_PLAY);
- else log_debug(_("ActionPlay: as_environment target is null or not a
sprite"));
+ else log_debug("ActionPlay: as_environment target is null or not a
sprite");
}
void
@@ -512,7 +512,7 @@ ActionStop(ActionExec& thread)
DisplayObject* tgtch = env.target();
MovieClip* tgt = tgtch ? tgtch->to_movie() : 0;
if (tgt) tgt->setPlayState(MovieClip::PLAYSTATE_STOP);
- else log_debug(_("ActionStop: as_environment target is null or not a
sprite"));
+ else log_debug("ActionStop: as_environment target is null or not a
sprite");
}
void
@@ -558,8 +558,8 @@ ActionGotoFrame(ActionExec& thread)
// frame number within this tag is hard-coded and 0-based
if (tgt) tgt->goto_frame(frame);
else {
- log_debug(_("ActionGotoFrame: as_environment target is null "
- "or not a sprite"));
+ log_debug("ActionGotoFrame: as_environment target is null "
+ "or not a sprite");
}
}
@@ -1389,8 +1389,8 @@ ActionImplementsOp(ActionExec& thread)
}
IF_VERBOSE_ACTION(
- log_action("%s (with .prototype %p) implements %s (with "
- ".prototype %p)", objval, (void*)obj, ctorval, (void*)inter);
+ log_action(_("%s (with .prototype %p) implements %s (with "
+ ".prototype %p)"), objval, (void*)obj, ctorval,
(void*)inter);
);
obj->addInterface(inter);
}
@@ -1424,7 +1424,7 @@ ActionFscommand2(ActionExec& thread)
}
ss << ")";
- LOG_ONCE( log_unimpl("fscommand2:%s", ss.str()) );
+ LOG_ONCE(log_unimpl(_("fscommand2:%s"), ss.str()) );
// TODO: check wheter or not we should drop anything from
// the stack, some reports and the Canonical tests
@@ -1555,7 +1555,7 @@ ActionMbSubString(ActionExec& thread)
as_value& string_val = env.top(2);
IF_VERBOSE_ACTION(
- log_action(" ActionMbSubString(%s, %d, %d)", string_val, arg0, arg1);
+ log_action(_(" ActionMbSubString(%s, %d, %d)"), string_val, arg0,
arg1);
);
env.drop(2);
@@ -1620,7 +1620,7 @@ ActionMbOrd(ActionExec& thread)
as_environment& env = thread.env;
if (env.get_version() == 5) {
- log_unimpl("Not properly implemented for SWF5");
+ log_unimpl(_("Not properly implemented for SWF5"));
// No need to return - it works a bit.
}
@@ -2518,14 +2518,14 @@ ActionNewEquals(ActionExec& thread)
as_value op1 = env.top(0);
try { convertToPrimitive(op1, vm); }
catch (const ActionTypeError& e) {
- log_debug(_("to_primitive(%s) threw an ActionTypeError %s"),
+ log_debug("to_primitive(%s) threw an ActionTypeError %s",
op1, e.what());
}
as_value op2 = env.top(1);
try { convertToPrimitive(op2, vm); }
catch (const ActionTypeError& e) {
- log_debug(_("to_primitive(%s) threw an ActionTypeError %s"),
+ log_debug("to_primitive(%s) threw an ActionTypeError %s",
op2, e.what());
}
@@ -3601,13 +3601,13 @@ commonGetURL(as_environment& env, as_value target,
if (loadTargetFlag) {
- log_debug(_("getURL2 target load"));
+ log_debug("getURL2 target load");
if (!target_ch) {
unsigned int levelno;
if (isLevelTarget(getSWFVersion(env), target_string, levelno)) {
- log_debug(_("Testing _level loading (level %u)"), levelno);
+ log_debug("Testing _level loading (level %u)", levelno);
m.loadMovie(url, target_string, varsToSend, sendVarsMethod);
return;
}
@@ -3661,7 +3661,7 @@ commonGetURL(as_environment& env, as_value target,
unsigned int levelno;
if (isLevelTarget(getSWFVersion(env), target_string, levelno)) {
- log_debug(_("Testing _level loading (level %u)"), levelno);
+ log_debug("Testing _level loading (level %u)", levelno);
m.loadMovie(url, target_string, varsToSend, sendVarsMethod);
return;
}
diff --git a/libcore/vm/ActionExec.cpp b/libcore/vm/ActionExec.cpp
index 30566cd..adb28f6 100644
--- a/libcore/vm/ActionExec.cpp
+++ b/libcore/vm/ActionExec.cpp
@@ -149,7 +149,7 @@ ActionExec::operator()()
pc, stop_pc, code.size(), _func ? _func : 0, codeVersion);
std::stringstream ss;
getVM(env).dumpState(ss, STACK_DUMP_LIMIT);
- log_action("%s", ss.str());
+ log_action(_("%s"), ss.str());
);
#endif
@@ -219,7 +219,7 @@ ActionExec::operator()()
boost::uint8_t action_id = code[pc];
IF_VERBOSE_ACTION (
- log_action("PC:%d - EX: %s", pc, code.disasm(pc));
+ log_action(_("PC:%d - EX: %s"), pc, code.disasm(pc));
);
// Set default next_pc offset, control flow action handlers
@@ -282,7 +282,7 @@ ActionExec::operator()()
ss << "Discarding " << stop_pc-next_pc
<< " bytes of remaining opcodes: " << std::endl;
dumpActions(next_pc, stop_pc, ss);
- log_action("%s", ss.str());
+ log_action(_("%s"), ss.str());
);
break;
}
@@ -293,7 +293,7 @@ ActionExec::operator()()
"stack follows"), pc, next_pc);
std::stringstream ss;
getVM(env).dumpState(ss, STACK_DUMP_LIMIT);
- log_action("%s", ss.str());
+ log_action(_("%s"), ss.str());
);
#endif
diff --git a/libcore/vm/VM.cpp b/libcore/vm/VM.cpp
index ac62a0f..836e835 100644
--- a/libcore/vm/VM.cpp
+++ b/libcore/vm/VM.cpp
@@ -369,7 +369,7 @@ newAdd(as_value& op1, const as_value& op2, const VM& vm)
catch (ActionTypeError& e) {}
#if GNASH_DEBUG
- log_debug(_("(%s + %s) [primitive conversion done]"), op1, r);
+ log_debug("(%s + %s) [primitive conversion done]", op1, r);
#endif
if (op1.is_string() || r.is_string()) {
http://git.savannah.gnu.org/cgit//commit/?id=9cf41121ed34485dda9d32135e9299724f6a04af
commit 9cf41121ed34485dda9d32135e9299724f6a04af
Author: Rob Savoye <address@hidden>
Date: Sun Jan 1 08:41:14 2012 -0700
Capitalize URL
diff --git a/libbase/URLAccessManager.cpp b/libbase/URLAccessManager.cpp
index 466ebf5..e0a6c28 100644
--- a/libbase/URLAccessManager.cpp
+++ b/libbase/URLAccessManager.cpp
@@ -145,7 +145,7 @@ local_check(const std::string& path, const URL& baseUrl)
// Don't allow local access if starting movie is a network resource.
if (baseUrl.protocol() != "file") {
log_security(_("Load of file %s forbidden"
- " (starting url %s is not a local resource)"),
+ " (starting URL %s is not a local resource)"),
path, baseUrl.str());
return false;
}
diff --git a/libbase/curl_adapter.cpp b/libbase/curl_adapter.cpp
index 437e9ad..9c05ef0 100644
--- a/libbase/curl_adapter.cpp
+++ b/libbase/curl_adapter.cpp
@@ -670,7 +670,7 @@ CurlStreamFile::fillCache(std::streampos size)
// give DNS enough time to resolve the lookup.
if (userTimeout && lastProgress.elapsed() > userTimeout) {
log_error(_("FIXME: Timeout (%u milliseconds) while loading "
- "from url %s"), userTimeout, _url);
+ "from URL %s"), userTimeout, _url);
// TODO: should we set _error here ?
return;
} else {
@@ -718,7 +718,7 @@ CurlStreamFile::fillCache(std::streampos size)
#endif
if (userTimeout && lastProgress.elapsed() > userTimeout) {
log_error(_("Timeout (%u milliseconds) while loading "
- "from url %s"), userTimeout, _url);
+ "from URL %s"), userTimeout, _url);
// TODO: should we set _error here ?
return;
}
@@ -760,12 +760,12 @@ CurlStreamFile::processMessages()
CURLINFO_RESPONSE_CODE, &code);
if ( code >= 400 ) {
- log_error(_("HTTP response %ld from url %s"),
+ log_error(_("HTTP response %ld from URL %s"),
code, _url);
_error = true;
_running = false;
} else {
- log_debug("HTTP response %ld from url %s",
+ log_debug("HTTP response %ld from URL %s",
code, _url);
}
diff --git a/libcore/asobj/LoadableObject.cpp b/libcore/asobj/LoadableObject.cpp
index 607b1c2..2742a54 100644
--- a/libcore/asobj/LoadableObject.cpp
+++ b/libcore/asobj/LoadableObject.cpp
@@ -309,7 +309,7 @@ loadableobject_sendAndLoad(const fn_call& fn)
const std::string& urlstr = fn.arg(0).to_string();
if ( urlstr.empty() ) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("sendAndLoad(): invalid empty url"));
+ log_aserror(_("sendAndLoad(): invalid empty URL"));
);
return as_value(false);
}
@@ -394,7 +394,7 @@ loadableobject_sendAndLoad(const fn_call& fn)
str = ri.streamProvider().getStream(url.str());
}
- log_security(_("Loading from url: '%s'"), url.str());
+ log_security(_("Loading from URL: '%s'"), url.str());
movie_root& mr = getRoot(*obj);
@@ -423,7 +423,7 @@ loadableobject_load(const fn_call& fn)
if ( urlstr.empty() )
{
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("load(): invalid empty url"));
+ log_aserror(_("load(): invalid empty URL"));
);
return as_value(false);
}
diff --git a/libcore/asobj/NetConnection_as.cpp
b/libcore/asobj/NetConnection_as.cpp
index 8bc2e16..b75f20b 100644
--- a/libcore/asobj/NetConnection_as.cpp
+++ b/libcore/asobj/NetConnection_as.cpp
@@ -437,7 +437,7 @@ NetConnection_as::validateURL() const
// Check if we're allowed to open url
if (!r.streamProvider().allow(uri)) {
- log_security(_("Gnash is not allowed to open this url: %s"), uriStr);
+ log_security(_("Gnash is not allowed to open this URL: %s"), uriStr);
return "";
}
diff --git a/libcore/asobj/Sound_as.cpp b/libcore/asobj/Sound_as.cpp
index 8f5b6ac..85663a9 100644
--- a/libcore/asobj/Sound_as.cpp
+++ b/libcore/asobj/Sound_as.cpp
@@ -578,7 +578,7 @@ Sound_as::loadSound(const std::string& file, bool streaming)
rcfile.saveStreamingMedia()));
if (!inputStream.get()) {
- log_error(_("Gnash could not open this url: %s"), url );
+ log_error(_("Gnash could not open this URL: %s"), url );
// dispatch onLoad (false)
callMethod(&owner(), NSV::PROP_ON_LOAD, false);
return;
diff --git a/libcore/movie_root.cpp b/libcore/movie_root.cpp
index 81e8d87..c8865d5 100644
--- a/libcore/movie_root.cpp
+++ b/libcore/movie_root.cpp
@@ -2150,7 +2150,7 @@ movie_root::getURL(const std::string& urlstr, const
std::string& target,
log_debug("Launching URL: %s", command);
const int ret = std::system(command.c_str());
if (ret == -1) {
- log_error(_("Fork failed launching url opener '%s'"), command);
+ log_error(_("Fork failed launching URL opener '%s'"), command);
}
return;
}
diff --git a/libcore/vm/ASHandlers.cpp b/libcore/vm/ASHandlers.cpp
index 735f56d..851b7e9 100644
--- a/libcore/vm/ASHandlers.cpp
+++ b/libcore/vm/ASHandlers.cpp
@@ -592,7 +592,7 @@ ActionGetUrl(ActionExec& thread)
const std::string target(code.read_string(pc + 3 + urlLength));
IF_VERBOSE_ACTION (
- log_action(_("GetUrl: target=%s url=%s"), target, url);
+ log_action(_("GetUrl: target=%s URL=%s"), target, url);
);
commonGetURL(env, target, url, 0u);
@@ -1914,7 +1914,7 @@ ActionGetUrl2(ActionExec& thread)
as_value url_val = env.top(1);
if (url_val.is_undefined()) {
- log_error(_("Undefined GetUrl2 url on stack, skipping"));
+ log_error(_("Undefined GetUrl2 URL on stack, skipping"));
}
else {
const std::string& url = url_val.to_string();
@@ -3497,7 +3497,7 @@ commonGetURL(as_environment& env, as_value target,
const std::string& url, boost::uint8_t method)
{
if (url.empty()) {
- log_error(_("Bogus empty GetUrl url in SWF file, skipping"));
+ log_error(_("Bogus empty GetUrl URL in SWF file, skipping"));
return;
}
@@ -3556,8 +3556,8 @@ commonGetURL(as_environment& env, as_value target,
// The base url must be set with the set_base_url() command.
//
- log_debug(_("get url: target=%s, url=%s, method=%x "
- "(sendVars:%X, loadTarget:%d, loadVariable:%d)"),
+ log_debug("get url: target=%s, URL=%s, method=%x "
+ "(sendVars:%X, loadTarget:%d, loadVariable:%d)",
target_string, url, static_cast<int>(method),
sendVarsMethod, loadTargetFlag, loadVariableFlag);
@@ -3565,7 +3565,7 @@ commonGetURL(as_environment& env, as_value target,
MovieClip* target_movie = target_ch ? target_ch->to_movie() : 0;
if (loadVariableFlag) {
- log_debug(_("getURL2 loadVariable"));
+ log_debug("getURL2 loadVariable");
if (!target_ch) {
log_error(_("getURL: target %s not found"), target_string);
-----------------------------------------------------------------------
Summary of changes:
cygnal/cvm.cpp | 30 +-
cygnal/cygnal.cpp | 4 +-
cygnal/handler.cpp | 10 +-
cygnal/http_server.cpp | 60 ++--
cygnal/libnet/network.cpp | 27 +-
cygnal/proc.cpp | 8 +-
cygnal/rtmp_server.cpp | 78 ++--
cygnal/serverSO.cpp | 2 +-
gui/gtk/gtk_glue_ovg.cpp | 2 +-
libbase/URLAccessManager.cpp | 2 +-
libbase/curl_adapter.cpp | 8 +-
libcore/LineStyle.cpp | 6 +-
libcore/TextField.cpp | 2 +-
libcore/asobj/LoadableObject.cpp | 6 +-
libcore/asobj/NetConnection_as.cpp | 2 +-
libcore/asobj/Sound_as.cpp | 2 +-
libcore/asobj/TextFormat_as.cpp | 2 +-
libcore/movie_root.cpp | 2 +-
libcore/parser/SWFMovieDefinition.cpp | 2 +-
libcore/parser/SWFParser.cpp | 4 +-
libcore/parser/TypesParser.cpp | 18 +-
libcore/parser/action_buffer.cpp | 2 +-
libcore/parser/filter_factory.cpp | 38 +-
libcore/vm/ASHandlers.cpp | 46 ++--
libcore/vm/ActionExec.cpp | 8 +-
libcore/vm/VM.cpp | 2 +-
libdevice/egl/eglDevice.cpp | 8 +-
po/gnash.pot | 698 ++++++++++++---------------------
28 files changed, 435 insertions(+), 644 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1377-g4a36339,
Rob Savoye <=