[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-1373-g5244e4e |
|
Date: |
Sat, 31 Dec 2011 20:04:15 +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 5244e4e87138d62ab99dddb1f2e90dac1de43968 (commit)
via 5f7a67c223c1c91f60b677bcf370c795dd5fab02 (commit)
via d6e71c11c20afa90c08a342061c9ba9e0d3280ca (commit)
via 7eb2de7988f02e14cc695261866bc6430109cfc8 (commit)
from 059b24afced55d89c4b60c66bfb8fc89491dc997 (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=5244e4e87138d62ab99dddb1f2e90dac1de43968
commit 5244e4e87138d62ab99dddb1f2e90dac1de43968
Author: Rob Savoye <address@hidden>
Date: Sat Dec 31 13:04:09 2011 -0700
updated with new strings
diff --git a/po/gnash.pot b/po/gnash.pot
index e615222..4033475 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 12:07-0700\n"
+"POT-Creation-Date: 2011-12-31 13:03-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"
@@ -919,6 +919,10 @@ msgstr ""
msgid "glError: %s caught\n"
msgstr ""
+#: libmedia/MediaParser.cpp:82
+msgid "No ID3 support implemented in this MediaParser"
+msgstr ""
+
#: libmedia/ffmpeg/MediaParserFfmpeg.cpp:79
msgid "MediaParserFfmpeg could not read probe data from input"
msgstr ""
@@ -929,6 +933,11 @@ msgstr ""
msgid "%s: seeking failed"
msgstr ""
+#: libmedia/ffmpeg/MediaParserFfmpeg.cpp:210
+msgid ""
+"FIXME: FFmpeg packet decompression timestamp has no value, taking as zero"
+msgstr ""
+
#: libmedia/ffmpeg/MediaParserFfmpeg.cpp:271
#, c-format
msgid ""
@@ -946,6 +955,14 @@ msgstr ""
msgid " Using stream %d for video: codec id %d"
msgstr ""
+#: libmedia/ffmpeg/MediaParserFfmpeg.cpp:477
+msgid "Duration of video stream unknown"
+msgstr ""
+
+#: libmedia/ffmpeg/MediaParserFfmpeg.cpp:506
+msgid "Duration of audio stream unknown to ffmpeg"
+msgstr ""
+
#: libmedia/ffmpeg/MediaParserFfmpeg.cpp:586
msgid ""
"MediaParserFfmpeg couldn't parse input format: tried to seek at negative "
@@ -1042,6 +1059,13 @@ msgid ""
"issue."
msgstr ""
+#: libmedia/ffmpeg/AudioDecoderFfmpeg.cpp:400
+#, c-format
+msgid ""
+"AudioDecoderFfmpeg: could not find a complete frame in the last %d bytes of "
+"input (malformed SWF or FLV?)"
+msgstr ""
+
#: libmedia/ffmpeg/AudioDecoderFfmpeg.cpp:489
msgid "failed to allocate audio buffer."
msgstr ""
@@ -1060,6 +1084,13 @@ msgid ""
"libavcodec might fix this issue."
msgstr ""
+#: libmedia/ffmpeg/AudioDecoderFfmpeg.cpp:586
+#, c-format
+msgid ""
+" --- Computation of resampled samples (%d) < then the actual returned "
+"samples (%d)"
+msgstr ""
+
#: libmedia/ffmpeg/VideoDecoderFfmpeg.cpp:140
#, c-format
msgid "Cannot find suitable decoder for flash codec %d"
@@ -1079,10 +1110,18 @@ msgstr ""
msgid "VideoDecoder: initialized FFMPEG codec %s (%d)"
msgstr ""
+#: libmedia/ffmpeg/VideoDecoderFfmpeg.cpp:305
+msgid "Pixel format not handled"
+msgstr ""
+
#: libmedia/ffmpeg/VideoDecoderFfmpeg.cpp:353
msgid "Out of memory while allocating avcodec frame"
msgstr ""
+#: libmedia/ffmpeg/VideoDecoderFfmpeg.cpp:372
+msgid "Decoding of a video frame failed"
+msgstr ""
+
#: libmedia/ffmpeg/VideoDecoderFfmpeg.cpp:433
#, c-format
msgid "Unsupported video codec %d"
@@ -1116,6 +1155,10 @@ msgid ""
"header. We'll warn only once for each FLV, expecting any further audio tag."
msgstr ""
+#: libmedia/FLVParser.cpp:186
+msgid "could not read audio frame?"
+msgstr ""
+
#: libmedia/FLVParser.cpp:224
#, c-format
msgid ""
@@ -1128,25 +1171,56 @@ msgstr ""
msgid "AVC packet type: %d"
msgstr ""
-#: libmedia/FLVParser.cpp:421
+#: libmedia/FLVParser.cpp:263
+msgid "could not read video frame?"
+msgstr ""
+
+#: libmedia/FLVParser.cpp:321
+#, c-format
+msgid "FLVParser::parseNextTag: can't seek to %d"
+msgstr ""
+
+#: libmedia/FLVParser.cpp:335
+#, c-format
+msgid ""
+"FLVParser::parseNextTag: can't read tag info (needed 12 bytes, only got %d)"
+msgstr ""
+
+#: libmedia/FLVParser.cpp:422
#, c-format
msgid "First byte of FLV_META_TAG is %d, expected 0x02 (STRING AMF0 type)"
msgstr ""
-#: libmedia/FLVParser.cpp:444
+#: libmedia/FLVParser.cpp:434
+#, c-format
+msgid ""
+"FLVParser::parseNextTag: can't read metaTag (%d) body (needed %d bytes, only "
+"got %d)"
+msgstr ""
+
+#: libmedia/FLVParser.cpp:445
msgid "Corrupt FLV: Meta tag unterminated!"
msgstr ""
-#: libmedia/FLVParser.cpp:452
+#: libmedia/FLVParser.cpp:453
#, c-format
msgid "FLVParser::parseNextTag: unknown FLV tag type %d"
msgstr ""
-#: libmedia/FLVParser.cpp:461
+#: libmedia/FLVParser.cpp:462
msgid ""
"Corrupt FLV: previous tag size record (%1%) unexpected (actual size: %2%)"
msgstr ""
+#: libmedia/FLVParser.cpp:480
+msgid "FLVParser::parseHeader: couldn't read 9 bytes of header"
+msgstr ""
+
+#: libmedia/FLVParser.cpp:532
+#, c-format
+msgid "FLVParser::readAudioFrame: could only read %d/%d bytes"
+msgstr ""
+
#: libmedia/gst/VideoConverterGst.cpp:37
msgid "VideoConverterGst: ffmpegcolorspace element missing"
msgstr ""
@@ -1392,6 +1466,227 @@ msgstr ""
msgid "AudioDecoderGst: buffer push failed."
msgstr ""
+#: libmedia/gst/VideoInputGst.cpp:317
+msgid "too high an index value, will cause segfault"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:367
+#, c-format
+msgid "%s: Could not create video test source."
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:385 libmedia/gst/AudioInputGst.cpp:117
+#, c-format
+msgid "%s: Could not create pulsesrc element"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:390 libmedia/gst/AudioInputGst.cpp:122
+#, c-format
+msgid "%s: Could not get property probe from pulsesrc element"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:626
+msgid "You have an invalid camera selected. Please check your gnashrc file"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:657
+#, c-format
+msgid "%s: Passed an invalid argument (not a valid dev_select value)"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:685 libmedia/gst/AudioInputGst.cpp:220
+#, c-format
+msgid "%s: Pipeline bus isn't an object for some reason"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:705 libmedia/gst/AudioInputGst.cpp:239
+#, c-format
+msgid "%s: Template pad isn't an object for some reason"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:718 libmedia/gst/AudioInputGst.cpp:253
+#, c-format
+msgid "%s: pipeline isn't an object for some reason"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:804
+#, c-format
+msgid "%s: type %s, cannot be handled for resolution width"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:825 libmedia/gst/AudioInputGst.cpp:279
+#, c-format
+msgid "%s: was passed a NULL pointer"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:931 libmedia/gst/VideoInputGst.cpp:1104
+#, c-format
+msgid "%s: Creation of the webcam_source_bin failed"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:933 libmedia/gst/VideoInputGst.cpp:1106
+#: libmedia/gst/AudioInputGst.cpp:326 libmedia/gst/AudioInputGst.cpp:382
+#, c-format
+msgid "the error was %s"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:961
+#, c-format
+msgid "%s: webam isn't set!"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1024
+#, c-format
+msgid ""
+"%s: the resolution you chose isn't supported, picking a "
+"supported value"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1128 libmedia/gst/AudioInputGst.cpp:337
+#, c-format
+msgid "%s: couldn't drop the sourcebin back into the main bin"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1137 libmedia/gst/AudioInputGst.cpp:347
+#, c-format
+msgid "%s: couldn't link up sourcebin and tee"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1169
+#, c-format
+msgid "%s: problem creating source bin"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1176 libmedia/gst/AudioInputGst.cpp:410
+#, c-format
+msgid "%s: problem creating tee element"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1180 libmedia/gst/AudioInputGst.cpp:414
+#, c-format
+msgid "%s: problem creating save_queue element"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1185
+#, c-format
+msgid "%s: problem creating video_display_queue element"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1196
+#, c-format
+msgid "%s: couldn't link webcam_source_bin and tee"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1203
+#, c-format
+msgid "%s: couldn't link tee and save_queue"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1209
+#, c-format
+msgid "%s: couldn't link tee and video_display_queue"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1218
+#, c-format
+msgid "%s: couldn't get save_queue_src_pad"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1228
+#, c-format
+msgid "%s: couldn't get video_display_queue_pad"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1240 libmedia/gst/AudioInputGst.cpp:464
+#, c-format
+msgid "%s: Unable to create main pipeline"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1258
+#, c-format
+msgid "%s: something went wrong creating the new video_display_bin"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1264
+#, c-format
+msgid "%s: problem creating video_scale element"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1273
+#, c-format
+msgid "%s: problem creating the video_sink element"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1282
+#, c-format
+msgid "%s: something went wrong in linking elements in video_display_bin"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1324
+msgid "something went wrong in the make_video_display_link function"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1356
+#, c-format
+msgid "%s: the unlinking of the pads failed"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1386
+#, c-format
+msgid "%s: something went wrong in the make_video_display_link function"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1416 libmedia/gst/AudioInputGst.cpp:540
+#: libmedia/gst/AudioInputGst.cpp:680
+#, c-format
+msgid "%s: unlink failed"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1423 libmedia/gst/AudioInputGst.cpp:687
+#, c-format
+msgid "%s: couldn't remove saveBin from pipeline"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1430
+#, c-format
+msgid "%s: videoSaveBin state change failed"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1453
+#, c-format
+msgid "%s: problem with creating video_save_csp element"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1458
+#, c-format
+msgid "%s: problem with creating video_enc element"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1465
+#, c-format
+msgid "%s: problem with creating video_save_rate element"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1469
+#, c-format
+msgid "%s: problem with creating video_save_scale element"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1476
+#, c-format
+msgid "%s: problem with creating mux element"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1480
+#, c-format
+msgid "%s: problem with creating video_file_sink element"
+msgstr ""
+
+#: libmedia/gst/VideoInputGst.cpp:1500
+#, c-format
+msgid "%s: there was some problem in linking!"
+msgstr ""
+
#: libmedia/gst/MediaHandlerGst.cpp:89
msgid "Wrong arguments given to GST VideoDecoder"
msgstr ""
@@ -1401,6 +1696,127 @@ msgstr ""
msgid "MediaHandlerGst::createAudioDecoder: %s -- %s"
msgstr ""
+#: libmedia/gst/AudioInputGst.cpp:100
+#, c-format
+msgid "%s: Could not create audio test source"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:190
+#, c-format
+msgid "%s: passed an invalid devselect argument"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:244
+msgid "The input device you selected isn't supported (yet)"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:270
+#, c-format
+msgid "%s: Passed a bad devselect value"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:324 libmedia/gst/AudioInputGst.cpp:380
+#, c-format
+msgid "%s: Creation of the audioSourceBin failed"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:406
+#, c-format
+msgid "%s: audioCreateSourceBin failed!"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:419
+#, c-format
+msgid "%s: problem creating audioPlaybackQueue element"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:426
+#, c-format
+msgid "%s: couldn't link audioSourceBin and tee"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:431
+#, c-format
+msgid "%s: couldn't link tee and saveQueue"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:436
+#, c-format
+msgid "%s: couldn't link tee and audioPlaybackQueue"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:445
+#, c-format
+msgid "%s: couldn't get saveQueueSrcPad"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:455
+#, c-format
+msgid "%s: couldn't get audioPlaybackQueue"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:481
+#, c-format
+msgid "%s: There was a problem making the audiosink!"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:517
+msgid "something went wrong in the makeSourcePlaybackLink function"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:548
+#, c-format
+msgid "%s: couldn't remove audioPlaybackBin from pipeline"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:555
+#, c-format
+msgid "%s: changing state of audioPlaybackBin failed"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:579
+#, c-format
+msgid "Error: %s"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:599
+#, c-format
+msgid "%s: Couldn't make audioconvert element"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:603
+#, c-format
+msgid "%s: Couldn't make vorbisenc element"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:607
+#, c-format
+msgid "%s: Couldn't make oggmux element"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:611
+#, c-format
+msgid "%s: Couldn't make filesink element"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:630
+#, c-format
+msgid "%s: Something went wrong in linking"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:658
+msgid "something went wrong in the makeAudioSourceSaveLink function"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:694
+#, c-format
+msgid "%s: audioSaveBin state change failed"
+msgstr ""
+
+#: libmedia/gst/AudioInputGst.cpp:755
+msgid "You have an invalid microphone selected. Check your gnashrc file"
+msgstr ""
+
#: libmedia/AudioDecoderSimple.cpp:162
msgid "corrupted ADPCM header"
msgstr ""
@@ -1482,7 +1898,7 @@ msgstr ""
#: libcore/FreetypeGlyphsProvider.cpp:266
#, c-format
-msgid "Can't close FreeType! Error %d"
+msgid "Can't close FreeType! Error = %d"
msgstr ""
#: libcore/FreetypeGlyphsProvider.cpp:280
@@ -2372,7 +2788,7 @@ msgstr ""
#: libcore/asobj/TextField_as.cpp:658
msgid ""
-"TextField.getTextFormat() discards url, target, tabStops, bullet and display"
+"TextField.getTextFormat() discards URL, target, tabStops, bullet and display"
msgstr ""
#: libcore/asobj/TextField_as.cpp:672 libcore/asobj/TextField_as.cpp:694
@@ -2439,24 +2855,11 @@ msgid ""
"TextField.replaceText(%s): endIndex out of range - taking as end of string"
msgstr ""
-#: libcore/asobj/TextField_as.cpp:1058
-msgid "TextField.removeTextField() TESTING"
-msgstr ""
-
-#: libcore/asobj/NetConnection_as.cpp:324
-msgid "Initial connection complete"
-msgstr ""
-
#: libcore/asobj/NetConnection_as.cpp:440
#, c-format
msgid "Gnash is not allowed to open this url: %s"
msgstr ""
-#: libcore/asobj/NetConnection_as.cpp:444
-#, c-format
-msgid "Connection to movie: %s"
-msgstr ""
-
#: libcore/asobj/NetConnection_as.cpp:496
#, c-format
msgid "Gnash is not allowed to connect to %s"
@@ -2480,11 +2883,6 @@ msgstr ""
msgid "NetConnection.call(): needs at least one argument"
msgstr ""
-#: libcore/asobj/NetConnection_as.cpp:668
-#, c-format
-msgid "NetConnection.call(%s)"
-msgstr ""
-
#: libcore/asobj/NetConnection_as.cpp:681
#, c-format
msgid "NetConnection.call(%s): second argument must be an object"
@@ -2503,11 +2901,6 @@ msgstr ""
msgid "NetConnection.addHeader()"
msgstr ""
-#: libcore/asobj/NetConnection_as.cpp:888
-#, c-format
-msgid "Invoke name %s"
-msgstr ""
-
#: libcore/asobj/NetConnection_as.cpp:892
msgid "Invoke buffer too short"
msgstr ""
@@ -2516,11 +2909,6 @@ msgstr ""
msgid "Invoke argument not present"
msgstr ""
-#: libcore/asobj/NetConnection_as.cpp:905
-#, c-format
-msgid "Invoking %s(%s)"
-msgstr ""
-
#: libcore/asobj/NetConnection_as.cpp:990
#, c-format
msgid "Unknown HTTP Remoting response identifier '%s'"
@@ -2531,97 +2919,24 @@ msgstr ""
msgid "Unsupported HTTP Remoting response callback: '%s' (size %d)"
msgstr ""
-#: libcore/asobj/NetConnection_as.cpp:1012
-msgid "callback called"
-msgstr ""
-
-#: libcore/asobj/NetConnection_as.cpp:1048
-msgid "creating connection"
-msgstr ""
-
-#: libcore/asobj/NetConnection_as.cpp:1055
-msgid "NetConnection.call(): encoded args from %1% calls: %2%"
-msgstr ""
-
-#: libcore/asobj/NetConnection_as.cpp:1077
-#, c-format
-msgid "Attempt to read %d bytes"
-msgstr ""
-
-#: libcore/asobj/NetConnection_as.cpp:1086
-#, c-format
-msgid ""
-"NetConnection.call: reply buffer capacity (%d) is too small to accept next "
-"%d bytes of chunk (current size is %d). Reserving %d bytes."
-msgstr ""
-
-#: libcore/asobj/NetConnection_as.cpp:1100
-msgid "read '%1%' bytes: %2%"
-msgstr ""
-
-#: libcore/asobj/NetConnection_as.cpp:1119
-msgid "connection is in error condition, calling NetConnection.onStatus"
-msgstr ""
-
-#: libcore/asobj/NetConnection_as.cpp:1136
-msgid "hit eof"
-msgstr ""
-
-#: libcore/asobj/NetConnection_as.cpp:1155
-#, c-format
-msgid "Error parsing server AMF: %s"
-msgstr ""
-
-#: libcore/asobj/NetConnection_as.cpp:1202
-#, c-format
-msgid "Could not serialize NetConnection.call argument %d"
-msgstr ""
-
-#: libcore/asobj/NetConnection_as.cpp:1230
-msgid "Sanity failed. no string method in invoke packet"
-msgstr ""
-
-#: libcore/asobj/NetConnection_as.cpp:1237
-#, c-format
-msgid "Invoke: read method string %s"
-msgstr ""
-
-#: libcore/asobj/NetConnection_as.cpp:1241
-#, c-format
-msgid "Server invoking <%s>"
-msgstr ""
-
-#: libcore/asobj/NetConnection_as.cpp:1249
+#: libcore/asobj/NetConnection_as.cpp:1155
#, c-format
-msgid "Received result for method call %s"
+msgid "Error parsing server AMF: %s"
msgstr ""
-#: libcore/asobj/NetConnection_as.cpp:1258
-#: libcore/asobj/NetConnection_as.cpp:1304
-#: libcore/asobj/NetConnection_as.cpp:1320
+#: libcore/asobj/NetConnection_as.cpp:1202
#, c-format
-msgid "Value: %s"
+msgid "Could not serialize NetConnection.call argument %d"
msgstr ""
-#: libcore/asobj/NetConnection_as.cpp:1268
-#, c-format
-msgid "Received server call %s %s"
+#: libcore/asobj/NetConnection_as.cpp:1230
+msgid "Sanity failed. no string method in invoke packet"
msgstr ""
#: libcore/asobj/NetConnection_as.cpp:1277
msgid "Server called _onbwcheck without a callback"
msgstr ""
-#: libcore/asobj/NetConnection_as.cpp:1287
-#, c-format
-msgid "AMF buffer for _onbwdone: %s\n"
-msgstr ""
-
-#: libcore/asobj/NetConnection_as.cpp:1292
-#, c-format
-msgid "Latency: %s, bandwidth %s"
-msgstr ""
-
#: libcore/asobj/NetConnection_as.cpp:1307
msgid "rtmp server sent error"
msgstr ""
@@ -2813,12 +3128,6 @@ msgstr ""
msgid "Object.unwatch(%s): missing argument"
msgstr ""
-#: libcore/asobj/PlayHead.cpp:96
-msgid ""
-"PlayHead::advance(): not all consumers consumed current position, won't "
-"advance"
-msgstr ""
-
#: libcore/asobj/String_as.cpp:451
msgid "string.slice() called with end < start"
msgstr ""
@@ -2848,24 +3157,6 @@ msgstr ""
msgid "%1%(%2%) has more than %3% argument(s)"
msgstr ""
-#: libcore/asobj/flash/external/ExternalInterface_as.cpp:250
-msgid "ExternalInterface not accessible when running standalone."
-msgstr ""
-
-#: libcore/asobj/flash/external/ExternalInterface_as.cpp:258
-#, c-format
-msgid "adding callback %s"
-msgstr ""
-
-#: libcore/asobj/flash/external/ExternalInterface_as.cpp:276
-msgid "ExternalInterface not accessible on call."
-msgstr ""
-
-#: libcore/asobj/flash/external/ExternalInterface_as.cpp:285
-#, c-format
-msgid "Calling External method \"%s\""
-msgstr ""
-
#: libcore/asobj/flash/external/ExternalInterface_as.cpp:292
#, c-format
msgid "VAL: %s"
@@ -2878,14 +3169,6 @@ msgid ""
"object."
msgstr ""
-#: libcore/asobj/flash/external/ExternalInterface_as.cpp:388
-msgid "Loading flash.external.ExternalInterface class"
-msgstr ""
-
-#: libcore/asobj/flash/external/external_pkg.cpp:38
-msgid "Loading flash.external package"
-msgstr ""
-
#: libcore/asobj/flash/net/FileReferenceList_as.cpp:91
#, c-format
msgid "FileReferenceList(%s): %s"
@@ -2897,10 +3180,6 @@ msgstr ""
msgid "arguments discarded"
msgstr ""
-#: libcore/asobj/flash/net/net_pkg.cpp:36
-msgid "Loading flash.net package"
-msgstr ""
-
#: libcore/asobj/flash/net/FileReference_as.cpp:159
#, c-format
msgid "FileReference(%s): %s"
@@ -2936,14 +3215,6 @@ msgstr ""
msgid "Attempt to set read-only property %s"
msgstr ""
-#: libcore/asobj/flash/geom/Rectangle_as.cpp:649
-msgid "Loading flash.geom.Rectangle class"
-msgstr ""
-
-#: libcore/asobj/flash/geom/geom_pkg.cpp:41
-msgid "Loading flash.geom package"
-msgstr ""
-
#: libcore/asobj/flash/geom/Point_as.cpp:119
#: libcore/asobj/flash/geom/Point_as.cpp:190
#: libcore/asobj/flash/geom/Point_as.cpp:238
@@ -3051,10 +3322,6 @@ msgstr ""
msgid "Point.polar(%s): %s"
msgstr ""
-#: libcore/asobj/flash/geom/Point_as.cpp:640
-msgid "Loading flash.geom.Point class"
-msgstr ""
-
#: libcore/asobj/flash/geom/ColorTransform_as.cpp:365
#, c-format
msgid ""
@@ -3067,10 +3334,6 @@ msgstr ""
msgid "ColorTransform(%s): discarding extra arguments"
msgstr ""
-#: libcore/asobj/flash/geom/ColorTransform_as.cpp:401
-msgid "Loading flash.geom.ColorTransform class"
-msgstr ""
-
#: libcore/asobj/flash/geom/Matrix_as.cpp:184
#, c-format
msgid "Matrix.concat(%s): needs one argument"
@@ -3081,21 +3344,6 @@ msgstr ""
msgid "Matrix.concat(%s): needs a Matrix object"
msgstr ""
-#: libcore/asobj/flash/geom/Matrix_as.cpp:215
-#, c-format
-msgid "(Matrix.concat) This matrix (pre-transform): %s"
-msgstr ""
-
-#: libcore/asobj/flash/geom/Matrix_as.cpp:217
-#, c-format
-msgid "(Matrix.concat) Transform matrix: %s"
-msgstr ""
-
-#: libcore/asobj/flash/geom/Matrix_as.cpp:224
-#, c-format
-msgid "(Matrix.concat) This matrix (post-transform): %s"
-msgstr ""
-
#: libcore/asobj/flash/geom/Matrix_as.cpp:255
#, c-format
msgid "Matrix.createBox(%s): needs at least two arguments"
@@ -3121,42 +3369,12 @@ msgstr ""
msgid "Matrix.rotate(%s): needs one argument"
msgstr ""
-#: libcore/asobj/flash/geom/Matrix_as.cpp:556
-#, c-format
-msgid "(Matrix.rotate) This matrix (pre-transform): %s"
-msgstr ""
-
-#: libcore/asobj/flash/geom/Matrix_as.cpp:564
-#, c-format
-msgid "(Matrix.rotate) Transformation matrix: %s"
-msgstr ""
-
-#: libcore/asobj/flash/geom/Matrix_as.cpp:565
-#, c-format
-msgid "(Matrix.rotate) This matrix (post-transform): %s"
-msgstr ""
-
#: libcore/asobj/flash/geom/Matrix_as.cpp:599
#: libcore/asobj/flash/geom/Matrix_as.cpp:770
#, c-format
msgid "Matrix.translate(%s): needs two arguments"
msgstr ""
-#: libcore/asobj/flash/geom/Matrix_as.cpp:633
-#, c-format
-msgid "(Matrix.scale) This matrix (pre-transform): %s"
-msgstr ""
-
-#: libcore/asobj/flash/geom/Matrix_as.cpp:641
-#, c-format
-msgid "(Matrix.scale) Transformation matrix: %s"
-msgstr ""
-
-#: libcore/asobj/flash/geom/Matrix_as.cpp:642
-#, c-format
-msgid "(Matrix.scale) This matrix (post-transform): %s"
-msgstr ""
-
#: libcore/asobj/flash/geom/Matrix_as.cpp:704
#, c-format
msgid "Matrix.translate(%s): needs one argument"
@@ -3172,10 +3390,6 @@ msgstr ""
msgid "Matrix.transformPoint(%s): object must be a Point"
msgstr ""
-#: libcore/asobj/flash/geom/Matrix_as.cpp:898
-msgid "Loading flash.geom.Matrix class"
-msgstr ""
-
#: libcore/asobj/flash/geom/Transform_as.cpp:122
#: libcore/asobj/flash/geom/Transform_as.cpp:198
msgid "Failed to construct flash.geom.ColorTransform!"
@@ -3220,34 +3434,6 @@ msgstr ""
msgid "Transform(%s): %s"
msgstr ""
-#: libcore/asobj/flash/geom/Transform_as.cpp:374
-msgid "Loading flash.geom.Transform class"
-msgstr ""
-
-#: libcore/asobj/flash/filters/filters_pkg.cpp:48
-msgid "Loading flash.filters package"
-msgstr ""
-
-#: libcore/asobj/flash/filters/BitmapFilter_as.cpp:117
-msgid "Loading flash.filters.BitmapFilter class"
-msgstr ""
-
-#: libcore/asobj/flash/text/text_pkg.cpp:34
-msgid "Loading flash.text package"
-msgstr ""
-
-#: libcore/asobj/flash/display/display_pkg.cpp:37
-msgid "Loading flash.display package"
-msgstr ""
-
-#: libcore/asobj/flash/display/BitmapData_as.cpp:647
-msgid "BitmapData.draw() called without an active renderer"
-msgstr ""
-
-#: libcore/asobj/flash/display/BitmapData_as.cpp:654
-msgid "Current renderer does not support internal rendering"
-msgstr ""
-
#: libcore/asobj/flash/display/BitmapData_as.cpp:816
msgid ""
"BitmapData.copyChannel(). Multiple destination channels are not supported"
@@ -3320,10 +3506,6 @@ msgstr ""
msgid "BitmapData.loadBitmap requires one argument"
msgstr ""
-#: libcore/asobj/flash/display/BitmapData_as.cpp:1634
-msgid "Loading flash.display.BitmapData class"
-msgstr ""
-
#: libcore/asobj/flash/display/BitmapData_as.cpp:1649
msgid ""
"BitmapData constructor requires at least two arguments. Will not construct a "
@@ -3353,7 +3535,7 @@ msgstr ""
#: libcore/asobj/MovieClipLoader.cpp:149
#, c-format
-msgid "MovieClipLoader.unloadClip(%s): expected at leastone argument"
+msgid "MovieClipLoader.unloadClip(%s): expected at least one argument"
msgstr ""
#: libcore/asobj/MovieClipLoader.cpp:156
@@ -3375,26 +3557,6 @@ msgstr ""
msgid "MovieClipLoader.getProgress(%s): first argument is not an sprite"
msgstr ""
-#: libcore/asobj/Sound_as.cpp:333
-msgid "stopProbeTimer called"
-msgstr ""
-
-#: libcore/asobj/Sound_as.cpp:368
-msgid "Probing audio for load"
-msgstr ""
-
-#: libcore/asobj/Sound_as.cpp:388
-msgid "Probing audio for end"
-msgstr ""
-
-#: libcore/asobj/Sound_as.cpp:409
-msgid "Probing audio for start"
-msgstr ""
-
-#: libcore/asobj/Sound_as.cpp:414
-msgid "Attaching aux streamer"
-msgstr ""
-
#: libcore/asobj/Sound_as.cpp:420
#, c-format
msgid "Could not create audio decoder: %s"
@@ -3404,18 +3566,6 @@ msgstr ""
msgid "No audio in Sound input."
msgstr ""
-#: libcore/asobj/Sound_as.cpp:516 libcore/asobj/Sound_as.cpp:646
-msgid "Character attached to Sound was unloaded and couldn't rebind"
-msgstr ""
-
-#: libcore/asobj/Sound_as.cpp:528
-msgid "We have no sound handler here..."
-msgstr ""
-
-#: libcore/asobj/Sound_as.cpp:549
-msgid "No media or sound handlers, won't load any sound"
-msgstr ""
-
#: libcore/asobj/Sound_as.cpp:581
#, c-format
msgid "Gnash could not open this url: %s"
@@ -3426,10 +3576,6 @@ msgstr ""
msgid "Unable to create parser for Sound at %s"
msgstr ""
-#: libcore/asobj/Sound_as.cpp:619
-msgid "Attaching the aux streamer"
-msgstr ""
-
#: libcore/asobj/Sound_as.cpp:676
msgid "No sound handler, nothing to start..."
msgstr ""
@@ -3442,16 +3588,6 @@ msgstr ""
msgid "Sound.start() has no effect on a streaming Sound"
msgstr ""
-#: libcore/asobj/Sound_as.cpp:699
-#, c-format
-msgid "Seeked MediaParser to %d, returned: %d"
-msgstr ""
-
-#: libcore/asobj/Sound_as.cpp:717
-#, c-format
-msgid "Sound.start: secOff:%d"
-msgstr ""
-
#: libcore/asobj/Sound_as.cpp:735
msgid "No sound handler, nothing to stop..."
msgstr ""
@@ -3755,11 +3891,6 @@ msgid ""
"string - returning undefined"
msgstr ""
-#: libcore/asobj/MovieClip_as.cpp:965
-#, c-format
-msgid "MovieClip.loadVariables(%s) - TESTING "
-msgstr ""
-
#: libcore/asobj/MovieClip_as.cpp:995
#, c-format
msgid "Can't find hitTest target %s"
@@ -3851,11 +3982,6 @@ msgstr ""
msgid "MovieClip.lineTo() needs at least two arguments"
msgstr ""
-#: libcore/asobj/MovieClip_as.cpp:1456
-#, c-format
-msgid "%s.lineTo(%g,%g);"
-msgstr ""
-
#: libcore/asobj/MovieClip_as.cpp:1470
msgid "MovieClip.moveTo() takes two args"
msgstr ""
@@ -3889,11 +4015,6 @@ msgstr ""
msgid "MovieClip.curveTo() takes four args"
msgstr ""
-#: libcore/asobj/MovieClip_as.cpp:1646
-#, c-format
-msgid "%s.curveTo(%g,%g,%g,%g);"
-msgstr ""
-
#: libcore/asobj/MovieClip_as.cpp:1671
msgid "beginFill() with no args is a no-op"
msgstr ""
@@ -3917,8 +4038,8 @@ msgstr ""
#: libcore/asobj/MovieClip_as.cpp:1762
#, c-format
msgid ""
-"%s.beginGradientFill(%s): one or more of the args from 2nd to 5th don't "
-"cast to objects"
+"%s.beginGradientFill(%s): one or more of the args from 2nd to 5th don't cast "
+"to objects"
msgstr ""
#: libcore/asobj/MovieClip_as.cpp:1776
@@ -3928,13 +4049,6 @@ msgid ""
"length"
msgstr ""
-#: libcore/asobj/MovieClip_as.cpp:1788
-#, c-format
-msgid ""
-"%s.beginGradientFill(%s): too many array elements for colors and ratios "
-"(%d), will trim to 8"
-msgstr ""
-
#: libcore/asobj/MovieClip_as.cpp:1928
#, c-format
msgid "min/max bbox values in MovieClip.startDrag(%s) swapped, fixing"
@@ -3945,15 +4059,6 @@ msgstr ""
msgid "non-finite bbox values in MovieClip.startDrag(%s), took as zero"
msgstr ""
-#: libcore/asobj/MovieClip_as.cpp:1972 libcore/asobj/MovieClip_as.cpp:2051
-msgid "MovieClip.attachBitmap: first argument should be a valid BitmapData"
-msgstr ""
-
-#: libcore/asobj/MovieClip_as.cpp:2040
-#, c-format
-msgid "MovieClip.attachBitmap: expected 2 args, got %d"
-msgstr ""
-
#: libcore/asobj/MovieClip_as.cpp:2077
msgid "Failed to construct flash.geom.Transform!"
msgstr ""
@@ -3976,11 +4081,6 @@ msgstr ""
msgid "No MediaHandler exists! Cannot create a Camera object"
msgstr ""
-#: libcore/asobj/Camera_as.cpp:271
-#, c-format
-msgid "%s: the camera is automatically chosen from gnashrc"
-msgstr ""
-
#: libcore/asobj/Camera_as.cpp:312
msgid "Camera::motionLevel can be set, but it's not implemented"
msgstr ""
@@ -4073,10 +4173,6 @@ msgstr ""
msgid "Attempt to set width property of Camera, use setMode"
msgstr ""
-#: libcore/asobj/SharedObject_as.cpp:138
-msgid "SOL: skip serialization of FUNCTION property"
-msgstr ""
-
#: libcore/asobj/SharedObject_as.cpp:163
#, c-format
msgid "Problems serializing an object's member %s=%s"
@@ -4094,11 +4190,6 @@ msgstr ""
msgid "Couldn't create dir for flushing SharedObject %s"
msgstr ""
-#: libcore/asobj/SharedObject_as.cpp:337
-#, c-format
-msgid "SharedObject %s not flushed (compiled as read-only mode)"
-msgstr ""
-
#: libcore/asobj/SharedObject_as.cpp:344
#, c-format
msgid ""
@@ -4124,15 +4215,6 @@ msgstr ""
msgid "SharedObject '%s' written to filesystem."
msgstr ""
-#: libcore/asobj/SharedObject_as.cpp:400
-msgid "Empty SOLSafeDir directive: we'll use '/tmp'"
-msgstr ""
-
-#: libcore/asobj/SharedObject_as.cpp:407
-#, c-format
-msgid "Invalid SOL safe dir %s: %s. Will try to create on flush/exit."
-msgstr ""
-
#: libcore/asobj/SharedObject_as.cpp:493
msgid "Attempting to open SOL file from non localhost-loaded SWF"
msgstr ""
@@ -4150,21 +4232,6 @@ msgid ""
"object."
msgstr ""
-#: libcore/asobj/SharedObject_as.cpp:565
-#, c-format
-msgid "SharedObject %s already known, returning it"
-msgstr ""
-
-#: libcore/asobj/SharedObject_as.cpp:569
-#, c-format
-msgid "SharedObject %s not loaded. Loading it now"
-msgstr ""
-
-#: libcore/asobj/SharedObject_as.cpp:583
-#, c-format
-msgid "SharedObject path: %s"
-msgstr ""
-
#: libcore/asobj/SharedObject_as.cpp:703
msgid "SharedObject.connect(): needs at least one argument"
msgstr ""
@@ -4191,16 +4258,6 @@ msgstr ""
msgid "SharedObject.getLocal(%s): missing object name"
msgstr ""
-#: libcore/asobj/SharedObject_as.cpp:799
-#, c-format
-msgid "SO name:%s, root:%s"
-msgstr ""
-
-#: libcore/asobj/SharedObject_as.cpp:806
-#, c-format
-msgid "SharedObject.getLocal returning %s"
-msgstr ""
-
#: libcore/asobj/SharedObject_as.cpp:813
msgid "SharedObject.getRemote()"
msgstr ""
@@ -4213,11 +4270,6 @@ msgstr ""
msgid "SharedObject.getDiskUsage()"
msgstr ""
-#: libcore/asobj/SharedObject_as.cpp:895
-#, c-format
-msgid "No existing SOL %s found. Will create on flush/exit."
-msgstr ""
-
#: libcore/asobj/SharedObject_as.cpp:904
#, c-format
msgid "readSOL: SOL file %s is too short (only %s bytes long) to be valid."
@@ -4227,11 +4279,6 @@ msgstr ""
msgid "readSOL: file ends before data segment"
msgstr ""
-#: libcore/asobj/SharedObject_as.cpp:937
-#, c-format
-msgid "readSOL: reading property name at byte %s"
-msgstr ""
-
#: libcore/asobj/SharedObject_as.cpp:942
msgid "SharedObject: end of buffer while reading length"
msgstr ""
@@ -4249,20 +4296,11 @@ msgstr ""
msgid "SharedObject: error parsing SharedObject '%s'"
msgstr ""
-#: libcore/asobj/SharedObject_as.cpp:972
-#, c-format
-msgid "parsed sol member named '%s' (len %s), value '%s'"
-msgstr ""
-
#: libcore/asobj/SharedObject_as.cpp:986
#, c-format
msgid "readSOL: Reading SharedObject %s: %s"
msgstr ""
-#: libcore/asobj/SharedObject_as.cpp:1064
-msgid "Did not serialize object"
-msgstr ""
-
#: libcore/asobj/Date_as.cpp:463
msgid "Date constructor called with more than 7 arguments"
msgstr ""
@@ -4403,11 +4441,6 @@ msgstr ""
msgid "ASconstructor(%s): args must be 0 or above"
msgstr ""
-#: libcore/asobj/Global_as.cpp:681 libcore/asobj/Global_as.cpp:724
-#, c-format
-msgid "No ASnative(%d, %d) registered with the VM"
-msgstr ""
-
#: libcore/asobj/Global_as.cpp:712
#, c-format
msgid "ASnative(%s): args must be 0 or above"
@@ -4464,12 +4497,6 @@ msgid ""
"XMLNode.insertBefore(): positional parameter is not a child of this node"
msgstr ""
-#: libcore/asobj/XMLNode_as.cpp:403
-#, c-format
-msgid ""
-"Stringifying node %p with name %s, as_value %s, %u attributes and %u children"
-msgstr ""
-
#: libcore/asobj/XMLNode_as.cpp:596
msgid "XMLNode::appendChild() needs at least one argument"
msgstr ""
@@ -4804,16 +4831,6 @@ msgstr ""
msgid "Could not attach NetStream aux streamer to sound handler: %s"
msgstr ""
-#: libcore/asobj/NetStream_as.cpp:1446
-msgid "detachAuxStreamer called while not attached"
-msgstr ""
-
-#: libcore/asobj/NetStream_as.cpp:1484
-#, c-format
-msgid ""
-"audio_streamer called, audioQueue size: %d, requested %d bytes of fill-up"
-msgstr ""
-
#: libcore/asobj/NetStream_as.cpp:1566
#, c-format
msgid ""
@@ -4865,11 +4882,6 @@ msgstr ""
msgid "Could not convert FLV metatag to as_value, passing undefined"
msgstr ""
-#: libcore/asobj/NetStream_as.cpp:1874
-#, c-format
-msgid "Calling %s(%s)"
-msgstr ""
-
#: libcore/asobj/Number_as.cpp:78
#, c-format
msgid "Number.toString(%s): radix must be in the 2..36 range (%d is invalid)"
@@ -4887,25 +4899,10 @@ msgstr ""
msgid "TextSnapshot.getText requires exactly 2 arguments"
msgstr ""
-#: libcore/asobj/XMLSocket_as.cpp:213
-#, c-format
-msgid "read: %d, this string ends: %d"
-msgstr ""
-
-#: libcore/asobj/XMLSocket_as.cpp:245
-#, c-format
-msgid " Message %d: %s "
-msgstr ""
-
#: libcore/asobj/XMLSocket_as.cpp:268
msgid "XMLSocket.send(): socket not initialized"
msgstr ""
-#: libcore/asobj/XMLSocket_as.cpp:306
-#, c-format
-msgid "XMLSocket.connect(%s) called"
-msgstr ""
-
#: libcore/asobj/XMLSocket_as.cpp:312
msgid "XMLSocket.connect() called while already connected, ignored"
msgstr ""
@@ -4968,11 +4965,6 @@ msgstr ""
msgid "TextFormat.getTextExtent requires at least oneargument"
msgstr ""
-#: libcore/asobj/TextFormat_as.cpp:708
-#, c-format
-msgid "Invalid display string %s "
-msgstr ""
-
#: libcore/asobj/TextFormat_as.cpp:726
#, c-format
msgid "Uknown alignment value: %d, take as left"
@@ -5012,11 +5004,6 @@ msgstr ""
msgid "Invalid connection name data"
msgstr ""
-#: libcore/asobj/LocalConnection_as.cpp:347
-#, c-format
-msgid "Data %s expired at %s. Removing its target as a listener"
-msgstr ""
-
#: libcore/asobj/LocalConnection_as.cpp:431
msgid "Failed to get lock on shared memory! Will not remove listener"
msgstr ""
@@ -5040,10 +5027,6 @@ msgstr ""
msgid "LocalConnection.send(%s): requires at least 2 arguments"
msgstr ""
-#: libcore/asobj/LocalConnection_as.cpp:774
-msgid "Not adding duplicated listener"
-msgstr ""
-
#: libcore/asobj/LocalConnection_as.cpp:783
msgid "No space for listener in shared memory!"
msgstr ""
@@ -5053,45 +5036,15 @@ msgstr ""
msgid "Invalid domain %s"
msgstr ""
-#: libcore/asobj/LocalConnection_as.cpp:848
-#, c-format
-msgid "Domain: %s"
-msgstr ""
-
#: libcore/asobj/LocalConnection_as.cpp:851
#, c-format
msgid "Invalid function name %s"
msgstr ""
-#: libcore/asobj/LocalConnection_as.cpp:862
-#, c-format
-msgid "First bool: %s"
-msgstr ""
-
-#: libcore/asobj/LocalConnection_as.cpp:863
-#, c-format
-msgid "Second Bool: %s"
-msgstr ""
-
-#: libcore/asobj/LocalConnection_as.cpp:867
-#, c-format
-msgid "First Number: %s"
-msgstr ""
-
-#: libcore/asobj/LocalConnection_as.cpp:873
-#, c-format
-msgid "Second Number: %s"
-msgstr ""
-
#: libcore/asobj/LocalConnection_as.cpp:877
msgid "Fewer AMF fields than expected."
msgstr ""
-#: libcore/asobj/LocalConnection_as.cpp:880
-#, c-format
-msgid "Data: %s"
-msgstr ""
-
#: libcore/asobj/Microphone_as.cpp:252
msgid "No MediaHandler exists! Cannot create a Microphone object"
msgstr ""
@@ -5139,7 +5092,7 @@ msgstr ""
#: libcore/asobj/LoadableObject.cpp:222
#, c-format
-msgid "XML.addRequestHeader(%s): arguments after thesecond will be discarded"
+msgid "XML.addRequestHeader(%s): arguments after the second will be discarded"
msgstr ""
#: libcore/asobj/LoadableObject.cpp:237
@@ -5159,11 +5112,6 @@ msgstr ""
msgid "sendAndLoad(): invalid target (must be an XML or LoadVars object)"
msgstr ""
-#: libcore/asobj/LoadableObject.cpp:393
-#, c-format
-msgid "Using GET method for sendAndLoad: %s"
-msgstr ""
-
#: libcore/asobj/LoadableObject.cpp:397
#, c-format
msgid "Loading from url: '%s'"
@@ -5949,7 +5897,7 @@ msgstr ""
#: libcore/vm/ASHandlers.cpp:2952
#, c-format
-msgid "Top of stack not an object %s at ActionEnum2 execution"
+msgid "Top of stack not an object %s at ActionEnum2 execution"
msgstr ""
#: libcore/vm/ASHandlers.cpp:3086
@@ -6011,7 +5959,7 @@ msgstr ""
#: libcore/vm/ASHandlers.cpp:3512
msgid ""
-"Bogus GetUrl2 send vars method in SWF file (both GET and POST requested). "
+"Bogus GetUrl2 send vars method in SWF file (both GET and POST requested). "
"Using GET"
msgstr ""
@@ -7723,7 +7671,7 @@ msgid "Mkit: unpaused"
msgstr ""
#: libsound/aos4/sound_handler_ahi.cpp:125
-msgid "AOS4: Spawn Audio Process.."
+msgid "AOS4: Spawn Audio Process."
msgstr ""
#: libsound/aos4/sound_handler_ahi.cpp:136
@@ -7731,7 +7679,7 @@ msgid "Unable to create Death Message for child!!"
msgstr ""
#: libsound/aos4/sound_handler_ahi.cpp:162
-msgid "AOS4: Audio Process spawned.."
+msgid "AOS4: Audio Process spawned."
msgstr ""
#: libsound/aos4/sound_handler_ahi.cpp:167
@@ -7812,10 +7760,71 @@ msgstr ""
msgid "Zero buffer length in sdl_audio_callback"
msgstr ""
+#: libsound/sound_handler.cpp:70
+msgid ""
+"Sound data creator didn't appropriately pad buffer. We'll do so now, but "
+"will cost memory copies."
+msgstr ""
+
+#: libsound/sound_handler.cpp:83
+#, c-format
+msgid "Invalid (%d) handle passed to fill_stream_data, doing nothing"
+msgstr ""
+
+#: libsound/sound_handler.cpp:90
+#, c-format
+msgid "handle passed to fill_stream_data (%d) was deleted"
+msgstr ""
+
+#: libsound/sound_handler.cpp:141
+#, c-format
+msgid "Invalid (%d) handle passed to delete_sound, doing nothing"
+msgstr ""
+
+#: libsound/sound_handler.cpp:152
+#, c-format
+msgid "handle passed to delete_sound (%d) already deleted"
+msgstr ""
+
+#: libsound/sound_handler.cpp:236
+#, c-format
+msgid "stop_sound(%d): sound was deleted"
+msgstr ""
+
+#: libsound/sound_handler.cpp:324
+#, c-format
+msgid "SDL_sound_handler::unplugInputStream: Aux streamer %p not found. "
+msgstr ""
+
+#: libsound/sound_handler.cpp:454
+#, c-format
+msgid "Could not start streaming sound: %s"
+msgstr ""
+
+#: libsound/sound_handler.cpp:465
+#, c-format
+msgid "Invalid (%d) sound_handle passed to startSound, doing nothing"
+msgstr ""
+
#: libsound/sound_handler.cpp:531
msgid "Trying to play sound with size 0"
msgstr ""
+#: libsound/sound_handler.cpp:545
+#, c-format
+msgid "Could not start event sound: %s"
+msgstr ""
+
+#: libsound/sound_handler.cpp:559
+#, c-format
+msgid "_inputStreams container still has a pointer to deleted InputStream %p!"
+msgstr ""
+
+#: libsound/sound_handler.cpp:704
+#, c-format
+msgid "Expected 1 InputStream element, found %d"
+msgstr ""
+
#: utilities/soldumper.cpp:72
msgid "This program dumps the internal data of a .sol file"
msgstr ""
@@ -11181,7 +11190,7 @@ msgstr ""
#: gui/pythonmod/gnash-view.cpp:220 gui/Player.cpp:288
#, c-format
-msgid "Could not create sound handler: %s. Will continue w/out sound."
+msgid "Could not create sound handler: %s. Will continue without sound."
msgstr ""
#: gui/pythonmod/gnash-view.cpp:223 gui/Player.cpp:283
http://git.savannah.gnu.org/cgit//commit/?id=5f7a67c223c1c91f60b677bcf370c795dd5fab02
commit 5f7a67c223c1c91f60b677bcf370c795dd5fab02
Author: Rob Savoye <address@hidden>
Date: Sat Dec 31 13:03:51 2011 -0700
print messages cleaned up for translations
diff --git a/libcore/FreetypeGlyphsProvider.cpp
b/libcore/FreetypeGlyphsProvider.cpp
index 556373f..494669f 100644
--- a/libcore/FreetypeGlyphsProvider.cpp
+++ b/libcore/FreetypeGlyphsProvider.cpp
@@ -263,7 +263,7 @@ FreetypeGlyphsProvider::close()
{
const int error = FT_Done_FreeType(m_lib);
if (error) {
- log_error(_("Can't close FreeType! Error %d"), error);
+ log_error(_("Can't close FreeType! Error = %d"), error);
}
}
diff --git a/libcore/MovieLoader.cpp b/libcore/MovieLoader.cpp
index fcb9e51..378a979 100644
--- a/libcore/MovieLoader.cpp
+++ b/libcore/MovieLoader.cpp
@@ -188,7 +188,7 @@ MovieLoader::clear()
_wakeup.notify_all(); // in case it was sleeping
#ifdef GNASH_DEBUG_LOCKING
- log_debug("clear: lock on requests: release ater notify_all");
+ log_debug("clear: lock on requests: release after notify_all");
#endif
requestsLock.unlock(); // allow the thread to die
diff --git a/libcore/asobj/Camera_as.cpp b/libcore/asobj/Camera_as.cpp
index 831e6b9..bc2dfbb 100644
--- a/libcore/asobj/Camera_as.cpp
+++ b/libcore/asobj/Camera_as.cpp
@@ -268,7 +268,7 @@ camera_get(const fn_call& fn)
const size_t nargs = fn.nargs;
if (nargs > 0) {
- log_debug(_("%s: the camera is automatically chosen from gnashrc"),
+ log_debug("%s: the camera is automatically chosen from gnashrc",
"Camera.get()");
}
diff --git a/libcore/asobj/Global_as.cpp b/libcore/asobj/Global_as.cpp
index 2062e9a..b1113de 100644
--- a/libcore/asobj/Global_as.cpp
+++ b/libcore/asobj/Global_as.cpp
@@ -678,7 +678,7 @@ global_asconstructor(const fn_call& fn)
VM& vm = getVM(fn);
as_function* fun = vm.getNative(x, y);
if (!fun) {
- log_debug(_("No ASnative(%d, %d) registered with the VM"), x, y);
+ log_debug("No ASnative(%d, %d) registered with the VM", x, y);
return as_value();
}
@@ -721,7 +721,7 @@ global_asnative(const fn_call& fn)
VM& vm = getVM(fn);
as_function* fun = vm.getNative(x, y);
if (!fun) {
- log_debug(_("No ASnative(%d, %d) registered with the VM"), x, y);
+ log_debug("No ASnative(%d, %d) registered with the VM", x, y);
return as_value();
}
return as_value(fun);
diff --git a/libcore/asobj/LoadableObject.cpp b/libcore/asobj/LoadableObject.cpp
index 33c4693..607b1c2 100644
--- a/libcore/asobj/LoadableObject.cpp
+++ b/libcore/asobj/LoadableObject.cpp
@@ -220,7 +220,7 @@ loadableobject_addRequestHeader(const fn_call& fn)
std::ostringstream ss;
fn.dump_args(ss);
log_aserror(_("XML.addRequestHeader(%s): arguments after the"
- "second will be discarded"), ss.str());
+ " second will be discarded"), ss.str());
);
}
@@ -390,7 +390,7 @@ loadableobject_sendAndLoad(const fn_call& fn)
url.set_querystring(existingQS + dataString);
}
- log_debug(_("Using GET method for sendAndLoad: %s"), url.str());
+ log_debug("Using GET method for sendAndLoad: %s", url.str());
str = ri.streamProvider().getStream(url.str());
}
diff --git a/libcore/asobj/LocalConnection_as.cpp
b/libcore/asobj/LocalConnection_as.cpp
index df6c138..5cd5743 100644
--- a/libcore/asobj/LocalConnection_as.cpp
+++ b/libcore/asobj/LocalConnection_as.cpp
@@ -293,7 +293,7 @@ LocalConnection_as::update()
// processes.
SharedMem::Lock lock(_shm);
if (!lock.locked()) {
- log_debug(_("Failed to get shm lock"));
+ log_error(_("Failed to get shm lock"));
return;
}
@@ -344,8 +344,8 @@ LocalConnection_as::update()
const boost::uint32_t timeNow = getTimestamp(vm);
if (timeNow - timestamp > timeout) {
- log_debug(_("Data %s expired at %s. Removing its target "
- "as a listener"), timestamp, timeNow);
+ log_debug("Data %s expired at %s. Removing its target "
+ "as a listener", timestamp, timeNow);
removeListener(connection, _shm);
markRead(_shm);
_lastTime = 0;
@@ -771,7 +771,7 @@ addListener(const std::string& name, SharedMem& mem)
getMarker(next, mem.end());
if (std::equal(name.c_str(), name.c_str() + name.size(), ptr)) {
- log_debug(_("Not adding duplicated listener"));
+ log_debug("Not adding duplicated listener");
return false;
}
@@ -845,7 +845,7 @@ executeAMFFunction(as_object& o, amf::Reader& rd)
return;
}
const std::string& domain = a.to_string();
- log_debug(_("Domain: %s"), domain);
+ log_debug("Domain: %s", domain);
if (!rd(a)) {
log_error(_("Invalid function name %s"), a);
@@ -859,25 +859,25 @@ executeAMFFunction(as_object& o, amf::Reader& rd)
if (a.is_bool()) {
// Both bools have been false in all the examples I've seen.
- log_debug(_("First bool: %s"), a);
- if (rd(a)) log_debug(_("Second Bool: %s"), a);
+ log_debug("First bool: %s", a);
+ if (rd(a)) log_debug("Second Bool: %s", a);
// We guess that the first number describes the number of data fields
// after the second number, before the function name.
- if (rd(a)) log_debug(_("First Number: %s"), a);
+ if (rd(a)) log_debug("First Number: %s", a);
// Handle negative numbers.
const size_t count = std::max<int>(0, toInt(a, getVM(o)));
// We don't know what the second number signifies.
- if (rd(a)) log_debug(_("Second Number: %s"), a);
+ if (rd(a)) log_debug("Second Number: %s", a);
for (size_t i = 0; i < count; ++i) {
if (!rd(a)) {
log_error(_("Fewer AMF fields than expected."));
return;
}
- log_debug(_("Data: %s"), a);
+ log_debug("Data: %s", a);
}
// Now we expect the next field to be the method to call.
diff --git a/libcore/asobj/MovieClipLoader.cpp
b/libcore/asobj/MovieClipLoader.cpp
index d1a1af5..191ec9a 100644
--- a/libcore/asobj/MovieClipLoader.cpp
+++ b/libcore/asobj/MovieClipLoader.cpp
@@ -147,7 +147,7 @@ moviecliploader_unloadClip(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
log_aserror(_("MovieClipLoader.unloadClip(%s): expected at least"
- "one argument"), ss.str());
+ " one argument"), ss.str());
);
return as_value();
}
diff --git a/libcore/asobj/MovieClip_as.cpp b/libcore/asobj/MovieClip_as.cpp
index a8fe16f..d24135f 100644
--- a/libcore/asobj/MovieClip_as.cpp
+++ b/libcore/asobj/MovieClip_as.cpp
@@ -962,7 +962,7 @@ movieclip_loadVariables(const fn_call& fn)
static_cast<MovieClip::VariablesMethod>(toInt(val, getVM(fn)));
movieclip->loadVariables(urlstr, method);
- log_debug(_("MovieClip.loadVariables(%s) - TESTING "), urlstr);
+ log_debug("MovieClip.loadVariables(%s) - TESTING ", urlstr);
return as_value();
}
@@ -1421,7 +1421,7 @@ movieclip_setMask(const fn_call& fn)
maskee->setMask(mask);
}
- //log_debug(_("MovieClip.setMask() TESTING"));
+ //log_debug("MovieClip.setMask() TESTING");
return as_value(true);
}
@@ -1453,7 +1453,7 @@ movieclip_lineTo(const fn_call& fn)
if (!isFinite(y)) y = 0;
#ifdef DEBUG_DRAWING_API
- log_debug(_("%s.lineTo(%g,%g);"), movieclip->getTarget(), x, y);
+ log_debug("%s.lineTo(%g,%g);", movieclip->getTarget(), x, y);
#endif
movieclip->graphics().lineTo(pixelsToTwips(x), pixelsToTwips(y),
movieclip->getDefinitionVersion());
@@ -1643,7 +1643,7 @@ movieclip_curveTo(const fn_call& fn)
if (!isFinite(ay)) ay = 0;
#ifdef DEBUG_DRAWING_API
- log_debug(_("%s.curveTo(%g,%g,%g,%g);"), movieclip->getTarget(),
+ log_debug("%s.curveTo(%g,%g,%g,%g);", movieclip->getTarget(),
cx, cy, ax, ay);
#endif
movieclip->graphics().curveTo(pixelsToTwips(cx), pixelsToTwips(cy),
@@ -1759,7 +1759,7 @@ movieclip_beginGradientFill(const fn_call& fn)
if (!colors || !alphas || !ratios || !matrix) {
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror(_("%s.beginGradientFill(%s): one or more of the "
+ log_aserror(_("%s.beginGradientFill(%s): one or more of the"
" args from 2nd to 5th don't cast to objects"),
movieclip->getTarget(), ss.str());
);
@@ -1785,8 +1785,8 @@ movieclip_beginGradientFill(const fn_call& fn)
// this limit.
if (stops > 15) {
std::stringstream ss; fn.dump_args(ss);
- log_debug(_("%s.beginGradientFill(%s): too many array elements"
- " for colors and ratios (%d), will trim to 8"),
+ log_debug("%s.beginGradientFill(%s): too many array elements"
+ " for colors and ratios (%d), will trim to 8",
movieclip->getTarget(), ss.str(), stops);
stops = 15;
}
@@ -1969,8 +1969,8 @@ movieclip_beginBitmapFill(const fn_call& fn)
if (!isNativeType(obj, bd) || bd->disposed()) {
IF_VERBOSE_ASCODING_ERRORS(
- log_debug(_("MovieClip.attachBitmap: first argument should be a "
- "valid BitmapData"), fn.arg(1));
+ log_debug("MovieClip.attachBitmap: first argument should be a "
+ "valid BitmapData", fn.arg(1));
);
return as_value();
}
@@ -2037,7 +2037,7 @@ movieclip_attachBitmap(const fn_call& fn)
if (fn.nargs < 2) {
IF_VERBOSE_ASCODING_ERRORS(
- log_debug(_("MovieClip.attachBitmap: expected 2 args, got %d"),
+ log_debug("MovieClip.attachBitmap: expected 2 args, got %d",
fn.nargs);
);
return as_value();
@@ -2048,8 +2048,8 @@ movieclip_attachBitmap(const fn_call& fn)
if (!isNativeType(obj, bd) || bd->disposed()) {
IF_VERBOSE_ASCODING_ERRORS(
- log_debug(_("MovieClip.attachBitmap: first argument should be a "
- "valid BitmapData"), fn.arg(1));
+ log_debug("MovieClip.attachBitmap: first argument should be a "
+ "valid BitmapData", fn.arg(1));
);
return as_value();
}
diff --git a/libcore/asobj/NetConnection_as.cpp
b/libcore/asobj/NetConnection_as.cpp
index c0a1b32..8bc2e16 100644
--- a/libcore/asobj/NetConnection_as.cpp
+++ b/libcore/asobj/NetConnection_as.cpp
@@ -321,7 +321,7 @@ public:
if (!_rtmp.connected()) return true;
_connectionComplete = true;
- log_debug(_("Initial connection complete"));
+ log_debug("Initial connection complete");
const RunResources& r = getRunResources(_nc.owner());
Global_as& gl = getGlobal(_nc.owner());
@@ -441,7 +441,7 @@ NetConnection_as::validateURL() const
return "";
}
- log_debug(_("Connection to movie: %s"), uriStr);
+ log_debug("Connection to movie: %s", uriStr);
return uriStr;
}
@@ -665,7 +665,7 @@ netconnection_call(const fn_call& fn)
#ifdef GNASH_DEBUG_REMOTING
std::stringstream ss; fn.dump_args(ss);
- log_debug(_("NetConnection.call(%s)"), ss.str());
+ log_debug("NetConnection.call(%s)", ss.str());
#endif
// TODO: arg(1) is the response object. let it know when data comes back
@@ -885,7 +885,7 @@ handleAMFInvoke(amf::Reader& rd, const boost::uint8_t*& b,
std::string headerName((char*)b, namelength);
#ifdef GNASH_DEBUG_REMOTING
- log_debug(_("Invoke name %s"), headerName);
+ log_debug("Invoke name %s", headerName);
#endif
b += namelength;
if (b + 5 > end) {
@@ -902,7 +902,7 @@ handleAMFInvoke(amf::Reader& rd, const boost::uint8_t*& b,
VM& vm = getVM(owner);
ObjectURI key = getURI(vm, headerName);
#ifdef GNASH_DEBUG_REMOTING
- log_debug(_("Invoking %s(%s)"), headerName, arg);
+ log_debug("Invoking %s(%s)", headerName, arg);
#endif
callMethod(&owner, key, arg);
}
@@ -1009,7 +1009,7 @@ HTTPRequest::handleAMFReplies(amf::Reader& rd, const
boost::uint8_t*& b,
}
#ifdef GNASH_DEBUG_REMOTING
- log_debug(_("callback called"));
+ log_debug("callback called");
#endif
callMethod(callback, methodKey, replyval);
@@ -1045,14 +1045,14 @@ HTTPRequest::send(const URL& url, NetConnection_as& nc)
{
// We should never have a request without any calls.
assert(_calls);
- log_debug(_("creating connection"));
+ log_debug("creating connection");
// Fill in header
(reinterpret_cast<boost::uint16_t*>(_data.data() + 4))[0] = htons(_calls);
std::string postdata(reinterpret_cast<char*>(_data.data()), _data.size());
#ifdef GNASH_DEBUG_REMOTING
- log_debug(_("NetConnection.call(): encoded args from %1% calls: %2%"),
+ log_debug("NetConnection.call(): encoded args from %1% calls: %2%",
_calls, hexify(_data.data(), _data.size(), false));
#endif
@@ -1074,7 +1074,7 @@ HTTPRequest::process(NetConnection_as& nc)
if (!toRead) toRead = NCCALLREPLYCHUNK;
#ifdef GNASH_DEBUG_REMOTING
- log_debug(_("Attempt to read %d bytes"), toRead);
+ log_debug("Attempt to read %d bytes", toRead);
#endif
// See if we need to allocate more bytes for the next
@@ -1083,9 +1083,9 @@ HTTPRequest::process(NetConnection_as& nc)
const size_t newCapacity = _reply.size() + toRead;
#ifdef GNASH_DEBUG_REMOTING
- log_debug(_("NetConnection.call: reply buffer capacity (%d) "
+ log_debug("NetConnection.call: reply buffer capacity (%d) "
"is too small to accept next %d bytes of chunk "
- "(current size is %d). Reserving %d bytes."),
+ "(current size is %d). Reserving %d bytes.",
_reply.capacity(), toRead, _reply.size(), newCapacity);
#endif
@@ -1097,8 +1097,8 @@ HTTPRequest::process(NetConnection_as& nc)
if (read > 0) {
#ifdef GNASH_DEBUG_REMOTING
- log_debug(_("read '%1%' bytes: %2%"), read,
- hexify(_reply.data() + _reply.size(), read, false));
+ log_debug("read '%1%' bytes: %2%", read,
+ hexify(_reply.data() + _reply.size(), read, false));
#endif
_reply.resize(_reply.size() + read);
}
@@ -1116,8 +1116,8 @@ HTTPRequest::process(NetConnection_as& nc)
// the buffer is full, 2) when we have a "length in bytes" value
// thas is satisfied
if (_connection->bad()) {
- log_debug(_("connection is in error condition, calling "
- "NetConnection.onStatus"));
+ log_debug("connection is in error condition, calling "
+ "NetConnection.onStatus");
// If the connection fails, it is manually verified
// that the pp calls onStatus with 1 undefined argument.
@@ -1133,7 +1133,7 @@ HTTPRequest::process(NetConnection_as& nc)
if (_reply.size() > 8) {
#ifdef GNASH_DEBUG_REMOTING
- log_debug(_("hit eof"));
+ log_debug("hit eof");
#endif
const boost::uint8_t *b = _reply.data();
const boost::uint8_t *end = _reply.data() + _reply.size();
@@ -1234,11 +1234,11 @@ RTMPConnection::handleInvoke(const boost::uint8_t*
payload,
++payload;
std::string method = amf::readString(payload, end);
- log_debug(_("Invoke: read method string %s"), method);
+ log_debug("Invoke: read method string %s", method);
if (*payload != amf::NUMBER_AMF0) return;
++payload;
- log_debug(_("Server invoking <%s>"), method);
+ log_debug("Server invoking <%s>", method);
const ObjectURI methodname = getURI(getVM(_nc.owner()), method);
@@ -1246,7 +1246,7 @@ RTMPConnection::handleInvoke(const boost::uint8_t*
payload,
// by us.
if (method == "_result") {
const double id = amf::readNumber(payload, end);
- log_debug(_("Received result for method call %s"),
+ log_debug("Received result for method call %s",
boost::io::group(std::setprecision(15), id));
as_value arg;
@@ -1255,7 +1255,7 @@ RTMPConnection::handleInvoke(const boost::uint8_t*
payload,
// TODO: use all args and check the order! We currently only use
// the last one!
while (rd(arg)) {
- log_debug(_("Value: %s"), arg);
+ log_debug("Value: %s", arg);
}
as_object* o = popCallback(id);
@@ -1265,7 +1265,7 @@ RTMPConnection::handleInvoke(const boost::uint8_t*
payload,
/// These are remote function calls initiated by the server.
const double id = amf::readNumber(payload, end);
- log_debug(_("Received server call %s %s"),
+ log_debug("Received server call %s %s",
boost::io::group(std::setprecision(15), id),
id ? "" : "(no reply expected)");
@@ -1284,12 +1284,12 @@ RTMPConnection::handleInvoke(const boost::uint8_t*
payload,
if (*payload != amf::NULL_AMF0) return;
++payload;
#ifdef GNASH_DEBUG_REMOTING
- log_debug(_("AMF buffer for _onbwdone: %s\n"),
+ log_debug("AMF buffer for _onbwdone: %s\n",
hexify(payload, end - payload, false));
#endif
double latency = amf::readNumber(payload, end);
double bandwidth = amf::readNumber(payload, end);
- log_debug(_("Latency: %s, bandwidth %s"), latency, bandwidth);
+ log_debug("Latency: %s, bandwidth %s", latency, bandwidth);
return;
}
@@ -1301,7 +1301,7 @@ RTMPConnection::handleInvoke(const boost::uint8_t*
payload,
// TODO: use all args and check the order! We currently only use
// the last one!
while (rd(arg)) {
- log_debug(_("Value: %s"), arg);
+ log_debug("Value: %s", arg);
}
log_error(_("rtmp server sent error"));
@@ -1317,7 +1317,7 @@ RTMPConnection::handleInvoke(const boost::uint8_t*
payload,
// TODO: use all args and check the order! We currently only use
// the last one!
while (rd(arg)) {
- log_debug(_("Value: %s"), arg);
+ log_debug("Value: %s", arg);
}
// Call method on the NetConnection object.
diff --git a/libcore/asobj/NetStream_as.cpp b/libcore/asobj/NetStream_as.cpp
index 7ac4548..fb84a9b 100644
--- a/libcore/asobj/NetStream_as.cpp
+++ b/libcore/asobj/NetStream_as.cpp
@@ -1443,7 +1443,7 @@ BufferedAudioStreamer::detachAuxStreamer()
if ( ! _soundHandler ) return;
if ( !_auxStreamer )
{
- log_debug(_("detachAuxStreamer called while not attached"));
+ log_debug("detachAuxStreamer called while not attached");
return;
}
_soundHandler->unplugInputStream(_auxStreamer);
@@ -1481,8 +1481,8 @@ BufferedAudioStreamer::fetch(boost::int16_t* samples,
unsigned int nSamples, boo
boost::mutex::scoped_lock lock(_audioQueueMutex);
#if 0
- log_debug(_("audio_streamer called, audioQueue size: %d, "
- "requested %d bytes of fill-up"),
+ log_debug("audio_streamer called, audioQueue size: %d, "
+ "requested %d bytes of fill-up",
_audioQueue.size(), len);
#endif
@@ -1871,7 +1871,7 @@ executeTag(const SimpleBuffer& _buffer, as_object&
thisPtr)
"undefined"));
}
- log_debug(_("Calling %s(%s)"), funcName, arg);
+ log_debug("Calling %s(%s)", funcName, arg);
callMethod(&thisPtr, funcKey, arg);
}
diff --git a/libcore/asobj/PlayHead.cpp b/libcore/asobj/PlayHead.cpp
index ef3870f..acd1fd4 100644
--- a/libcore/asobj/PlayHead.cpp
+++ b/libcore/asobj/PlayHead.cpp
@@ -93,9 +93,9 @@ PlayHead::advanceIfConsumed()
// not all available consumers consumed current position,
// won't advance
#if 0
- log_debug(_("PlayHead::advance(): "
- "not all consumers consumed current position, "
- "won't advance"));
+ log_debug("PlayHead::advance(): "
+ "not all consumers consumed current position, "
+ "won't advance");
#endif
return;
}
diff --git a/libcore/asobj/SharedObject_as.cpp
b/libcore/asobj/SharedObject_as.cpp
index 32e98d2..5f89112 100644
--- a/libcore/asobj/SharedObject_as.cpp
+++ b/libcore/asobj/SharedObject_as.cpp
@@ -135,7 +135,7 @@ public:
assert(!_error);
if (val.is_function()) {
- log_debug(_("SOL: skip serialization of FUNCTION property"));
+ log_debug("SOL: skip serialization of FUNCTION property");
return true;
}
@@ -334,7 +334,7 @@ SharedObject_as::flush(int space) const
}
#ifdef USE_SOL_READONLY
- log_debug(_("SharedObject %s not flushed (compiled as read-only
mode)"),
+ log_debug("SharedObject %s not flushed (compiled as read-only mode)",
filespec);
return false;
#endif
@@ -397,15 +397,15 @@ SharedObjectLibrary::SharedObjectLibrary(VM& vm)
_solSafeDir = rcfile.getSOLSafeDir();
if (_solSafeDir.empty()) {
- log_debug(_("Empty SOLSafeDir directive: we'll use '/tmp'"));
+ log_debug("Empty SOLSafeDir directive: we'll use '/tmp'");
_solSafeDir = "/tmp/";
}
// Check if the base dir exists here
struct stat statbuf;
if (stat(_solSafeDir.c_str(), &statbuf) == -1) {
- log_debug(_("Invalid SOL safe dir %s: %s. Will try to create on "
- "flush/exit."), _solSafeDir, std::strerror(errno));
+ log_debug("Invalid SOL safe dir %s: %s. Will try to create on "
+ "flush/exit.", _solSafeDir, std::strerror(errno));
}
// Which URL we should use here is under research.
@@ -562,11 +562,11 @@ SharedObjectLibrary::getLocal(const std::string& objName,
// If the shared object was already opened, use it.
SoLib::iterator it = _soLib.find(key);
if (it != _soLib.end()) {
- log_debug(_("SharedObject %s already known, returning it"), key);
+ log_debug("SharedObject %s already known, returning it", key);
return &it->second->owner();
}
- log_debug(_("SharedObject %s not loaded. Loading it now"), key);
+ log_debug("SharedObject %s not loaded. Loading it now", key);
// Otherwise create a new one and register to the lib
SharedObject_as* sh = createSharedObject(*_vm.getGlobal());
@@ -580,7 +580,7 @@ SharedObjectLibrary::getLocal(const std::string& objName,
newspec += ".sol";
sh->setFilespec(newspec);
- log_debug(_("SharedObject path: %s"), newspec);
+ log_debug("SharedObject path: %s", newspec);
as_object* data = readSOL(_vm, newspec);
@@ -796,14 +796,14 @@ sharedobject_getLocal(const fn_call& fn)
root = fn.arg(1).to_string(swfVersion);
}
- log_debug(_("SO name:%s, root:%s"), objName, root);
+ log_debug("SO name:%s, root:%s", objName, root);
VM& vm = getVM(fn);
as_object* obj = vm.getSharedObjectLibrary().getLocal(objName, root);
as_value ret(obj);
- log_debug(_("SharedObject.getLocal returning %s"), ret);
+ log_debug("SharedObject.getLocal returning %s", ret);
return ret;
}
@@ -892,7 +892,7 @@ readSOL(VM& vm, const std::string& filespec)
if (stat(filespec.c_str(), &st) != 0) {
// No existing SOL file. A new one will be created.
- log_debug(_("No existing SOL %s found. Will create on flush/exit."),
+ log_debug("No existing SOL %s found. Will create on flush/exit.",
filespec);
return data;
}
@@ -934,8 +934,8 @@ readSOL(VM& vm, const std::string& filespec)
while (buf != end) {
- log_debug(_("readSOL: reading property name at "
- "byte %s"), buf - sbuf.get());
+ log_debug("readSOL: reading property name at "
+ "byte %s", buf - sbuf.get());
// read property name
if (end - buf < 2) {
@@ -969,7 +969,7 @@ readSOL(VM& vm, const std::string& filespec)
return 0;
}
- log_debug(_("parsed sol member named '%s' (len %s), value '%s'"),
+ log_debug("parsed sol member named '%s' (len %s), value '%s'",
prop_name, len, as);
// set name/value as a member of this (SharedObject) object
@@ -1061,7 +1061,7 @@ encodeData(const std::string& name, as_object& data,
SimpleBuffer& buf)
if (!props.success()) {
// There are good reasons for this to fail, so it's not an error. Real
// errors are logged during serialization.
- log_debug(_("Did not serialize object"));
+ log_debug("Did not serialize object");
return false;
}
return true;
diff --git a/libcore/asobj/Sound_as.cpp b/libcore/asobj/Sound_as.cpp
index dbd0346..8f5b6ac 100644
--- a/libcore/asobj/Sound_as.cpp
+++ b/libcore/asobj/Sound_as.cpp
@@ -330,7 +330,7 @@ void
Sound_as::stopProbeTimer()
{
#ifdef GNASH_DEBUG_SOUND_AS
- log_debug(_("stopProbeTimer called"));
+ log_debug("stopProbeTimer called");
#endif
getRoot(owner()).removeAdvanceCallback(this);
}
@@ -365,7 +365,7 @@ Sound_as::probeAudio()
if ( ! _soundLoaded ) {
#ifdef GNASH_DEBUG_SOUND_AS
- log_debug(_("Probing audio for load"));
+ log_debug("Probing audio for load");
#endif
if (_mediaParser->parsingCompleted()) {
@@ -385,7 +385,7 @@ Sound_as::probeAudio()
if (isAttached()) {
#ifdef GNASH_DEBUG_SOUND_AS
- log_debug(_("Probing audio for end"));
+ log_debug("Probing audio for end");
#endif
boost::mutex::scoped_lock lock(_soundCompletedMutex);
@@ -406,12 +406,12 @@ Sound_as::probeAudio()
}
else {
#ifdef GNASH_DEBUG_SOUND_AS
- log_debug(_("Probing audio for start"));
+ log_debug("Probing audio for start");
#endif
bool parsingCompleted = _mediaParser->parsingCompleted();
try {
- log_debug(_("Attaching aux streamer"));
+ log_debug("Attaching aux streamer");
_inputStream = attachAuxStreamerIfNeeded();
}
catch (const MediaException& e) {
@@ -510,11 +510,11 @@ Sound_as::getVolume(int& volume)
// some other sound...
//
if ( _attachedCharacter ) {
- //log_debug(_("Sound has an attached DisplayObject"));
+ //log_debug("Sound has an attached DisplayObject");
DisplayObject* ch = _attachedCharacter->get();
if (! ch) {
- log_debug(_("Character attached to Sound was unloaded and "
- "couldn't rebind"));
+ log_debug("Character attached to Sound was unloaded and "
+ "couldn't rebind");
return false;
}
volume = ch->getVolume();
@@ -525,7 +525,7 @@ Sound_as::getVolume(int& volume)
// sound_handler for volume. If we have no sound handler, we
// can't do much, so we'll return false
if (!_soundHandler) {
- log_debug(_("We have no sound handler here..."));
+ log_debug("We have no sound handler here...");
return false;
}
@@ -546,7 +546,7 @@ void
Sound_as::loadSound(const std::string& file, bool streaming)
{
if (!_mediaHandler || !_soundHandler) {
- log_debug(_("No media or sound handlers, won't load any sound"));
+ log_debug("No media or sound handlers, won't load any sound");
return;
}
@@ -616,7 +616,7 @@ Sound_as::attachAuxStreamerIfNeeded()
// start playing ASAP, a call to ::start will just change _startTime
#ifdef GNASH_DEBUG_SOUND_AS
- log_debug(_("Attaching the aux streamer"));
+ log_debug("Attaching the aux streamer");
#endif
return _soundHandler->attach_aux_streamer(getAudioWrapper, (void*) this);
}
@@ -643,8 +643,8 @@ Sound_as::setVolume(int volume)
if ( _attachedCharacter ) {
DisplayObject* ch = _attachedCharacter->get();
if ( ! ch ) {
- log_debug(_("Character attached to Sound was unloaded and "
- "couldn't rebind"));
+ log_debug("Character attached to Sound was unloaded and "
+ "couldn't rebind");
return;
}
ch->setVolume(volume);
@@ -696,7 +696,7 @@ Sound_as::start(double secOff, int loops)
boost::uint32_t seekms = boost::uint32_t(secOff * 1000);
// TODO: boost::mutex::scoped_lock parserLock(_parserMutex);
bool seeked = _mediaParser->seek(seekms); // well, we try...
- log_debug(_("Seeked MediaParser to %d, returned: %d"), seekms,
seeked);
+ log_debug("Seeked MediaParser to %d, returned: %d", seekms,
seeked);
}
@@ -714,7 +714,7 @@ Sound_as::start(double secOff, int loops)
inPoint = (secOff*44100);
}
- log_debug(_("Sound.start: secOff:%d"), secOff);
+ log_debug("Sound.start: secOff:%d", secOff);
_soundHandler->startSound(
soundId,
@@ -822,14 +822,14 @@ Sound_as::getAudio(boost::int16_t* samples, unsigned int
nSamples, bool& atEOF)
if ( ! frame.get() ) {
// just wait some more if parsing isn't complete yet
if ( ! parsingComplete ) {
- //log_debug(_("Parsing not complete and no more audio
frames in input, try again later"));
+ //log_debug("Parsing not complete and no more audio frames
in input, try again later");
break;
}
// or detach and stop here...
// (should really honour loopings if any,
// but that should be only done for non-streaming sound!)
- //log_debug(_("Parsing complete and no more audio frames in
input, detaching"));
+ //log_debug("Parsing complete and no more audio frames in
input, detaching");
markSoundCompleted(true);
@@ -845,7 +845,7 @@ Sound_as::getAudio(boost::int16_t* samples, unsigned int
nSamples, bool& atEOF)
// if we've been asked to start at a specific time, skip
// any frame with earlier timestamp
if ( frame->timestamp < _startTime ) {
- //log_debug(_("This audio frame timestamp (%d) < requested
start time (%d)"), frame->timestamp, _startTime);
+ //log_debug("This audio frame timestamp (%d) < requested start
time (%d)", frame->timestamp, _startTime);
continue;
}
@@ -857,13 +857,13 @@ Sound_as::getAudio(boost::int16_t* samples, unsigned int
nSamples, bool& atEOF)
continue;
}
- //log_debug(_(" decoded %d bytes of audio"), _leftOverSize);
+ //log_debug(" decoded %d bytes of audio", _leftOverSize);
}
assert( !(_leftOverSize%2) );
int n = std::min<int>(_leftOverSize, len);
- //log_debug(_(" consuming %d bytes of decoded audio"), n);
+ //log_debug(" consuming %d bytes of decoded audio", n);
std::copy(_leftOverPtr, _leftOverPtr+n, stream);
diff --git a/libcore/asobj/String_as.cpp b/libcore/asobj/String_as.cpp
index 0edebf0..6e980ae 100644
--- a/libcore/asobj/String_as.cpp
+++ b/libcore/asobj/String_as.cpp
@@ -195,7 +195,7 @@ string_slice(const fn_call& fn)
size_t retlen = end - start;
- //log_debug(_("start: %d, end: %d, retlen: %d"), start, end, retlen);
+ //log_debug("start: %d, end: %d, retlen: %d", start, end, retlen);
return as_value(utf8::encodeCanonicalString(
wstr.substr(start, retlen), version));
@@ -459,7 +459,7 @@ string_substring(const fn_call& fn)
}
end -= start;
- //log_debug(_("Start: %d, End: %d"), start, end);
+ //log_debug("Start: %d, End: %d", start, end);
return as_value(utf8::encodeCanonicalString(wstr.substr(start, end),
version));
}
diff --git a/libcore/asobj/TextField_as.cpp b/libcore/asobj/TextField_as.cpp
index 5464230..d123682 100644
--- a/libcore/asobj/TextField_as.cpp
+++ b/libcore/asobj/TextField_as.cpp
@@ -655,7 +655,7 @@ textfield_getTextFormat(const fn_call& fn)
// TODO: add font color and some more
LOG_ONCE(
- log_unimpl(_("TextField.getTextFormat() discards url, target, "
+ log_unimpl(_("TextField.getTextFormat() discards URL, target, "
"tabStops, bullet and display")));
return as_value(textformat);
@@ -1055,7 +1055,7 @@ textfield_removeTextField(const fn_call& fn)
text->removeTextField();
- LOG_ONCE(log_debug(_("TextField.removeTextField() TESTING")));
+ LOG_ONCE(log_debug("TextField.removeTextField() TESTING"));
return as_value();
}
diff --git a/libcore/asobj/TextFormat_as.cpp b/libcore/asobj/TextFormat_as.cpp
index e163b3c..37d16c9 100644
--- a/libcore/asobj/TextFormat_as.cpp
+++ b/libcore/asobj/TextFormat_as.cpp
@@ -705,7 +705,7 @@ parseDisplayString(const std::string& display)
if (cmp(display, "block")) return TextField::TEXTFORMAT_BLOCK;
// Is this correct? We have to return something here...
- log_debug(_("Invalid display string %s "), display);
+ log_debug("Invalid display string %s ", display);
return TextField::TEXTFORMAT_BLOCK;
}
diff --git a/libcore/asobj/XMLNode_as.cpp b/libcore/asobj/XMLNode_as.cpp
index d80a0e9..48bf384 100644
--- a/libcore/asobj/XMLNode_as.cpp
+++ b/libcore/asobj/XMLNode_as.cpp
@@ -400,8 +400,8 @@ XMLNode_as::stringify(const XMLNode_as& xml, std::ostream&
xmlout, bool encode)
NodeType type = xml.nodeType();
#ifdef GNASH_DEBUG
- log_debug(_("Stringifying node %p with name %s, as_value %s, %u "
- "attributes and %u children"), (void*)&xml, nodeName,
+ log_debug("Stringifying node %p with name %s, as_value %s, %u "
+ "attributes and %u children", (void*)&xml, nodeName,
nodeValue, xml._attributes.size(), xml._children.size());
#endif
diff --git a/libcore/asobj/XMLSocket_as.cpp b/libcore/asobj/XMLSocket_as.cpp
index 6d5d9c8..c3f4585 100644
--- a/libcore/asobj/XMLSocket_as.cpp
+++ b/libcore/asobj/XMLSocket_as.cpp
@@ -210,7 +210,7 @@ XMLSocket_as::checkForIncomingData()
while (static_cast<size_t>(ptr - buf.get()) < bytesRead) {
#ifdef GNASH_XMLSOCKET_DEBUG
- log_debug(_("read: %d, this string ends: %d"), bytesRead,
+ log_debug("read: %d, this string ends: %d", bytesRead,
ptr + std::strlen(ptr) - buf.get());
#endif
@@ -242,7 +242,7 @@ XMLSocket_as::checkForIncomingData()
#ifdef GNASH_XMLSOCKET_DEBUG
for (size_t i = 0, e = msgs.size(); i != e; ++i) {
- log_debug(_(" Message %d: %s "), i, msgs[i]);
+ log_debug(" Message %d: %s ", i, msgs[i]);
}
#endif
@@ -303,7 +303,7 @@ xmlsocket_connect(const fn_call& fn)
#ifdef GNASH_XMLSOCKET_DEBUG
std::stringstream ss;
fn.dump_args(ss);
- log_debug(_("XMLSocket.connect(%s) called"), ss.str());
+ log_debug("XMLSocket.connect(%s) called", ss.str());
#endif
XMLSocket_as* ptr = ensure<ThisIsNative<XMLSocket_as> >(fn);
diff --git a/libcore/asobj/XML_as.cpp b/libcore/asobj/XML_as.cpp
index 12cd952..d2350b9 100644
--- a/libcore/asobj/XML_as.cpp
+++ b/libcore/asobj/XML_as.cpp
@@ -382,7 +382,7 @@ XML_as::parseTag(XMLNode_as*& node, xml_iterator& it,
// Malformed. Search for the parent node.
XMLNode_as* s = node;
while (s && !noCaseCompare(s->nodeName(), tagName)) {
- //log_debug(_("parent: %s, this: %s"), s->nodeName(), tagName);
+ //log_debug("parent: %s, this: %s", s->nodeName(), tagName);
s = s->getParent();
}
if (s) {
diff --git a/libcore/asobj/flash/display/BitmapData_as.cpp
b/libcore/asobj/flash/display/BitmapData_as.cpp
index 55f55dc..a8f555c 100644
--- a/libcore/asobj/flash/display/BitmapData_as.cpp
+++ b/libcore/asobj/flash/display/BitmapData_as.cpp
@@ -644,14 +644,14 @@ BitmapData_as::draw(MovieClip& mc, const Transform&
transform)
Renderer* base = getRunResources(*_owner).renderer();
if (!base) {
- log_debug(_("BitmapData.draw() called without an active renderer"));
+ log_debug("BitmapData.draw() called without an active renderer");
return;
}
Renderer::Internal in(*base, im);
Renderer* internal = in.renderer();
if (!internal) {
- log_debug(_("Current renderer does not support internal rendering"));
+ log_debug("Current renderer does not support internal rendering");
return;
}
@@ -1631,7 +1631,7 @@ bitmapdata_loadBitmap(const fn_call& fn)
as_value
get_flash_display_bitmap_data_constructor(const fn_call& fn)
{
- log_debug(_("Loading flash.display.BitmapData class"));
+ log_debug("Loading flash.display.BitmapData class");
Global_as& gl = getGlobal(fn);
as_object* proto = createObject(gl);
attachBitmapDataInterface(*proto);
diff --git a/libcore/asobj/flash/display/display_pkg.cpp
b/libcore/asobj/flash/display/display_pkg.cpp
index ee554f8..1fc2a63 100644
--- a/libcore/asobj/flash/display/display_pkg.cpp
+++ b/libcore/asobj/flash/display/display_pkg.cpp
@@ -34,7 +34,7 @@ namespace gnash {
static as_value
get_flash_display_package(const fn_call& fn)
{
- log_debug(_("Loading flash.display package"));
+ log_debug("Loading flash.display package");
Global_as& gl = getGlobal(fn);
diff --git a/libcore/asobj/flash/external/ExternalInterface_as.cpp
b/libcore/asobj/flash/external/ExternalInterface_as.cpp
index 8c18ff0..332b72e 100644
--- a/libcore/asobj/flash/external/ExternalInterface_as.cpp
+++ b/libcore/asobj/flash/external/ExternalInterface_as.cpp
@@ -247,7 +247,7 @@ externalinterface_addCallback(const fn_call& fn)
movie_root& mr = getRoot(fn);
if (mr.getControlFD() <= 0) {
- log_debug(_("ExternalInterface not accessible when running
standalone."));
+ log_debug("ExternalInterface not accessible when running standalone.");
return as_value(false);
}
@@ -255,7 +255,7 @@ externalinterface_addCallback(const fn_call& fn)
const as_value& name_as = fn.arg(0);
std::string name = name_as.to_string();
if (fn.arg(1).is_object()) {
- log_debug(_("adding callback %s"), name);
+ log_debug("adding callback %s", name);
as_object* asCallback = toObject(fn.arg(1), getVM(fn));
mr.addExternalCallback(name, asCallback);
}
@@ -273,7 +273,7 @@ externalinterface_call(const fn_call& fn)
as_value val;
if (mr.getControlFD() <= 0) {
- log_debug(_("ExternalInterface not accessible on call."));
+ log_debug("ExternalInterface not accessible on call.");
val.set_null();
return as_value(val);
}
@@ -282,7 +282,7 @@ externalinterface_call(const fn_call& fn)
const as_value& methodName_as = fn.arg(0);
const std::string methodName = methodName_as.to_string();
const std::vector<as_value>& args = fn.getArgs();
- log_debug(_("Calling External method \"%s\""), methodName);
+ log_debug("Calling External method \"%s\"", methodName);
std::string result = mr.callExternalJavascript(methodName, args);
if (!result.empty()) {
val = ExternalInterface::parseXML(result);
@@ -385,7 +385,7 @@ externalinterface_objectID(const fn_call& fn)
as_value
externalInterfaceConstructor(const fn_call& fn)
{
- log_debug(_("Loading flash.external.ExternalInterface class"));
+ log_debug("Loading flash.external.ExternalInterface class");
Global_as& gl = getGlobal(fn);
as_object* proto = createObject(gl);
as_object* cl = gl.createClass(emptyFunction, proto);
diff --git a/libcore/asobj/flash/external/external_pkg.cpp
b/libcore/asobj/flash/external/external_pkg.cpp
index a5214fd..b44695e 100644
--- a/libcore/asobj/flash/external/external_pkg.cpp
+++ b/libcore/asobj/flash/external/external_pkg.cpp
@@ -35,7 +35,7 @@ as_value
get_flash_external_package(const fn_call& fn)
{
- log_debug(_("Loading flash.external package"));
+ log_debug("Loading flash.external package");
Global_as& gl = getGlobal(fn);
diff --git a/libcore/asobj/flash/filters/BitmapFilter_as.cpp
b/libcore/asobj/flash/filters/BitmapFilter_as.cpp
index 880928a..ea313af 100644
--- a/libcore/asobj/flash/filters/BitmapFilter_as.cpp
+++ b/libcore/asobj/flash/filters/BitmapFilter_as.cpp
@@ -114,7 +114,7 @@ attachBitmapFilterInterface(as_object& o)
as_value
getBitmapFilterConstructor(const fn_call& fn)
{
- log_debug(_("Loading flash.filters.BitmapFilter class"));
+ log_debug("Loading flash.filters.BitmapFilter class");
Global_as& gl = getGlobal(fn);
VM& vm = getVM(fn);
diff --git a/libcore/asobj/flash/filters/filters_pkg.cpp
b/libcore/asobj/flash/filters/filters_pkg.cpp
index 0ef9a5a..83705c4 100644
--- a/libcore/asobj/flash/filters/filters_pkg.cpp
+++ b/libcore/asobj/flash/filters/filters_pkg.cpp
@@ -45,7 +45,7 @@ as_value
get_flash_filters_package(const fn_call& fn)
{
- log_debug(_("Loading flash.filters package"));
+ log_debug("Loading flash.filters package");
Global_as& gl = getGlobal(fn);
as_object* pkg = createObject(gl);
diff --git a/libcore/asobj/flash/geom/ColorTransform_as.cpp
b/libcore/asobj/flash/geom/ColorTransform_as.cpp
index 7687aa8..2aba6f4 100644
--- a/libcore/asobj/flash/geom/ColorTransform_as.cpp
+++ b/libcore/asobj/flash/geom/ColorTransform_as.cpp
@@ -398,7 +398,7 @@ colortransform_ctor(const fn_call& fn)
as_value
get_flash_geom_color_transform_constructor(const fn_call& fn)
{
- log_debug(_("Loading flash.geom.ColorTransform class"));
+ log_debug("Loading flash.geom.ColorTransform class");
Global_as& gl = getGlobal(fn);
as_object* proto = createObject(gl);
as_object* cl = gl.createClass(&colortransform_ctor, proto);
diff --git a/libcore/asobj/flash/geom/Matrix_as.cpp
b/libcore/asobj/flash/geom/Matrix_as.cpp
index 3a3b290..78f887d 100644
--- a/libcore/asobj/flash/geom/Matrix_as.cpp
+++ b/libcore/asobj/flash/geom/Matrix_as.cpp
@@ -212,16 +212,16 @@ matrix_concat(const fn_call& fn)
fillMatrix(currentMatrix, *ptr);
#ifdef GNASH_DEBUG_GEOM_MATRIX
- log_debug(_("(Matrix.concat) This matrix (pre-transform): %s"),
+ log_debug("(Matrix.concat) This matrix (pre-transform): %s",
currentMatrix);
- log_debug(_("(Matrix.concat) Transform matrix: %s"),
+ log_debug("(Matrix.concat) Transform matrix: %s",
concatMatrix);
#endif
currentMatrix = boost::numeric::ublas::prod(concatMatrix, currentMatrix);
#ifdef GNASH_DEBUG_GEOM_MATRIX
- log_debug(_("(Matrix.concat) This matrix (post-transform): %s"),
+ log_debug("(Matrix.concat) This matrix (post-transform): %s",
currentMatrix);
#endif
@@ -553,7 +553,7 @@ matrix_rotate(const fn_call& fn)
currentMatrix(1, 1) = toNumber(d, getVM(fn));
#ifdef GNASH_DEBUG_GEOM_MATRIX
- log_debug(_("(Matrix.rotate) This matrix (pre-transform): %s"),
+ log_debug("(Matrix.rotate) This matrix (pre-transform): %s",
currentMatrix);
#endif
@@ -561,8 +561,8 @@ matrix_rotate(const fn_call& fn)
currentMatrix = boost::numeric::ublas::prod(currentMatrix,
transformMatrix);
#ifdef GNASH_DEBUG_GEOM_MATRIX
- log_debug(_("(Matrix.rotate) Transformation matrix: %s"), transformMatrix);
- log_debug(_("(Matrix.rotate) This matrix (post-transform): %s"),
+ log_debug("(Matrix.rotate) Transformation matrix: %s", transformMatrix);
+ log_debug("(Matrix.rotate) This matrix (post-transform): %s",
currentMatrix);
#endif
@@ -630,7 +630,7 @@ matrix_scale(const fn_call& fn)
currentMatrix(1, 1) = toNumber(d, getVM(fn));
#ifdef GNASH_DEBUG_GEOM_MATRIX
- log_debug(_("(Matrix.scale) This matrix (pre-transform): %s"),
+ log_debug("(Matrix.scale) This matrix (pre-transform): %s",
currentMatrix);
#endif
@@ -638,8 +638,8 @@ matrix_scale(const fn_call& fn)
currentMatrix = boost::numeric::ublas::prod(currentMatrix,
transformMatrix);
#ifdef GNASH_DEBUG_GEOM_MATRIX
- log_debug(_("(Matrix.scale) Transformation matrix: %s"), transformMatrix);
- log_debug(_("(Matrix.scale) This matrix (post-transform): %s"),
+ log_debug("(Matrix.scale) Transformation matrix: %s", transformMatrix);
+ log_debug("(Matrix.scale) This matrix (post-transform): %s",
currentMatrix);
#endif
@@ -895,7 +895,7 @@ matrix_ctor(const fn_call& fn)
as_value
get_flash_geom_matrix_constructor(const fn_call& fn)
{
- log_debug(_("Loading flash.geom.Matrix class"));
+ log_debug("Loading flash.geom.Matrix class");
Global_as& gl = getGlobal(fn);
as_object* proto = createObject(gl);
attachMatrixInterface(*proto);
diff --git a/libcore/asobj/flash/geom/Point_as.cpp
b/libcore/asobj/flash/geom/Point_as.cpp
index ba39e23..1da9216 100644
--- a/libcore/asobj/flash/geom/Point_as.cpp
+++ b/libcore/asobj/flash/geom/Point_as.cpp
@@ -637,7 +637,7 @@ point_ctor(const fn_call& fn)
as_value
get_flash_geom_point_constructor(const fn_call& fn)
{
- log_debug(_("Loading flash.geom.Point class"));
+ log_debug("Loading flash.geom.Point class");
Global_as& gl = getGlobal(fn);
as_object* proto = createObject(gl);
as_object* cl = gl.createClass(&point_ctor, proto);
diff --git a/libcore/asobj/flash/geom/Rectangle_as.cpp
b/libcore/asobj/flash/geom/Rectangle_as.cpp
index a1940bd..e6f3a2d 100644
--- a/libcore/asobj/flash/geom/Rectangle_as.cpp
+++ b/libcore/asobj/flash/geom/Rectangle_as.cpp
@@ -646,7 +646,7 @@ Rectangle_ctor(const fn_call& fn)
as_value
get_flash_geom_rectangle_constructor(const fn_call& fn)
{
- log_debug(_("Loading flash.geom.Rectangle class"));
+ log_debug("Loading flash.geom.Rectangle class");
Global_as& gl = getGlobal(fn);
as_object* proto = createObject(gl);
attachRectangleInterface(*proto);
diff --git a/libcore/asobj/flash/geom/Transform_as.cpp
b/libcore/asobj/flash/geom/Transform_as.cpp
index ee82a6d..103daf4 100644
--- a/libcore/asobj/flash/geom/Transform_as.cpp
+++ b/libcore/asobj/flash/geom/Transform_as.cpp
@@ -371,7 +371,7 @@ transform_ctor(const fn_call& fn)
as_value
get_flash_geom_transform_constructor(const fn_call& fn)
{
- log_debug(_("Loading flash.geom.Transform class"));
+ log_debug("Loading flash.geom.Transform class");
Global_as& gl = getGlobal(fn);
as_object* proto = createObject(gl);
attachTransformInterface(*proto);
diff --git a/libcore/asobj/flash/geom/geom_pkg.cpp
b/libcore/asobj/flash/geom/geom_pkg.cpp
index 834a619..4e9f672 100644
--- a/libcore/asobj/flash/geom/geom_pkg.cpp
+++ b/libcore/asobj/flash/geom/geom_pkg.cpp
@@ -38,7 +38,7 @@ namespace {
as_value
get_flash_geom_package(const fn_call& fn)
{
- log_debug(_("Loading flash.geom package"));
+ log_debug("Loading flash.geom package");
Global_as& gl = getGlobal(fn);
as_object *pkg = createObject(gl);
diff --git a/libcore/asobj/flash/net/net_pkg.cpp
b/libcore/asobj/flash/net/net_pkg.cpp
index 3b08443..22a66f9 100644
--- a/libcore/asobj/flash/net/net_pkg.cpp
+++ b/libcore/asobj/flash/net/net_pkg.cpp
@@ -33,7 +33,7 @@ namespace gnash {
static as_value
get_flash_net_package(const fn_call& fn)
{
- log_debug(_("Loading flash.net package"));
+ log_debug("Loading flash.net package");
Global_as& gl = getGlobal(fn);
diff --git a/libcore/asobj/flash/text/text_pkg.cpp
b/libcore/asobj/flash/text/text_pkg.cpp
index 31ec129..4ed891d 100644
--- a/libcore/asobj/flash/text/text_pkg.cpp
+++ b/libcore/asobj/flash/text/text_pkg.cpp
@@ -31,7 +31,7 @@ namespace gnash {
static as_value
get_flash_text_package(const fn_call& fn)
{
- log_debug(_("Loading flash.text package"));
+ log_debug("Loading flash.text package");
Global_as& gl = getGlobal(fn);
diff --git a/libcore/vm/ASHandlers.cpp b/libcore/vm/ASHandlers.cpp
index e7ad791..735f56d 100644
--- a/libcore/vm/ASHandlers.cpp
+++ b/libcore/vm/ASHandlers.cpp
@@ -2949,7 +2949,7 @@ ActionEnum2(ActionExec& thread)
as_object* obj = safeToObject(getVM(thread.env), obj_val);
if (!obj || !obj_val.is_object()) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("Top of stack not an object %s at ActionEnum2 "
+ log_aserror(_("Top of stack not an object %s at ActionEnum2"
" execution"), obj_val);
);
return;
@@ -3509,7 +3509,7 @@ commonGetURL(as_environment& env, as_value target,
// handle malformed sendVarsMethod
if ((method & 3) == 3) {
- log_error(_("Bogus GetUrl2 send vars method "
+ log_error(_("Bogus GetUrl2 send vars method"
" in SWF file (both GET and POST requested). Using GET"));
sendVarsMethod = MovieClip::METHOD_GET;
}
http://git.savannah.gnu.org/cgit//commit/?id=d6e71c11c20afa90c08a342061c9ba9e0d3280ca
commit d6e71c11c20afa90c08a342061c9ba9e0d3280ca
Author: Rob Savoye <address@hidden>
Date: Sat Dec 31 13:03:35 2011 -0700
change w/out to without
diff --git a/gui/Player.cpp b/gui/Player.cpp
index edbef64..84b9e7d 100644
--- a/gui/Player.cpp
+++ b/gui/Player.cpp
@@ -286,7 +286,7 @@ Player::init_sound()
} catch (const SoundException& ex) {
log_error(_("Could not create sound handler: %s."
- " Will continue w/out sound."), ex.what());
+ " Will continue without sound."), ex.what());
}
}
}
diff --git a/gui/pythonmod/gnash-view.cpp b/gui/pythonmod/gnash-view.cpp
index d6e7ddf..fd7cbb6 100644
--- a/gui/pythonmod/gnash-view.cpp
+++ b/gui/pythonmod/gnash-view.cpp
@@ -218,7 +218,7 @@ gnash_view_init(GnashView *view)
view->media_handler.get()));
} catch (gnash::SoundException& ex) {
gnash::log_error(_("Could not create sound handler: %s."
- " Will continue w/out sound."), ex.what());
+ " Will continue without sound."), ex.what());
}
gnash::log_error(_("Sound requested but no sound support compiled in"));
#endif
http://git.savannah.gnu.org/cgit//commit/?id=7eb2de7988f02e14cc695261866bc6430109cfc8
commit 7eb2de7988f02e14cc695261866bc6430109cfc8
Author: Rob Savoye <address@hidden>
Date: Sat Dec 31 13:03:08 2011 -0700
add gettext macro to all log_error() messages.
diff --git a/libmedia/FLVParser.cpp b/libmedia/FLVParser.cpp
index eb4b876..cf7b03c 100644
--- a/libmedia/FLVParser.cpp
+++ b/libmedia/FLVParser.cpp
@@ -183,7 +183,7 @@ FLVParser::parseAudioTag(const FLVTag& flvtag, const
FLVAudioTag& audiotag, boos
frame = readAudioFrame(bodyLength-1, flvtag.timestamp);
if ( ! frame.get() ) {
- log_error("could not read audio frame?");
+ log_error(_("could not read audio frame?"));
}
// If this is the first audioframe no info about the
@@ -260,7 +260,7 @@ FLVParser::parseVideoTag(const FLVTag& flvtag, const
FLVVideoTag& videotag, boos
std::auto_ptr<EncodedVideoFrame> frame = readVideoFrame(bodyLength-1,
flvtag.timestamp);
if ( ! frame.get() ) {
- log_error("could not read video frame?");
+ log_error(_("could not read video frame?"));
}
// If this is the first videoframe no info about the
@@ -318,7 +318,8 @@ FLVParser::parseNextTag(bool index_only)
//log_debug("FLVParser::parseNextTag seeking to %d", thisTagPos+4);
if (!_stream->seek(thisTagPos+4))
{
- log_error("FLVParser::parseNextTag: can't seek to %d",
thisTagPos+4);
+ log_error(_("FLVParser::parseNextTag: can't seek to %d"),
+ thisTagPos+4);
completed = true;
return false;
@@ -331,8 +332,8 @@ FLVParser::parseNextTag(bool index_only)
if ( actuallyRead < 12 )
{
if ( actuallyRead )
- log_error("FLVParser::parseNextTag: can't read tag info
"
- "(needed 12 bytes, only got %d)", actuallyRead);
+ log_error(_("FLVParser::parseNextTag: can't read tag info "
+ "(needed 12 bytes, only got %d)"),
actuallyRead);
// else { assert(_stream->eof(); } ?
completed = true;
@@ -430,8 +431,8 @@ FLVParser::parseNextTag(bool index_only)
if ( actuallyRead < flvtag.body_size-1 )
{
- log_error("FLVParser::parseNextTag: can't read metaTag
(%d) "
- "body (needed %d bytes, only got %d)",
+ log_error(_("FLVParser::parseNextTag: can't read metaTag
(%d) "
+ "body (needed %d bytes, only got %d)"),
FLV_META_TAG, flvtag.body_size, actuallyRead);
return false;
}
@@ -476,7 +477,7 @@ FLVParser::parseHeader()
boost::uint8_t header[9];
if ( _stream->read(header, 9) != 9 )
{
- log_error("FLVParser::parseHeader: couldn't read 9 bytes of
header");
+ log_error(_("FLVParser::parseHeader: couldn't read 9 bytes of
header"));
return false;
}
@@ -528,7 +529,7 @@ FLVParser::readAudioFrame(boost::uint32_t dataSize,
boost::uint32_t timestamp)
std::fill(data + bytesRead, data + bufSize, 0);
if (bytesRead < dataSize) {
- log_error("FLVParser::readAudioFrame: could only read %d/%d
bytes",
+ log_error(_("FLVParser::readAudioFrame: could only read %d/%d
bytes"),
bytesRead, dataSize);
}
diff --git a/libmedia/MediaParser.cpp b/libmedia/MediaParser.cpp
index 94804fa..24db245 100644
--- a/libmedia/MediaParser.cpp
+++ b/libmedia/MediaParser.cpp
@@ -79,7 +79,7 @@ MediaParser::isBufferEmpty() const
boost::optional<Id3Info>
MediaParser::getId3Info() const
{
- log_error("No ID3 support implemented in this MediaParser");
+ log_error(_("No ID3 support implemented in this MediaParser"));
return boost::optional<Id3Info>();
}
diff --git a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
index 98a7721..40c4fe0 100644
--- a/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
+++ b/libmedia/ffmpeg/AudioDecoderFfmpeg.cpp
@@ -397,10 +397,10 @@ AudioDecoderFfmpeg::decode(const boost::uint8_t* input,
// or FLV AudioTag not containing full audio frames)
//
- log_error("AudioDecoderFfmpeg: "
+ log_error(_("AudioDecoderFfmpeg: "
"could not find a complete frame in "
"the last %d bytes of input"
- " (malformed SWF or FLV?)",
+ " (malformed SWF or FLV?)"),
consumed);
//abort();
continue;
@@ -583,7 +583,7 @@ AudioDecoderFfmpeg::decodeFrame(const boost::uint8_t* input,
av_free(output);
if (expectedMaxOutSamples < outSamples) {
- log_error(" --- Computation of resampled samples (%d) < then the
actual returned samples (%d)",
+ log_error(_(" --- Computation of resampled samples (%d) < then the
actual returned samples (%d)"),
expectedMaxOutSamples, outSamples);
log_debug(" input frame size: %d", outSize);
diff --git a/libmedia/ffmpeg/MediaParserFfmpeg.cpp
b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
index be65b5e..563cabb 100644
--- a/libmedia/ffmpeg/MediaParserFfmpeg.cpp
+++ b/libmedia/ffmpeg/MediaParserFfmpeg.cpp
@@ -207,8 +207,8 @@ MediaParserFfmpeg::parseAudioFrame(AVPacket& packet)
// mdb:93, lastbuf:0 skiping granule 0
// When playing:
http://downloads.bbc.co.uk/news/nol/shared/spl/hi/audio_slideshow/kenadamptw/slideshow_629.swf
//
- LOG_ONCE(log_error("FIXME: FFmpeg packet decompression "
- "timestamp has no value, taking as zero"));
+ LOG_ONCE(log_error(_("FIXME: FFmpeg packet decompression "
+ "timestamp has no value, taking as zero")));
dts = 0;
}
boost::uint64_t timestamp = static_cast<boost::uint64_t>(dts *
as_double(_audioStream->time_base) * 1000.0);
@@ -474,7 +474,7 @@ MediaParserFfmpeg::initializeParser()
boost::uint64_t duration = _videoStream->duration;
#endif
if (duration == AV_NOPTS_VALUE) {
- log_error("Duration of video stream unknown");
+ log_error(_("Duration of video stream unknown"));
duration=0; // TODO: guess!
} else {
duration = duration / as_double(_videoStream->time_base); // TODO:
check this
@@ -503,7 +503,7 @@ MediaParserFfmpeg::initializeParser()
boost::uint64_t duration = _audioStream->duration;
#endif
if (duration == AV_NOPTS_VALUE) {
- log_error("Duration of audio stream unknown to ffmpeg");
+ log_error(_("Duration of audio stream unknown to ffmpeg"));
duration=0; // TODO: guess!
}
else {
diff --git a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
index bd3288a..6abeb08 100644
--- a/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
+++ b/libmedia/ffmpeg/VideoDecoderFfmpeg.cpp
@@ -302,7 +302,7 @@ VideoDecoderFfmpeg::frameToImage(AVCodecContext* srcCtx,
im.reset(new image::ImageRGB(width, height));
break;
default:
- log_error("Pixel format not handled");
+ log_error(_("Pixel format not handled"));
return im;
}
@@ -369,7 +369,7 @@ VideoDecoderFfmpeg::decode(const boost::uint8_t* input,
#endif
if (!bytes) {
- log_error("Decoding of a video frame failed");
+ log_error(_("Decoding of a video frame failed"));
av_free(frame);
return ret;
}
diff --git a/libmedia/gst/AudioInputGst.cpp b/libmedia/gst/AudioInputGst.cpp
index 8099075..a8c4fec 100644
--- a/libmedia/gst/AudioInputGst.cpp
+++ b/libmedia/gst/AudioInputGst.cpp
@@ -97,7 +97,7 @@ AudioInputGst::findAudioDevs()
element = gst_element_factory_make ("audiotestsrc", "audtestsrc");
if (element == NULL) {
- log_error("%s: Could not create audio test source", __FUNCTION__);
+ log_error(_("%s: Could not create audio test source"), __FUNCTION__);
return;
} else {
_audioVect.push_back(new GnashAudio);
@@ -114,12 +114,12 @@ AudioInputGst::findAudioDevs()
element = gst_element_factory_make ("pulsesrc", "pulsesrc");
if ( ! element ) {
- log_error("%s: Could not create pulsesrc element", __FUNCTION__);
+ log_error(_("%s: Could not create pulsesrc element"), __FUNCTION__);
return;
}
probe = GST_PROPERTY_PROBE (element);
if ( ! probe ) {
- log_error("%s: Could not get property probe from pulsesrc element",
+ log_error(_("%s: Could not get property probe from pulsesrc element"),
__FUNCTION__);
return;
}
@@ -187,7 +187,7 @@ AudioInputGst::getSelectedCaps(int devselect)
if (devselect < 0 ||
(static_cast<size_t>(devselect) >= _audioVect.size())) {
- log_error("%s: passed an invalid devselect argument", __FUNCTION__);
+ log_error(_("%s: passed an invalid devselect argument"), __FUNCTION__);
exit(EXIT_FAILURE);
}
@@ -217,7 +217,7 @@ AudioInputGst::getSelectedCaps(int devselect)
if (GST_IS_OBJECT(bus)){
gst_object_unref (bus);
} else {
- log_error("%s: Pipeline bus isn't an object for some reason",
+ log_error(_("%s: Pipeline bus isn't an object for some reason"),
__FUNCTION__);
}
//if everything above worked properly, begin probing for values
@@ -236,12 +236,12 @@ AudioInputGst::getSelectedCaps(int devselect)
if (GST_IS_OBJECT(pad)) {
gst_object_unref (pad);
} else {
- log_error("%s: Template pad isn't an object for some reason",
+ log_error(_("%s: Template pad isn't an object for some
reason"),
__FUNCTION__);
}
bool ok = checkSupportedFormats(caps);
if (ok) {
- log_error("The input device you selected isn't supported
(yet)");
+ log_error(_("The input device you selected isn't supported
(yet)"));
} else {
gst_caps_unref(caps);
}
@@ -250,7 +250,7 @@ AudioInputGst::getSelectedCaps(int devselect)
if (GST_IS_OBJECT(pipeline)){
gst_object_unref (pipeline);
} else {
- log_error("%s: pipeline isn't an object for some reason",
+ log_error(_("%s: pipeline isn't an object for some reason"),
__FUNCTION__);
}
}
@@ -267,7 +267,7 @@ AudioInputGst::transferToPrivate(int devselect) {
if (devselect < 0 ||
(static_cast<size_t>(devselect) >= _audioVect.size())) {
- log_error("%s: Passed a bad devselect value", __FUNCTION__);
+ log_error(_("%s: Passed a bad devselect value"), __FUNCTION__);
exit (EXIT_FAILURE);
}
GnashAudioPrivate *audio = new GnashAudioPrivate;
@@ -276,7 +276,7 @@ AudioInputGst::transferToPrivate(int devselect) {
audio->setDeviceName(_audioVect[devselect]->getProductName());
_globalAudio = audio;
} else {
- log_error("%s: was passed a NULL pointer", __FUNCTION__);
+ log_error(_("%s: was passed a NULL pointer"), __FUNCTION__);
}
return audio;
}
@@ -321,9 +321,9 @@ AudioInputGst::audioChangeSourceBin(GnashAudioPrivate
*audio)
audio->_audioSourceBin = gst_parse_bin_from_description(command, TRUE,
&error);
if (audio->_audioSourceBin == NULL) {
- log_error ("%s: Creation of the audioSourceBin failed",
+ log_error(_("%s: Creation of the audioSourceBin failed"),
__FUNCTION__);
- log_error ("the error was %s\n", error->message);
+ log_error(_("the error was %s"), error->message);
return false;
}
g_free(command);
@@ -334,7 +334,7 @@ AudioInputGst::audioChangeSourceBin(GnashAudioPrivate
*audio)
result = gst_bin_add(GST_BIN(audio->_audioMainBin),
audio->_audioSourceBin);
if (!result) {
- log_error("%s: couldn't drop the sourcebin back into the main bin",
+ log_error(_("%s: couldn't drop the sourcebin back into the main bin"),
__FUNCTION__);
return false;
}
@@ -344,7 +344,7 @@ AudioInputGst::audioChangeSourceBin(GnashAudioPrivate
*audio)
result = gst_element_link(audio->_audioSourceBin, tee);
if (!result) {
- log_error("%s: couldn't link up sourcebin and tee", __FUNCTION__);
+ log_error(_("%s: couldn't link up sourcebin and tee"), __FUNCTION__);
return false;
}
_globalAudio = audio;
@@ -377,9 +377,9 @@ AudioInputGst::audioCreateSourceBin(GnashAudioPrivate
*audio)
audio->_audioSourceBin = gst_parse_bin_from_description(command, TRUE,
&error);
if (audio->_audioSourceBin == NULL) {
- log_error ("%s: Creation of the audioSourceBin failed",
+ log_error(_("%s: Creation of the audioSourceBin failed"),
__FUNCTION__);
- log_error ("the error was %s", error->message);
+ log_error(_("the error was %s"), error->message);
return false;
}
g_free(command);
@@ -403,37 +403,37 @@ AudioInputGst::audioCreateMainBin(GnashAudioPrivate
*audio)
ok = audioCreateSourceBin(audio);
if (ok != true) {
- log_error("%s: audioCreateSourceBin failed!", __FUNCTION__);
+ log_error(_("%s: audioCreateSourceBin failed!"), __FUNCTION__);
return false;
}
if ((tee = gst_element_factory_make ("tee", "tee")) == NULL) {
- log_error("%s: problem creating tee element", __FUNCTION__);
+ log_error(_("%s: problem creating tee element"), __FUNCTION__);
return false;
}
if ((saveQueue = gst_element_factory_make("queue", "saveQueue")) == NULL) {
- log_error("%s: problem creating save_queue element", __FUNCTION__);
+ log_error(_("%s: problem creating save_queue element"), __FUNCTION__);
return false;
}
if ((audioPlaybackQueue =
gst_element_factory_make("queue", "audioPlaybackQueue")) == NULL) {
- log_error("%s: problem creating audioPlaybackQueue element",
__FUNCTION__);
+ log_error(_("%s: problem creating audioPlaybackQueue element"),
__FUNCTION__);
return false;
}
gst_bin_add_many (GST_BIN (audio->_audioMainBin), audio->_audioSourceBin,
tee, saveQueue, audioPlaybackQueue, NULL);
ok = gst_element_link(audio->_audioSourceBin, tee);
if (ok != true) {
- log_error("%s: couldn't link audioSourceBin and tee", __FUNCTION__);
+ log_error(_("%s: couldn't link audioSourceBin and tee"), __FUNCTION__);
return false;
}
ok &= gst_element_link_many (tee, saveQueue, NULL);
if (ok != true) {
- log_error("%s: couldn't link tee and saveQueue", __FUNCTION__);
+ log_error(_("%s: couldn't link tee and saveQueue"), __FUNCTION__);
return false;
}
ok &= gst_element_link_many (tee, audioPlaybackQueue, NULL);
if (ok != true) {
- log_error("%s: couldn't link tee and audioPlaybackQueue",
__FUNCTION__);
+ log_error(_("%s: couldn't link tee and audioPlaybackQueue"),
__FUNCTION__);
return false;
}
@@ -442,7 +442,7 @@ AudioInputGst::audioCreateMainBin(GnashAudioPrivate *audio)
//add ghostpad to saveQueue (allows connections between bins)
pad = gst_element_get_pad (saveQueue, "src");
if (pad == NULL) {
- log_error("%s: couldn't get saveQueueSrcPad", __FUNCTION__);
+ log_error(_("%s: couldn't get saveQueueSrcPad"), __FUNCTION__);
return false;
}
gst_element_add_pad (audio->_audioMainBin,
@@ -452,7 +452,7 @@ AudioInputGst::audioCreateMainBin(GnashAudioPrivate *audio)
//add ghostpad to video_display_queue
pad = gst_element_get_pad (audioPlaybackQueue, "src");
if (pad == NULL) {
- log_error("%s: couldn't get audioPlaybackQueue", __FUNCTION__);
+ log_error(_("%s: couldn't get audioPlaybackQueue"), __FUNCTION__);
return false;
}
gst_element_add_pad (audio->_audioMainBin,
@@ -461,7 +461,7 @@ AudioInputGst::audioCreateMainBin(GnashAudioPrivate *audio)
if (!ok) {
- log_error("%s: Unable to create main pipeline", __FUNCTION__);
+ log_error(_("%s: Unable to create main pipeline"), __FUNCTION__);
return false;
} else {
return true;
@@ -478,7 +478,7 @@ AudioInputGst::audioCreatePlaybackBin(GnashAudioPrivate
*audio)
audio->_audioPlaybackBin = gst_bin_new("playbackBin");
if ((autosink = gst_element_factory_make ("autoaudiosink", "audiosink"))
== NULL) {
- log_error("%s: There was a problem making the audiosink!",
__FUNCTION__);
+ log_error(_("%s: There was a problem making the audiosink!"),
__FUNCTION__);
return false;
}
@@ -514,7 +514,7 @@
AudioInputGst::makeAudioSourcePlaybackLink(GnashAudioPrivate *audio)
if (padreturn == GST_PAD_LINK_OK) {
return true;
} else {
- log_error("something went wrong in the makeSourcePlaybackLink
function");
+ log_error(_("something went wrong in the makeSourcePlaybackLink
function"));
return false;
}
}
@@ -537,7 +537,7 @@
AudioInputGst::breakAudioSourcePlaybackLink(GnashAudioPrivate *audio)
ok = gst_pad_unlink(audioPlaybackQueueSrc, audioPlaybackBinSink);
if (ok != true) {
- log_error("%s: unlink failed", __FUNCTION__);
+ log_error(_("%s: unlink failed"), __FUNCTION__);
return false;
} else {
state = gst_element_set_state(audio->_audioPlaybackBin,
GST_STATE_NULL);
@@ -545,14 +545,15 @@
AudioInputGst::breakAudioSourcePlaybackLink(GnashAudioPrivate *audio)
//return true;
ok = gst_bin_remove(GST_BIN(audio->_pipeline),
audio->_audioPlaybackBin);
if (ok != true) {
- log_error("%s: couldn't remove audioPlaybackBin from pipeline",
+ log_error(_("%s: couldn't remove audioPlaybackBin from
pipeline"),
__FUNCTION__);
return false;
} else {
return true;
}
} else {
- log_error("%s: changing state of audioPlaybackBin failed",
__FUNCTION__);
+ log_error(_("%s: changing state of audioPlaybackBin failed"),
+ __FUNCTION__);
return false;
}
}
@@ -575,7 +576,7 @@ audio_bus_call (GstBus* /*bus*/, GstMessage *msg, gpointer
/*data*/)
gst_message_parse_error (msg, &error, &debug);
g_free (debug);
- log_error ("Error: %s\n", error->message);
+ log_error(_("Error: %s"), error->message);
g_error_free (error);
break;
}
@@ -595,19 +596,19 @@ AudioInputGst::audioCreateSaveBin(GnashAudioPrivate*
audio)
audio->_audioSaveBin = gst_bin_new ("audioSaveBin");
if ((audioConvert = gst_element_factory_make("audioconvert",
"audio_convert")) == NULL) {
- log_error("%s: Couldn't make audioconvert element", __FUNCTION__);
+ log_error(_("%s: Couldn't make audioconvert element"), __FUNCTION__);
return false;
}
if ((audioEnc = gst_element_factory_make("vorbisenc", "audio_enc")) ==
NULL){
- log_error("%s: Couldn't make vorbisenc element", __FUNCTION__);
+ log_error(_("%s: Couldn't make vorbisenc element"), __FUNCTION__);
return false;
}
if ((audio->_mux = gst_element_factory_make("oggmux", "mux")) == NULL) {
- log_error("%s: Couldn't make oggmux element", __FUNCTION__);
+ log_error(_("%s: Couldn't make oggmux element"), __FUNCTION__);
return false;
}
if ((filesink = gst_element_factory_make("filesink", "filesink")) == NULL)
{
- log_error("%s: Couldn't make filesink element", __FUNCTION__);
+ log_error(_("%s: Couldn't make filesink element"), __FUNCTION__);
return false;
} else {
g_object_set(filesink, "location", "audioOut.ogg", NULL);
@@ -626,7 +627,7 @@ AudioInputGst::audioCreateSaveBin(GnashAudioPrivate* audio)
filesink, NULL);
if (!ok) {
- log_error("%s: Something went wrong in linking", __FUNCTION__);
+ log_error(_("%s: Something went wrong in linking"), __FUNCTION__);
return false;
}
@@ -654,7 +655,7 @@ AudioInputGst::makeAudioSourceSaveLink (GnashAudioPrivate*
audio)
if (padreturn == GST_PAD_LINK_OK) {
return true;
} else {
- log_error("something went wrong in the makeAudioSourceSaveLink
function");
+ log_error(_("something went wrong in the makeAudioSourceSaveLink
function"));
return false;
}
}
@@ -676,20 +677,21 @@ AudioInputGst::breakAudioSourceSaveLink
(GnashAudioPrivate *audio)
ok = gst_pad_unlink(audioSaveQueueSrc, audioSaveBinSink);
if (ok != true) {
- log_error("%s: unlink failed", __FUNCTION__);
+ log_error(_("%s: unlink failed"), __FUNCTION__);
return false;
} else {
state = gst_element_set_state(audio->_audioSaveBin, GST_STATE_NULL);
if (state != GST_STATE_CHANGE_FAILURE) {
ok = gst_bin_remove(GST_BIN(audio->_pipeline),
audio->_audioSaveBin);
if (ok != true) {
- log_error("%s: couldn't remove saveBin from pipeline",
__FUNCTION__);
+ log_error(_("%s: couldn't remove saveBin from pipeline"),
+ __FUNCTION__);
return false;
} else {
return true;
}
} else {
- log_error("%s: audioSaveBin state change failed", __FUNCTION__);
+ log_error(_("%s: audioSaveBin state change failed"), __FUNCTION__);
return false;
}
}
@@ -750,8 +752,8 @@ AudioInputGst::makeAudioDevSelection()
if (audioDevice < 0 ||
static_cast<size_t>(audioDevice) >= _audioVect.size()) {
- log_error("You have an invalid microphone selected. Check "
- "your gnashrc file");
+ log_error(_("You have an invalid microphone selected. Check "
+ "your gnashrc file"));
exit(EXIT_FAILURE);
} else {
//set _name value for actionscript
diff --git a/libmedia/gst/VideoInputGst.cpp b/libmedia/gst/VideoInputGst.cpp
index 01b139e..c936e2d 100644
--- a/libmedia/gst/VideoInputGst.cpp
+++ b/libmedia/gst/VideoInputGst.cpp
@@ -314,7 +314,7 @@ VideoInputGst::VideoInputGst()
if (_devSelection < 10) {
_index = _devSelection;
} else {
- log_error("too high an index value, will cause segfault");
+ log_error(_("too high an index value, will cause segfault"));
}
setWebcam(_devSelection);
@@ -364,7 +364,7 @@ VideoInputGst::findVidDevs(std::vector<GnashWebcam*>&
cameraList)
element = gst_element_factory_make ("videotestsrc", "vidtestsrc");
if (element == NULL) {
- log_error("%s: Could not create video test source.", __FUNCTION__);
+ log_error(_("%s: Could not create video test source."), __FUNCTION__);
return;
} else {
cameraList.push_back(new GnashWebcam);
@@ -382,12 +382,12 @@ VideoInputGst::findVidDevs(std::vector<GnashWebcam*>&
cameraList)
element = gst_element_factory_make ("v4lsrc", "v4lvidsrc");
if ( ! element ) {
- log_error("%s: Could not create pulsesrc element", __FUNCTION__);
+ log_error(_("%s: Could not create pulsesrc element"), __FUNCTION__);
return;
}
probe = GST_PROPERTY_PROBE (element);
if ( ! probe ) {
- log_error("%s: Could not get property probe from pulsesrc element",
+ log_error(_("%s: Could not get property probe from pulsesrc element"),
__FUNCTION__);
return;
}
@@ -623,8 +623,8 @@ VideoInputGst::makeWebcamDeviceSelection()
if (webcamDevice < 0 ||
static_cast<size_t>(webcamDevice) >= _vidVect.size()) {
- log_error("You have an invalid camera selected. Please "
- "check your gnashrc file");
+ log_error(_("You have an invalid camera selected. Please "
+ "check your gnashrc file"));
exit(EXIT_FAILURE);
}
@@ -654,8 +654,8 @@ VideoInputGst::getSelectedCaps(gint dev_select)
if (dev_select < 0 ||
static_cast<size_t>(dev_select) >= _vidVect.size()) {
- log_error("%s: Passed an invalid argument (not a valid "
- "dev_select value)", __FUNCTION__);
+ log_error(_("%s: Passed an invalid argument (not a valid "
+ "dev_select value)"), __FUNCTION__);
exit(EXIT_FAILURE);
}
@@ -682,7 +682,7 @@ VideoInputGst::getSelectedCaps(gint dev_select)
if (GST_IS_OBJECT(bus)){
gst_object_unref (bus);
} else {
- log_error("%s: Pipeline bus isn't an object for some reason",
+ log_error(_("%s: Pipeline bus isn't an object for some reason"),
__FUNCTION__);
}
@@ -702,7 +702,7 @@ VideoInputGst::getSelectedCaps(gint dev_select)
if (GST_IS_OBJECT(pad)) {
gst_object_unref (pad);
} else {
- log_error("%s: Template pad isn't an object for some reason",
+ log_error(_("%s: Template pad isn't an object for some
reason"),
__FUNCTION__);
}
if (dev_select != 0) {
@@ -715,7 +715,7 @@ VideoInputGst::getSelectedCaps(gint dev_select)
if (GST_IS_OBJECT(pipeline)){
gst_object_unref (pipeline);
} else {
- log_error("%s: pipeline isn't an object for some reason",
+ log_error(_("%s: pipeline isn't an object for some reason"),
__FUNCTION__);
}
}
@@ -801,7 +801,7 @@ VideoInputGst::getSupportedFormats(GnashWebcam *cam,
GstCaps *caps)
}
}
else {
- log_error("%s: type %s, cannot be handled for resolution width",
+ log_error(_("%s: type %s, cannot be handled for resolution width"),
__FUNCTION__, G_VALUE_TYPE_NAME (const_cast<GValue *>(width)));
}
}
@@ -822,7 +822,7 @@ VideoInputGst::setWebcam(size_t dev_select)
_name = name;
_globalWebcam = webcam;
} else {
- log_error("%s: was passed a NULL pointer", __FUNCTION__);
+ log_error(_("%s: was passed a NULL pointer"), __FUNCTION__);
}
return webcam;
}
@@ -928,9 +928,9 @@ VideoInputGst::webcamCreateSourceBin()
webcam->_webcamSourceBin =
gst_parse_bin_from_description (command, TRUE, &error);
if (webcam->_webcamSourceBin == NULL) {
- log_error ("%s: Creation of the webcam_source_bin failed",
+ log_error(_("%s: Creation of the webcam_source_bin failed"),
__FUNCTION__);
- log_error ("the error was %s", error->message);
+ log_error(_("the error was %s"), error->message);
return false;
}
@@ -958,7 +958,7 @@
VideoInputGst::checkForSupportedFramerate(GnashWebcamPrivate *webcam,
{
if (!webcam) {
- log_error("%s: webam isn't set!", __FUNCTION__);
+ log_error(_("%s: webam isn't set!"), __FUNCTION__);
}
for (int i = 0; i < webcam->_currentFormat->numFramerates; ++i) {
int val = std::ceil(static_cast<double>(
@@ -1021,8 +1021,8 @@ VideoInputGst::webcamChangeSourceBin()
//if format didn't get set, something went wrong. try picking
//the first supported format and a different supported resolution
if (!format) {
- log_error("%s: the resolution you chose isn't supported, picking \
- a supported value", __FUNCTION__);
+ log_error(_("%s: the resolution you chose isn't supported, picking
\
+ a supported value"), __FUNCTION__);
format = &g_array_index (webcam->_webcamDevice->videoFormats,
WebcamVidFormat, 0);
@@ -1101,9 +1101,9 @@ VideoInputGst::webcamChangeSourceBin()
webcam->_webcamSourceBin =
gst_parse_bin_from_description (command, TRUE, &error);
if (webcam->_webcamSourceBin == NULL) {
- log_error ("%s: Creation of the webcam_source_bin failed",
+ log_error(_("%s: Creation of the webcam_source_bin failed"),
__FUNCTION__);
- log_error ("the error was %s", error->message);
+ log_error(_("the error was %s"), error->message);
return false;
}
@@ -1125,7 +1125,7 @@ VideoInputGst::webcamChangeSourceBin()
result = gst_bin_add(GST_BIN(webcam->_webcamMainBin),
webcam->_webcamSourceBin);
if (result != true) {
- log_error("%s: couldn't drop the sourcebin back into the main
bin",
+ log_error(_("%s: couldn't drop the sourcebin back into the
main bin"),
__FUNCTION__);
return false;
} else {
@@ -1134,7 +1134,7 @@ VideoInputGst::webcamChangeSourceBin()
"tee");
result = gst_element_link(webcam->_webcamSourceBin, tee);
if (result != true) {
- log_error("%s: couldn't link up sourcebin and tee",
__FUNCTION__);
+ log_error(_("%s: couldn't link up sourcebin and tee"),
__FUNCTION__);
return false;
} else {
return true;
@@ -1166,23 +1166,24 @@ VideoInputGst::webcamCreateMainBin()
ok = webcamCreateSourceBin();
if (ok != true) {
- log_error("%s: problem creating source bin", __FUNCTION__);
+ log_error(_("%s: problem creating source bin"), __FUNCTION__);
return false;
}
assert(webcam->_webcamSourceBin);
if ((tee = gst_element_factory_make ("tee", "tee")) == NULL) {
- log_error("%s: problem creating tee element", __FUNCTION__);
+ log_error(_("%s: problem creating tee element"), __FUNCTION__);
return false;
}
if ((save_queue = gst_element_factory_make("queue", "save_queue")) ==
NULL) {
- log_error("%s: problem creating save_queue element", __FUNCTION__);
+ log_error(_("%s: problem creating save_queue element"), __FUNCTION__);
return false;
}
if ((video_display_queue =
gst_element_factory_make("queue", "video_display_queue")) == NULL) {
- log_error("%s: problem creating video_display_queue element",
__FUNCTION__);
+ log_error(_("%s: problem creating video_display_queue element"),
+ __FUNCTION__);
return false;
}
@@ -1192,19 +1193,20 @@ VideoInputGst::webcamCreateMainBin()
ok = gst_element_link(webcam->_webcamSourceBin, tee);
if (ok != true) {
- log_error("%s: couldn't link webcam_source_bin and tee", __FUNCTION__);
+ log_error(_("%s: couldn't link webcam_source_bin and tee"),
+ __FUNCTION__);
return false;
}
ok &= gst_element_link_many (tee, save_queue, NULL);
if (ok != true) {
- log_error("%s: couldn't link tee and save_queue", __FUNCTION__);
+ log_error(_("%s: couldn't link tee and save_queue"), __FUNCTION__);
return false;
}
ok &= gst_element_link_many (tee, video_display_queue, NULL);
if (ok != true) {
- log_error("%s: couldn't link tee and video_display_queue",
__FUNCTION__);
+ log_error(_("%s: couldn't link tee and video_display_queue"),
__FUNCTION__);
return false;
}
@@ -1213,7 +1215,7 @@ VideoInputGst::webcamCreateMainBin()
//add ghostpad to save_queue (allows connections between bins)
pad = gst_element_get_pad (save_queue, "src");
if (pad == NULL) {
- log_error("%s: couldn't get save_queue_src_pad", __FUNCTION__);
+ log_error(_("%s: couldn't get save_queue_src_pad"), __FUNCTION__);
return false;
}
gst_element_add_pad (webcam->_webcamMainBin,
@@ -1223,7 +1225,7 @@ VideoInputGst::webcamCreateMainBin()
//add ghostpad to video_display_queue
pad = gst_element_get_pad (video_display_queue, "src");
if (pad == NULL) {
- log_error("%s: couldn't get video_display_queue_pad", __FUNCTION__);
+ log_error(_("%s: couldn't get video_display_queue_pad"), __FUNCTION__);
return false;
}
gst_element_add_pad (webcam->_webcamMainBin,
@@ -1235,7 +1237,7 @@ VideoInputGst::webcamCreateMainBin()
assert(_devSelection == 0 || webcam->_currentFormat);
if (!ok) {
- log_error("%s: Unable to create main pipeline", __FUNCTION__);
+ log_error(_("%s: Unable to create main pipeline"), __FUNCTION__);
return false;
}
return true;
@@ -1253,13 +1255,13 @@ VideoInputGst::webcamCreateDisplayBin()
webcam->_videoDisplayBin = gst_bin_new("video_display_bin");
if (webcam->_videoDisplayBin == NULL) {
- log_error("%s: something went wrong creating the new
video_display_bin",
+ log_error(_("%s: something went wrong creating the new
video_display_bin"),
__FUNCTION__);
return false;
}
if ((video_scale = gst_element_factory_make("videoscale", "video_scale"))
== NULL) {
- log_error("%s: problem creating video_scale element", __FUNCTION__);
+ log_error(_("%s: problem creating video_scale element"), __FUNCTION__);
return false;
}
else {
@@ -1268,7 +1270,7 @@ VideoInputGst::webcamCreateDisplayBin()
}
if ((video_sink = gst_element_factory_make("autovideosink", "video_sink"))
== NULL) {
- log_error("%s: problem creating the video_sink element", __FUNCTION__);
+ log_error(_("%s: problem creating the video_sink element"),
__FUNCTION__);
return false;
}
@@ -1277,7 +1279,7 @@ VideoInputGst::webcamCreateDisplayBin()
ok = gst_element_link_many(video_scale, video_sink, NULL);
if (ok != true) {
- log_error("%s: something went wrong in linking elements in
video_display_bin",
+ log_error(_("%s: something went wrong in linking elements in
video_display_bin"),
__FUNCTION__);
return false;
}
@@ -1319,7 +1321,7 @@ VideoInputGst::webcamMakeVideoDisplayLink()
if (padreturn == GST_PAD_LINK_OK) {
return true;
} else {
- log_error("something went wrong in the make_video_display_link
function");
+ log_error(_("something went wrong in the make_video_display_link
function"));
return false;
}
}
@@ -1351,7 +1353,7 @@ VideoInputGst::webcamBreakVideoDisplayLink()
ok = gst_pad_unlink(videoDisplayQueueSrc, videoDisplayBinSink);
if (ok != true) {
- log_error("%s: the unlinking of the pads failed", __FUNCTION__);
+ log_error(_("%s: the unlinking of the pads failed"), __FUNCTION__);
return false;
} else {
return true;
@@ -1381,7 +1383,7 @@ VideoInputGst::webcamMakeVideoSaveLink()
if (padreturn == GST_PAD_LINK_OK) {
return true;
} else {
- log_error("%s: something went wrong in the make_video_display_link
function",
+ log_error(_("%s: something went wrong in the make_video_display_link
function"),
__FUNCTION__);
return false;
}
@@ -1411,20 +1413,21 @@ VideoInputGst::webcamBreakVideoSaveLink()
ok = gst_pad_unlink(videoSaveQueueSrc, videoSaveSink);
if (ok != true) {
- log_error("%s: unlink failed", __FUNCTION__);
+ log_error(_("%s: unlink failed"), __FUNCTION__);
return false;
} else {
state = gst_element_set_state(webcam->_videoSaveBin, GST_STATE_NULL);
if (state != GST_STATE_CHANGE_FAILURE) {
ok = gst_bin_remove(GST_BIN(webcam->_pipeline),
webcam->_videoSaveBin);
if (ok != true) {
- log_error("%s: couldn't remove saveBin from pipeline",
__FUNCTION__);
+ log_error(_("%s: couldn't remove saveBin from pipeline"),
+ __FUNCTION__);
return false;
} else {
return true;
}
} else {
- log_error("%s: videoSaveBin state change failed", __FUNCTION__);
+ log_error(_("%s: videoSaveBin state change failed"), __FUNCTION__);
return false;
}
}
@@ -1447,34 +1450,34 @@ VideoInputGst::webcamCreateSaveBin()
if ((video_save_csp =
gst_element_factory_make("ffmpegcolorspace", "video_save_csp"))
== NULL) {
- log_error("%s: problem with creating video_save_csp element",
+ log_error(_("%s: problem with creating video_save_csp element"),
__FUNCTION__);
return false;
}
if ((video_enc = gst_element_factory_make("theoraenc", "video_enc")) ==
NULL) {
- log_error("%s: problem with creating video_enc element", __FUNCTION__);
+ log_error(_("%s: problem with creating video_enc element"),
__FUNCTION__);
return false;
} else {
g_object_set (video_enc, "keyframe-force", 1, NULL);
}
if ((video_save_rate = gst_element_factory_make("videorate",
"video_save_rate")) == NULL) {
- log_error("%s: problem with creating video_save_rate element",
__FUNCTION__);
+ log_error(_("%s: problem with creating video_save_rate element"),
__FUNCTION__);
return false;
}
if ((video_save_scale = gst_element_factory_make("videoscale",
"video_save_scale")) == NULL) {
- log_error("%s: problem with creating video_save_scale element",
__FUNCTION__);
+ log_error(_("%s: problem with creating video_save_scale element"),
__FUNCTION__);
return false;
} else {
//Use bilinear scaling
g_object_set (video_save_scale, "method", 1, NULL);
}
if ((mux = gst_element_factory_make("oggmux", "mux")) == NULL) {
- log_error("%s: problem with creating mux element", __FUNCTION__);
+ log_error(_("%s: problem with creating mux element"), __FUNCTION__);
return false;
}
if ((webcam->_videoFileSink = gst_element_factory_make("filesink",
"video_file_sink")) == NULL) {
- log_error("%s: problem with creating video_file_sink element",
__FUNCTION__);
+ log_error(_("%s: problem with creating video_file_sink element"),
__FUNCTION__);
return false;
} else {
g_object_set(webcam->_videoFileSink, "location", "vidoutput.ogg",
NULL);
@@ -1494,7 +1497,7 @@ VideoInputGst::webcamCreateSaveBin()
video_save_scale, video_enc, mux, webcam->_videoFileSink, NULL);
if (ok != true) {
- log_error("%s: there was some problem in linking!", __FUNCTION__);
+ log_error(_("%s: there was some problem in linking!"), __FUNCTION__);
}
return true;
}
@@ -1516,7 +1519,7 @@ bus_call (GstBus * /*bus*/, GstMessage *msg, gpointer
/*data*/)
gst_message_parse_error (msg, &error, &debug);
g_free (debug);
- log_error ("Error: %s", error->message);
+ log_error("%s", error->message);
g_error_free (error);
break;
diff --git a/libsound/aos4/sound_handler_ahi.cpp
b/libsound/aos4/sound_handler_ahi.cpp
index 4c7a22a..c55b62e 100644
--- a/libsound/aos4/sound_handler_ahi.cpp
+++ b/libsound/aos4/sound_handler_ahi.cpp
@@ -122,7 +122,7 @@ AOS4_sound_handler::openAudio()
{
if ( _audioOpened ) return; // nothing to do
- log_debug(_("AOS4: Spawn Audio Process.."));
+ log_debug(_("AOS4: Spawn Audio Process."));
_DMreplyport = (struct MsgPort*) IExec->AllocSysObjectTags(ASOT_PORT,
TAG_DONE);
_dmsg = (struct DeathMessage*)
IExec->AllocSysObjectTags(ASOT_MESSAGE,
@@ -159,7 +159,7 @@ AOS4_sound_handler::openAudio()
audioTaskID = (int)AudioPump;
_audioOpened = true;
- log_debug(_("AOS4: Audio Process spawned.."));
+ log_debug(_("AOS4: Audio Process spawned."));
}
else
{
diff --git a/libsound/sound_handler.cpp b/libsound/sound_handler.cpp
index 1b97539..4e6ea25 100644
--- a/libsound/sound_handler.cpp
+++ b/libsound/sound_handler.cpp
@@ -67,8 +67,8 @@ ensurePadding(SimpleBuffer& data, media::MediaHandler* m)
{
const size_t padding = m ? m->getInputPaddingSize() : 0;
if (data.capacity() - data.size() < padding) {
- log_error("Sound data creator didn't appropriately pad "
- "buffer. We'll do so now, but will cost memory copies.");
+ log_error(_("Sound data creator didn't appropriately pad "
+ "buffer. We'll do so now, but will cost memory copies."));
data.reserve(data.size() + padding);
}
}
@@ -80,15 +80,15 @@ sound_handler::addSoundBlock(std::auto_ptr<SimpleBuffer>
data,
size_t sampleCount, int seekSamples, int handle)
{
if (!validHandle(_streamingSounds, handle)) {
- log_error("Invalid (%d) handle passed to fill_stream_data, "
- "doing nothing", handle);
+ log_error(_("Invalid (%d) handle passed to fill_stream_data, "
+ "doing nothing"), handle);
return -1;
}
StreamingSoundData* sounddata = _streamingSounds[handle];
if (!sounddata) {
- log_error("handle passed to fill_stream_data (%d) "
- "was deleted", handle);
+ log_error(_("handle passed to fill_stream_data (%d) "
+ "was deleted"), handle);
return -1;
}
@@ -138,19 +138,19 @@ sound_handler::delete_sound(int handle)
{
// Check if the sound exists
if (!validHandle(_sounds, handle)) {
- log_error("Invalid (%d) handle passed to delete_sound, "
- "doing nothing", handle);
+ log_error(_("Invalid (%d) handle passed to delete_sound, "
+ "doing nothing"), handle);
return;
}
#ifdef GNASH_DEBUG_SOUNDS_MANAGEMENT
- log_debug ("deleting sound :%d", handle);
+ log_debug("deleting sound :%d", handle);
#endif
EmbedSound* def = _sounds[handle];
if (!def) {
- log_error("handle passed to delete_sound (%d) "
- "already deleted", handle);
+ log_error(_("handle passed to delete_sound (%d) "
+ "already deleted"), handle);
return;
}
@@ -233,7 +233,7 @@ sound_handler::stopEventSound(int handle)
EmbedSound* sounddata = _sounds[handle];
if (!sounddata) {
- log_error("stop_sound(%d): sound was deleted", handle);
+ log_error(_("stop_sound(%d): sound was deleted"), handle);
return;
}
@@ -321,8 +321,8 @@ sound_handler::unplugInputStream(InputStream* id)
// WARNING: erasing would break any iteration in the set
InputStreams::iterator it2=_inputStreams.find(id);
if (it2 == _inputStreams.end()) {
- log_error("SDL_sound_handler::unplugInputStream: "
- "Aux streamer %p not found. ",
+ log_error(_("SDL_sound_handler::unplugInputStream: "
+ "Aux streamer %p not found. "),
id);
return; // we won't delete it, as it's likely deleted already
}
@@ -451,7 +451,7 @@ sound_handler::playStream(int soundId, StreamBlockId
blockId)
plugInputStream(is);
}
catch (const MediaException& e) {
- log_error("Could not start streaming sound: %s", e.what());
+ log_error(_("Could not start streaming sound: %s"), e.what());
}
}
@@ -462,8 +462,8 @@ sound_handler::startSound(int handle, int loops, const
SoundEnvelopes* env,
{
// Check if the sound exists
if (!validHandle(_sounds, handle)) {
- log_error("Invalid (%d) sound_handle passed to startSound, "
- "doing nothing", handle);
+ log_error(_("Invalid (%d) sound_handle passed to startSound, "
+ "doing nothing"), handle);
return;
}
@@ -542,7 +542,7 @@ sound_handler::startSound(int handle, int loops, const
SoundEnvelopes* env,
plugInputStream(sound);
}
catch (const MediaException& e) {
- log_error("Could not start event sound: %s", e.what());
+ log_error(_("Could not start event sound: %s"), e.what());
}
}
@@ -556,8 +556,8 @@ sound_handler::plugInputStream(std::auto_ptr<InputStream>
newStreamer)
if (!_inputStreams.insert(newStreamer.release()).second) {
// this should never happen !
- log_error("_inputStreams container still has a pointer "
- "to deleted InputStream %p!", newStreamer.get());
+ log_error(_("_inputStreams container still has a pointer "
+ "to deleted InputStream %p!"), newStreamer.get());
// FIXME: replace the old element with the new one !
abort();
}
@@ -701,7 +701,7 @@ sound_handler::unplugCompletedInputStreams()
++it2; // before we erase it
InputStreams::size_type erased = _inputStreams.erase(is);
if ( erased != 1 ) {
- log_error("Expected 1 InputStream element, found %d", erased);
+ log_error(_("Expected 1 InputStream element, found %d"),
erased);
abort();
}
it = it2;
-----------------------------------------------------------------------
Summary of changes:
gui/Player.cpp | 2 +-
gui/pythonmod/gnash-view.cpp | 2 +-
libcore/FreetypeGlyphsProvider.cpp | 2 +-
libcore/MovieLoader.cpp | 2 +-
libcore/asobj/Camera_as.cpp | 2 +-
libcore/asobj/Global_as.cpp | 4 +-
libcore/asobj/LoadableObject.cpp | 4 +-
libcore/asobj/LocalConnection_as.cpp | 20 +-
libcore/asobj/MovieClipLoader.cpp | 2 +-
libcore/asobj/MovieClip_as.cpp | 24 +-
libcore/asobj/NetConnection_as.cpp | 50 +-
libcore/asobj/NetStream_as.cpp | 8 +-
libcore/asobj/PlayHead.cpp | 6 +-
libcore/asobj/SharedObject_as.cpp | 30 +-
libcore/asobj/Sound_as.cpp | 40 +-
libcore/asobj/String_as.cpp | 4 +-
libcore/asobj/TextField_as.cpp | 4 +-
libcore/asobj/TextFormat_as.cpp | 2 +-
libcore/asobj/XMLNode_as.cpp | 4 +-
libcore/asobj/XMLSocket_as.cpp | 6 +-
libcore/asobj/XML_as.cpp | 2 +-
libcore/asobj/flash/display/BitmapData_as.cpp | 6 +-
libcore/asobj/flash/display/display_pkg.cpp | 2 +-
.../asobj/flash/external/ExternalInterface_as.cpp | 10 +-
libcore/asobj/flash/external/external_pkg.cpp | 2 +-
libcore/asobj/flash/filters/BitmapFilter_as.cpp | 2 +-
libcore/asobj/flash/filters/filters_pkg.cpp | 2 +-
libcore/asobj/flash/geom/ColorTransform_as.cpp | 2 +-
libcore/asobj/flash/geom/Matrix_as.cpp | 20 +-
libcore/asobj/flash/geom/Point_as.cpp | 2 +-
libcore/asobj/flash/geom/Rectangle_as.cpp | 2 +-
libcore/asobj/flash/geom/Transform_as.cpp | 2 +-
libcore/asobj/flash/geom/geom_pkg.cpp | 2 +-
libcore/asobj/flash/net/net_pkg.cpp | 2 +-
libcore/asobj/flash/text/text_pkg.cpp | 2 +-
libcore/vm/ASHandlers.cpp | 4 +-
libmedia/FLVParser.cpp | 19 +-
libmedia/MediaParser.cpp | 2 +-
libmedia/ffmpeg/AudioDecoderFfmpeg.cpp | 6 +-
libmedia/ffmpeg/MediaParserFfmpeg.cpp | 8 +-
libmedia/ffmpeg/VideoDecoderFfmpeg.cpp | 4 +-
libmedia/gst/AudioInputGst.cpp | 88 +-
libmedia/gst/VideoInputGst.cpp | 103 ++-
libsound/aos4/sound_handler_ahi.cpp | 4 +-
libsound/sound_handler.cpp | 42 +-
po/gnash.pot | 989 ++++++++++----------
46 files changed, 781 insertions(+), 766 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-1373-g5244e4e,
Rob Savoye <=