[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-1360-gc4aa168 |
|
Date: |
Fri, 30 Dec 2011 01:59:19 +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 c4aa168cd114979f454c42f57dc4c09dac23bfdd (commit)
via 95f980ff4acad1b431a0ada27c2f860d8b4d4859 (commit)
via d5dcf1459df918fcb40854d6175e79fbee6c9270 (commit)
from a20374773c5f8e3009a128dc0c014675f3f32aae (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=c4aa168cd114979f454c42f57dc4c09dac23bfdd
commit c4aa168cd114979f454c42f57dc4c09dac23bfdd
Author: Rob Savoye <address@hidden>
Date: Thu Dec 29 18:59:15 2011 -0700
updated with new strings
diff --git a/po/gnash.pot b/po/gnash.pot
index 63c4cd6..faca603 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-29 17:10-0700\n"
+"POT-Creation-Date: 2011-12-29 18:59-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"
@@ -3497,6 +3497,29 @@ 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"
+msgstr ""
+
#: libcore/asobj/flash/external/ExternalInterface_as.cpp:343
#, c-format
msgid ""
@@ -3504,87 +3527,368 @@ msgid ""
"object."
msgstr ""
-#: libcore/asobj/flash/net/FileReferenceList_as.cpp:93
-#: libcore/asobj/flash/net/FileReference_as.cpp:161
+#: 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"
+msgstr ""
+
+#: libcore/asobj/flash/net/FileReferenceList_as.cpp:92
+#: libcore/asobj/flash/net/FileReference_as.cpp:160
#: libcore/asobj/flash/geom/Transform_as.cpp:357
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"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Rectangle_as.cpp:153
+#, c-format
+msgid "flash.geom.Rectangle(%s): %s"
+msgstr ""
+
#: libcore/asobj/flash/geom/Rectangle_as.cpp:154
-#: libcore/asobj/flash/geom/Point_as.cpp:421
-#: libcore/asobj/flash/geom/Point_as.cpp:501
-#: libcore/asobj/flash/geom/Point_as.cpp:582
-#: libcore/asobj/flash/geom/Point_as.cpp:590
+#: libcore/asobj/flash/geom/Point_as.cpp:427
+#: libcore/asobj/flash/geom/Point_as.cpp:511
+#: libcore/asobj/flash/geom/Point_as.cpp:596
+#: libcore/asobj/flash/geom/Point_as.cpp:604
#: libcore/asobj/MovieClip_as.cpp:532
msgid "missing arguments"
msgstr ""
+#: libcore/asobj/flash/geom/Rectangle_as.cpp:471
+#: libcore/asobj/flash/geom/Rectangle_as.cpp:545
+#: libcore/asobj/flash/geom/Rectangle_as.cpp:603
+#: libcore/asobj/flash/geom/Matrix_as.cpp:421
+#: libcore/asobj/flash/geom/Matrix_as.cpp:747
+msgid "Failed to construct flash.geom.Point!"
+msgstr ""
+
#: libcore/asobj/flash/geom/Rectangle_as.cpp:483
#: libcore/asobj/flash/geom/Rectangle_as.cpp:557
#: libcore/asobj/flash/geom/Rectangle_as.cpp:616
-#: libcore/asobj/flash/geom/Point_as.cpp:406
+#: libcore/asobj/flash/geom/Point_as.cpp:411
#, c-format
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:188
-#: libcore/asobj/flash/geom/Point_as.cpp:236
-#: libcore/asobj/flash/geom/Point_as.cpp:320
+#: libcore/asobj/flash/geom/Point_as.cpp:190
+#: libcore/asobj/flash/geom/Point_as.cpp:238
+#: libcore/asobj/flash/geom/Point_as.cpp:323
#, c-format
msgid "%s: missing arguments"
msgstr ""
#: libcore/asobj/flash/geom/Point_as.cpp:128
-#: libcore/asobj/flash/geom/Point_as.cpp:246
-#: libcore/asobj/flash/geom/Point_as.cpp:329
+#: libcore/asobj/flash/geom/Point_as.cpp:138
+#: libcore/asobj/flash/geom/Point_as.cpp:148
+#: libcore/asobj/flash/geom/Point_as.cpp:156
+#: libcore/asobj/flash/geom/Point_as.cpp:332
+#: libcore/asobj/flash/geom/Point_as.cpp:342
+#: libcore/asobj/flash/geom/Point_as.cpp:352
+#: libcore/asobj/flash/geom/Point_as.cpp:360
+#, c-format
+msgid "Point.add(%s): %s"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Point_as.cpp:129
+#: libcore/asobj/flash/geom/Point_as.cpp:249
+#: libcore/asobj/flash/geom/Point_as.cpp:333
msgid "arguments after first discarded"
msgstr ""
-#: libcore/asobj/flash/geom/Point_as.cpp:137
-#: libcore/asobj/flash/geom/Point_as.cpp:338
-#: libcore/asobj/flash/geom/Point_as.cpp:520
+#: libcore/asobj/flash/geom/Point_as.cpp:139
+#: libcore/asobj/flash/geom/Point_as.cpp:343
+#: libcore/asobj/flash/geom/Point_as.cpp:532
msgid "first argument doesn't cast to object"
msgstr ""
-#: libcore/asobj/flash/geom/Point_as.cpp:147
+#: libcore/asobj/flash/geom/Point_as.cpp:149
msgid "first argument cast to object doesn't contain an 'x' member"
msgstr ""
-#: libcore/asobj/flash/geom/Point_as.cpp:155
+#: libcore/asobj/flash/geom/Point_as.cpp:157
msgid "first argument cast to object doesn't contain an 'y' member"
msgstr ""
-#: libcore/asobj/flash/geom/Point_as.cpp:199
-#: libcore/asobj/flash/geom/Point_as.cpp:439
+#: libcore/asobj/flash/geom/Point_as.cpp:200
+#, c-format
+msgid "Point.equals(%s): %s"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Point_as.cpp:201
+#: libcore/asobj/flash/geom/Point_as.cpp:447
msgid "First arg must be an object"
msgstr ""
-#: libcore/asobj/flash/geom/Point_as.cpp:210
-#: libcore/asobj/flash/geom/Point_as.cpp:449
+#: libcore/asobj/flash/geom/Point_as.cpp:211
+#: libcore/asobj/flash/geom/Point_as.cpp:457
+#, c-format
+msgid "Point.equals(%s): %s %s"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Point_as.cpp:212
+#: libcore/asobj/flash/geom/Point_as.cpp:458
msgid "First arg must be an instance of"
msgstr ""
-#: libcore/asobj/flash/geom/Point_as.cpp:348
+#: libcore/asobj/flash/geom/Point_as.cpp:248
+#, c-format
+msgid "Point.normalize(%s): %s"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Point_as.cpp:353
msgid "first argument casted to object doesn't contain an 'x' member"
msgstr ""
-#: libcore/asobj/flash/geom/Point_as.cpp:356
+#: libcore/asobj/flash/geom/Point_as.cpp:361
msgid "first argument casted to object doesn't contain an 'y' member"
msgstr ""
-#: libcore/asobj/flash/geom/Point_as.cpp:430
+#: libcore/asobj/flash/geom/Point_as.cpp:426
+#: libcore/asobj/flash/geom/Point_as.cpp:436
+#: libcore/asobj/flash/geom/Point_as.cpp:446
+#, c-format
+msgid "Point.distance(%s): %s"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Point_as.cpp:437
msgid "arguments after first two discarded"
msgstr ""
#: libcore/asobj/flash/geom/Point_as.cpp:510
+#: libcore/asobj/flash/geom/Point_as.cpp:520
+#: libcore/asobj/flash/geom/Point_as.cpp:531
+#: libcore/asobj/flash/geom/Point_as.cpp:547
+#, c-format
+msgid "Point.interpolate(%s): %s"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Point_as.cpp:521
msgid "arguments after first three discarded"
msgstr ""
-#: libcore/asobj/flash/geom/Point_as.cpp:535
+#: libcore/asobj/flash/geom/Point_as.cpp:548
msgid "second argument doesn't cast to object"
msgstr ""
+#: libcore/asobj/flash/geom/Point_as.cpp:595
+#: libcore/asobj/flash/geom/Point_as.cpp:604
+#, c-format
+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 ""
+"ColorTransform(%s): not enough arguments (need 8). Constructing with default "
+"values"
+msgstr ""
+
+#: libcore/asobj/flash/geom/ColorTransform_as.cpp:380
+#, c-format
+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"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Matrix_as.cpp:198
+#, c-format
+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"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Matrix_as.cpp:314
+#, c-format
+msgid "Matrix.createGradientBox(%s): needs at least two arguments"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Matrix_as.cpp:388
+#, c-format
+msgid "Matrix.deltaTransformPoint(%s): needs one argument"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Matrix_as.cpp:402
+#, c-format
+msgid "Matrix.deltaTransformPoint(%s): needs an object"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Matrix_as.cpp:523
+#, c-format
+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"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Matrix_as.cpp:717
+#, c-format
+msgid "Matrix.transformPoint(%s): needs an object"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Matrix_as.cpp:729
+#, c-format
+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!"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Transform_as.cpp:145
+#, c-format
+msgid "Transform.colorTransform(%s): extra arguments discarded"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Transform_as.cpp:155
+#, c-format
+msgid "Transform.colorTransform(%s): argument is not an object"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Transform_as.cpp:170
+#, c-format
+msgid "Transform.colorTransform(%s): argument is not a ColorTransform"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Transform_as.cpp:236
+msgid "Failed to construct flash.geom.Matrix!"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Transform_as.cpp:305
+#, c-format
+msgid "Transform.matrix(%s): extra arguments discarded"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Transform_as.cpp:315
+#, c-format
+msgid "Transform.matrix(%s): argument is not an object"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Transform_as.cpp:346
+#, c-format
+msgid "flash.geom.Transform(%s): needs one argument"
+msgstr ""
+
+#: libcore/asobj/flash/geom/Transform_as.cpp:356
+#, c-format
+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 ""
@@ -3593,6 +3897,94 @@ msgstr ""
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"
+msgstr ""
+
+#: libcore/asobj/flash/display/BitmapData_as.cpp:842
+msgid ""
+"BitmapData.copyChannel(): no part of source rectangleoverlaps with the "
+"source BitmapData"
+msgstr ""
+
+#: libcore/asobj/flash/display/BitmapData_as.cpp:856
+msgid ""
+"BitmapData.copyChannel(): destination area is wholly outside the destination "
+"BitmapData"
+msgstr ""
+
+#: libcore/asobj/flash/display/BitmapData_as.cpp:914
+msgid "BitmapData.copyPixels(): arguments after the first three are discarded"
+msgstr ""
+
+#: libcore/asobj/flash/display/BitmapData_as.cpp:964
+msgid ""
+"BitmapData.copyPixels(): no part of source rectangleoverlaps with the source "
+"BitmapData"
+msgstr ""
+
+#: libcore/asobj/flash/display/BitmapData_as.cpp:978
+msgid ""
+"BitmapData.copyPixels(): destination area is wholly outside the destination "
+"BitmapData"
+msgstr ""
+
+#: libcore/asobj/flash/display/BitmapData_as.cpp:1064
+#, c-format
+msgid "BitmapData.draw(%s) requires at least one argument"
+msgstr ""
+
+#: libcore/asobj/flash/display/BitmapData_as.cpp:1076
+msgid "BitmapData.draw() with BitmapData argument"
+msgstr ""
+
+#: libcore/asobj/flash/display/BitmapData_as.cpp:1083
+#, c-format
+msgid "BitmapData.draw(%s): first argument must be a MovieClip"
+msgstr ""
+
+#: libcore/asobj/flash/display/BitmapData_as.cpp:1120
+#, c-format
+msgid "BitmapData.fillRect(%s): needs an object"
+msgstr ""
+
+#: libcore/asobj/flash/display/BitmapData_as.cpp:1157
+msgid "floodFill called on disposed BitmapData!"
+msgstr ""
+
+#: libcore/asobj/flash/display/BitmapData_as.cpp:1231
+msgid "getPixel32 called on disposed BitmapData!"
+msgstr ""
+
+#: libcore/asobj/flash/display/BitmapData_as.cpp:1361
+msgid "BitmapData.perlinNoise() stitch value"
+msgstr ""
+
+#: libcore/asobj/flash/display/BitmapData_as.cpp:1562
+msgid "Failed to construct flash.geom.Rectangle!"
+msgstr ""
+
+#: libcore/asobj/flash/display/BitmapData_as.cpp:1584
+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 "
+"BitmapData"
+msgstr ""
+
+#: libcore/asobj/flash/display/BitmapData_as.cpp:1663
+msgid ""
+"BitmapData width and height must be between 1 and 2880. Will not construct a "
+"BitmapData"
+msgstr ""
+
#: libcore/asobj/MovieClipLoader.cpp:105
#, c-format
msgid "MovieClipLoader.loadClip(%s): missing arguments"
@@ -8982,386 +9374,1691 @@ msgstr ""
msgid "FSCommand_callback(%p): %s %s"
msgstr ""
-#: cygnal/libamf/lcshm.cpp:659
+#: cygnal/libamf/flv.cpp:94
+msgid "Bad magic number for FLV file!"
+msgstr ""
+
+#: cygnal/libamf/flv.cpp:101
#, c-format
-msgid " ***** The size of the data is %s *****"
+msgid "Bad version in FLV header! %d"
msgstr ""
-#: cygnal/libamf/sol.cpp:230
+#: cygnal/libamf/flv.cpp:110
#, c-format
-msgid ""
-"%s: SOL file header is: \n"
-"%s"
+msgid "Bad FLV file Type: %d"
msgstr ""
-#: cygnal/libamf/amf.cpp:913
-msgid "AMF body input data is NULL"
+#: cygnal/libamf/flv.cpp:123
+#, c-format
+msgid "Bad header size in FLV header! %d"
msgstr ""
-#: cygnal/libamf/amf.cpp:937
-msgid "AMF data too short to contain type field"
+#: cygnal/libamf/flv.cpp:156
+#, c-format
+msgid "%d bytes for a string is over the safe limit of %d"
msgstr ""
-#: cygnal/libamf/amf.cpp:958
-msgid "AMF data segment too short to containtype NUMBER"
+#: cygnal/libamf/flv.cpp:186
+#, c-format
+msgid "Bad FLV Audio Sound Type: %x"
msgstr ""
-#: cygnal/handler.cpp:319
+#: cygnal/libamf/flv.cpp:195
#, c-format
-msgid "No %s symbol in plugin"
+msgid "Bad FLV Audio Sound size: %d"
msgstr ""
-#: cygnal/handler.cpp:335 cygnal/handler.cpp:350
+#: cygnal/libamf/flv.cpp:209
#, c-format
-msgid "Couldn't get %s symbol"
+msgid "Bad FLV Audio Sound Rate: %d"
msgstr ""
-#: cygnal/cvm.cpp:274
-msgid "Setting debugger ON"
+#: cygnal/libamf/flv.cpp:226
+#, c-format
+msgid "Bad FLV Audio Sound format: %d"
msgstr ""
-#: cygnal/cvm.cpp:276
-msgid "The debugger has been disabled at configuration time"
+#: cygnal/libamf/flv.cpp:257
+#, c-format
+msgid "Bad FLV Video Codec CodecID: 0x%x"
msgstr ""
-#: cygnal/http_server.cpp:487 cygnal/http_server.cpp:519
-msgid "Sent GET Reply"
+#: cygnal/libamf/flv.cpp:267
+#, c-format
+msgid "Bad FLV Video Frame CodecID: 0x%x"
msgstr ""
-#: cygnal/http_server.cpp:491
-msgid "Couldn't send GET Reply, no header data"
+#: cygnal/libamf/flv.cpp:340 cygnal/libamf/flv.cpp:342
+#: cygnal/libamf/flv.cpp:344
+#, c-format
+msgid "FLV MetaData: %s: %s"
msgstr ""
-#: cygnal/http_server.cpp:523
-msgid "Couldn't send POST Reply, no header data"
+#: cygnal/libamf/lcshm.cpp:372
+msgid "No data pointer to parse!"
msgstr ""
-#: cygnal/libnet/rtmp.cpp:184
-#, c-format
-msgid "AMF Header size bits (0x%X) out of range"
+#: cygnal/libamf/lcshm.cpp:391
+msgid "Didn't extract an element from the byte stream!"
msgstr ""
-#: cygnal/libnet/rtmp.cpp:308
+#: cygnal/libamf/lcshm.cpp:503
#, c-format
-msgid "The body size is: %d"
+msgid " The size of %s is %d "
msgstr ""
-#: cygnal/libnet/rtmp.cpp:339
+#: cygnal/libamf/lcshm.cpp:520
#, c-format
-msgid "The type is: %s"
+msgid "Failed to open shared memory segment: \"%s\""
msgstr ""
-#: cygnal/libnet/rtmp.cpp:341
+#: cygnal/libamf/lcshm.cpp:561
#, c-format
-msgid "The type is: 0x%x"
+msgid "Failed to open shared memory segment: 0x%x"
msgstr ""
-#: cygnal/libnet/rtmp.cpp:480 cygnal/rtmp_server.cpp:435
+#: cygnal/libamf/lcshm.cpp:660
#, c-format
-msgid "The Header size is: %d"
+msgid " ***** The size of the data is %s *****"
msgstr ""
-#: cygnal/libnet/rtmp.cpp:481 cygnal/rtmp_server.cpp:436
+#: cygnal/libamf/element.cpp:175
+msgid "Can't create remote function calls yet"
+msgstr ""
+
+#: cygnal/libamf/element.cpp:479
#, c-format
-msgid "The AMF index is: 0x%x"
+msgid "Size of Element \"%s\" is: %d"
msgstr ""
-#: cygnal/libnet/rtmp.cpp:508 cygnal/rtmp_server.cpp:489
-msgid "Reading AMF packets till we're done..."
+#: cygnal/libamf/element.cpp:1534
+msgid "FIXME: got AMF3 data!"
+msgstr ""
+
+#: cygnal/libamf/sol.cpp:230
+#, c-format
+msgid ""
+"%s: SOL file header is: \n"
+"%s"
+msgstr ""
+
+#: cygnal/libamf/sol.cpp:250
+#, c-format
+msgid "Failed opening file '%s' in binary mode"
+msgstr ""
+
+#: cygnal/libamf/sol.cpp:337
+#, c-format
+msgid "Error writing %d bytes of header to output file %s"
+msgstr ""
+
+#: cygnal/libamf/sol.cpp:344
+#, c-format
+msgid "Error writing %d bytes of body to output file %s"
+msgstr ""
+
+#: cygnal/libamf/sol.cpp:404
+#, c-format
+msgid "%s is an SOL file"
+msgstr ""
+
+#: cygnal/libamf/sol.cpp:407
+#, c-format
+msgid ""
+"%s looks like an SOL file, but the length is wrong. Should be %d, got %d"
+msgstr ""
+
+#: cygnal/libamf/sol.cpp:413
+#, c-format
+msgid "%s isn't an SOL file"
+msgstr ""
+
+#: cygnal/libamf/sol.cpp:455
+#, c-format
+msgid "Reading SharedObject %s: %s"
+msgstr ""
+
+#: cygnal/libamf/amf_msg.cpp:178
+msgid "AMF Message 'target' field missing!"
+msgstr ""
+
+#: cygnal/libamf/amf_msg.cpp:181
+msgid "AMF Message 'reply' field missing!"
+msgstr ""
+
+#: cygnal/libamf/amf_msg.cpp:184
+msgid "AMF Message 'size' field missing!"
+msgstr ""
+
+#: cygnal/libamf/amf_msg.cpp:231
+#, c-format
+msgid ""
+"Error parsing the AMF packet: \n"
+"\t%s"
+msgstr ""
+
+#: cygnal/libamf/amf.cpp:180
+#, c-format
+msgid "Encoded data size has %d properties"
+msgstr ""
+
+#: cygnal/libamf/amf.cpp:300
+msgid "XML AMF objects not supported yet"
+msgstr ""
+
+#: cygnal/libamf/amf.cpp:404
+msgid "Movie Clip AMF objects not supported yet"
+msgstr ""
+
+#: cygnal/libamf/amf.cpp:495
+msgid "Long String AMF objects not supported yet"
+msgstr ""
+
+#: cygnal/libamf/amf.cpp:512
+msgid "Reecord Set AMF objects not supported yet"
+msgstr ""
+
+#: cygnal/libamf/amf.cpp:561
+msgid "Encoding a strict array as an ecma array"
+msgstr ""
+
+#: cygnal/libamf/amf.cpp:784
+msgid "FIXME: got AMF3 data type"
+msgstr ""
+
+#: cygnal/libamf/amf.cpp:913
+msgid "AMF body input data is NULL"
+msgstr ""
+
+#: cygnal/libamf/amf.cpp:937
+msgid "AMF data too short to contain type field"
+msgstr ""
+
+#: cygnal/libamf/amf.cpp:948
+msgid "Element has no type!"
+msgstr ""
+
+#: cygnal/libamf/amf.cpp:958
+msgid "AMF data segment too short to containtype NUMBER"
+msgstr ""
+
+#: cygnal/libamf/amf.cpp:978
+#, c-format
+msgid "%d bytes for a string is over the safe limit of %d, line %d"
+msgstr ""
+
+#: cygnal/libamf/amf.cpp:1021
+msgid "AMF0 MovieClip frame"
+msgstr ""
+
+#: cygnal/libamf/amf.cpp:1151
+msgid "Found object terminator byte"
+msgstr ""
+
+#: cygnal/libamf/amf.cpp:1169
+#, c-format
+msgid "%s: type %d"
+msgstr ""
+
+#: cygnal/libamf/amf.cpp:1262
+#, c-format
+msgid "No data associated with Property \"%s\""
+msgstr ""
+
+#: cygnal/libamf/buffer.cpp:179
+#, c-format
+msgid "Buffer %x (%d) stayed in queue for %f seconds"
+msgstr ""
+
+#: cygnal/libamf/buffer.cpp:711
+#, c-format
+msgid "cygnal::Buffer::resize(%d): Truncating data (%d bytes) while resizing!"
+msgstr ""
+
+#: cygnal/libamf/buffer.cpp:766
+#, c-format
+msgid "Creating %d errors in the buffer"
+msgstr ""
+
+#: cygnal/handler.cpp:104
+#, c-format
+msgid "Adding %d to the client array."
+msgstr ""
+
+#: cygnal/handler.cpp:128
+#, c-format
+msgid "Protocol %d for Handler::AddClient()"
+msgstr ""
+
+#: cygnal/handler.cpp:168 cygnal/handler.cpp:193
+#, c-format
+msgid "HTTP key is: %s"
+msgstr ""
+
+#: cygnal/handler.cpp:171 cygnal/handler.cpp:196
+msgid "HTTP key couldn't be read!"
+msgstr ""
+
+#: cygnal/handler.cpp:214 cygnal/handler.cpp:244
+#, c-format
+msgid "FD #%d has no protocol handler registered"
+msgstr ""
+
+#: cygnal/handler.cpp:261
+#, c-format
+msgid "Removing %d from the client array."
+msgstr ""
+
+#: cygnal/handler.cpp:319
+#, c-format
+msgid "No %s symbol in plugin"
+msgstr ""
+
+#: cygnal/handler.cpp:322
+#, c-format
+msgid "Initialized Plugin: \"%s\": %s"
+msgstr ""
+
+#: cygnal/handler.cpp:335 cygnal/handler.cpp:350
+#, c-format
+msgid "Couldn't get %s symbol"
+msgstr ""
+
+#: cygnal/handler.cpp:462
+#, c-format
+msgid "FILENAME: %s"
+msgstr ""
+
+#: cygnal/cvm.cpp:274
+msgid "Setting debugger ON"
+msgstr ""
+
+#: cygnal/cvm.cpp:276
+msgid "The debugger has been disabled at configuration time"
+msgstr ""
+
+#: cygnal/cvm.cpp:430
+#, c-format
+msgid ""
+"Will sleep %ld microseconds between iterations - fps is %g, clockAdvance is "
+"%lu"
+msgstr ""
+
+#: cygnal/cvm.cpp:451 cygnal/cvm.cpp:542
+#, c-format
+msgid "iteration, timer: %lu, localDelay: %ld\n"
+msgstr ""
+
+#: cygnal/cvm.cpp:487
+#, c-format
+msgid "exiting after %d advances"
+msgstr ""
+
+#: cygnal/cvm.cpp:497
+#, c-format
+msgid "exiting after %d times last frame was reached"
+msgstr ""
+
+#: cygnal/cvm.cpp:531
+#, c-format
+msgid "%d loop backs; jumping one-after latest frame (%d)"
+msgstr ""
+
+#: cygnal/http_server.cpp:150
+#, c-format
+msgid "FIXME: found filestream %s in cache!"
+msgstr ""
+
+#: cygnal/http_server.cpp:154 cygnal/http_server.cpp:211
+#, c-format
+msgid "New filestream %s"
+msgstr ""
+
+#: cygnal/http_server.cpp:193 cygnal/http_server.cpp:287
+#: cygnal/libnet/http.cpp:422 cygnal/libnet/http.cpp:521
+#, c-format
+msgid "Que empty, net connection dropped for fd #%d"
+msgstr ""
+
+#: cygnal/http_server.cpp:213
+#, c-format
+msgid "Reusing filestream %s"
+msgstr ""
+
+#: cygnal/http_server.cpp:306
+msgid "couldn't read data!"
+msgstr ""
+
+#: cygnal/http_server.cpp:312 cygnal/libnet/http.cpp:542
+msgid "Got file data in POST"
+msgstr ""
+
+#: cygnal/http_server.cpp:319 cygnal/libnet/http.cpp:549
+msgid "Got AMF data in POST"
+msgstr ""
+
+#: cygnal/http_server.cpp:373 cygnal/libnet/http.cpp:592
+msgid "PUT request"
+msgstr ""
+
+#: cygnal/http_server.cpp:383 cygnal/libnet/http.cpp:601
+msgid "DELETE request"
+msgstr ""
+
+#: cygnal/http_server.cpp:393 cygnal/libnet/http.cpp:609
+msgid "CONNECT request"
+msgstr ""
+
+#: cygnal/http_server.cpp:403 cygnal/libnet/http.cpp:617
+msgid "OPTIONS request"
+msgstr ""
+
+#: cygnal/http_server.cpp:413 cygnal/libnet/http.cpp:625
+msgid "HEAD request"
+msgstr ""
+
+#: cygnal/http_server.cpp:423 cygnal/libnet/http.cpp:633
+msgid "TRACE request"
+msgstr ""
+
+#: cygnal/http_server.cpp:488 cygnal/http_server.cpp:520
+msgid "Sent GET Reply"
+msgstr ""
+
+#: cygnal/http_server.cpp:492
+msgid "Couldn't send GET Reply, no header data"
+msgstr ""
+
+#: cygnal/http_server.cpp:524
+msgid "Couldn't send POST Reply, no header data"
+msgstr ""
+
+#: cygnal/http_server.cpp:557 cygnal/http_server.cpp:578
+#, c-format
+msgid "Caught corrupted string! length was %d, null at %d"
+msgstr ""
+
+#: cygnal/http_server.cpp:874 cygnal/http_server.cpp:969
+#: cygnal/libnet/http.cpp:216 cygnal/libnet/http.cpp:1295
+#, c-format
+msgid "Parameters for file: \"%s\""
+msgstr ""
+
+#: cygnal/http_server.cpp:918
+#, c-format
+msgid "Setting Max Requests for Keep-Alive to %d"
+msgstr ""
+
+#: cygnal/http_server.cpp:929 cygnal/libnet/http.cpp:176
+#, c-format
+msgid "Setting Content Length to %d"
+msgstr ""
+
+#: cygnal/http_server.cpp:942 cygnal/libnet/http.cpp:189
+#, c-format
+msgid "Setting Content Type to %d"
+msgstr ""
+
+#: cygnal/http_server.cpp:952 cygnal/libnet/http.cpp:199
+#, c-format
+msgid "Got a request, parsing \"%s\""
+msgstr ""
+
+#: cygnal/http_server.cpp:978 cygnal/libnet/http.cpp:225
+msgid "Enabling Keep Alive by default for HTTP > 1.0"
+msgstr ""
+
+#: cygnal/http_server.cpp:1013
+#, c-format
+msgid "Processing HTTP data for fd #%d"
+msgstr ""
+
+#: cygnal/http_server.cpp:1022
+msgid "FIXME: Existing data in packet!"
+msgstr ""
+
+#: cygnal/http_server.cpp:1024
+msgid "FIXME: No existing data in packet!"
+msgstr ""
+
+#: cygnal/http_server.cpp:1027
+#, c-format
+msgid "Net HTTP server failed to read from fd #%d..."
+msgstr ""
+
+#: cygnal/http_server.cpp:1035
+#, c-format
+msgid "No active DiskStreams for fd #%d: %s..."
+msgstr ""
+
+#: cygnal/http_server.cpp:1039
+#, c-format
+msgid "Found active DiskStream! for fd #%d: %s"
+msgstr ""
+
+#: cygnal/http_server.cpp:1073
+msgid "Keep-Alive is off"
+msgstr ""
+
+#: cygnal/http_server.cpp:1075
+msgid "Keep-Alive is on"
+msgstr ""
+
+#: cygnal/http_server.cpp:1080
+#, c-format
+msgid "Processing time for GET request was %f seconds"
+msgstr ""
+
+#: cygnal/libnet/cache.cpp:62
+msgid "using this constructor is only allowed for testing purposes."
+msgstr ""
+
+#: cygnal/libnet/cache.cpp:105
+#, c-format
+msgid "Adding file %s to cache."
+msgstr ""
+
+#: cygnal/libnet/cache.cpp:148
+#, c-format
+msgid "Trying to find %s in the cache."
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:184
+#, c-format
+msgid "AMF Header size bits (0x%X) out of range"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:283
+#, c-format
+msgid "RTMP Header size can't be more then %d bytes!!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:288
+msgid "RTMP Header size can't be zero!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:308
+#, c-format
+msgid "The body size is: %d"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:315
+#, c-format
+msgid "Using previous body size of %d for channel %d"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:318
+#, c-format
+msgid "Previous body size for channel %d is zero!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:328
+#, c-format
+msgid "Suspicious large RTMP packet body size! %d"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:341
+#, c-format
+msgid "The type is: %s"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:343
+#, c-format
+msgid "The type is: 0x%x"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:348
+#, c-format
+msgid "Using previous type of %d for channel %d"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:360
+#, c-format
+msgid "RTMP %s: channel: %d, head size %d, body size: %d"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:482 cygnal/rtmp_server.cpp:435
+#, c-format
+msgid "The Header size is: %d"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:483 cygnal/rtmp_server.cpp:436
+#, c-format
+msgid "The AMF index is: 0x%x"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:499
+#, c-format
+msgid "END is %x"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:510 cygnal/rtmp_server.cpp:489
+msgid "Reading AMF packets till we're done..."
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:519 cygnal/rtmp_server.cpp:499
+#, c-format
+msgid "Total size in header is %d, buffer size is: %d"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:523 cygnal/rtmp_server.cpp:503
+msgid "FIXME: MERGING"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:539
+#, c-format
+msgid "SWF file %s"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:542
+#, c-format
+msgid "is Loading video %s"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:545
+#, c-format
+msgid "is file name is %s"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:674
+#, c-format
+msgid "Unknown User Control message %d!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:746
+msgid "Name field of RTMP Message corrupted!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:762
+msgid "Stream ID field of RTMP Message corrupted!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:991
+#, c-format
+msgid "Bogus size parameter in %s!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1028
+msgid "Couldn't write the full 12 byte RTMP header!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1031
+msgid "Wrote the full 12 byte RTMP header."
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1051
+msgid "Couldn't write the full 1 byte RTMP continuation header!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1054
+msgid "Wrote the full 1 byte RTMP continuation header"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1066
+msgid "Couldn't write the RTMP body!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1069
+#, c-format
+msgid "Wrote %d bytes of the RTMP body, %d bytes left."
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1086
+msgid "Couldn't write the RTMP packet!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1089
+msgid "Wrote the RTMP packet."
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1135 cygnal/libnet/rtmp.cpp:1137
+#, c-format
+msgid "Response header: %s"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1141
+#, c-format
+msgid "Processing message of type %s!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1147
+msgid "Got CHUNK_SIZE packet!!!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1149
+#, c-format
+msgid "Setting packet chunk size to %d."
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1159
+#, c-format
+msgid "FIXME: Ping type is: %d, ignored for now"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1181
+msgid "Got SERVER packet!!!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1189
+msgid "Got CLIENT packet!!!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1197
+msgid "Got VIDEO packets!!!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1213
+msgid "Got Shared Object packet!!!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1220
+#, c-format
+msgid "%s: Msg status is: %d: %s, name is %s, size is %d"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1224
+msgid "Got onBWDone packet!!!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1229
+#, c-format
+msgid "Couldn't decode message body for type %s!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1283
+#, c-format
+msgid "no data for fd #%d, done reading this packet, read %d bytes..."
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1289
+#, c-format
+msgid "Got an empty packet from the server at line %d"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1298 cygnal/libnet/http.cpp:1518
+#, c-format
+msgid "socket for fd #%d was closed..."
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1329
+msgid "Buffer pointer is invalid."
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1355
+msgid "Got a message on the system channel!"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1459
+#, c-format
+msgid "Packet size out of range! %d, %d"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1470
+#, c-format
+msgid "RTMP packet size is out of range! %d, %d"
+msgstr ""
+
+#: cygnal/libnet/rtmp.cpp:1475
+#, c-format
+msgid "RTMP header size is out of range! %d"
+msgstr ""
+
+#: cygnal/libnet/sshserver.cpp:145
+#, c-format
+msgid "User %s wants to auth with pass %s\n"
msgstr ""
#: cygnal/libnet/sshserver.cpp:200 cygnal/libnet/sshclient.cpp:459
msgid "==== The SSH header breaks down as follows: ===="
msgstr ""
-#: cygnal/libnet/network.cpp:114
-msgid "Could not find a usable WinSock DLL"
+#: cygnal/libnet/network.cpp:114
+msgid "Could not find a usable WinSock DLL"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:162
+#, c-format
+msgid "already connected to port %hd"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:184
+#, c-format
+msgid "unable to get protocol entry for %s"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:201 cygnal/libnet/network.cpp:424
+#: cygnal/libnet/network.cpp:582
+#, c-format
+msgid "unable to create socket: %s"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:208
+msgid "setsockopt SO_REUSEADDR failed"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:219
+#, c-format
+msgid "unable to bind to port %hd: %s"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:229
+#, c-format
+msgid "Server bound to service on %s, port %hd, using fd #%d"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:235
+#, c-format
+msgid "unable to listen on port: %hd: %s "
+msgstr ""
+
+#: cygnal/libnet/network.cpp:291
+#, c-format
+msgid "Waiting to accept net traffic on fd #%d for port %d"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:326
+msgid "Have a SIGINT interupt waiting!"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:330 cygnal/libnet/network.cpp:922
+#: cygnal/libnet/network.cpp:1103 cygnal/libnet/network.cpp:1301
+#: cygnal/libnet/network.cpp:1431
+msgid "Have a pending SIGINT interupt waiting!"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:335 cygnal/libnet/network.cpp:928
+#: cygnal/libnet/network.cpp:1436
+msgid "Have a pending SIGPIPE interupt waiting!"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:351
+msgid "There is a new network connection request."
+msgstr ""
+
+#: cygnal/libnet/network.cpp:358
+#, c-format
+msgid "The accept() socket for fd #%d was interrupted by a system call"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:362
+#, c-format
+msgid "The accept() socket for fd #%d never was available"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:368
+#, c-format
+msgid "The accept() socket for fd #%d timed out waitingfor data"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:381
+#, c-format
+msgid "unable to accept: %s"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:386
+#, c-format
+msgid "Accepting tcp/ip connection on fd #%d for port %d"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:445 cygnal/libnet/network.cpp:603
+#, c-format
+msgid "The connect() socket for fd %d was interrupted by a system call"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:451 cygnal/libnet/network.cpp:476
+#: cygnal/libnet/network.cpp:609 cygnal/libnet/network.cpp:649
+#, c-format
+msgid "The connect() socket for fd %d never was available for writing"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:462 cygnal/libnet/network.cpp:627
+#, c-format
+msgid "The connect() socket for fd %d timed out waiting to write"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:470
+#, c-format
+msgid "\tsocket name %s for fd %d"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:552
+#, c-format
+msgid "%s: to host %s at port %d"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:558
+#, c-format
+msgid "The hostname for this machine is %s"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:560
+msgid "Couldn't get the hostname for this machine"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:575
+#, c-format
+msgid "The IP address for this client socket is %s"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:642
+#, c-format
+msgid "\tport %d at IP %s for fd %d"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:729
+#, c-format
+msgid "Unable to close the socket for fd #%d: %s"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:737
+#, c-format
+msgid "Closed the socket on fd #%d"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:766
+#, c-format
+msgid "%s: Closed fd #%d"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:878
+#, c-format
+msgid "Trying to read %d bytes from fd #%d"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:942 cygnal/libnet/network.cpp:1116
+#, c-format
+msgid "The socket for fd #%d was interrupted by a system call"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:946
+#, c-format
+msgid "The socket for fd #%d was never available for reading"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:952
+#, c-format
+msgid "The socket for #fd %d timed out waiting to read"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:969
+#, c-format
+msgid "The socket for fd #%d was never available for reading data"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:975
+#, c-format
+msgid "The socket for #fd %d timed out waiting to read data"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:981
+#, c-format
+msgid "read %d bytes from fd #%d from port %d"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:985
+#, c-format
+msgid ""
+"%s: Read packet data from fd #%d (%d bytes): \n"
+"%s"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1120
+#, c-format
+msgid "The socket for fd #%d was never available for writing"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1124
+#, c-format
+msgid "The socket for fd #%d timed out waiting to write"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1138
+#, c-format
+msgid "Wrote zero out of %d bytes to fd #%d: %s"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1143
+#, c-format
+msgid "Couldn't write %d bytes to fd #%d: %s"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1151
+#, c-format
+msgid "wrote %d bytes to fd #%d, expected %d"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1156
+#, c-format
+msgid "wrote %d bytes to fd #%d for port %d"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1164
+#, c-format
+msgid ""
+"%s: Wrote packet data to fd #%d: \n"
+"%s"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1178
+#, c-format
+msgid "took %d usec to write (%d bytes)"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1193 cygnal/libnet/network.cpp:1204
+#, c-format
+msgid "%s: adding fd #%d to pollfds"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1230
+#, c-format
+msgid "%s: erasing fd #%d from pollfds"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1278
+#, c-format
+msgid "%s: waiting for %d fds"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1317
+#, c-format
+msgid "Poll returned: %d, timeout is: %d"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1448
+msgid "Waiting for data was interrupted by a system call"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1452
+msgid "Waiting for data for fdset, was never available for reading"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1466
+#, c-format
+msgid "select() got an error: %s."
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1470
+#, c-format
+msgid "select() saw activity on %d file descriptors."
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1546
+#, c-format
+msgid "Can't connect to server %s"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1558
+#, c-format
+msgid "Using default hostname: \"%s\""
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1563
+#, c-format
+msgid "Using default keyfile: \"%s\""
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1568
+#, c-format
+msgid "Using default CA List: \"%s\""
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1574
+#, c-format
+msgid "Using default Password: \"%s\""
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1579
+#, c-format
+msgid "Using default Root Path to PEM files: \"%s\""
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1584
+msgid "Connected to SSL server"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1586
+msgid "Couldn't connect to SSL server"
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1619
+#, c-format
+msgid "#%d bytes waiting in kernel network buffer."
+msgstr ""
+
+#: cygnal/libnet/network.cpp:1630
+#, c-format
+msgid "Got an %d interrupt while blocked on pselect()"
+msgstr ""
+
+#: cygnal/libnet/statistics.cpp:113
+#, c-format
+msgid "Stream type is: %s"
+msgstr ""
+
+#: cygnal/libnet/statistics.cpp:119
+#, c-format
+msgid "%d bytes were transfered in %s seconds"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:152
+#, c-format
+msgid "URL is %s"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:153
+#, c-format
+msgid "Protocol is %s"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:154
+#, c-format
+msgid "Host is %s"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:155
+#, c-format
+msgid "Port is %s"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:156
+#, c-format
+msgid "Path is %s"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:157
+#, c-format
+msgid "Filename is %s"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:158
+#, c-format
+msgid "App is %s"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:159
+#, c-format
+msgid "Query is %s"
msgstr ""
-#: cygnal/libnet/network.cpp:184
+#: cygnal/libnet/rtmp_client.cpp:160
#, c-format
-msgid "unable to get protocol entry for %s"
+msgid "tcUrl is %s"
msgstr ""
-#: cygnal/libnet/network.cpp:201 cygnal/libnet/network.cpp:424
-#: cygnal/libnet/network.cpp:582
+#: cygnal/libnet/rtmp_client.cpp:161
#, c-format
-msgid "unable to create socket: %s"
+msgid "swfUrl is %s"
msgstr ""
-#: cygnal/libnet/network.cpp:208
-msgid "setsockopt SO_REUSEADDR failed"
+#: cygnal/libnet/rtmp_client.cpp:162
+#, c-format
+msgid "pageUrl is %s"
msgstr ""
-#: cygnal/libnet/network.cpp:219
+#: cygnal/libnet/rtmp_client.cpp:313
+msgid "RTMP handshake request failed"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:336
+msgid "RTMP handshake completion failed!"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:350
+msgid "Sent NetConnection Connect message successfully"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:353
+msgid "Couldn't send NetConnection Connect message,"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:622
+msgid "Couldn't read data block in handshake!"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:635
#, c-format
-msgid "unable to bind to port %hd: %s"
+msgid "Read data block in handshake, got %d bytes."
msgstr ""
-#: cygnal/libnet/network.cpp:229
+#: cygnal/libnet/rtmp_client.cpp:638
#, c-format
-msgid "Server bound to service on %s, port %hd, using fd #%d"
+msgid "Couldn't read data block in handshake, read %d bytes!"
msgstr ""
-#: cygnal/libnet/network.cpp:235
+#: cygnal/libnet/rtmp_client.cpp:645
#, c-format
-msgid "unable to listen on port: %hd: %s "
+msgid "RTMP Handshake header: Uptime: %u"
msgstr ""
-#: cygnal/libnet/network.cpp:291
+#: cygnal/libnet/rtmp_client.cpp:688
#, c-format
-msgid "Waiting to accept net traffic on fd #%d for port %d"
+msgid "About to write %d bytes, data is: %d bytes."
msgstr ""
-#: cygnal/libnet/network.cpp:351
-msgid "There is a new network connection request."
+#: cygnal/libnet/rtmp_client.cpp:691
+#, c-format
+msgid "Client response header for handshake 2: %s"
msgstr ""
-#: cygnal/libnet/network.cpp:358
+#: cygnal/libnet/rtmp_client.cpp:693
#, c-format
-msgid "The accept() socket for fd #%d was interrupted by a system call"
+msgid "Data in response for handshake 2: %s"
msgstr ""
-#: cygnal/libnet/network.cpp:362
+#: cygnal/libnet/rtmp_client.cpp:702
+msgid "Couldn't write the second handshake packet!"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:729
+msgid "Got no response from the RTMP server"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:737
+msgid "Got empty packet in buffer."
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:748
+msgid "No response from INVOKE of NetConnection connect"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:755
#, c-format
-msgid "The accept() socket for fd #%d never was available"
+msgid ""
+"%s: There are %d channel queues in the RTMP input queue, %d messages in "
+"front queue"
msgstr ""
-#: cygnal/libnet/network.cpp:368
+#: cygnal/libnet/rtmp_client.cpp:768
+msgid "Couldn't decode RTMP message header"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:773
+msgid "RTMP packet can't be of none type!"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:777
+msgid "Server message data packet"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:781
+msgid "Abort packet"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:784
+msgid "Bytes Read data packet"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:789
#, c-format
-msgid "The accept() socket for fd #%d timed out waitingfor data"
+msgid "Got a Ping type %s"
msgstr ""
-#: cygnal/libnet/network.cpp:381
+#: cygnal/libnet/rtmp_client.cpp:793
+msgid "Set Window Size message data packet"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:796
+msgid "Set Bandwidthmessage data packet"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:799
+msgid "Route from other server packet"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:818
+msgid "AMF0 Shared Object data packet message"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:821
+msgid "AMF3 Notify data packet message"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:824
+msgid "AMF3 Shared Object data packet message"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:827
+msgid "AMF0 Invoke packet message"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:830
+msgid "AMF0 Notify data packet message"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:841
+msgid "Flv data packet message"
+msgstr ""
+
+#: cygnal/libnet/rtmp_client.cpp:844
+msgid "Couldn't decode RTMP message Body"
+msgstr ""
+
+#: cygnal/libnet/sslserver.cpp:136
+msgid "ssl!!"
+msgstr ""
+
+#: cygnal/libnet/sslserver.cpp:159
+msgid "Got an incoming SSL connection request"
+msgstr ""
+
+#: cygnal/libnet/sslserver.cpp:169 cygnal/libnet/sslclient.cpp:137
+#: cygnal/libnet/sslclient.cpp:161 cygnal/libnet/sslclient.cpp:212
+#: cygnal/libnet/sslclient.cpp:236 cygnal/libnet/sslclient.cpp:314
#, c-format
-msgid "unable to accept: %s"
+msgid "Error was: \"%s\"!"
msgstr ""
-#: cygnal/libnet/network.cpp:386
+#: cygnal/libnet/sslserver.cpp:182 cygnal/libnet/sslclient.cpp:386
+msgid "==== The SSL header breaks down as follows: ===="
+msgstr ""
+
+#: cygnal/libnet/cque.cpp:71
+msgid "CQue::wait(win32)"
+msgstr ""
+
+#: cygnal/libnet/cque.cpp:83
+msgid "CQue::notify(win32)"
+msgstr ""
+
+#: cygnal/libnet/sslclient.cpp:211
#, c-format
-msgid "Accepting tcp/ip connection on fd #%d for port %d"
+msgid "Can't read CA list from \"%s\"!"
msgstr ""
-#: cygnal/libnet/network.cpp:445 cygnal/libnet/network.cpp:603
+#: cygnal/libnet/sslclient.cpp:216
#, c-format
-msgid "The connect() socket for fd %d was interrupted by a system call"
+msgid "Read CA list from \"%s\""
msgstr ""
-#: cygnal/libnet/network.cpp:451 cygnal/libnet/network.cpp:476
-#: cygnal/libnet/network.cpp:609 cygnal/libnet/network.cpp:649
+#: cygnal/libnet/sslclient.cpp:222
#, c-format
-msgid "The connect() socket for fd %d never was available for writing"
+msgid "Can't read certificate file \"%s\"!"
msgstr ""
-#: cygnal/libnet/network.cpp:462 cygnal/libnet/network.cpp:627
+#: cygnal/libnet/sslclient.cpp:225
#, c-format
-msgid "The connect() socket for fd %d timed out waiting to write"
+msgid "Read certificate file \"%s\"."
msgstr ""
-#: cygnal/libnet/network.cpp:470
+#: cygnal/libnet/sslclient.cpp:235
#, c-format
-msgid "\tsocket name %s for fd %d"
+msgid "Can't read CERT file \"%s\"!"
msgstr ""
-#: cygnal/libnet/network.cpp:552
+#: cygnal/libnet/sslclient.cpp:240
#, c-format
-msgid "%s: to host %s at port %d"
+msgid "Read key file \"%s\"."
msgstr ""
-#: cygnal/libnet/network.cpp:558
+#: cygnal/libnet/sslclient.cpp:301
#, c-format
-msgid "The hostname for this machine is %s"
+msgid "PORT is: %d"
msgstr ""
-#: cygnal/libnet/network.cpp:560
-msgid "Couldn't get the hostname for this machine"
+#: cygnal/libnet/sslclient.cpp:304
+#, c-format
+msgid "Error connecting to remote machine: %s"
msgstr ""
-#: cygnal/libnet/network.cpp:575
+#: cygnal/libnet/sslclient.cpp:313
#, c-format
-msgid "The IP address for this client socket is %s"
+msgid "Can't connect to SSL server %s"
msgstr ""
-#: cygnal/libnet/network.cpp:642
+#: cygnal/libnet/sslclient.cpp:318
#, c-format
-msgid "\tport %d at IP %s for fd %d"
+msgid "Connected to SSL server %s"
msgstr ""
-#: cygnal/libnet/network.cpp:729
+#: cygnal/libnet/sslclient.cpp:351
+msgid "Certificate doesn't verify"
+msgstr ""
+
+#: cygnal/libnet/sslclient.cpp:354
+msgid "Certificate verified."
+msgstr ""
+
+#: cygnal/libnet/sslclient.cpp:363
+msgid "Couldn't get Peer certificate!"
+msgstr ""
+
+#: cygnal/libnet/sslclient.cpp:366
+msgid "Got Peer certificate."
+msgstr ""
+
+#: cygnal/libnet/sslclient.cpp:374
+msgid "Common name doesn't match host name"
+msgstr ""
+
+#: cygnal/libnet/sslclient.cpp:409
#, c-format
-msgid "Unable to close the socket for fd #%d: %s"
+msgid "Callback executed to set the SSL password, size is: %d"
msgstr ""
-#: cygnal/libnet/network.cpp:737
+#: cygnal/libnet/sslclient.cpp:413
#, c-format
-msgid "Closed the socket on fd #%d"
+msgid "The buffer for the password needs to be %d bytes larger"
msgstr ""
-#: cygnal/libnet/network.cpp:878
+#: cygnal/libnet/sslclient.cpp:439
#, c-format
-msgid "Trying to read %d bytes from fd #%d"
+msgid "-Error with certificate at depth: %i\n"
msgstr ""
-#: cygnal/libnet/network.cpp:942 cygnal/libnet/network.cpp:1116
+#: cygnal/libnet/sslclient.cpp:441
#, c-format
-msgid "The socket for fd #%d was interrupted by a system call"
+msgid " issuer = %s\n"
msgstr ""
-#: cygnal/libnet/network.cpp:946
+#: cygnal/libnet/sslclient.cpp:443
#, c-format
-msgid "The socket for fd #%d was never available for reading"
+msgid " subject = %s\n"
msgstr ""
-#: cygnal/libnet/network.cpp:952
+#: cygnal/libnet/sslclient.cpp:444
#, c-format
-msgid "The socket for #fd %d timed out waiting to read"
+msgid "err %i:%s\n"
msgstr ""
-#: cygnal/libnet/network.cpp:969
+#: cygnal/libnet/http.cpp:220
#, c-format
-msgid "The socket for fd #%d was never available for reading data"
+msgid "Requesting file: \"%s\""
msgstr ""
-#: cygnal/libnet/network.cpp:975
+#: cygnal/libnet/http.cpp:433
+msgid "FIXME: found file in cache!"
+msgstr ""
+
+#: cygnal/libnet/http.cpp:499
#, c-format
-msgid "The socket for #fd %d timed out waiting to read data"
+msgid "http_handler all done transferring requested file \"%s\"."
msgstr ""
-#: cygnal/libnet/network.cpp:981
+#: cygnal/libnet/http.cpp:564
+msgid "Got CGI echo request in POST"
+msgstr ""
+
+#: cygnal/libnet/http.cpp:1385
#, c-format
-msgid "read %d bytes from fd #%d from port %d"
+msgid "%s: Total size for first chunk is: %d, data size %d (%d)"
msgstr ""
-#: cygnal/libnet/network.cpp:985
+#: cygnal/libnet/http.cpp:1419 cygnal/libnet/http.cpp:1512
#, c-format
-msgid ""
-"%s: Read packet data from fd #%d (%d bytes): \n"
-"%s"
+msgid "no data yet for fd #%d, continuing..."
msgstr ""
-#: cygnal/libnet/network.cpp:1120
+#: cygnal/libnet/http.cpp:1436
#, c-format
-msgid "The socket for fd #%d was never available for writing"
+msgid "%s: end of chunks!"
msgstr ""
-#: cygnal/libnet/network.cpp:1124
+#: cygnal/libnet/http.cpp:1502
#, c-format
-msgid "The socket for fd #%d timed out waiting to write"
+msgid "Starting to wait for data in net for fd #%d"
msgstr ""
-#: cygnal/libnet/network.cpp:1138
+#: cygnal/libnet/http.cpp:1538
#, c-format
-msgid "Wrote zero out of %d bytes to fd #%d: %s"
+msgid "no more data for fd #%d, exiting..."
msgstr ""
-#: cygnal/libnet/network.cpp:1143
+#: cygnal/libnet/http.cpp:1542
#, c-format
-msgid "Couldn't write %d bytes to fd #%d: %s"
+msgid "Handler done for fd #%d, can't read any data..."
msgstr ""
-#: cygnal/libnet/network.cpp:1151
+#: cygnal/libnet/http.cpp:1548
#, c-format
-msgid "wrote %d bytes to fd #%d, expected %d"
+msgid "Done receiving data for fd #%d..."
msgstr ""
-#: cygnal/libnet/network.cpp:1156
+#: cygnal/libnet/http.cpp:1560
+msgid "==== The HTTP header breaks down as follows: ===="
+msgstr ""
+
+#: cygnal/libnet/http.cpp:1561
#, c-format
-msgid "wrote %d bytes to fd #%d for port %d"
+msgid "Filespec: %s"
msgstr ""
-#: cygnal/libnet/network.cpp:1164
+#: cygnal/libnet/http.cpp:1562
#, c-format
-msgid ""
-"%s: Wrote packet data to fd #%d: \n"
-"%s"
+msgid "Version: %d.%d"
+msgstr ""
+
+#: cygnal/libnet/http.cpp:1566
+#, c-format
+msgid "Field: \"%s\" = \"%s\""
+msgstr ""
+
+#: cygnal/libnet/http.cpp:1570
+msgid "RTMPT optional index is: "
+msgstr ""
+
+#: cygnal/libnet/http.cpp:1571
+msgid "RTMPT optional client ID is: "
+msgstr ""
+
+#: cygnal/libnet/http.cpp:1572
+msgid "==== ==== ===="
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:307
+#, c-format
+msgid "Deleting %s on fd #%d"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:351
+#, c-format
+msgid "Closing %s on fd #%d"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:405
+#, c-format
+msgid "%s: offset is: %d"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:419
+#, c-format
+msgid "Adjusting offset from %d to %d so it's page aligned."
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:422
+msgid "Offset is page aligned already"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:429
+#, c-format
+msgid "Loading entire file of %d bytes into memory segment"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:433
+#, c-format
+msgid "Loading partial file of %d bytes into memory segment"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:442
+msgid "Using existing Buffer for file"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:493
+#, c-format
+msgid "Couldn't load file %s"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:498
+#, c-format
+msgid "Couldn't map file %s into memory: %s"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:502
+#, c-format
+msgid "File %s a offset %d mapped to: %p"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:586
+#, c-format
+msgid "Writing data (%d bytes) to disk: \"%s\""
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:660
+#, c-format
+msgid "Trying to open %s"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:665
+#, c-format
+msgid "Opening file %s (fd #%d), %lld bytes in size."
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:672
+#, c-format
+msgid "File %s doesn't exist"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:727
+#, c-format
+msgid "No Diskstream open %s for net fd #%d"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:733
+#, c-format
+msgid "Diskstream %s is closed on net fd #%d."
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:753
+#, c-format
+msgid "In %s(%d): couldn't write %d bytes to net fd #%d! %s"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:758
+#, c-format
+msgid "Done playing file %s, size was: %d"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:771
+#, c-format
+msgid "In %s(%d): couldn't write %d of bytes of data to net fd #%d! Got %d, %s"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:803
+msgid "Restarting Disk Stream from the beginning"
+msgstr ""
+
+#: cygnal/libnet/diskstream.cpp:956
+#, c-format
+msgid "%s is a directory, appending index.html"
+msgstr ""
+
+#: cygnal/libnet/sshclient.cpp:120
+#, c-format
+msgid "SSH read error was: \"%s\"!"
msgstr ""
-#: cygnal/libnet/network.cpp:1178
+#: cygnal/libnet/sshclient.cpp:142
#, c-format
-msgid "took %d usec to write (%d bytes)"
+msgid "SSH write error was: \"%s\"!"
msgstr ""
-#: cygnal/libnet/network.cpp:1448
-msgid "Waiting for data was interrupted by a system call"
+#: cygnal/libnet/sshclient.cpp:180
+msgid "Couldn't set hostname option"
msgstr ""
-#: cygnal/libnet/network.cpp:1452
-msgid "Waiting for data for fdset, was never available for reading"
+#: cygnal/libnet/sshclient.cpp:187
+msgid "Couldn't set user name option"
msgstr ""
-#: cygnal/libnet/network.cpp:1630
+#: cygnal/libnet/sshclient.cpp:195
#, c-format
-msgid "Got an %d interrupt while blocked on pselect()"
+msgid "Connection failed : %s\n"
msgstr ""
-#: cygnal/libnet/statistics.cpp:114
+#: cygnal/libnet/sshclient.cpp:210
#, c-format
-msgid "Stream type is: %s"
+msgid "SSH Server is currently known: %d"
msgstr ""
-#: cygnal/libnet/statistics.cpp:120
-#, c-format
-msgid "%d bytes were transfered in %s seconds"
+#: cygnal/libnet/sshclient.cpp:213
+msgid "Host key for server changed : server's one is now: "
msgstr ""
-#: cygnal/libnet/rtmp_client.cpp:622
-msgid "Couldn't read data block in handshake!"
+#: cygnal/libnet/sshclient.cpp:214
+msgid "Public key hash"
msgstr ""
-#: cygnal/libnet/rtmp_client.cpp:635
-#, c-format
-msgid "Read data block in handshake, got %d bytes."
+#: cygnal/libnet/sshclient.cpp:216
+msgid "For security reason, connection will be stopped"
msgstr ""
-#: cygnal/libnet/sslserver.cpp:159
-msgid "Got an incoming SSL connection request"
+#: cygnal/libnet/sshclient.cpp:220
+msgid ""
+"The host key for this server was not found but an other type of key exists."
msgstr ""
-#: cygnal/libnet/sslserver.cpp:182 cygnal/libnet/sslclient.cpp:381
-msgid "==== The SSL header breaks down as follows: ===="
+#: cygnal/libnet/sshclient.cpp:221
+msgid ""
+"An attacker might change the default server key to confuse your clientinto "
+"thinking the key does not exist\n"
+"We advise you to rerun the client with -d or -r for more safety."
msgstr ""
-#: cygnal/libnet/http.cpp:1558
-msgid "==== The HTTP header breaks down as follows: ===="
+#: cygnal/libnet/sshclient.cpp:232
+msgid "The server is unknown. Do you trust the host key ? (yes,no)"
msgstr ""
-#: cygnal/libnet/http.cpp:1559
+#: cygnal/libnet/sshclient.cpp:233
#, c-format
-msgid "Filespec: %s"
+msgid "Public key hash: %s"
msgstr ""
-#: cygnal/libnet/http.cpp:1560
-#, c-format
-msgid "Version: %d.%d"
+#: cygnal/libnet/sshclient.cpp:240
+msgid ""
+"This new key will be written on disk for further usage. do you agree? (yes,"
+"no) "
msgstr ""
-#: cygnal/libnet/http.cpp:1570
-msgid "==== ==== ===="
+#: cygnal/libnet/sshclient.cpp:266
+msgid "supported auth methods: "
msgstr ""
-#: cygnal/libnet/diskstream.cpp:490
-#, c-format
-msgid "Couldn't load file %s"
+#: cygnal/libnet/sshclient.cpp:268
+msgid "\tpublickey"
msgstr ""
-#: cygnal/libnet/diskstream.cpp:495
-#, c-format
-msgid "Couldn't map file %s into memory: %s"
+#: cygnal/libnet/sshclient.cpp:271
+msgid "\tkeyboard-interactive"
msgstr ""
-#: cygnal/libnet/diskstream.cpp:499
+#: cygnal/libnet/sshclient.cpp:277
#, c-format
-msgid "File %s a offset %d mapped to: %p"
+msgid "Authenticating with pubkey: %s"
msgstr ""
-#: cygnal/libnet/diskstream.cpp:662
+#: cygnal/libnet/sshclient.cpp:289
#, c-format
-msgid "Opening file %s (fd #%d), %lld bytes in size."
+msgid "authenticating with keyb-interactive: %s"
msgstr ""
-#: cygnal/libnet/diskstream.cpp:669
+#: cygnal/libnet/sshclient.cpp:298
#, c-format
-msgid "File %s doesn't exist"
+msgid "Authentication failed: %s"
+msgstr ""
+
+#: cygnal/libnet/sshclient.cpp:393
+msgid "Can't open the SSH channel!"
+msgstr ""
+
+#: cygnal/libnet/sshclient.cpp:396
+msgid "Can't allocate memory for new SSH channel!"
+msgstr ""
+
+#: cygnal/libnet/sshclient.cpp:412
+msgid "Can't read from a non-existant channel!"
+msgstr ""
+
+#: cygnal/libnet/sshclient.cpp:427
+msgid "Can't write to a non-existant channel!"
msgstr ""
#: cygnal/crc.cpp:145
@@ -9444,6 +11141,20 @@ msgstr ""
msgid " -r, --root Document root for all files"
msgstr ""
+#: cygnal/cygnal.cpp:264
+msgid ": couldn't open file: "
+msgstr ""
+
+#: cygnal/cygnal.cpp:341
+#, c-format
+msgid "Couldn't connect to %s"
+msgstr ""
+
+#: cygnal/cygnal.cpp:361
+#, c-format
+msgid "%s is active on fd #%d."
+msgstr ""
+
#: cygnal/cygnal.cpp:499
#, c-format
msgid "Extraneous argument: %s"
@@ -9480,11 +11191,123 @@ msgstr ""
msgid "Got an incoming Admin request"
msgstr ""
-#: cygnal/cygnal.cpp:933
+#: cygnal/cygnal.cpp:650
+msgid "no more admin data, exiting...\n"
+msgstr ""
+
+#: cygnal/cygnal.cpp:735
+msgid "admin_handler: Done...!\n"
+msgstr ""
+
+#: cygnal/cygnal.cpp:764
+#, c-format
+msgid "Can't start %s Connection Handler for fd #%d, port %hd"
+msgstr ""
+
+#: cygnal/cygnal.cpp:768
+#, c-format
+msgid "Starting %s Connection Handler for fd #%d, port %hd"
+msgstr ""
+
+#: cygnal/cygnal.cpp:779
+#, c-format
+msgid "This system has %d cpus."
+msgstr ""
+
+#: cygnal/cygnal.cpp:816
+#, c-format
+msgid "No new %s network connections"
+msgstr ""
+
+#: cygnal/cygnal.cpp:820
+#, c-format
+msgid "*** New %s network connection for thread ID #%d, fd #%d ***"
+msgstr ""
+
+#: cygnal/cygnal.cpp:866
+#, c-format
+msgid "Creating new %s Handler for %s using fd #%d"
+msgstr ""
+
+#: cygnal/cygnal.cpp:884
+#, c-format
+msgid "Resuing %s Handler for %s using fd #%d"
+msgstr ""
+
+#: cygnal/cygnal.cpp:910
+#, c-format
+msgid "Creating new %s Handler for: %s for fd %#d"
+msgstr ""
+
+#: cygnal/cygnal.cpp:934
#, c-format
msgid "Cygnal Plugin paths are: %s"
msgstr ""
+#: cygnal/cygnal.cpp:955
+#, c-format
+msgid "Couldn't load plugin for %s"
+msgstr ""
+
+#: cygnal/cygnal.cpp:966
+#, c-format
+msgid "Number of active Threads is %d"
+msgstr ""
+
+#: cygnal/cygnal.cpp:969
+#, c-format
+msgid "Restarting loop for next connection for port %d..."
+msgstr ""
+
+#: cygnal/cygnal.cpp:1009
+#, c-format
+msgid "Handler has %d clients attached, %d threads"
+msgstr ""
+
+#: cygnal/cygnal.cpp:1014
+#, c-format
+msgid "Handler client[%d] is: %d"
+msgstr ""
+
+#: cygnal/cygnal.cpp:1027 cygnal/rtmp_server.cpp:1388
+#, c-format
+msgid "%d active disk streams"
+msgstr ""
+
+#: cygnal/cygnal.cpp:1067
+#, c-format
+msgid "Got a hit for fd #%d, protocol %s"
+msgstr ""
+
+#: cygnal/cygnal.cpp:1071
+msgid "No protocol specified!"
+msgstr ""
+
+#: cygnal/cygnal.cpp:1079 cygnal/cygnal.cpp:1104 cygnal/cygnal.cpp:1115
+#, c-format
+msgid "Done with HTTP connection for fd #%d, CGI %s"
+msgstr ""
+
+#: cygnal/cygnal.cpp:1084
+#, c-format
+msgid "Not Done with HTTP connection for fd #%d, it's a persistent connection."
+msgstr ""
+
+#: cygnal/cygnal.cpp:1093
+#, c-format
+msgid "Done with RTMP connection for fd #%d, CGI "
+msgstr ""
+
+#: cygnal/cygnal.cpp:1127
+#, c-format
+msgid "Unsupported network protocol for fd #%d, %d"
+msgstr ""
+
+#: cygnal/cygnal.cpp:1147
+#, c-format
+msgid "Got no hits, %d retries"
+msgstr ""
+
#: cygnal/cgi-bin/echo/echo.cpp:161 cygnal/cgi-bin/echo/gateway.cpp:139
#: cygnal/cgi-bin/fitcDemo/fitcDemo.cpp:166
#: cygnal/cgi-bin/oflaDemo/oflaDemo.cpp:233
@@ -9521,6 +11344,106 @@ msgstr ""
msgid "Processing RTMP Handshake for fd #%d"
msgstr ""
+#: cygnal/rtmp_server.cpp:124
+msgid "Failed to read the handshake from the client."
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:127
+msgid "Read first handshake from the client."
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:139
+msgid "failed to read the handshake from the client."
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:142
+msgid "Read second handshake from the client."
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:149
+msgid "Didn't receive any data in handshake!"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:160
+msgid "RTMP header had parsing error!"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:168
+#, c-format
+msgid "NetConnection unusually large! %d"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:185
+msgid "De chunkifying the NetConnection packet."
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:202
+msgid "failed to read the body of the handshake data from the client."
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:205
+msgid "Read handshake data body from the client."
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:210
+msgid "Didn't receive NetConnection object in handshake!"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:213
+msgid "Got NetConnection ::connect() INVOKE."
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:232
+msgid "Sent onBWDone to client"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:234
+msgid "Couldn't send onBWDone to client!"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:247
+msgid "Sent set Client Window Size to client"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:249
+msgid "Couldn't send set Client Window Size to client!"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:259 cygnal/rtmp_server.cpp:1700
+msgid "Sent Ping to client"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:261 cygnal/rtmp_server.cpp:1702
+msgid "Couldn't send Ping to client!"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:273 cygnal/rtmp_server.cpp:1657
+#: cygnal/rtmp_server.cpp:1680
+msgid "Sent response to client."
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:275
+msgid "Couldn't send response to client!"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:336
+#, c-format
+msgid "Sent RTMP Handshake response at %d"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:338
+#, c-format
+msgid "Couldn't sent RTMP Handshake response at %d!"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:355
+msgid "No data in original handshake buffer."
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:359
+msgid "No data in response handshake buffer."
+msgstr ""
+
#: cygnal/rtmp_server.cpp:385
msgid "Handshake Finish Data matched"
msgstr ""
@@ -9530,21 +11453,158 @@ msgstr ""
msgid "Handshake Finish Data didn't match by %d bytes"
msgstr ""
-#: cygnal/rtmp_server.cpp:584
+#: cygnal/rtmp_server.cpp:397
+#, c-format
+msgid "Got AMF data in handshake, %d bytes for fd #%d"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:555
+msgid "Route"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:567
+msgid "AMF3 Notify"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:573
+msgid "AMF3 Invoke"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:582
+msgid "FLV Dat"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:585
#, c-format
msgid "ERROR: Unidentified RTMP message content type 0x%x"
msgstr ""
-#: cygnal/rtmp_server.cpp:1360
+#: cygnal/rtmp_server.cpp:1105
+msgid "Couldn't reliably extract the echo data!"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1361
#, c-format
msgid "Starting RTMP Handler for fd #%d, cgi-bin is \"%s\""
msgstr ""
-#: cygnal/rtmp_server.cpp:1664
+#: cygnal/rtmp_server.cpp:1400
+#, c-format
+msgid "ERROR: No stream for client %d"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1411
+msgid "data left from previous packet"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1442
+msgid "Stream Start"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1445
+msgid "Stream EOF"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1448
+msgid "Stream No Data"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1451
+#, c-format
+msgid "Stream Set Buffer: %d"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1460
+#, c-format
+msgid "Processed Ping message from client, type %d"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1465
+msgid "Stream Pong"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1471
+msgid "Got the 1st Audio packet!"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1473
+msgid "Got the 1st Video packet!"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1475
+msgid "Got the Window Set Size packet!"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1477
+msgid "Got unknown system message!"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1484
+msgid "Set Chunk Size"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1487
+msgid "Bytes Read"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1495
+msgid "Set Window Size"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1498
+msgid "Set Bandwidth"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1505
+#, c-format
+msgid "SharedObject name is \"%s\""
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1509 cygnal/rtmp_server.cpp:1512
+#: cygnal/rtmp_server.cpp:1515 cygnal/rtmp_server.cpp:1518
+#: cygnal/rtmp_server.cpp:1665
+#, c-format
+msgid "RTMP type %d"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1524
+#, c-format
+msgid "Error INVOKING method \"%s\"!"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1528
+#, c-format
+msgid "INVOKEing method \"%s\""
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1537
+#, c-format
+msgid "The Transaction ID from the client is: %g"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1621
+#, c-format
+msgid "Sending %s to client"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1627
+msgid "Sent first page to client"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1648
+msgid "Received an _error message from the client!"
+msgstr ""
+
+#: cygnal/rtmp_server.cpp:1668
#, c-format
msgid "ERROR: Unidentified AMF header data type 0x%x"
msgstr ""
+#: cygnal/rtmp_server.cpp:1692
+#, c-format
+msgid "Never read any data from fd #%d"
+msgstr ""
+
#: cygnal/testsuite/libnet.all/test_handler.cpp:113
#: cygnal/testsuite/libnet.all/generate_amfbins.cpp:112
#: cygnal/testsuite/libnet.all/test_rtmp.cpp:120
@@ -9616,6 +11676,26 @@ msgstr ""
msgid "Document Root for CGI files is: %s"
msgstr ""
+#: cygnal/proc.cpp:115
+#, c-format
+msgid "Starting \"%s\""
+msgstr ""
+
+#: cygnal/proc.cpp:119
+#, c-format
+msgid "Invalid filespec for CGI: \"%s\""
+msgstr ""
+
+#: cygnal/proc.cpp:187
+#, c-format
+msgid "Finding \"%s\""
+msgstr ""
+
+#: cygnal/proc.cpp:207
+#, c-format
+msgid "Stopping \"%s\""
+msgstr ""
+
#: gui/fb/fb.cpp:175
msgid "Closing framebuffer device"
msgstr ""
http://git.savannah.gnu.org/cgit//commit/?id=95f980ff4acad1b431a0ada27c2f860d8b4d4859
commit 95f980ff4acad1b431a0ada27c2f860d8b4d4859
Author: Rob Savoye <address@hidden>
Date: Thu Dec 29 18:59:04 2011 -0700
add macro so new strings get found by xgettext, so they can be translated.
diff --git a/cygnal/cvm.cpp b/cygnal/cvm.cpp
index 97c0068..dd9d0d7 100644
--- a/cygnal/cvm.cpp
+++ b/cygnal/cvm.cpp
@@ -427,8 +427,8 @@ play_movie(const std::string& filename, const RunResources&
runResources)
long clockAdvance = fpsDelay/1000;
long localDelay = delay == -1 ? fpsDelay : delay; // microseconds
- log_debug("Will sleep %ld microseconds between iterations - "
- "fps is %g, clockAdvance is %lu", localDelay, fps, clockAdvance);
+ log_debug(_("Will sleep %ld microseconds between iterations - "
+ "fps is %g, clockAdvance is %lu"), localDelay, fps,
clockAdvance);
// Use a clock advanced at every iteration to match exact FPS speed.
@@ -448,7 +448,7 @@ play_movie(const std::string& filename, const RunResources&
runResources)
return md;
}
- log_debug("iteration, timer: %lu, localDelay: %ld\n",
+ log_debug(_("iteration, timer: %lu, localDelay: %ld\n"),
cl.elapsed(), localDelay);
gnashSleep(localDelay);
@@ -484,7 +484,7 @@ play_movie(const std::string& filename, const RunResources&
runResources)
m.display(); // FIXME: for which reason are we calling display here ??
++nadvances;
if ( limit_advances && nadvances >= limit_advances) {
- log_debug("exiting after %d advances", nadvances);
+ log_debug(_("exiting after %d advances"), nadvances);
break;
}
@@ -494,8 +494,8 @@ play_movie(const std::string& filename, const RunResources&
runResources)
if (curr_frame >= md->get_frame_count() - 1 ) {
if ( allowed_end_hits && ++end_hitcount >= allowed_end_hits )
{
- log_debug("exiting after %d"
- " times last frame was reached", end_hitcount);
+ log_debug(_("exiting after %d"
+ " times last frame was reached"), end_hitcount);
break;
}
}
@@ -528,8 +528,8 @@ play_movie(const std::string& filename, const RunResources&
runResources)
else if (m.get_current_frame() < last_frame) {
if ( last_frame > latest_frame ) latest_frame = last_frame;
if ( ++loop_back_count > allowloopbacks ) {
- log_debug("%d loop backs; jumping one-after "
- "latest frame (%d)",
+ log_debug(_("%d loop backs; jumping one-after "
+ "latest frame (%d)"),
loop_back_count, latest_frame+1);
m.goto_frame(latest_frame + 1);
loop_back_count = 0;
@@ -539,7 +539,7 @@ play_movie(const std::string& filename, const RunResources&
runResources)
resetLastAdvanceTimer();
}
- log_debug("iteration, timer: %lu, localDelay: %ld\n",
+ log_debug(_("iteration, timer: %lu, localDelay: %ld\n"),
cl.elapsed(), localDelay);
gnashSleep(localDelay);
}
diff --git a/cygnal/cygnal.cpp b/cygnal/cygnal.cpp
index abd807c..0dfc7f0 100644
--- a/cygnal/cygnal.cpp
+++ b/cygnal/cygnal.cpp
@@ -261,7 +261,7 @@ Cygnal::loadPeersFile(const std::string &filespec)
in.open(filespec.c_str());
if (!in) {
- log_error(": couldn't open file: ", filespec);
+ log_error(_(": couldn't open file: "), filespec);
return false;
}
@@ -338,7 +338,7 @@ Cygnal::probePeers(peer_t &peer)
gnash::URL url(uri.str());
if (!(peer.fd = net.connectToServer(uri.str()))) {
- log_network("Couldn't connect to %s", uri.str());
+ log_network(_("Couldn't connect to %s"), uri.str());
peer.connected = false;
} else {
peer.connected = true;
@@ -358,7 +358,7 @@ Cygnal::probePeers(std::vector<boost::shared_ptr<peer_t> >
&peers)
boost::shared_ptr<Cygnal::peer_t> peer = *it;
probePeers(*peer);
if (peer->connected) {
- log_network("%s is active on fd #%d.", peer->hostname,
+ log_network(_("%s is active on fd #%d."), peer->hostname,
peer->fd);
_active_peers.push_back(*it);
}
@@ -472,7 +472,7 @@ main(int argc, char *argv[])
break;
case 'v':
dbglogfile.setVerbosity();
- LOG_ONCE(log_network (_("Verbose output turned on")))
+ LOG_ONCE(log_network(_("Verbose output turned on")))
break;
case 'p':
port_offset = parser.argument<int>(i);
@@ -496,11 +496,11 @@ main(int argc, char *argv[])
exit(EXIT_SUCCESS);
break;
default:
- log_error (_("Extraneous argument: %s"),
parser.argument(i).c_str());
+ log_error(_("Extraneous argument: %s"),
parser.argument(i).c_str());
}
}
- log_network (_("Document Root for media files is: %s"), docroot);
+ log_network(_("Document Root for media files is: %s"), docroot);
crcfile.setDocumentRoot(docroot);
// load the file of peers. A peer is another instance of Cygnal we
@@ -582,7 +582,7 @@ main(int argc, char *argv[])
// Wait for all the threads to die.
alldone.wait(lk);
- log_network (_("Cygnal done..."));
+ log_network(_("Cygnal done..."));
// Delete the data we allowcated to pass to each connection_handler.
delete rtmp_data;
@@ -647,7 +647,7 @@ admin_handler(Network::thread_params_t *args)
const char *ptr = reinterpret_cast<const char *>(data);
ret = net.readNet(data, ADMINPKTSIZE, 100);
if (ret < 0) {
- log_network("no more admin data, exiting...\n");
+ log_network(_("no more admin data, exiting...\n"));
if ((ret == 0) && cmd != Handler::POLL) {
break;
}
@@ -732,7 +732,7 @@ admin_handler(Network::thread_params_t *args)
break;
};
} while (ret > 0);
- log_network("admin_handler: Done...!\n");
+ log_network(_("admin_handler: Done...!\n"));
net.closeNet(); // this shuts down this socket connection
}
net.closeConnection(); // this shuts down the server on this
connection
@@ -761,11 +761,11 @@ connection_handler(Network::thread_params_t *args)
// Start a server on this tcp/ip port.
fd = net.createServer(args->port);
if (fd <= 0) {
- log_error("Can't start %s Connection Handler for fd #%d, port %hd",
+ log_error(_("Can't start %s Connection Handler for fd #%d, port %hd"),
proto_str[args->protocol], fd, args->port);
return;
} else {
- log_network("Starting %s Connection Handler for fd #%d, port %hd",
+ log_network(_("Starting %s Connection Handler for fd #%d, port %hd"),
proto_str[args->protocol], fd, args->port);
}
@@ -776,7 +776,7 @@ connection_handler(Network::thread_params_t *args)
// handling part of the total active file descriptors.
#ifdef HAVE_SYSCONF
long ncpus = sysconf(_SC_NPROCESSORS_ONLN);
- LOG_ONCE(log_network("This system has %d cpus.", ncpus));
+ LOG_ONCE(log_network(_("This system has %d cpus."), ncpus));
#endif
size_t nfds = crcfile.getFDThread();
@@ -813,10 +813,11 @@ connection_handler(Network::thread_params_t *args)
// things when you have a heavily threaded application.
args->netfd = net.newConnection(true, fd);
if (args->netfd <= 0) {
- log_network("No new %s network connections",
proto_str[args->protocol]);
+ log_network(_("No new %s network connections"),
+ proto_str[args->protocol]);
continue;
} else {
- log_network("*** New %s network connection for thread ID #%d, fd
#%d ***",
+ log_network(_("*** New %s network connection for thread ID #%d, fd
#%d ***"),
proto_str[args->protocol], tid, args->netfd);
}
@@ -862,7 +863,7 @@ connection_handler(Network::thread_params_t *args)
}
} while (retries);
string &key = hand->getKey(args->netfd);
- log_network("Creating new %s Handler for %s using fd #%d",
+ log_network(_("Creating new %s Handler for %s using fd #%d"),
proto_str[hargs->protocol], key, hargs->netfd);
hargs->handler = hand;
hargs->buffer = buf;
@@ -880,7 +881,7 @@ connection_handler(Network::thread_params_t *args)
// We're done, close this network connection
}
} else {
- log_network("Resuing %s Handler for %s using fd #%d",
+ log_network(_("Resuing %s Handler for %s using fd #%d"),
proto_str[hargs->protocol], key, hargs->netfd);
hand->addClient(args->netfd, Network::HTTP);
}
@@ -906,7 +907,7 @@ connection_handler(Network::thread_params_t *args)
string key = url.hostname() + url.path();
boost::shared_ptr<Handler> hand = cyg.findHandler(url.path());
if (!hand) {
- log_network("Creating new %s Handler for: %s for fd %#d",
+ log_network(_("Creating new %s Handler for: %s for fd %#d"),
proto_str[args->protocol], key, args->netfd);
hand.reset(new Handler);
cyg.addHandler(key, hand);
@@ -930,7 +931,7 @@ connection_handler(Network::thread_params_t *args)
}
if (crcfile.getCgiRoot().size() > 0) {
cgiroot += ":" + crcfile.getCgiRoot();
- log_network (_("Cygnal Plugin paths are: %s"), cgiroot);
+ log_network(_("Cygnal Plugin paths are: %s"), cgiroot);
} else {
cgiroot = PLUGINSDIR;
}
@@ -951,7 +952,7 @@ connection_handler(Network::thread_params_t *args)
net.closeNet(args->netfd);
}
} else {
- log_error("Couldn't load plugin for %s", key);
+ log_error(_("Couldn't load plugin for %s"), key);
}
// // We're done, close this network connection
@@ -962,10 +963,11 @@ connection_handler(Network::thread_params_t *args)
// delete rtmp;
} // end of if RTMP
- log_network("Number of active Threads is %d", tids.num_of_tids());
+ log_network(_("Number of active Threads is %d"), tids.num_of_tids());
// net.closeNet(args->netfd); // this shuts down this socket
connection
- log_network("Restarting loop for next connection for port %d...",
args->port);
+ log_network(_("Restarting loop for next connection for port %d..."),
+ args->port);
} while(!done);
// All threads should wake up now.
@@ -1004,12 +1006,12 @@ event_handler(Network::thread_params_t *args)
// for select. We may want to do this elsewhere, as it could
// be a performance hit as the number of file descriptors gets
// larger.
- log_debug("Handler has %d clients attached, %d threads",
+ log_debug(_("Handler has %d clients attached, %d threads"),
hand->getClients().size(), tids.num_of_tids());
int max = 0;
for (size_t i = 0; i<hand->getClients().size(); i++) {
- log_debug("Handler client[%d] is: %d", i, hand->getClient(i));
+ log_debug(_("Handler client[%d] is: %d"), i, hand->getClient(i));
if (hand->getClient(i) >= max) {
max = hand->getClient(i);
// hand->dump();
@@ -1022,7 +1024,7 @@ event_handler(Network::thread_params_t *args)
// 0 is a reserved stream, so we start with 1, as the reserved
// stream isn't one we care about here.
if (hand->getActiveDiskStreams()) {
- log_network("%d active disk streams",
+ log_network(_("%d active disk streams"),
hand->getActiveDiskStreams());
// hand->dump();
}
@@ -1062,11 +1064,11 @@ event_handler(Network::thread_params_t *args)
for (int i=0; i <= max + 1; i++) {
if (FD_ISSET(i, &hits)) {
FD_CLR(i, &hits);
- log_network("Got a hit for fd #%d, protocol %s", i,
+ log_network(_("Got a hit for fd #%d, protocol %s"), i,
proto_str[hand->getProtocol(i)]);
switch (hand->getProtocol(i)) {
case Network::NONE:
- log_error("No protocol specified!");
+ log_error(_("No protocol specified!"));
break;
case Network::HTTP:
{
@@ -1074,12 +1076,12 @@ event_handler(Network::thread_params_t *args)
// largs.filespec = fullpath;
boost::shared_ptr<HTTPServer> &http =
hand->getHTTPHandler(i);
if (!http->http_handler(hand, args->netfd, args->buffer))
{
- log_network("Done with HTTP connection for fd #%d,
CGI %s", i, args->filespec);
+ log_network(_("Done with HTTP connection for fd #%d,
CGI %s"), i, args->filespec);
net.closeNet(args->netfd);
hand->removeClient(args->netfd);
done = true;
} else {
- log_network("Not Done with HTTP connection for fd
#%d, it's a persistent connection.", i);
+ log_network(_("Not Done with HTTP connection for fd
#%d, it's a persistent connection."), i);
}
continue;
@@ -1088,7 +1090,7 @@ event_handler(Network::thread_params_t *args)
args->netfd = i;
// args->filespec = path;
if (!rtmp_handler(args)) {
- log_network("Done with RTMP connection for fd #%d,
CGI ", i, args->filespec);
+ log_network(_("Done with RTMP connection for fd #%d,
CGI "), i, args->filespec);
done = true;
}
break;
@@ -1099,7 +1101,7 @@ event_handler(Network::thread_params_t *args)
boost::shared_ptr<HTTPServer> &http =
hand->getHTTPHandler(i);
// args->filespec = path;
if (!http->http_handler(hand, args->netfd, args->buffer))
{
- log_network("Done with HTTP connection for fd #%d,
CGI %s", i, largs.filespec);
+ log_network(_("Done with HTTP connection for fd #%d,
CGI %s"), i, largs.filespec);
return;
}
break;
@@ -1110,7 +1112,7 @@ event_handler(Network::thread_params_t *args)
// args->filespec = path;
boost::shared_ptr<HTTPServer> &http =
hand->getHTTPHandler(i);
if (!http->http_handler(hand, args->netfd, args->buffer))
{
- log_network("Done with HTTP connection for fd #%d,
CGI %s", i, args->filespec);
+ log_network(_("Done with HTTP connection for fd #%d,
CGI %s"), i, args->filespec);
return;
}
break;
@@ -1122,7 +1124,7 @@ event_handler(Network::thread_params_t *args)
case Network::DTN:
break;
default:
- log_error("Unsupported network protocol for fd #%d, %d",
+ log_error(_("Unsupported network protocol for fd #%d,
%d"),
largs.netfd, hand->getProtocol(i));
done = true;
break;
@@ -1142,7 +1144,7 @@ event_handler(Network::thread_params_t *args)
hits = net.waitForNetData(hand->getClients());
if (FD_ISSET(0, &hits)) {
FD_CLR(0, &hits);
- log_network("Got no hits, %d retries", retries);
+ log_network(_("Got no hits, %d retries"), retries);
// net.closeNet(args->netfd);
// hand->removeClient(args->netfd);
// done = true;
diff --git a/cygnal/handler.cpp b/cygnal/handler.cpp
index 0e66373..9d0e0b5 100644
--- a/cygnal/handler.cpp
+++ b/cygnal/handler.cpp
@@ -101,7 +101,7 @@ Handler::addClient(int fd, Network::protocols_supported_e
proto)
boost::mutex::scoped_lock lock(_mutex);
- log_debug("Adding %d to the client array.", fd);
+ log_debug(_("Adding %d to the client array."), fd);
switch (proto) {
case Network::NONE:
break;
@@ -125,7 +125,7 @@ Handler::addClient(int fd, Network::protocols_supported_e
proto)
case Network::RTMPS:
case Network::DTN:
default:
- log_unimpl("Protocol %d for Handler::AddClient()", proto);
+ log_unimpl(_("Protocol %d for Handler::AddClient()"), proto);
break;
}
@@ -165,10 +165,10 @@ Handler::parseFirstRequest(int fd,
gnash::Network::protocols_supported_e proto)
}
path = _http[fd]->getFilespec();
key = hostname + path;
- log_debug("HTTP key is: %s", key);
+ log_debug(_("HTTP key is: %s"), key);
_keys[fd] = key;
} else {
- log_error("HTTP key couldn't be read!");
+ log_error(_("HTTP key couldn't be read!"));
}
#else
HTTPServer http;
@@ -190,10 +190,10 @@ Handler::parseFirstRequest(int fd,
gnash::Network::protocols_supported_e proto)
}
path = http.getFilespec();
key = hostname + path;
- log_debug("HTTP key is: %s", key);
+ log_debug(_("HTTP key is: %s"), key);
_keys[fd] = key;
} else {
- log_error("HTTP key couldn't be read!");
+ log_error(_("HTTP key couldn't be read!"));
}
#endif
break;
@@ -211,7 +211,7 @@ Handler::parseFirstRequest(int fd,
gnash::Network::protocols_supported_e proto)
case Network::RTMPS:
case Network::DTN:
default:
- log_error("FD #%d has no protocol handler registered", fd);
+ log_error(_("FD #%d has no protocol handler registered"), fd);
break;
};
@@ -241,7 +241,7 @@ Handler::recvMsg(int fd)
case Network::RTMPS:
case Network::DTN:
default:
- log_error("FD #%d has no protocol handler registered", fd);
+ log_error(_("FD #%d has no protocol handler registered"), fd);
break;
}
@@ -258,7 +258,7 @@ Handler::removeClient(int x)
vector<int>::iterator it;
for (it = _clients.begin(); it < _clients.end(); ++it) {
if (*it == x) {
- log_debug("Removing %d from the client array.", *it);
+ log_debug(_("Removing %d from the client array."), *it);
_clients.erase(it);
}
}
@@ -319,7 +319,7 @@ Handler::initModule(const std::string& str)
log_network(_("No %s symbol in plugin"), symbol);
} else {
boost::shared_ptr<cygnal_init_t> info = init_symptr(_netconnect);
- log_network("Initialized Plugin: \"%s\": %s", info->version,
+ log_network(_("Initialized Plugin: \"%s\": %s"), info->version,
info->description);
}
@@ -459,7 +459,7 @@ Handler::playStream(const std::string &filespec)
string fullpath = crcfile.getDocumentRoot();
fullpath += "/";
fullpath += filespec;
- log_debug("FILENAME: %s", fullpath);
+ log_debug(_("FILENAME: %s"), fullpath);
// gnash::DiskStream &ds = findStream(filespec);
if (ds->getState() == DiskStream::CREATED) {
diff --git a/cygnal/http_server.cpp b/cygnal/http_server.cpp
index d63a294..6365ff0 100644
--- a/cygnal/http_server.cpp
+++ b/cygnal/http_server.cpp
@@ -147,11 +147,11 @@ HTTPServer::processClientRequest(Handler *hand, int fd,
cygnal::Buffer *buf)
// See if the file is in the cache and already opened.
boost::shared_ptr<DiskStream> filestream(cache.findFile(_filespec));
if (filestream) {
- log_debug("FIXME: found filestream %s in cache!", _filespec);
+ log_debug(_("FIXME: found filestream %s in cache!"), _filespec);
filestream->dump();
} else {
filestream.reset(new DiskStream);
- log_network("New filestream %s", _filespec);
+ log_network(_("New filestream %s"), _filespec);
// cache.addFile(url, filestream); FIXME: always reload from disk
for now.
// Oopen the file and read the first chunk into memory
@@ -189,8 +189,8 @@ HTTPServer::processGetRequest(Handler *hand, int fd,
cygnal::Buffer *buf)
// cerr << hexify(buf->reference(), buf->allocated(), false) << endl;
if (buf == 0) {
- // log_debug("Que empty, net connection dropped for fd #%d",
getFileFd());
- log_debug("Que empty, net connection dropped for fd #%d", fd);
+ // log_debug(_("Que empty, net connection dropped for fd #%d"),
getFileFd());
+ log_debug(_("Que empty, net connection dropped for fd #%d"), fd);
// cygnal::Buffer buf;
return _buf;
}
@@ -208,9 +208,9 @@ HTTPServer::processGetRequest(Handler *hand, int fd,
cygnal::Buffer *buf)
}
if (!_diskstream) {
_diskstream.reset(new DiskStream);
- log_network("New filestream %s", _filespec);
+ log_network(_("New filestream %s"), _filespec);
} else {
- log_network("Reusing filestream %s", _filespec);
+ log_network(_("Reusing filestream %s"), _filespec);
}
// Oopen the file and read the first chunk into memory
@@ -284,7 +284,8 @@ HTTPServer::processPostRequest(int fd, cygnal::Buffer * /*
bufFIXME */)
buf = _que.pop();
if (buf == 0) {
- log_debug("Que empty, net connection dropped for fd #%d", getFileFd());
+ log_debug(_("Que empty, net connection dropped for fd #%d"),
+ getFileFd());
return buf;
}
// cerr << __FUNCTION__ << buf->allocated() << " : " <<
hexify(buf->reference(), buf->allocated(), true) << endl;
@@ -302,20 +303,20 @@ HTTPServer::processPostRequest(int fd, cygnal::Buffer *
/* bufFIXME */)
// cerr << "Need to read more data, only have " << buf->allocated() << "
bytes" << endl;
ret = readNet(fd, *content, 2);
if (ret < 0) {
- log_error("couldn't read data!");
+ log_error(_("couldn't read data!"));
}
data = content->reference();
}
if (getField("content-type") == "application/x-www-form-urlencoded") {
- log_debug("Got file data in POST");
+ log_debug(_("Got file data in POST"));
string url = _docroot + _filespec;
DiskStream ds(url, *content);
ds.writeToDisk();
// ds.close();
// oh boy, we got ourselves some encoded AMF objects instead of a
boring file.
} else if (getField("content-type") == "application/x-amf") {
- log_debug("Got AMF data in POST");
+ log_debug(_("Got AMF data in POST"));
#if 0
amf::AMF amf;
boost::shared_ptr<cygnal::Element> el =
amf.extractAMF(content.reference(), content.end());
@@ -369,7 +370,7 @@ HTTPServer::processPutRequest(int /* fd */, cygnal::Buffer
*/* buf */)
{
boost::shared_ptr<cygnal::Buffer> buf;
// GNASH_REPORT_FUNCTION;
- log_unimpl("PUT request");
+ log_unimpl(_("PUT request"));
return buf;
}
@@ -379,7 +380,7 @@ HTTPServer::processDeleteRequest(int /* fd */,
cygnal::Buffer */* buf */)
{
// GNASH_REPORT_FUNCTION;
boost::shared_ptr<cygnal::Buffer> buf;
- log_unimpl("DELETE request");
+ log_unimpl(_("DELETE request"));
return buf;
}
@@ -389,7 +390,7 @@ HTTPServer::processConnectRequest(int /* fd */,
cygnal::Buffer */* buf */)
{
// GNASH_REPORT_FUNCTION;
boost::shared_ptr<cygnal::Buffer> buf;
- log_unimpl("CONNECT request");
+ log_unimpl(_("CONNECT request"));
return buf;
}
@@ -399,7 +400,7 @@ HTTPServer::processOptionsRequest(int /* fd */,
cygnal::Buffer */* buf */)
{
// GNASH_REPORT_FUNCTION;
boost::shared_ptr<cygnal::Buffer> buf;
- log_unimpl("OPTIONS request");
+ log_unimpl(_("OPTIONS request"));
return buf;
}
@@ -409,7 +410,7 @@ HTTPServer::processHeadRequest(int /* fd */, cygnal::Buffer
*/* buf */)
{
// GNASH_REPORT_FUNCTION;
boost::shared_ptr<cygnal::Buffer> buf;
- log_unimpl("HEAD request");
+ log_unimpl(_("HEAD request"));
return buf;
}
@@ -419,7 +420,7 @@ HTTPServer::processTraceRequest(int /* fd */,
cygnal::Buffer */* buf */)
{
// GNASH_REPORT_FUNCTION;
boost::shared_ptr<cygnal::Buffer> buf;
- log_unimpl("TRACE request");
+ log_unimpl(_("TRACE request"));
return buf;
}
@@ -553,7 +554,7 @@ HTTPServer::parseEchoRequest(boost::uint8_t *data, size_t
size)
// reduces memory errors caused by some of the corrupted tes cases.
boost::uint8_t *endstr = std::find(tmpptr, tmpptr+length, '\0');
if (endstr != tmpptr+length) {
- log_debug("Caught corrupted string! length was %d, null at %d",
+ log_debug(_("Caught corrupted string! length was %d, null at %d"),
length, endstr-tmpptr);
length = endstr-tmpptr;
}
@@ -574,7 +575,7 @@ HTTPServer::parseEchoRequest(boost::uint8_t *data, size_t
size)
// reduces memory errors caused by some of the corrupted tes cases.
endstr = std::find(tmpptr, tmpptr+length, '\0');
if (endstr != tmpptr+length) {
- log_debug("Caught corrupted string! length was %d, null at %d",
+ log_debug(_("Caught corrupted string! length was %d, null at %d"),
length, endstr-tmpptr);
length = endstr-tmpptr;
}
@@ -870,12 +871,12 @@ HTTPServer::extractCommand(boost::uint8_t *data)
if (params != end) {
_params = std::string(params+1, end);
_filespec = std::string(start, params);
- log_debug("Parameters for file: \"%s\"", _params);
+ log_debug(_("Parameters for file: \"%s\""), _params);
} else {
// This is fine as long as end is within the buffer.
_filespec = std::string(start, end);
}
- // log_debug("Requesting file: \"%s\"", _filespec);
+ // log_debug(_("Requesting file: \"%s\""), _filespec);
// The third field is always the HTTP version
// The version is the last field and is the protocol name
@@ -884,7 +885,7 @@ HTTPServer::extractCommand(boost::uint8_t *data)
// in it. It's actually two separate integers.
_version.major = *(end+6) - '0';
_version.minor = *(end+8) - '0';
- // log_debug (_("Version: %d.%d"), _version.major, _version.minor);
+ // log_debug(_("Version: %d.%d"), _version.major, _version.minor);
}
return cmd;
@@ -914,7 +915,8 @@ HTTPServer::processHeaderFields(cygnal::Buffer &buf)
_keepalive = true;
if ((value != "on") && (value != "off")) {
_max_requests = strtol(value.c_str(), NULL, 0);
- log_debug("Setting Max Requests for Keep-Alive to %d",
_max_requests);
+ log_debug(_("Setting Max Requests for Keep-Alive to %d"),
+ _max_requests);
}
}
if (name == "connection") {
@@ -924,20 +926,20 @@ HTTPServer::processHeaderFields(cygnal::Buffer &buf)
}
if (name == "content-length") {
_filesize = strtol(value.c_str(), NULL, 0);
- log_debug("Setting Content Length to %d", _filesize);
+ log_debug(_("Setting Content Length to %d"), _filesize);
}
if (name == "content-type") {
// This is the type used by flash when sending a AMF data via
POST
if (value == "application/x-amf") {
-// log_debug("Got AMF data in the POST request!");
+// log_debug(_("Got AMF data in the POST request!"));
_filetype = DiskStream::FILETYPE_AMF;
}
// This is the type used by wget when sending a file via POST
if (value == "application/x-www-form-urlencoded") {
-// log_debug("Got file data in the POST request");
+// log_debug(_("Got file data in the POST request"));
_filetype = DiskStream::FILETYPE_ENCODED;
}
- log_debug("Setting Content Type to %d", _filetype);
+ log_debug(_("Setting Content Type to %d"), _filetype);
}
// cerr << "FIXME: " << (void *)i << " : " << dec << end << endl;
@@ -947,7 +949,7 @@ HTTPServer::processHeaderFields(cygnal::Buffer &buf)
break;
#if 1
} else {
- log_debug("Got a request, parsing \"%s\"", *i);
+ log_debug(_("Got a request, parsing \"%s\""), *i);
string::size_type start = i->find(" ");
string::size_type params = i->find("?");
string::size_type pos = i->find("HTTP/");
@@ -964,7 +966,7 @@ HTTPServer::processHeaderFields(cygnal::Buffer &buf)
if (params != string::npos) {
_params = i->substr(params+1, end);
_filespec = i->substr(start+1, params);
- log_debug("Parameters for file: \"%s\"", _params);
+ log_debug(_("Parameters for file: \"%s\""), _params);
} else {
_filespec = i->substr(start+1, pos-start-2);
}
@@ -973,7 +975,7 @@ HTTPServer::processHeaderFields(cygnal::Buffer &buf)
// HTTP 1.1 enables persistent network connections
// by default.
if (_version.minor > 0) {
- log_debug("Enabling Keep Alive by default for HTTP >
1.0");
+ log_debug(_("Enabling Keep Alive by default for HTTP >
1.0"));
_keepalive = true;
}
}
@@ -1008,7 +1010,7 @@ HTTPServer::http_handler(Handler *hand, int netfd,
cygnal::Buffer *buf)
// by default, only look once unless changed later
// www->setDocRoot(crcfile.getDocumentRoot());
// log_network("Docroot for HTTP files is %s", crcfile.getDocumentRoot());
- log_network("Processing HTTP data for fd #%d", netfd);
+ log_network(_("Processing HTTP data for fd #%d"), netfd);
// Wait for data, and when we get it, process it.
#ifdef USE_STATISTICS
@@ -1017,12 +1019,12 @@ HTTPServer::http_handler(Handler *hand, int netfd,
cygnal::Buffer *buf)
#endif
if (buf) {
- log_network("FIXME: Existing data in packet!");
+ log_network(_("FIXME: Existing data in packet!"));
} else {
- log_network("FIXME: No existing data in packet!");
+ log_network(_("FIXME: No existing data in packet!"));
// See if we have any messages waiting
if (recvMsg(netfd) == 0) {
- log_debug("Net HTTP server failed to read from fd #%d...", netfd);
+ log_debug(_("Net HTTP server failed to read from fd #%d..."),
netfd);
return false;
}
}
@@ -1030,10 +1032,12 @@ HTTPServer::http_handler(Handler *hand, int netfd,
cygnal::Buffer *buf)
// Process incoming messages
HTTP::http_method_e cmd = processClientRequest(hand, netfd, buf);
if (cmd != HTTP::HTTP_GET) {
- log_debug("No active DiskStreams for fd #%d: %s...", netfd, _filespec);
+ log_debug(_("No active DiskStreams for fd #%d: %s..."), netfd,
+ _filespec);
} else {
if (_diskstream) {
- log_debug("Found active DiskStream! for fd #%d: %s", netfd,
_filespec);
+ log_debug(_("Found active DiskStream! for fd #%d: %s"), netfd,
+ _filespec);
hand->setDiskStream(netfd, _diskstream);
cache.addFile(_filespec, _diskstream);
// Send the first chunk of the file to the client.
@@ -1066,14 +1070,14 @@ HTTPServer::http_handler(Handler *hand, int netfd,
cygnal::Buffer *buf)
// Unless the Keep-Alive flag is set, this isn't a persisant network
// connection.
if (!keepAlive()) {
- log_debug("Keep-Alive is off", keepAlive());
+ log_debug(_("Keep-Alive is off"), keepAlive());
} else {
- log_debug("Keep-Alive is on", keepAlive());
+ log_debug(_("Keep-Alive is on"), keepAlive());
}
#ifdef USE_STATISTICS
struct timespec end;
clock_gettime (CLOCK_REALTIME, &end);
- log_debug("Processing time for GET request was %f seconds",
+ log_debug(_("Processing time for GET request was %f seconds"),
static_cast<float>(((end.tv_sec - start.tv_sec) +
((end.tv_nsec - start.tv_nsec)/1e9))));
#endif
diff --git a/cygnal/libamf/amf.cpp b/cygnal/libamf/amf.cpp
index ad6f127..87f4415 100644
--- a/cygnal/libamf/amf.cpp
+++ b/cygnal/libamf/amf.cpp
@@ -177,7 +177,7 @@ AMF::encodeObject(const cygnal::Element &data)
// GNASH_REPORT_FUNCTION;
boost::uint32_t length;
length = data.propertySize();
- gnash::log_debug("Encoded data size has %d properties", length);
+ gnash::log_debug(_("Encoded data size has %d properties"), length);
boost::shared_ptr<cygnal::Buffer> buf;
if (length) {
buf.reset(new cygnal::Buffer);
@@ -297,7 +297,7 @@ AMF::encodeXMLObject(const boost::uint8_t * /*data */,
size_t /* size */)
{
// GNASH_REPORT_FUNCTION;
boost::shared_ptr<Buffer> buf;
- gnash::log_unimpl("XML AMF objects not supported yet");
+ gnash::log_unimpl(_("XML AMF objects not supported yet"));
buf.reset();
return buf;
}
@@ -401,7 +401,7 @@ AMF::encodeMovieClip(const boost::uint8_t * /*data */,
size_t /* size */)
{
// GNASH_REPORT_FUNCTION;
boost::shared_ptr<Buffer> buf;
- gnash::log_unimpl("Movie Clip AMF objects not supported yet");
+ gnash::log_unimpl(_("Movie Clip AMF objects not supported yet"));
return buf;
}
@@ -492,7 +492,7 @@ AMF::encodeLongString(const boost::uint8_t * /* data */,
size_t /* size */)
{
// GNASH_REPORT_FUNCTION;
boost::shared_ptr<Buffer> buf;
- gnash::log_unimpl("Long String AMF objects not supported yet");
+ gnash::log_unimpl(_("Long String AMF objects not supported yet"));
return buf;
}
@@ -509,7 +509,7 @@ AMF::encodeRecordSet(const boost::uint8_t * /* data */,
size_t /* size */)
{
// GNASH_REPORT_FUNCTION;
boost::shared_ptr<Buffer> buf;
- gnash::log_unimpl("Reecord Set AMF objects not supported yet");
+ gnash::log_unimpl(_("Reecord Set AMF objects not supported yet"));
return buf;
}
@@ -558,7 +558,7 @@ AMF::encodeStrictArray(const cygnal::Element &data)
// array which is more compact. At least this is what Red5 does.
if (el->getType() == Element::UNDEFINED_AMF0) {
if (!sparse) {
- gnash::log_debug("Encoding a strict array as an ecma
array");
+ gnash::log_debug(_("Encoding a strict array as an ecma
array"));
*buf->reference() = Element::ECMA_ARRAY_AMF0;
// When returning an ECMA array for a sparsely populated
// array, Red5 adds one more to the count to be 1 based,
@@ -781,7 +781,7 @@ AMF::encodeElement(const cygnal::Element& el)
// case Element::FUNCTION:
// break;
case Element::AMF3_DATA:
- gnash::log_error("FIXME: got AMF3 data type");
+ gnash::log_error(_("FIXME: got AMF3 data type"));
break;
default:
buf.reset();
@@ -945,7 +945,7 @@ AMF::extractAMF(boost::uint8_t *in, boost::uint8_t* tooFar)
switch (type) {
case Element::NOTYPE:
{
- gnash::log_error("Element has no type!");
+ gnash::log_error(_("Element has no type!"));
break;
}
case Element::NUMBER_AMF0:
@@ -975,8 +975,8 @@ AMF::extractAMF(boost::uint8_t *in, boost::uint8_t* tooFar)
length = ntohs((*(boost::uint16_t *)tmpptr) & 0xffff);
tmpptr += sizeof(boost::uint16_t);
if (length >= SANE_STR_SIZE) {
- gnash::log_error("%d bytes for a string is over the safe "
- "limit of %d, line %d", length,
+ gnash::log_error(_("%d bytes for a string is over the safe "
+ "limit of %d, line %d"), length,
SANE_STR_SIZE, __LINE__);
el.reset();
return el;
@@ -1018,7 +1018,7 @@ AMF::extractAMF(boost::uint8_t *in, boost::uint8_t*
tooFar)
break;
}
case Element::MOVIECLIP_AMF0:
- gnash::log_debug("AMF0 MovieClip frame");
+ gnash::log_debug(_("AMF0 MovieClip frame"));
break;
case Element::NULL_AMF0:
el->makeNull();
@@ -1148,7 +1148,7 @@ AMF::extractAMF(boost::uint8_t *in, boost::uint8_t*
tooFar)
while (tmpptr < tooFar - length) {
// FIXME: was tooFar - AMF_HEADER_SIZE)
if (*(tmpptr +3) == TERMINATOR) {
- gnash::log_debug("Found object terminator byte");
+ gnash::log_debug(_("Found object terminator byte"));
tmpptr++;
break;
}
@@ -1166,7 +1166,7 @@ AMF::extractAMF(boost::uint8_t *in, boost::uint8_t*
tooFar)
}
case Element::AMF3_DATA:
default:
- gnash::log_unimpl("%s: type %d", __PRETTY_FUNCTION__, (int)type);
+ gnash::log_unimpl(_("%s: type %d"), __PRETTY_FUNCTION__,
(int)type);
el.reset();
return el;
}
@@ -1259,7 +1259,7 @@ AMF::extractProperty(boost::uint8_t *in, boost::uint8_t*
tooFar)
// If we get a NULL object, there is no data. In that case, we only return
// the name of the property.
if (type == Element::NULL_AMF0) {
- gnash::log_debug("No data associated with Property \"%s\"", name);
+ gnash::log_debug(_("No data associated with Property \"%s\""), name);
el.reset(new Element);
el->setName(name.c_str(), name.size());
tmpptr += 1;
diff --git a/cygnal/libamf/amf_msg.cpp b/cygnal/libamf/amf_msg.cpp
index e1fb0dd..6c5e1c3 100644
--- a/cygnal/libamf/amf_msg.cpp
+++ b/cygnal/libamf/amf_msg.cpp
@@ -175,13 +175,13 @@ AMF_msg::parseMessageHeader(boost::uint8_t *data, size_t
size)
msg->size = ntohl((*(boost::uint32_t *)tmpptr));
if (msg->target.empty()) {
- log_error("AMF Message \'target\' field missing!");
+ log_error(_("AMF Message \'target\' field missing!"));
}
if (msg->response.empty()) {
- log_error("AMF Message \'reply\' field missing!");
+ log_error(_("AMF Message \'reply\' field missing!"));
}
if (msg->size == 0) {
- log_error("AMF Message \'size\' field missing!");
+ log_error(_("AMF Message \'size\' field missing!"));
} else {
msg->size = size;
}
@@ -228,7 +228,7 @@ AMF_msg::parseAMFPacket(boost::uint8_t *data, size_t size)
}
}
} catch(std::exception& e) {
- log_error("Error parsing the AMF packet: \n\t%s", e.what());
+ log_error(_("Error parsing the AMF packet: \n\t%s"), e.what());
}
return header;
diff --git a/cygnal/libamf/buffer.cpp b/cygnal/libamf/buffer.cpp
index 7d1510a..ff42887 100644
--- a/cygnal/libamf/buffer.cpp
+++ b/cygnal/libamf/buffer.cpp
@@ -176,7 +176,7 @@ Buffer::~Buffer()
#ifdef USE_STATS_BUFFERS
struct timespec now;
clock_gettime (CLOCK_REALTIME, &now);
- log_debug("Buffer %x (%d) stayed in queue for %f seconds",
+ log_debug(_("Buffer %x (%d) stayed in queue for %f seconds"),
(void *)_data.get(), _nbytes,
(float)((now.tv_sec - _stamp.tv_sec) + ((now.tv_nsec -
_stamp.tv_nsec)/1e9)));
#endif
@@ -708,7 +708,7 @@ Buffer::resize(size_t size)
// deleted when this method returns.
// We loose data if we resize smaller than the data currently held.
if (size < used) {
- gnash::log_error("cygnal::Buffer::resize(%d): Truncating data (%d
bytes) while resizing!", size, used - size);
+ gnash::log_error(_("cygnal::Buffer::resize(%d): Truncating data (%d
bytes) while resizing!"), size, used - size);
used = size;
}
boost::uint8_t *newptr = new boost::uint8_t[size];
@@ -763,7 +763,7 @@ Buffer::corrupt(int factor)
// Pick the number of errors to create based on the Buffer's data size
boost::uniform_int<> errs(1, (_nbytes/factor));
int errors = errs(seed);
- gnash::log_debug("Creating %d errors in the buffer", errors);
+ gnash::log_debug(_("Creating %d errors in the buffer"), errors);
for (int i=0; i<errors; i++) {
// find a location someplace within the file.
diff --git a/cygnal/libamf/element.cpp b/cygnal/libamf/element.cpp
index da45258..8e890bf 100644
--- a/cygnal/libamf/element.cpp
+++ b/cygnal/libamf/element.cpp
@@ -172,7 +172,7 @@ Element::Element(bool /* flag */, double /* unknown1 */,
double /* unknown2 */,
_referenceid(0)
{
// GNASH_REPORT_FUNCTION;
- log_unimpl("Can't create remote function calls yet");
+ log_unimpl(_("Can't create remote function calls yet"));
}
Element &
@@ -476,7 +476,7 @@ Element::encode(bool notobject)
size += _properties[i]->getNameSize();
size += AMF_PROP_HEADER_SIZE;
}
- gnash::log_debug("Size of Element \"%s\" is: %d", _name, size);
+ gnash::log_debug(_("Size of Element \"%s\" is: %d"), _name, size);
buf.reset(new Buffer(size+AMF_PROP_HEADER_SIZE));
if (!notobject) {
*buf = Element::OBJECT_AMF0;
@@ -1531,7 +1531,7 @@ Element::dump(std::ostream& os) const
break;
case Element::AMF3_DATA:
if (getDataSize() != 0) {
- gnash::log_debug("FIXME: got AMF3 data!");
+ gnash::log_debug(_("FIXME: got AMF3 data!"));
}
// cerr << "AMF3 data is: 0x" << hexify(_data, _length, false) << endl;
break;
diff --git a/cygnal/libamf/flv.cpp b/cygnal/libamf/flv.cpp
index 4f41f1e..84cbfc6 100644
--- a/cygnal/libamf/flv.cpp
+++ b/cygnal/libamf/flv.cpp
@@ -91,14 +91,14 @@ Flv::decodeHeader(boost::uint8_t *data)
// test the magic number
if (memcmp(header->sig, "FLV", 3) != 0) {
- log_error("Bad magic number for FLV file!");
+ log_error(_("Bad magic number for FLV file!"));
header.reset();
return header;
}
// Make sure the version is legit, it should alwys be 1
if (header->version != 0x1) {
- log_error("Bad version in FLV header! %d", _header.version);
+ log_error(_("Bad version in FLV header! %d"), _header.version);
header.reset();
return header;
}
@@ -107,7 +107,7 @@ Flv::decodeHeader(boost::uint8_t *data)
if (((header->type & Flv::FLV_AUDIO) && (header->type & Flv::FLV_VIDEO))
|| (header->type & Flv::FLV_AUDIO) || (header->type & Flv::FLV_VIDEO)) {
} else {
- log_error("Bad FLV file Type: %d", header->type);
+ log_error(_("Bad FLV file Type: %d"), header->type);
}
// Be lazy, as head_size is an array of 4 bytes, and not an integer in the
data
@@ -120,7 +120,7 @@ Flv::decodeHeader(boost::uint8_t *data)
// The header size is always 9, guess it could change some day in the far
future, so
// we should use it.
if (ntohl(size) != 0x9) {
- log_error("Bad header size in FLV header! %d", size);
+ log_error(_("Bad header size in FLV header! %d"), size);
header.reset();
}
@@ -153,7 +153,7 @@ Flv::decodeMetaData(boost::uint8_t *buf, size_t size)
boost::uint16_t length;
length = ntohs((*(boost::uint16_t *)ptr) & 0xffff);
if (length >= SANE_STR_SIZE) {
- log_error("%d bytes for a string is over the safe limit of %d",
+ log_error(_("%d bytes for a string is over the safe limit of %d"),
length, SANE_STR_SIZE);
}
ptr += sizeof(boost::uint16_t);
@@ -183,7 +183,7 @@ Flv::decodeAudioData(boost::uint8_t byte)
} else if (!byte && Flv::AUDIO_STEREO) {
audio->type = Flv::AUDIO_MONO;
} else {
- log_error("Bad FLV Audio Sound Type: %x", byte + 0);
+ log_error(_("Bad FLV Audio Sound Type: %x"), byte + 0);
}
// Get the sound size
@@ -192,7 +192,7 @@ Flv::decodeAudioData(boost::uint8_t byte)
} else if (!(byte >> 1) && Flv::AUDIO_16BIT) {
audio->size = Flv::AUDIO_8BIT;
} else {
- log_error("Bad FLV Audio Sound size: %d", byte >> 1);
+ log_error(_("Bad FLV Audio Sound size: %d"), byte >> 1);
}
// Get the sound rate
@@ -206,7 +206,7 @@ Flv::decodeAudioData(boost::uint8_t byte)
} else if ((byte >> 2) == 0) {
audio->rate = Flv::AUDIO_55KHZ;
} else {
- log_error("Bad FLV Audio Sound Rate: %d", byte >> 2);
+ log_error(_("Bad FLV Audio Sound Rate: %d"), byte >> 2);
}
// Get the sound format
@@ -223,7 +223,7 @@ Flv::decodeAudioData(boost::uint8_t byte)
} else if (!(byte >> 4) && Flv::AUDIO_ADPCM) {
audio->format = Flv::AUDIO_UNCOMPRESSED;
} else {
- log_error("Bad FLV Audio Sound format: %d", byte >> 4);
+ log_error(_("Bad FLV Audio Sound format: %d"), byte >> 4);
}
return audio;
@@ -254,7 +254,7 @@ Flv::decodeVideoData(boost::uint8_t byte)
} else if (byte && Flv::VIDEO_SPEEX) {
video->codecID = Flv::VIDEO_SPEEX;
} else {
- log_error("Bad FLV Video Codec CodecID: 0x%x", byte + 0);
+ log_error(_("Bad FLV Video Codec CodecID: 0x%x"), byte + 0);
}
if (byte && Flv::KEYFRAME) {
@@ -264,7 +264,7 @@ Flv::decodeVideoData(boost::uint8_t byte)
} else if (byte && Flv::DISPOSABLE) {
video->type = Flv::DISPOSABLE;
} else {
- log_error("Bad FLV Video Frame CodecID: 0x%x", byte + 0);
+ log_error(_("Bad FLV Video Frame CodecID: 0x%x"), byte + 0);
}
return video;
@@ -337,11 +337,11 @@ Flv::dump()
// an onMetaData packet of an FLV stream only contains number or
// boolean bydefault
if (el->getType() == Element::NUMBER_AMF0) {
- log_debug("FLV MetaData: %s: %s", el->getName(),
el->to_number());
+ log_debug(_("FLV MetaData: %s: %s"), el->getName(),
el->to_number());
} else if (el->getType() == Element::BOOLEAN_AMF0) {
- log_debug("FLV MetaData: %s: %s", el->getName(),
(el->to_bool() ? "true" : "false") );
+ log_debug(_("FLV MetaData: %s: %s"), el->getName(),
(el->to_bool() ? "true" : "false") );
} else {
- log_debug("FLV MetaData: %s: %s", el->getName(),
el->to_string());
+ log_debug(_("FLV MetaData: %s: %s"), el->getName(),
el->to_string());
}
}
} else {
diff --git a/cygnal/libamf/lcshm.cpp b/cygnal/libamf/lcshm.cpp
index 0da98d4..3467677 100644
--- a/cygnal/libamf/lcshm.cpp
+++ b/cygnal/libamf/lcshm.cpp
@@ -369,7 +369,7 @@ LcShm::parseHeader(boost::uint8_t *data, boost::uint8_t*
tooFar)
boost::uint8_t *ptr = data;
if (data == 0) {
- log_debug("No data pointer to parse!");
+ log_debug(_("No data pointer to parse!"));
return 0;
}
@@ -388,7 +388,7 @@ LcShm::parseHeader(boost::uint8_t *data, boost::uint8_t*
tooFar)
AMF amf;
boost::shared_ptr<Element> el = amf.extractAMF(ptr, tooFar);
if (el == 0) {
- log_debug("Didn't extract an element from the byte stream!");
+ log_debug(_("Didn't extract an element from the byte stream!"));
return 0;
}
_object.connection_name = el->to_string();
@@ -500,10 +500,11 @@ LcShm::connect(const string& names)
//GNASH_REPORT_FUNCTION;
//log_debug(" The connect function is called");
- log_debug(" The size of %s is %d ",names, names.size());
+ log_debug(_(" The size of %s is %d "), names, names.size());
- if (names == "")
- return false;
+ if (names == "") {
+ return false;
+ }
_name = names;
@@ -516,7 +517,7 @@ LcShm::connect(const string& names)
}
if (SharedMem::begin() <= 0) {
- log_error("Failed to open shared memory segment: \"%s\"",
names.c_str());
+ log_error(_("Failed to open shared memory segment: \"%s\""),
names.c_str());
return false;
}
@@ -557,7 +558,7 @@ LcShm::connect(key_t key)
}
if (SharedMem::begin() <= 0) {
- log_error("Failed to open shared memory segment: 0x%x", key);
+ log_error(_("Failed to open shared memory segment: 0x%x"), key);
return false;
}
diff --git a/cygnal/libamf/sol.cpp b/cygnal/libamf/sol.cpp
index d48f29b..203925a 100644
--- a/cygnal/libamf/sol.cpp
+++ b/cygnal/libamf/sol.cpp
@@ -247,7 +247,7 @@ SOL::writeFile(const std::string &filespec, const
std::string &name)
// GNASH_REPORT_FUNCTION;
std::ofstream ofs(filespec.c_str(), std::ios::binary);
if ( ! ofs ) {
- log_error("Failed opening file '%s' in binary mode", filespec.c_str());
+ log_error(_("Failed opening file '%s' in binary mode"),
filespec.c_str());
return false;
}
@@ -334,14 +334,14 @@ SOL::writeFile(const std::string &filespec, const
std::string &name)
if ( ofs.write(head.get(), _header.size()).fail() )
{
- log_error("Error writing %d bytes of header to output file %s",
+ log_error(_("Error writing %d bytes of header to output file %s"),
_header.size(), filespec);
return false;
}
if ( ofs.write(body.get(), _filesize).fail() )
{
- log_error("Error writing %d bytes of body to output file %s",
+ log_error(_("Error writing %d bytes of body to output file %s"),
_filesize, filespec);
return false;
}
@@ -401,16 +401,16 @@ SOL::readFile(const std::string &filespec)
// consistency check
if ((buf[0] == 0) && (buf[1] == 0xbf)) {
if (bodysize == length) {
- log_debug("%s is an SOL file", filespec);
+ log_debug(_("%s is an SOL file"), filespec);
}
else {
- log_error("%s looks like an SOL file, but the length is
wrong. "
- "Should be %d, got %d",
+ log_error(_("%s looks like an SOL file, but the length is
wrong. "
+ "Should be %d, got %d"),
filespec, (_filesize - 6), length);
}
}
else {
- log_error("%s isn't an SOL file", filespec);
+ log_error(_("%s isn't an SOL file"), filespec);
}
#ifndef GNASH_TRUST_AMF
@@ -452,7 +452,7 @@ SOL::readFile(const std::string &filespec)
return true;
}
catch (std::exception& e) {
- log_error("Reading SharedObject %s: %s", filespec, e.what());
+ log_error(_("Reading SharedObject %s: %s"), filespec, e.what());
return false;
}
diff --git a/cygnal/libnet/cache.cpp b/cygnal/libnet/cache.cpp
index 8df629f..290e411 100644
--- a/cygnal/libnet/cache.cpp
+++ b/cygnal/libnet/cache.cpp
@@ -59,7 +59,7 @@ Cache::Cache()
_pagesize(0)
{
// GNASH_REPORT_FUNCTION;
- log_error("using this constructor is only allowed for testing purposes.");
+ log_error(_("using this constructor is only allowed for testing
purposes."));
#ifdef USE_STATS_CACHE
clock_gettime (CLOCK_REALTIME, &_last_access);
#endif
@@ -102,7 +102,7 @@ Cache::addFile(const std::string &name,
boost::shared_ptr<DiskStream> &file)
// GNASH_REPORT_FUNCTION;
boost::mutex::scoped_lock lock(cache_mutex);
- log_network("Adding file %s to cache.", name);
+ log_network(_("Adding file %s to cache."), name);
_files[name] = file;
}
@@ -145,7 +145,7 @@ Cache::findFile(const std::string &name)
{
// GNASH_REPORT_FUNCTION;
- log_network("Trying to find %s in the cache.", name);
+ log_network(_("Trying to find %s in the cache."), name);
boost::mutex::scoped_lock lock(cache_mutex);
#ifdef USE_STATS_CACHE
clock_gettime (CLOCK_REALTIME, &_last_access);
diff --git a/cygnal/libnet/cque.cpp b/cygnal/libnet/cque.cpp
index 7b4d170..773d6c5 100644
--- a/cygnal/libnet/cque.cpp
+++ b/cygnal/libnet/cque.cpp
@@ -68,7 +68,7 @@ CQue::wait()
boost::mutex::scoped_lock lk(_cond_mutex);
#ifndef _WIN32
_cond.wait(lk);
- log_unimpl("CQue::wait(win32)");
+ log_unimpl(_("CQue::wait(win32)"));
#endif
// log_debug("wait mutex released for \"%s\"", _name);
}
@@ -80,7 +80,7 @@ CQue::notify()
// GNASH_REPORT_FUNCTION;
#ifndef _WIN32
_cond.notify_one();
- log_unimpl("CQue::notify(win32)");
+ log_unimpl(_("CQue::notify(win32)"));
#endif
// log_debug("wait mutex triggered for \"%s\"", _name);
}
diff --git a/cygnal/libnet/diskstream.cpp b/cygnal/libnet/diskstream.cpp
index a63ca37..001a69d 100644
--- a/cygnal/libnet/diskstream.cpp
+++ b/cygnal/libnet/diskstream.cpp
@@ -304,7 +304,7 @@ DiskStream::DiskStream(const string &str, int netfd)
DiskStream::~DiskStream()
{
GNASH_REPORT_FUNCTION;
- log_debug("Deleting %s on fd #%d", _filespec, _filefd);
+ log_debug(_("Deleting %s on fd #%d"), _filespec, _filefd);
if (_filefd) {
::close(_filefd);
@@ -348,7 +348,7 @@ DiskStream::close()
{
// GNASH_REPORT_FUNCTION;
- log_debug("Closing %s on fd #%d", _filespec, _filefd);
+ log_debug(_("Closing %s on fd #%d"), _filespec, _filefd);
if (_filefd) {
::close(_filefd);
@@ -401,7 +401,8 @@ DiskStream::loadToMem(size_t filesize, off_t offset)
{
GNASH_REPORT_FUNCTION;
- log_debug("%s: offset is: %d", __FUNCTION__, offset);
+
+ log_debug(_("%s: offset is: %d"), __FUNCTION__, offset);
// store the offset we came in with so next time we know where to start
_offset = offset;
@@ -415,20 +416,22 @@ DiskStream::loadToMem(size_t filesize, off_t offset)
if (offset % _pagesize) {
// calculate the number of pages
page = ((offset - (offset % _pagesize)) / _pagesize) * _pagesize;
- log_debug("Adjusting offset from %d to %d so it's page aligned.",
+ log_debug(_("Adjusting offset from %d to %d so it's page aligned."),
offset, page);
} else {
- log_debug("Offset is page aligned already");
+ log_debug(_("Offset is page aligned already"));
}
}
// Figure out the maximum number of bytes we can load into memory.
size_t loadsize = 0;
if (filesize < _max_memload) {
- log_debug("Loading entire file of %d bytes into memory segment",
filesize);
+ log_debug(_("Loading entire file of %d bytes into memory segment"),
+ filesize);
loadsize = filesize;
} else {
- log_debug("Loading partial file of %d bytes into memory segment",
filesize, _max_memload);
+ log_debug(_("Loading partial file of %d bytes into memory segment"),
+ filesize, _max_memload);
loadsize = _max_memload;
}
@@ -436,7 +439,7 @@ DiskStream::loadToMem(size_t filesize, off_t offset)
// this DiskStream, so sufficient memory will already be allocated for
this data.
// If the data came from a disk based file, then we allocate enough memory
to hold it.
if (_dataptr) {
- log_debug("Using existing Buffer for file");
+ log_debug(_("Using existing Buffer for file"));
return _dataptr + offset;
}
@@ -487,16 +490,16 @@ DiskStream::loadToMem(size_t filesize, off_t offset)
_filefd, page));
#endif
} else {
- log_error (_("Couldn't load file %s"), _filespec);
+ log_error(_("Couldn't load file %s"), _filespec);
return 0;
}
if (dataptr == MAP_FAILED) {
- log_error (_("Couldn't map file %s into memory: %s"),
+ log_error(_("Couldn't map file %s into memory: %s"),
_filespec, strerror(errno));
return 0;
} else {
- log_debug (_("File %s a offset %d mapped to: %p"), _filespec, offset,
(void *)dataptr);
+ log_debug(_("File %s a offset %d mapped to: %p"), _filespec, offset,
(void *)dataptr);
clock_gettime (CLOCK_REALTIME, &_last_access);
_dataptr = dataptr;
// map the seekptr to the end of data
@@ -580,7 +583,7 @@ DiskStream::writeToDisk(const std::string &filespec,
boost::uint8_t *data, size_
if (fd < 0) {
log_error(strerror(errno));
}
- log_debug("Writing data (%d bytes) to disk: \"%s\"", size, filespec);
+ log_debug(_("Writing data (%d bytes) to disk: \"%s\""), size, filespec);
::write(fd, data, size);
::close(fd);
@@ -654,7 +657,7 @@ DiskStream::open(const string &filespec, int netfd,
Statistics &statistics)
_statistics = statistics;
_filespec = filespec;
- log_debug("Trying to open %s", filespec);
+ log_debug(_("Trying to open %s"), filespec);
if (getFileStats(filespec)) {
boost::mutex::scoped_lock lock(io_mutex);
@@ -721,12 +724,14 @@ DiskStream::play(int netfd, bool flag)
}
switch (_state) {
case NO_STATE:
- log_network("No Diskstream open %s for net fd #%d", _filespec,
netfd);
+ log_network(_("No Diskstream open %s for net fd #%d"),
+ _filespec, netfd);
break;
case CREATED:
case CLOSED:
if (_dataptr) {
- log_network("Diskstream %s is closed on net fd #%d.",
_filespec, netfd);
+ log_network(_("Diskstream %s is closed on net fd #%d."),
+ _filespec, netfd);
}
done = true;
continue;
@@ -745,12 +750,13 @@ DiskStream::play(int netfd, bool flag)
#else
ret = net.writeNet(netfd, (_dataptr + _offset), (_filesize -
_offset));
if (ret != (_filesize - _offset)) {
- log_error("In %s(%d): couldn't write %d bytes to net fd
#%d! %s",
+ log_error(_("In %s(%d): couldn't write %d bytes to net fd
#%d! %s"),
__FUNCTION__, __LINE__, (_filesize - _offset),
netfd, strerror(errno));
}
#endif
- log_network("Done playing file %s, size was: %d", _filespec,
_filesize);
+ log_network(_("Done playing file %s, size was: %d"),
+ _filespec, _filesize);
close();
done = true;
// reset to the beginning of the file
@@ -762,7 +768,7 @@ DiskStream::play(int netfd, bool flag)
#else
ret = net.writeNet(netfd, (_dataptr + _offset), _pagesize);
if (ret != _pagesize) {
- log_error("In %s(%d): couldn't write %d of bytes of data
to net fd #%d! Got %d, %s",
+ log_error(_("In %s(%d): couldn't write %d of bytes of
data to net fd #%d! Got %d, %s"),
__FUNCTION__, __LINE__, _pagesize, netfd,
ret, strerror(errno));
return false;
@@ -774,7 +780,7 @@ DiskStream::play(int netfd, bool flag)
case EINVAL:
case ENOSYS:
case EFAULT:
- log_network("ERROR: %s", strerror(errno));
+ log_error("%s", strerror(errno));
break;
default:
break;
@@ -794,7 +800,7 @@ DiskStream::play(int netfd, bool flag)
case MULTICAST:
break;
case DONE:
- log_debug("Restarting Disk Stream from the beginning");
+ log_debug(_("Restarting Disk Stream from the beginning"));
_offset = 0;
_filefd = 0;
_state = PLAY;
@@ -839,7 +845,7 @@ DiskStream::preview(const string & /*filespec*/, int
/*frames*/)
// GNASH_REPORT_FUNCTION;
_state = PREVIEW;
- log_unimpl("%s", __PRETTY_FUNCTION__);
+ log_unimpl(__PRETTY_FUNCTION__);
return true; // Default to true
}
@@ -860,7 +866,7 @@ DiskStream::thumbnail(const string & /*filespec*/, int
/*quantity*/)
// GNASH_REPORT_FUNCTION;
_state = THUMBNAIL;
- log_unimpl("%s", __PRETTY_FUNCTION__);
+ log_unimpl(__PRETTY_FUNCTION__);
return true; // Default to true
}
@@ -873,7 +879,7 @@ DiskStream::pause()
// GNASH_REPORT_FUNCTION;
_state = PAUSE;
- log_unimpl("%s", __PRETTY_FUNCTION__);
+ log_unimpl(__PRETTY_FUNCTION__);
return true; // Default to true
}
@@ -907,7 +913,7 @@ DiskStream::upload(const string & /*filespec*/)
// GNASH_REPORT_FUNCTION;
_state = UPLOAD;
- log_unimpl("%s", __PRETTY_FUNCTION__);
+ log_unimpl( __PRETTY_FUNCTION__);
return true; // Default to true
}
@@ -918,7 +924,7 @@ DiskStream::multicast(const string & /*filespec*/)
// GNASH_REPORT_FUNCTION;
_state = MULTICAST;
- log_unimpl("%s", __PRETTY_FUNCTION__);
+ log_unimpl(__PRETTY_FUNCTION__);
return true; // Default to true
}
@@ -947,7 +953,7 @@ DiskStream::getFileStats(const std::string &filespec)
// does, which is to load the index.html file in that
// directry if it exists.
if (S_ISDIR(st.st_mode)) {
- log_debug("%s is a directory, appending index.html\n",
+ log_debug(_("%s is a directory, appending index.html"),
actual_filespec.c_str());
if (actual_filespec[actual_filespec.size()-1] != '/') {
actual_filespec += '/';
diff --git a/cygnal/libnet/http.cpp b/cygnal/libnet/http.cpp
index 4f21cfc..3a01766 100644
--- a/cygnal/libnet/http.cpp
+++ b/cygnal/libnet/http.cpp
@@ -173,7 +173,7 @@ HTTP::processHeaderFields(cygnal::Buffer *buf)
}
if (name == "content-length") {
_filesize = strtol(value.c_str(), NULL, 0);
- log_debug("Setting Content Length to %d", _filesize);
+ log_debug(_("Setting Content Length to %d"), _filesize);
}
if (name == "content-type") {
// This is the type used by flash when sending a AMF data via
POST
@@ -186,7 +186,7 @@ HTTP::processHeaderFields(cygnal::Buffer *buf)
// log_debug("Got file data in the POST request");
_filetype = DiskStream::FILETYPE_ENCODED;
}
- log_debug("Setting Content Type to %d", _filetype);
+ log_debug(_("Setting Content Type to %d"), _filetype);
}
// cerr << "FIXME: " << (void *)i << " : " << dec << end << endl;
@@ -196,7 +196,7 @@ HTTP::processHeaderFields(cygnal::Buffer *buf)
break;
#if 1
} else {
- log_debug("Got a request, parsing \"%s\"", *i);
+ log_debug(_("Got a request, parsing \"%s\""), *i);
string::size_type start = i->find(" ");
string::size_type params = i->find("?");
string::size_type pos = i->find("HTTP/");
@@ -213,16 +213,16 @@ HTTP::processHeaderFields(cygnal::Buffer *buf)
if (params != string::npos) {
_params = i->substr(params+1, end);
_filespec = i->substr(start+1, params);
- log_debug("Parameters for file: \"%s\"", _params);
+ log_debug(_("Parameters for file: \"%s\""), _params);
} else {
_filespec = i->substr(start+1, pos-start-2);
}
- log_debug("Requesting file: \"%s\"", _filespec);
+ log_debug(_("Requesting file: \"%s\""), _filespec);
// HTTP 1.1 enables persistent network connections
// by default.
if (_version.minor > 0) {
- log_debug("Enabling Keep Alive by default for HTTP >
1.0");
+ log_debug(_("Enabling Keep Alive by default for HTTP >
1.0"));
_keepalive = true;
}
}
@@ -419,7 +419,7 @@ HTTP::processGetRequest(int fd)
if (buf == 0) {
// log_debug("Que empty, net connection dropped for fd #%d",
getFileFd());
- log_debug("Que empty, net connection dropped for fd #%d", fd);
+ log_debug(_("Que empty, net connection dropped for fd #%d"), fd);
return false;
}
@@ -430,7 +430,7 @@ HTTP::processGetRequest(int fd)
// See if the file is in the cache and already opened.
boost::shared_ptr<DiskStream> filestream(cache.findFile(url));
if (filestream) {
- log_network("FIXME: found file in cache!");
+ log_network(_("FIXME: found file in cache!"));
} else {
filestream.reset(new DiskStream);
// cerr << "New Filestream at 0x" << hex << filestream.get() << endl;
@@ -496,7 +496,8 @@ HTTP::processGetRequest(int fd)
#endif
}
- log_debug("http_handler all done transferring requested file \"%s\".",
_filespec);
+ log_debug(_("http_handler all done transferring requested file \"%s\"."),
+ _filespec);
return true;
}
@@ -517,7 +518,7 @@ HTTP::processPostRequest(int fd)
boost::shared_ptr<cygnal::Buffer> buf(_que.pop());
if (buf == 0) {
- log_debug("Que empty, net connection dropped for fd #%d", getFileFd());
+ log_debug(_("Que empty, net connection dropped for fd #%d"),
getFileFd());
return false;
}
// cerr << __FUNCTION__ << buf->allocated() << " : " <<
hexify(buf->reference(), buf->allocated(), true) << endl;
@@ -538,14 +539,14 @@ HTTP::processPostRequest(int fd)
}
if (getField("content-type") == "application/x-www-form-urlencoded") {
- log_debug("Got file data in POST");
+ log_debug(_("Got file data in POST"));
string url = _docroot + _filespec;
DiskStream ds(url, *content);
ds.writeToDisk();
// ds.close();
// oh boy, we got ourselves some encoded AMF objects instead of a
boring file.
} else if (getField("content-type") == "application/x-amf") {
- log_debug("Got AMF data in POST");
+ log_debug(_("Got AMF data in POST"));
#if 0
amf::AMF amf;
boost::shared_ptr<cygnal::Element> el =
amf.extractAMF(content.reference(), content.end());
@@ -560,7 +561,7 @@ HTTP::processPostRequest(int fd)
if ((_filespec == "/echo/gateway")
&& (getField("content-type") == "application/x-amf")) {
// const char *num = (const char *)buf->at(10);
- log_debug("Got CGI echo request in POST");
+ log_debug(_("Got CGI echo request in POST"));
// cerr << "FIXME 2: " << hexify(content->reference(),
content->allocated(), true) << endl;
vector<boost::shared_ptr<cygnal::Element> > headers =
parseEchoRequest(*content);
@@ -588,7 +589,7 @@ bool
HTTP::processPutRequest(int /* fd */)
{
// GNASH_REPORT_FUNCTION;
- log_unimpl("PUT request");
+ log_unimpl(_("PUT request"));
return false;
}
@@ -597,7 +598,7 @@ bool
HTTP::processDeleteRequest(int /* fd */)
{
// GNASH_REPORT_FUNCTION;
- log_unimpl("DELETE request");
+ log_unimpl(_("DELETE request"));
return false;
}
@@ -605,7 +606,7 @@ bool
HTTP::processConnectRequest(int /* fd */)
{
// GNASH_REPORT_FUNCTION;
- log_unimpl("CONNECT request");
+ log_unimpl(_("CONNECT request"));
return false;
}
@@ -613,7 +614,7 @@ bool
HTTP::processOptionsRequest(int /* fd */)
{
// GNASH_REPORT_FUNCTION;
- log_unimpl("OPTIONS request");
+ log_unimpl(_("OPTIONS request"));
return false;
}
@@ -621,7 +622,7 @@ bool
HTTP::processHeadRequest(int /* fd */)
{
// GNASH_REPORT_FUNCTION;
- log_unimpl("HEAD request");
+ log_unimpl(_("HEAD request"));
return false;
}
@@ -629,7 +630,7 @@ bool
HTTP::processTraceRequest(int /* fd */)
{
// GNASH_REPORT_FUNCTION;
- log_unimpl("TRACE request");
+ log_unimpl(_("TRACE request"));
return false;
}
#endif
@@ -1291,7 +1292,7 @@ HTTP::extractCommand(boost::uint8_t *data)
if (params != end) {
_params = std::string(params+1, end);
_filespec = std::string(start, params);
- log_debug("Parameters for file: \"%s\"", _params);
+ log_debug(_("Parameters for file: \"%s\""), _params);
} else {
// This is fine as long as end is within the buffer.
_filespec = std::string(start, end);
@@ -1381,7 +1382,7 @@ HTTP::recvChunked(boost::uint8_t *data, size_t size)
std::string bytes(data, start-2);
size_t sizesize = start-data;
total = static_cast<size_t>(strtol(bytes.c_str(), NULL, 16));
- log_debug("%s: Total size for first chunk is: %d, data size %d (%d)",
+ log_debug(_("%s: Total size for first chunk is: %d, data size %d (%d)"),
__PRETTY_FUNCTION__, total, size, sizesize);
buf.reset(new cygnal::Buffer(total+2));
// Add the existing data from the previous packet
@@ -1415,7 +1416,8 @@ HTTP::recvChunked(boost::uint8_t *data, size_t size)
//buf->dump();
// We got data.
if (ret == 0) {
- log_debug("no data yet for fd #%d, continuing...", getFileFd());
+ log_debug(_("no data yet for fd #%d, continuing..."),
+ getFileFd());
done = true;
}
if (ret) {
@@ -1431,7 +1433,7 @@ HTTP::recvChunked(boost::uint8_t *data, size_t size)
total = static_cast<size_t>(strtol(bytes.c_str(), NULL,
16));
// The total size of the last chunk is always "0"
if (total == 0) {
- log_debug("%s: end of chunks!",
__PRETTY_FUNCTION__);
+ log_debug(_("%s: end of chunks!"),
__PRETTY_FUNCTION__);
pktsize = 0;
done = true;
chunks = false;
@@ -1497,7 +1499,7 @@ HTTP::recvMsg(int fd, size_t size)
size = cygnal::NETBUFSIZE;
}
- log_debug("Starting to wait for data in net for fd #%d", fd);
+ log_debug(_("Starting to wait for data in net for fd #%d"), fd);
Network net;
do {
@@ -1507,13 +1509,13 @@ HTTP::recvMsg(int fd, size_t size)
// the read timed out as there was no data, but the socket is still
open.
if (ret == 0) {
- log_debug("no data yet for fd #%d, continuing...", fd);
+ log_debug(_("no data yet for fd #%d, continuing..."), fd);
continue;
}
// ret is "no position" when the socket is closed from the other end of
the connection,
// so we're done.
if ((ret == static_cast<size_t>(string::npos)) ||
(static_cast<int>(ret) == -1)) {
- log_debug("socket for fd #%d was closed...", fd);
+ log_debug(_("socket for fd #%d was closed..."), fd);
return 0;
}
// We got data. Resize the buffer if necessary.
@@ -1533,17 +1535,17 @@ HTTP::recvMsg(int fd, size_t size)
continue;
}
} else {
- log_debug("no more data for fd #%d, exiting...", fd);
+ log_debug(_("no more data for fd #%d, exiting..."), fd);
return 0;
}
if (static_cast<int>(ret) == -1) {
- log_debug("Handler done for fd #%d, can't read any data...", fd);
+ log_debug(_("Handler done for fd #%d, can't read any data..."), fd);
return -1;
}
} while (ret);
// We're done. Notify the other threads the socket is closed, and tell
them to die.
- log_debug("Done receiving data for fd #%d...", fd);
+ log_debug(_("Done receiving data for fd #%d..."), fd);
return ret;
}
@@ -1561,13 +1563,13 @@ HTTP::dump() {
std::map<string, string>::const_iterator it;
for (it = _fields.begin(); it != _fields.end(); ++it) {
- log_debug("Field: \"%s\" = \"%s\"", it->first, it->second);
+ log_debug(_("Field: \"%s\" = \"%s\""), it->first, it->second);
}
// Dump the RTMPT fields
- log_debug("RTMPT optional index is: ", _index);
- log_debug("RTMPT optional client ID is: ", _clientid);
- log_debug (_("==== ==== ===="));
+ log_debug(_("RTMPT optional index is: "), _index);
+ log_debug(_("RTMPT optional client ID is: "), _clientid);
+ log_debug(_("==== ==== ===="));
}
} // end of gnash namespace
diff --git a/cygnal/libnet/network.cpp b/cygnal/libnet/network.cpp
index f0b0e8e..7b95ee6 100644
--- a/cygnal/libnet/network.cpp
+++ b/cygnal/libnet/network.cpp
@@ -159,7 +159,7 @@ Network::createServer(short port)
int retries = 0;
if (_listenfd >= 2) {
- log_debug("already connected to port %hd", port);
+ log_debug(_("already connected to port %hd"), port);
return _listenfd;
}
@@ -323,16 +323,16 @@ Network::newConnection(bool block, int fd)
ret = pselect(fd+1, &fdset, NULL, NULL, &tval, &blockset);
}
if (sig_number) {
- log_debug("Have a SIGINT interupt waiting!");
+ log_debug(_("Have a SIGINT interupt waiting!"));
}
sigpending(&pending);
if (sigismember(&pending, SIGINT)) {
- log_debug("Have a pending SIGINT interupt waiting!");
+ log_debug(_("Have a pending SIGINT interupt waiting!"));
int sig;
sigwait(&blockset, &sig);
}
if (sigismember(&pending, SIGPIPE)) {
- log_debug("Have a pending SIGPIPE interupt waiting!");
+ log_debug(_("Have a pending SIGPIPE interupt waiting!"));
int sig;
sigwait(&blockset, &sig);
}
@@ -763,7 +763,7 @@ Network::closeConnection(int fd)
if (fd > 0) {
::close(fd);
- log_debug("%s: Closed fd #%d", __FUNCTION__, fd);
+ log_debug(_("%s: Closed fd #%d"), __FUNCTION__, fd);
// closeNet(fd);
}
@@ -875,7 +875,7 @@ Network::readNet(int fd, byte_t *buffer, int nbytes, int
timeout)
// boost::mutex::scoped_lock lock(_net_mutex);
if (_debug) {
- log_debug (_("Trying to read %d bytes from fd #%d"), nbytes, fd);
+ log_debug(_("Trying to read %d bytes from fd #%d"), nbytes, fd);
}
#ifdef NET_TIMING
if (_timing_debug)
@@ -919,13 +919,13 @@ Network::readNet(int fd, byte_t *buffer, int nbytes, int
timeout)
ret = pselect(fd+1, &fdset, NULL, NULL, &tval, &blockset);
sigpending(&pending);
if (sigismember(&pending, SIGINT)) {
- log_debug("Have a pending SIGINT interupt waiting!");
+ log_debug(_("Have a pending SIGINT interupt waiting!"));
int sig;
sigwait(&blockset, &sig);
cntrlc_handler(SIGINT);
}
if (sigismember(&pending, SIGPIPE)) {
- log_debug("Have a pending SIGPIPE interupt waiting!");
+ log_debug(_("Have a pending SIGPIPE interupt waiting!"));
int sig;
sigwait(&blockset, &sig);
cntrlc_handler(SIGINT);
@@ -939,17 +939,17 @@ Network::readNet(int fd, byte_t *buffer, int nbytes, int
timeout)
// If interrupted by a system call, try again
if (ret == -1 && errno == EINTR) {
- log_error (_("The socket for fd #%d was interrupted by a system
call"), fd);
+ log_error(_("The socket for fd #%d was interrupted by a system
call"), fd);
}
if (ret == -1) {
- log_error (_("The socket for fd #%d was never available for
reading"), fd);
+ log_error(_("The socket for fd #%d was never available for
reading"), fd);
return -1;
}
if (ret == 0) {
if (_debug) {
- log_debug (_("The socket for #fd %d timed out waiting to
read"), fd);
+ log_debug(_("The socket for #fd %d timed out waiting to read"),
fd);
}
return 0;
}
@@ -966,7 +966,7 @@ Network::readNet(int fd, byte_t *buffer, int nbytes, int
timeout)
// If we read zero bytes, the network may be closed, as we returned
from the select()
if (ret == -1) {
- log_error (_("The socket for fd #%d was never available for
reading data"), fd);
+ log_error(_("The socket for fd #%d was never available for reading
data"), fd);
return -1;
}
@@ -1100,7 +1100,7 @@ Network::writeNet(int fd, const byte_t *buffer, int
nbytes, int timeout)
ret = pselect(fd+1, NULL, &fdset, NULL, &tval, &blockset);
sigpending(&pending);
if (sigismember(&pending, SIGINT)) {
- log_debug("Have a pending SIGINT interupt waiting!");
+ log_debug(_("Have a pending SIGINT interupt waiting!"));
int sig;
sigwait(&blockset, &sig);
cntrlc_handler(SIGINT);
@@ -1190,7 +1190,7 @@ Network::addPollFD(struct pollfd &fd, Network::entry_t
*func)
{
// GNASH_REPORT_FUNCTION;
- log_debug("%s: adding fd #%d to pollfds", __PRETTY_FUNCTION__, fd.fd);
+ log_debug(_("%s: adding fd #%d to pollfds"), __PRETTY_FUNCTION__, fd.fd);
boost::mutex::scoped_lock lock(_poll_mutex);
_handlers[fd.fd] = func;
_pollfds.push_back(fd);
@@ -1201,7 +1201,7 @@ void
Network::addPollFD(struct pollfd &fd)
{
// GNASH_REPORT_FUNCTION;
- log_debug("%s: adding fd #%d to pollfds", __PRETTY_FUNCTION__, fd.fd);
+ log_debug(_("%s: adding fd #%d to pollfds"), __PRETTY_FUNCTION__, fd.fd);
boost::mutex::scoped_lock lock(_poll_mutex);
_pollfds.push_back(fd);
// notify();
@@ -1227,7 +1227,7 @@ void
Network::erasePollFD(int fd)
{
// GNASH_REPORT_FUNCTION;
- log_debug("%s: erasing fd #%d from pollfds", __PRETTY_FUNCTION__, fd);
+ log_debug(_("%s: erasing fd #%d from pollfds"), __PRETTY_FUNCTION__, fd);
boost::mutex::scoped_lock lock(_poll_mutex);
if (_pollfds.size() > 0) {
vector<struct pollfd>::iterator it;
@@ -1275,7 +1275,7 @@ Network::waitForNetData(int limit, struct pollfd *fds)
boost::shared_ptr<vector<struct pollfd> > hits(new vector<struct pollfd>);
- log_debug("%s: waiting for %d fds", __FUNCTION__, limit);
+ log_debug(_("%s: waiting for %d fds"), __FUNCTION__, limit);
if ((fds == 0) || (limit == 0)) {
return hits;
@@ -1298,7 +1298,7 @@ Network::waitForNetData(int limit, struct pollfd *fds)
int ret = ppoll(fds, limit, &tval, &blockset);
sigpending(&pending);
if (sigismember(&pending, SIGINT)) {
- log_debug("Have a pending SIGINT interupt waiting!");
+ log_debug(_("Have a pending SIGINT interupt waiting!"));
int sig;
sigwait(&blockset, &sig);
}
@@ -1314,7 +1314,7 @@ Network::waitForNetData(int limit, struct pollfd *fds)
#endif
#endif
- log_debug("Poll returned: %d, timeout is: %d", ret, _timeout);
+ log_debug(_("Poll returned: %d, timeout is: %d"), ret, _timeout);
while (ret--) {
for (int i = 0; i<limit; i++) {
@@ -1428,12 +1428,12 @@ Network::waitForNetData(int limit, fd_set files)
int ret = pselect(limit+1, &fdset, NULL, NULL, &tval, &sigmask);
sigpending(&pending);
if (sigismember(&pending, SIGINT)) {
- log_debug("Have a pending SIGINT interupt waiting!");
+ log_debug(_("Have a pending SIGINT interupt waiting!"));
int sig;
sigwait(&sigmask, &sig);
}
if (sigismember(&pending, SIGPIPE)) {
- log_debug("Have a pending SIGPIPE interupt waiting!");
+ log_debug(_("Have a pending SIGPIPE interupt waiting!"));
int sig;
sigwait(&sigmask, &sig);
}
@@ -1463,11 +1463,11 @@ Network::waitForNetData(int limit, fd_set files)
}
if (ret < 0) {
- log_error("select() got an error: %s.", strerror(errno));
+ log_error(_("select() got an error: %s."), strerror(errno));
FD_ZERO(&fdset);
FD_SET(0, &fdset);
} else {
- log_network("select() saw activity on %d file descriptors.", ret);
+ log_network(_("select() saw activity on %d file descriptors."), ret);
}
return fdset;
@@ -1543,7 +1543,7 @@ Network::initSSL(std::string &hostname, std::string
&passwd,
if (_sockfd == 0) {
if ((_sockfd = createClient(hostname, SSL_PORT) == false)) {
- log_error("Can't connect to server %s", hostname);
+ log_error(_("Can't connect to server %s"), hostname);
return false;
}
}
@@ -1555,35 +1555,35 @@ Network::initSSL(std::string &hostname, std::string
&passwd,
if (!hostname.empty()) {
_ssl->setHostname(hostname);
} else {
- log_debug("Using default hostname: \"%s\"", _host);
+ log_debug(_("Using default hostname: \"%s\""), _host);
}
if (!keyfile.empty()) {
_ssl->setKeyfile(keyfile);
} else {
- log_debug("Using default keyfile: \"%s\"", _ssl->getKeyfile());
+ log_debug(_("Using default keyfile: \"%s\""), _ssl->getKeyfile());
}
if (!calist.empty()) {
_ssl->setCAlist(calist);
} else {
- log_debug("Using default CA List: \"%s\"", _ssl->getCAlist());
+ log_debug(_("Using default CA List: \"%s\""), _ssl->getCAlist());
}
if (!passwd.empty()) {
_ssl->setPassword(passwd);
} else {
- log_debug("Using default Password: \"%s\"", _ssl->getPassword());
+ log_debug(_("Using default Password: \"%s\""), _ssl->getPassword());
}
if (!rootpath.empty()) {
_ssl->setRootPath(rootpath);
} else {
- log_debug("Using default Root Path to PEM files: \"%s\"",
+ log_debug(_("Using default Root Path to PEM files: \"%s\""),
_ssl->getRootPath());
}
if (_ssl->sslConnect(_sockfd)) {
- log_debug("Connected to SSL server");
+ log_debug(_("Connected to SSL server"));
} else {
- log_error("Couldn't connect to SSL server");
+ log_error(_("Couldn't connect to SSL server"));
return false;
}
@@ -1616,7 +1616,7 @@ Network::sniffBytesReady(int fd)
}
}
- log_network("#%d bytes waiting in kernel network buffer.", bytes);
+ log_network(_("#%d bytes waiting in kernel network buffer."), bytes);
return bytes;
}
diff --git a/cygnal/libnet/rtmp.cpp b/cygnal/libnet/rtmp.cpp
index 8ca0e18..7f77a7e 100644
--- a/cygnal/libnet/rtmp.cpp
+++ b/cygnal/libnet/rtmp.cpp
@@ -280,12 +280,12 @@ RTMP::decodeHeader(boost::uint8_t *in)
// Make sure the header size is in range, it has to be between
// 1-12 bytes.
if (head->head_size > RTMP_MAX_HEADER_SIZE) {
- log_error("RTMP Header size can't be more then %d bytes!!",
+ log_error(_("RTMP Header size can't be more then %d bytes!!"),
RTMP_MAX_HEADER_SIZE);
head.reset();
return head;
} else if (head->head_size == 0) {
- log_error("RTMP Header size can't be zero!");
+ log_error(_("RTMP Header size can't be zero!"));
head.reset();
return head;
}
@@ -312,10 +312,11 @@ RTMP::decodeHeader(boost::uint8_t *in)
// reuse the previous body size.
head->bodysize = _bodysize[head->channel];
if (head->bodysize) {
- log_network("Using previous body size of %d for channel %d",
+ log_network(_("Using previous body size of %d for channel %d"),
head->bodysize, head->channel);
} else {
- log_error("Previous body size for channel %d is zero!",
head->channel);
+ log_error(_("Previous body size for channel %d is zero!"),
+ head->channel);
head.reset();
return head;
}
@@ -324,7 +325,8 @@ RTMP::decodeHeader(boost::uint8_t *in)
// the bodysize is limited to two bytes, so if we think we have
// more than that, something probably screwed up.
if (head->bodysize > 65535) {
- log_error("Suspicious large RTMP packet body size! %d", head->bodysize);
+ log_error(_("Suspicious large RTMP packet body size! %d"),
+ head->bodysize);
head.reset();
return head;
}
@@ -343,7 +345,7 @@ RTMP::decodeHeader(boost::uint8_t *in)
#endif
} else {
if (_type[head->channel] <= RTMP::FLV_DATA) {
- log_network("Using previous type of %d for channel %d",
+ log_network(_("Using previous type of %d for channel %d"),
head->type, head->channel);
head->type = _type[head->channel];
}
@@ -355,7 +357,7 @@ RTMP::decodeHeader(boost::uint8_t *in)
// log_network(_("The source/destination is: %x"), head->src_dest);
}
- log_network("RTMP %s: channel: %d, head size %d, body size: %d",
+ log_network(_("RTMP %s: channel: %d, head size %d, body size: %d"),
((head->head_size == 1) ? "same" : content_str[head->type]),
head->channel,
head->head_size,
@@ -477,8 +479,8 @@ RTMP::packetRead(cygnal::Buffer &buf)
amf_index = *ptr & RTMP_INDEX_MASK;
headersize = headerSize(*buf.reference());
- log_network (_("The Header size is: %d"), headersize);
- log_network (_("The AMF index is: 0x%x"), amf_index);
+ log_network(_("The Header size is: %d"), headersize);
+ log_network(_("The AMF index is: 0x%x"), amf_index);
if (headersize > 1) {
RTMP::rtmp_head_t *rthead = decodeHeader(ptr);
@@ -494,7 +496,7 @@ RTMP::packetRead(cygnal::Buffer &buf)
boost::uint8_t *end = buf.remove(0xc3);
#else
boost::uint8_t *end = buf.find(0xc3);
- log_network("END is %x", (void *)end);
+ log_network(_("END is %x"), (void *)end);
*end = '*';
#endif
@@ -505,7 +507,7 @@ RTMP::packetRead(cygnal::Buffer &buf)
// el->dump();
el = amf.extractAMF(ptr, tooFar); // @@strk@@ : what's the +1 for ?
// el->dump();
- log_network (_("Reading AMF packets till we're done..."));
+ log_network(_("Reading AMF packets till we're done..."));
// buf->dump();
while (ptr < end) {
boost::shared_ptr<cygnal::Element> el = amf.extractProperty(ptr,
tooFar);
@@ -514,10 +516,11 @@ RTMP::packetRead(cygnal::Buffer &buf)
}
ptr += 1;
size_t actual_size = static_cast<size_t>(_header.bodysize -
AMF_HEADER_SIZE);
- log_network("Total size in header is %d, buffer size is: %d",
_header.bodysize, buf.size());
+ log_network(_("Total size in header is %d, buffer size is: %d"),
+ _header.bodysize, buf.size());
// buf->dump();
if (buf.size() < actual_size) {
- log_network("FIXME: MERGING");
+ log_network(_("FIXME: MERGING"));
// buf = _handler->merge(buf); FIXME needs to use shared_ptr
}
while ((ptr - buf.begin()) < static_cast<int>(actual_size)) {
@@ -533,13 +536,13 @@ RTMP::packetRead(cygnal::Buffer &buf)
boost::shared_ptr<cygnal::Element> app = getProperty("app");
if (file) {
- log_network("SWF file %s", file->to_string());
+ log_network(_("SWF file %s"), file->to_string());
}
if (url) {
- log_network("is Loading video %s", url->to_string());
+ log_network(_("is Loading video %s"), url->to_string());
}
if (app) {
- log_network("is file name is %s", app->to_string());
+ log_network(_("is file name is %s"), app->to_string());
}
return true;
@@ -668,7 +671,7 @@ RTMP::decodeUserControl(boost::uint8_t *data)
case STREAM_PONG:
break;
default:
- log_unimpl("Unknown User Control message %d!", 1);
+ log_unimpl(_("Unknown User Control message %d!"), 1);
break;
};
@@ -740,7 +743,7 @@ RTMP::decodeMsgBody(boost::uint8_t *data, size_t size)
if (name) {
ptr += name->getDataSize() + cygnal::AMF_HEADER_SIZE; // skip the
length bytes too
} else {
- log_error("Name field of RTMP Message corrupted!");
+ log_error(_("Name field of RTMP Message corrupted!"));
msg.reset();
return msg;
}
@@ -756,7 +759,7 @@ RTMP::decodeMsgBody(boost::uint8_t *data, size_t size)
ptr += cygnal::AMF0_NUMBER_SIZE + 1;
}
} else {
- log_error("Stream ID field of RTMP Message corrupted!");
+ log_error(_("Stream ID field of RTMP Message corrupted!"));
msg.reset();
return msg;
}
@@ -985,7 +988,7 @@ RTMP::sendMsg(int fd, int channel, rtmp_headersize_e
head_size,
#if 0
// We got some bogus parameters
if (total_size || size 0) {
- log_error("Bogus size parameter in %s!", __PRETTY_FUNCTION__);
+ log_error(_("Bogus size parameter in %s!"), __PRETTY_FUNCTION__);
return false;
}
#endif
@@ -1022,10 +1025,10 @@ RTMP::sendMsg(int fd, int channel, rtmp_headersize_e
head_size,
#if 0
ret = writeNet(fd, head->reference(), head->size());
if (ret == -1) {
- log_error("Couldn't write the full 12 byte RTMP header!");
+ log_error(_("Couldn't write the full 12 byte RTMP header!"));
return false;
} else {
- log_network("Wrote the full 12 byte RTMP header.");
+ log_network(_("Wrote the full 12 byte RTMP header."));
}
#else
*bigbuf = head;
@@ -1045,10 +1048,10 @@ RTMP::sendMsg(int fd, int channel, rtmp_headersize_e
head_size,
#if 0
ret = writeNet(fd, *cont_head);
if (ret == -1) {
- log_error("Couldn't write the full 1 byte RTMP continuation
header!");
+ log_error(_("Couldn't write the full 1 byte RTMP continuation
header!"));
return false;
} else {
- log_network("Wrote the full 1 byte RTMP continuation header");
+ log_network(_("Wrote the full 1 byte RTMP continuation
header"));
}
#else
*bigbuf += cont_head;
@@ -1060,10 +1063,10 @@ RTMP::sendMsg(int fd, int channel, rtmp_headersize_e
head_size,
#if 0
ret = writeNet(fd, data + nbytes, partial);
if (ret == -1) {
- log_error("Couldn't write the RTMP body!");
+ log_error(_("Couldn't write the RTMP body!"));
return false;
} else {
- log_network("Wrote %d bytes of the RTMP body, %d bytes left.",
+ log_network(_("Wrote %d bytes of the RTMP body, %d bytes left."),
ret, size-nbytes);
}
#else
@@ -1080,10 +1083,10 @@ RTMP::sendMsg(int fd, int channel, rtmp_headersize_e
head_size,
ret = writeNet(fd, *bigbuf);
if (ret == -1) {
- log_error("Couldn't write the RTMP packet!");
+ log_error(_("Couldn't write the RTMP packet!"));
return false;
} else {
- log_network("Wrote the RTMP packet.");
+ log_network(_("Wrote the RTMP packet."));
}
#endif
@@ -1129,19 +1132,21 @@ RTMP::sendRecvMsg(cygnal::Buffer &bufin)
if (rthead) {
if (rthead->head_size == 1) {
- log_network("Response header: %s", hexify(ptr, 7, false));
+ log_network(_("Response header: %s"), hexify(ptr, 7, false));
} else {
- log_network("Response header: %s", hexify(ptr,
rthead->head_size, false));
+ log_network(_("Response header: %s"),
+ hexify(ptr, rthead->head_size, false));
}
if (rthead->type <= RTMP::FLV_DATA) {
- log_error("Processing message of type %s!",
content_str[rthead->type]);
+ log_error(_("Processing message of type %s!"),
+ content_str[rthead->type]);
}
switch (rthead->type) {
case CHUNK_SIZE:
- log_network("Got CHUNK_SIZE packet!!!");
+ log_networ(_("Got CHUNK_SIZE packet!!!"));
_chunksize[rthead->channel] =
ntohl(*reinterpret_cast<boost::uint32_t *>(ptr + rthead->head_size));
- log_network("Setting packet chunk size to %d.", _chunksize);
+ log_network(_("Setting packet chunk size to %d."),
_chunksize);
// decodeChunkSize();
break;
case BYTES_READ:
@@ -1151,7 +1156,8 @@ RTMP::sendRecvMsg(cygnal::Buffer &bufin)
case PING:
{
RTMP::rtmp_ping_t *ping = decodePing(ptr);
- log_network("FIXME: Ping type is: %d, ignored for now",
ping->type);
+ log_network(_("FIXME: Ping type is: %d, ignored for now"),
+ ping->type);
switch (ping->type) {
case PING_CLEAR:
break;
@@ -1172,7 +1178,7 @@ RTMP::sendRecvMsg(cygnal::Buffer &bufin)
}
case SERVER:
{
- log_network("Got SERVER packet!!!");
+ log_network(_("Got SERVER packet!!!"));
Buffer server_data(rthead->bodysize);
server_data.copy(ptr + rthead->head_size, rthead->bodysize);
// decodeServer();
@@ -1180,7 +1186,7 @@ RTMP::sendRecvMsg(cygnal::Buffer &bufin)
}
case CLIENT:
{
- log_network("Got CLIENT packet!!!");
+ log_network(_("Got CLIENT packet!!!"));
Buffer client_data(rthead->bodysize);
client_data.copy(ptr + rthead->head_size, rthead->bodysize);
// decodeClient();
@@ -1188,7 +1194,7 @@ RTMP::sendRecvMsg(cygnal::Buffer &bufin)
}
case VIDEO_DATA:
{
- log_network("Got VIDEO packets!!!");
+ log_network(_("Got VIDEO packets!!!"));
boost::shared_ptr<cygnal::Buffer> frame;
do {
frame = recvMsg(1); // use a 1 second timeout
@@ -1204,23 +1210,23 @@ RTMP::sendRecvMsg(cygnal::Buffer &bufin)
// decodeNotify();
break;
case SHARED_OBJ:
- log_network("Got Shared Object packet!!!");
+ log_network(_("Got Shared Object packet!!!"));
// decodeSharedObj();
break;
case INVOKE:
msg = decodeMsgBody(ptr + rthead->head_size,
rthead->bodysize);
// msg->dump();
if (msg) {
- log_network("%s: Msg status is: %d: %s, name is %s, size
is %d", __FUNCTION__,
+ log_network(_("%s: Msg status is: %d: %s, name is %s,
size is %d"), __FUNCTION__,
msg->getStatus(), status_str[msg->getStatus()],
msg->getMethodName(), msg->size());
if (msg->getMethodName() == "onBWDone") {
- log_network("Got onBWDone packet!!!");
+ log_network(_("Got onBWDone packet!!!"));
continue;
}
return msg;
} else {
- log_error("Couldn't decode message body for type %s!",
+ log_error(_("Couldn't decode message body for type %s!"),
content_str[rthead->type]);
}
// decodeInvoke();
@@ -1274,13 +1280,14 @@ RTMP::recvMsg(int fd)
}
// the read timed out as there was no data, but the socket is still
open.
if (ret == 0) {
- log_network("no data for fd #%d, done reading this packet, read %d
bytes...", fd,
+ log_network(_("no data for fd #%d, done reading this packet, read
%d bytes..."), fd,
buf->allocated());
buf.reset();
break;
}
if ((ret == 1) && (*(buf->reference()) == 0xff)) {
- log_network("Got an empty packet from the server at line %d",
__LINE__);
+ log_network(_("Got an empty packet from the server at line %d"),
+ __LINE__);
ret = 0;
buf->clear();
continue;
@@ -1288,7 +1295,7 @@ RTMP::recvMsg(int fd)
// ret is "no position" when the socket is closed from the other end of
the connection,
// so we're done.
if ((ret == static_cast<int>(std::string::npos)) || (ret == -1)) {
- log_network("socket for fd #%d was closed...", fd);
+ log_network(_("socket for fd #%d was closed..."), fd);
buf.reset();
break;
}
@@ -1319,7 +1326,7 @@ RTMP::split(boost::uint8_t *data, size_t size)
// GNASH_REPORT_FUNCTION;
if (data == 0) {
- log_error("Buffer pointer is invalid.");
+ log_error(_("Buffer pointer is invalid."));
}
boost::shared_ptr<RTMP::queues_t> channels(new RTMP::queues_t);
@@ -1345,7 +1352,7 @@ RTMP::split(boost::uint8_t *data, size_t size)
// System channel messages are always on channel 2, and get
// processed differently later on.
if (rthead->channel == RTMP_SYSTEM_CHANNEL) {
- log_network("Got a message on the system channel!", __FUNCTION__);
+ log_network(_("Got a message on the system channel!"),
__FUNCTION__);
}
// If the header size is 4 bytes or less, then reuse the body size
// of the last message for this channel.
@@ -1449,7 +1456,8 @@ RTMP::split(boost::uint8_t *data, size_t size)
// FIXME: why is this off by 1 byte ?
ptr += pktsize - 1;
} else {
- log_error("Packet size out of range! %d, %d",
rthead->bodysize, pktsize);
+ log_error(_("Packet size out of range! %d, %d"),
+ rthead->bodysize, pktsize);
}
// add this packet to the list of active channels if we've
gotten
// all the data.
@@ -1459,11 +1467,13 @@ RTMP::split(boost::uint8_t *data, size_t size)
channels->push_back(&_queues[rthead->channel]);
// }
} else {
- log_error("RTMP packet size is out of range! %d, %d",
rthead->bodysize, pktsize);
+ log_error(_("RTMP packet size is out of range! %d, %d"),
+ rthead->bodysize, pktsize);
break;
}
} else {
- log_error("RTMP header size is out of range! %d",
rthead->head_size);
+ log_error(_("RTMP header size is out of range! %d"),
+ rthead->head_size);
break;
}
}
@@ -1477,5 +1487,5 @@ RTMP::split(boost::uint8_t *data, size_t size)
// local Variables:
// mode: C++
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
// End:
diff --git a/cygnal/libnet/rtmp_client.cpp b/cygnal/libnet/rtmp_client.cpp
index 2981779..3058424 100644
--- a/cygnal/libnet/rtmp_client.cpp
+++ b/cygnal/libnet/rtmp_client.cpp
@@ -149,17 +149,17 @@ RTMPClient::encodeConnect(const char *uri,
swfUrl = "http://localhost:1935/demos/videoConference.swf";;
pageUrl = "http://gnashdev.org";;
- log_network("URL is %s", url);
- log_network("Protocol is %s", protocol);
- log_network("Host is %s", hostname);
- log_network("Port is %s", port);
- log_network("Path is %s", path);
- log_network("Filename is %s", filename);
- log_network("App is %s", app);
- log_network("Query is %s", query);
- log_network("tcUrl is %s", tcUrl);
- log_network("swfUrl is %s", swfUrl);
- log_network("pageUrl is %s", pageUrl);
+ log_network(_("URL is %s"), url);
+ log_network(_("Protocol is %s"), protocol);
+ log_network(_("Host is %s"), hostname);
+ log_network(_("Port is %s"), port);
+ log_network(_("Path is %s"), path);
+ log_network(_("Filename is %s"), filename);
+ log_network(_("App is %s"), app);
+ log_network(_("Query is %s"), query);
+ log_network(_("tcUrl is %s"), tcUrl);
+ log_network(_("swfUrl is %s"), swfUrl);
+ log_network(_("pageUrl is %s"), pageUrl);
return encodeConnect(app.c_str(), swfUrl.c_str(), tcUrl.c_str(),
audioCodecs, videoCodecs, videoFunction,
@@ -310,7 +310,7 @@ RTMPClient::connectToServer(const std::string &url)
// server.
boost::shared_ptr<cygnal::Buffer> handshake1 = handShakeRequest();
if (!handshake1) {
- log_error("RTMP handshake request failed");
+ log_error(_("RTMP handshake request failed"));
return false;
}
@@ -333,7 +333,7 @@ RTMPClient::connectToServer(const std::string &url)
handshake2->dump();
if (!clientFinish(*handshake2)) {
#endif
- log_error("RTMP handshake completion failed!");
+ log_error(_("RTMP handshake completion failed!"));
// return (false);
}
@@ -347,10 +347,10 @@ RTMPClient::connectToServer(const std::string &url)
boost::shared_ptr<RTMPMsg> msg = msgque.front();
msgque.pop_front();
if (msg->getStatus() == RTMPMsg::NC_CONNECT_SUCCESS) {
- log_network("Sent NetConnection Connect message successfully");
+ log_network(_("Sent NetConnection Connect message
successfully"));
}
if (msg->getStatus() == RTMPMsg::NC_CONNECT_FAILED) {
- log_error("Couldn't send NetConnection Connect message,");
+ log_error(_("Couldn't send NetConnection Connect message,"));
}
}
}
@@ -619,7 +619,7 @@ RTMPClient::clientFinish(cygnal::Buffer &data)
done = true;
}
if (ret < 0) {
- log_error (_("Couldn't read data block in handshake!"));
+ log_error(_("Couldn't read data block in handshake!"));
handshake1.reset();
return handshake1;
}
@@ -632,17 +632,18 @@ RTMPClient::clientFinish(cygnal::Buffer &data)
} while (!done);
if (handshake1->allocated() == boost::lexical_cast<size_t>(max_size)) {
- log_network (_("Read data block in handshake, got %d bytes."),
+ log_network(_("Read data block in handshake, got %d bytes."),
handshake1->allocated());
} else {
- log_error("Couldn't read data block in handshake, read %d bytes!",
+ log_error(_("Couldn't read data block in handshake, read %d bytes!"),
handshake1->allocated());
}
_handshake_header.uptime = ntohl(*reinterpret_cast<boost::uint32_t *>
(handshake1->reference() + 1));
- log_network("RTMP Handshake header: Uptime: %u", _handshake_header.uptime);
+ log_network(_("RTMP Handshake header: Uptime: %u"),
+ _handshake_header.uptime);
#if 0
if (memcmp(handshake2->reference() + RTMP_HANDSHAKE_SIZE + 8,
@@ -684,11 +685,13 @@ RTMPClient::clientFinish(cygnal::Buffer &data)
*handshake2 += data;
// Write the second chunk to the server
- log_network("About to write %d bytes, data is: %d bytes.",
+ log_network(_("About to write %d bytes, data is: %d bytes."),
handshake2->allocated(),
data.allocated());
- log_network("Client response header for handshake 2: %s",
hexify(handshake2->reference(), 12, false));
- log_network("Data in response for handshake 2: %s",
hexify(handshake1->reference() + RTMP_HANDSHAKE_SIZE + 1, 12, false));
+ log_network(_("Client response header for handshake 2: %s"),
+ hexify(handshake2->reference(), 12, false));
+ log_network(_("Data in response for handshake 2: %s"),
+ hexify(handshake1->reference() + RTMP_HANDSHAKE_SIZE + 1, 12,
false));
#if 0
ret = writeNet(handshake2->reference()+RTMP_HANDSHAKE_SIZE,
RTMP_HANDSHAKE_SIZE + data.allocated() + 1);
@@ -696,7 +699,7 @@ RTMPClient::clientFinish(cygnal::Buffer &data)
ret = writeNet(*handshake2);
#endif
if ( ret <= 0 ) {
- log_error("Couldn't write the second handshake packet!");
+ log_error(_("Couldn't write the second handshake packet!"));
handshake1.reset();
return handshake1;
} else {
@@ -723,7 +726,7 @@ RTMPClient::recvResponse()
// messages on channel 2, and the response message on channel 3 from our
request.
boost::shared_ptr<cygnal::Buffer> response = recvMsg();
if (!response) {
- log_error("Got no response from the RTMP server");
+ log_error(_("Got no response from the RTMP server"));
return msgque;
}
@@ -731,7 +734,7 @@ RTMPClient::recvResponse()
// but when I do streaming, it's always there, so we need to remove it.
boost::uint8_t *pktstart = response->reference();
if (*pktstart == 0xff) {
- log_network("Got empty packet in buffer.");
+ log_network(_("Got empty packet in buffer."));
pktstart++;
}
@@ -742,15 +745,14 @@ RTMPClient::recvResponse()
// If we got no responses, something obviously went wrong.
if (!que->size()) {
- log_error("No response from INVOKE of NetConnection connect");
-
+ log_error(_("No response from INVOKE of NetConnection connect"));
}
// There is a queue of queues used to hold all the messages. The first
queue
// is indexed by the channel number, the second queue is all the messages
that
// have arrived for that channel.
while (que->size()) { // see if there are any messages at all
- log_network("%s: There are %d channel queues in the RTMP input queue,
%d messages in front queue",
+ log_network(_("%s: There are %d channel queues in the RTMP input queue,
%d messages in front queue"),
__PRETTY_FUNCTION__, que->size(), que->front()->size());
// Get the CQue for the first channel
CQue *channel_q = que->front();
@@ -763,36 +765,38 @@ RTMPClient::recvResponse()
if (ptr) { // If there is legit data
rthead = decodeHeader(ptr->reference());
if (!rthead) {
- log_error("Couldn't decode RTMP message header");
+ log_error(_("Couldn't decode RTMP message header"));
continue;
}
switch (rthead->type) {
case RTMP::NONE:
- log_error("RTMP packet can't be of none type!");
+ log_error(_("RTMP packet can't be of none type!"));
+
break;
case RTMP::CHUNK_SIZE:
- log_unimpl("Server message data packet");
+ log_unimpl(_("Server message data packet"));
+
break;
case RTMP::ABORT:
- log_unimpl("Abort packet");
+ log_unimpl(_("Abort packet"));
break;
case RTMP::BYTES_READ:
- log_unimpl("Bytes Read data packet");
+ log_unimpl(_("Bytes Read data packet"));
break;
case RTMP::USER:
{
boost::shared_ptr<RTMP::rtmp_ping_t> ping =
decodePing(ptr->reference() + rthead->head_size);
- log_network("Got a Ping type %s", ping_str[ping->type]);
+ log_network(_("Got a Ping type %s"),
ping_str[ping->type]);
break;
}
case RTMP::WINDOW_SIZE:
- log_unimpl("Set Window Size message data packet");
+ log_unimpl(_("Set Window Size message data packet"));
break;
case RTMP::SET_BANDWITH:
- log_unimpl("Set Bandwidthmessage data packet");
+ log_unimpl(_("Set Bandwidthmessage data packet"));
break;
case RTMP::ROUTE:
- log_unimpl("Route from other server packet");
+ log_unimpl(_("Route from other server packet"));
break;
case RTMP::AUDIO_DATA:
{
@@ -811,19 +815,19 @@ RTMPClient::recvResponse()
break;
}
case RTMP::SHARED_OBJ:
- log_unimpl("AMF0 Shared Object data packet message");
+ log_unimpl(_("AMF0 Shared Object data packet message"));
break;
case RTMP::AMF3_NOTIFY:
- log_unimpl("AMF3 Notify data packet message");
+ log_unimpl(_("AMF3 Notify data packet message"));
break;
case RTMP::AMF3_SHARED_OBJ:
- log_unimpl("AMF3 Shared Object data packet message");
+ log_unimpl(_("AMF3 Shared Object data packet message"));
break;
case RTMP::AMF3_INVOKE:
- log_unimpl("AMF0 Invoke packet message");
+ log_unimpl(_("AMF0 Invoke packet message"));
break;
case RTMP::NOTIFY:
- log_unimpl("AMF0 Notify data packet message");
+ log_unimpl(_("AMF0 Notify data packet message"));
break;
case RTMP::INVOKE:
{
@@ -834,10 +838,10 @@ RTMPClient::recvResponse()
break;
}
case RTMP::FLV_DATA:
- log_unimpl("Flv data packet message");
+ log_unimpl(_("Flv data packet message"));
break;
default :
- log_error("Couldn't decode RTMP message Body");
+ log_error(_("Couldn't decode RTMP message Body"));
break;
}
}
@@ -859,5 +863,5 @@ RTMPClient::recvResponse()
// local Variables:
// mode: C++
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
// End:
diff --git a/cygnal/libnet/sshclient.cpp b/cygnal/libnet/sshclient.cpp
index 08e65ed..5b45b99 100644
--- a/cygnal/libnet/sshclient.cpp
+++ b/cygnal/libnet/sshclient.cpp
@@ -117,7 +117,7 @@ SSHClient::sshRead(boost::uint8_t *buf, size_t size)
int ret = channel_read(_channel, buf, size, 0);
if (ret < 0) {
- log_error("SSH read error was: \"%s\"!", ssh_get_error(_session));
+ log_error(_("SSH read error was: \"%s\"!"), ssh_get_error(_session));
}
return ret;
@@ -139,7 +139,7 @@ SSHClient::sshWrite(const boost::uint8_t *buf, size_t size)
int ret = channel_write(_channel, buf, size);
if (ret < 0) {
- log_error("SSH write error was: \"%s\"!", ssh_get_error(_session));
+ log_error(_("SSH write error was: \"%s\"!"), ssh_get_error(_session));
}
return ret;
}
@@ -177,14 +177,14 @@ SSHClient::sshConnect(int /* fd */, std::string &hostname)
// We always need a hostname to connect to
if (ssh_options_set(_session, SSH_OPTIONS_HOST, hostname.c_str()) < 0) {
- log_error("Couldn't set hostname option");
+ log_error(_("Couldn't set hostname option"));
return false;
}
// We always need a user name for the connection
if (_user.empty()) {
if (ssh_options_set(_session, SSH_OPTIONS_USER, _user.c_str()) < 0) {
- log_error("Couldn't set user name option");
+ log_error(_("Couldn't set user name option"));
return false;
}
}
@@ -192,7 +192,7 @@ SSHClient::sshConnect(int /* fd */, std::string &hostname)
// Start a new session
_session = ssh_new();
if(ssh_connect(_session)){
- log_error("Connection failed : %s\n", ssh_get_error(_session));
+ log_error(_("Connection failed : %s\n"), ssh_get_error(_session));
sshShutdown();
return false;
}
@@ -207,20 +207,20 @@ SSHClient::sshConnect(int /* fd */, std::string &hostname)
}
switch(_state){
case SSH_SERVER_KNOWN_OK: // ok
- log_debug("SSH Server is currently known: %d", _state);
+ log_debug(_("SSH Server is currently known: %d"), _state);
break;
case SSH_SERVER_KNOWN_CHANGED:
- log_error("Host key for server changed : server's one is now: ");
- ssh_print_hexa("Public key hash", hash, hlen);
+ log_error(_("Host key for server changed : server's one is now: "));
+ ssh_print_hexa(_("Public key hash"), hash, hlen);
free(hash);
- log_error("For security reason, connection will be stopped");
+ log_error(_("For security reason, connection will be stopped"));
sshShutdown();
return false;;
case SSH_SERVER_FOUND_OTHER:
- log_error("The host key for this server was not found but an other
type of key exists.");
- log_error("An attacker might change the default server key to confuse
your client"
+ log_error(_("The host key for this server was not found but an other
type of key exists."));
+ log_error(_("An attacker might change the default server key to
confuse your client"
"into thinking the key does not exist\n"
- "We advise you to rerun the client with -d or -r for more
safety.");
+ "We advise you to rerun the client with -d or -r for more
safety."));
sshShutdown();
return false;;
case SSH_SERVER_NOT_KNOWN:
@@ -229,29 +229,29 @@ SSHClient::sshConnect(int /* fd */, std::string &hostname)
// FIXME: for now, accecpt all new keys, and update the
// $HOME/.ssh/know_hosts file.
#if 0
- log_error("The server is unknown. Do you trust the host key ?
(yes,no)");
- log_error("Public key hash: %s", hexa);
+ log_error(_("The server is unknown. Do you trust the host key ?
(yes,no)"));
+ log_error(_("Public key hash: %s"), hexa);
free(hexa);
fgets(buf, sizeof(buf), stdin);
if(strncasecmp(buf, "yes", 3) != 0){
sshShutdown();
return false;
}
- log_error("This new key will be written on disk for further usage. do
you agree? (yes,no) ");
+ log_error(_("This new key will be written on disk for further usage.
do you agree? (yes,no) "));
fgets(buf, sizeof(buf), stdin);
if(strncasecmp(buf, "yes", 3)==0){
if(ssh_write_knownhost(_session))
- log_error("%s", ssh_get_error(_session));
+ log_error(ssh_get_error(_session));
}
#else
if(ssh_write_knownhost(_session)) {
- log_error("%s", ssh_get_error(_session));
+ log_error(ssh_get_error(_session));
}
#endif
break;
case SSH_SERVER_ERROR:
free(hash);
- log_error("%s", ssh_get_error(_session));
+ log_error(ssh_get_error(_session));
sshShutdown();
return false;
}
@@ -263,30 +263,30 @@ SSHClient::sshConnect(int /* fd */, std::string &hostname)
int auth = ssh_auth_list(_session);
// log_debug("auth: 0x%04x", auth);
- log_debug("supported auth methods: ");
+ log_debug(_("supported auth methods: "));
if (auth & SSH_AUTH_METHOD_PUBLICKEY) {
- log_debug("\tpublickey");
+ log_debug(_("\tpublickey"));
}
if (auth & SSH_AUTH_METHOD_INTERACTIVE) {
- log_debug("\tkeyboard-interactive");
+ log_debug(_("\tkeyboard-interactive"));
}
/* no ? you should :) */
auth=ssh_userauth_autopubkey(_session, NULL);
if(auth == SSH_AUTH_ERROR){
- log_debug("Authenticating with pubkey: %s",ssh_get_error(_session));
+ log_debug(_("Authenticating with pubkey: %s"),
ssh_get_error(_session));
ssh_finalize();
return false;
}
banner = ssh_get_issue_banner(_session);
if(banner){
- log_debug("%s", banner);
+ log_debug(banner);
free(banner);
}
if(auth != SSH_AUTH_SUCCESS){
auth = authKbdint(_session);
if(auth == SSH_AUTH_ERROR){
- log_error("authenticating with keyb-interactive: %s",
+ log_error(_("authenticating with keyb-interactive: %s"),
ssh_get_error(_session));
ssh_finalize();
return false;
@@ -295,7 +295,7 @@ SSHClient::sshConnect(int /* fd */, std::string &hostname)
if(auth != SSH_AUTH_SUCCESS){
password = getpass("Password: ");
if(ssh_userauth_password(_session, NULL, password) !=
SSH_AUTH_SUCCESS){
- log_error("Authentication failed: %s",ssh_get_error(_session));
+ log_error(_("Authentication failed: %s"), ssh_get_error(_session));
ssh_disconnect(_session);
ssh_finalize();
return false;
@@ -345,13 +345,13 @@ SSHClient::authKbdint(ssh_session session)
instruction = const_cast<char
*>(ssh_userauth_kbdint_getinstruction(session));
n=ssh_userauth_kbdint_getnprompts(session);
if(strlen(name)>0)
- log_debug("%s", name);
+ log_debug(name);
if(strlen(instruction)>0)
- log_debug("%s", instruction);
+ log_debug(instruction);
for(i=0; i<n; ++i){
prompt = const_cast<char *>(ssh_userauth_kbdint_getprompt(session,
i, &echo));
if(echo){
- log_debug("%s", prompt);
+ log_debug(prompt);
fgets(buffer,sizeof(buffer),stdin);
buffer[sizeof(buffer)-1]=0;
if((ptr=strchr(buffer,'\n')))
@@ -390,10 +390,10 @@ SSHClient::openChannel(ssh_session session)
_channel = channel_new(session);
if (_channel) {
if (channel_open_session(_channel) != SSH_OK) {
- log_error("Can't open the SSH channel!");
+ log_error(_("Can't open the SSH channel!"));
}
} else {
- log_error("Can't allocate memory for new SSH channel!");
+ log_error(_("Can't allocate memory for new SSH channel!"));
}
}
@@ -409,7 +409,7 @@ SSHClient::readChannel(ssh_channel channel, cygnal::Buffer
&buf)
if (channel) {
ret = channel_read(channel, buf.reference(), buf.size(), 0);
} else {
- log_error("Can't read from a non-existant channel!");
+ log_error(_("Can't read from a non-existant channel!"));
}
return ret;
@@ -424,7 +424,7 @@ SSHClient::writeChannel(ssh_channel channel, cygnal::Buffer
&buf)
if (channel) {
ret = channel_write(channel, buf.reference(), buf.size());
} else {
- log_error("Can't write to a non-existant channel!");
+ log_error(_("Can't write to a non-existant channel!"));
}
return ret;
@@ -466,5 +466,5 @@ SSHClient::dump() {
// local Variables:
// mode: C++
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
// End:
diff --git a/cygnal/libnet/sshserver.cpp b/cygnal/libnet/sshserver.cpp
index 6efb69a..0e0c0b3 100644
--- a/cygnal/libnet/sshserver.cpp
+++ b/cygnal/libnet/sshserver.cpp
@@ -142,7 +142,7 @@ SSHServer::processSSHMessage(ssh_message message)
break;
case SSH_AUTH_METHOD_PASSWORD:
{
- log_debug("User %s wants to auth with pass %s\n",
+ log_debug(_("User %s wants to auth with pass %s\n"),
ssh_message_auth_user(message),
ssh_message_auth_password(message));
string user = ssh_message_auth_user(message);
@@ -207,5 +207,5 @@ SSHServer::dump() {
// local Variables:
// mode: C++
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
// End:
diff --git a/cygnal/libnet/sslclient.cpp b/cygnal/libnet/sslclient.cpp
index 36e57f1..be4c705 100644
--- a/cygnal/libnet/sslclient.cpp
+++ b/cygnal/libnet/sslclient.cpp
@@ -134,7 +134,8 @@ SSLClient::sslRead(boost::uint8_t *buf, size_t size)
ERR_clear_error();
int ret = SSL_read(_ssl.get(), buf, size);
if (ret < 0) {
- log_error("Error was: \"%s\"!",
ERR_reason_error_string(ERR_get_error()));
+ log_error(_("Error was: \"%s\"!"),
+ ERR_reason_error_string(ERR_get_error()));
}
return ret;
@@ -157,7 +158,8 @@ SSLClient::sslWrite(const boost::uint8_t *buf, size_t
length)
ERR_clear_error();
int ret = SSL_write(_ssl.get(), buf, length);
if (ret < 0) {
- log_error("Error was: \"%s\"!",
ERR_reason_error_string(ERR_get_error()));
+ log_error(_("Error was: \"%s\"!"),
+ ERR_reason_error_string(ERR_get_error()));
}
return ret;
}
@@ -206,20 +208,21 @@ SSLClient::sslSetupCTX(std::string &keyspec, std::string
&caspec)
ERR_clear_error();
if (!(SSL_CTX_load_verify_locations(_ctx.get(), cafile.c_str(),
_rootpath.c_str()))) {
- log_error("Can't read CA list from \"%s\"!", cafile);
- log_error("Error was: \"%s\"!",
ERR_reason_error_string(ERR_get_error()));
+ log_error(_("Can't read CA list from \"%s\"!"), cafile);
+ log_error(_("Error was: \"%s\"!"),
+ ERR_reason_error_string(ERR_get_error()));
return false;
} else {
- log_debug("Read CA list from \"%s\"", cafile);
+ log_debug(_("Read CA list from \"%s\""), cafile);
}
// Load our keys and certificates
ERR_clear_error();
if ((ret = SSL_CTX_use_certificate_chain_file(_ctx.get(),
keyfile.c_str())) != 1) {
- log_error("Can't read certificate file \"%s\"!", keyfile);
+ log_error(_("Can't read certificate file \"%s\"!"), keyfile);
return false;
} else {
- log_debug("Read certificate file \"%s\".", keyfile);
+ log_debug(_("Read certificate file \"%s\"."), keyfile);
}
// Set the password as a callback, otherwise we get prompted for it
@@ -229,11 +232,12 @@ SSLClient::sslSetupCTX(std::string &keyspec, std::string
&caspec)
ERR_clear_error();
if((ret = SSL_CTX_use_PrivateKey_file(_ctx.get(), keyfile.c_str(),
SSL_FILETYPE_PEM)) != 1) {
- log_error("Can't read CERT file \"%s\"!", keyfile);
- log_error("Error was: \"%s\"!",
ERR_reason_error_string(ERR_get_error()));
+ log_error(_("Can't read CERT file \"%s\"!"), keyfile);
+ log_error(_("Error was: \"%s\"!"),
+ ERR_reason_error_string(ERR_get_error()));
return false;
} else {
- log_debug("Read key file \"%s\".", keyfile);
+ log_debug(_("Read key file \"%s\"."), keyfile);
}
SSL_CTX_set_verify(_ctx.get(), SSL_VERIFY_PEER, verify_callback);
@@ -294,10 +298,10 @@ SSLClient::sslConnect(int fd, std::string &hostname,
short port)
_bio.reset(BIO_new_connect(const_cast<char *>(_hostname.c_str())));
BIO_set_conn_int_port(_bio.get(), &port);
- log_debug("PORT is: %d", BIO_get_conn_port(_bio.get()));
+ log_debug(_("PORT is: %d"), BIO_get_conn_port(_bio.get()));
if (BIO_do_connect(_bio.get()) <= 0) {
- log_error("Error connecting to remote machine: %s",
+ log_error(_("Error connecting to remote machine: %s"),
ERR_reason_error_string(ERR_get_error()));
}
#endif
@@ -306,11 +310,12 @@ SSLClient::sslConnect(int fd, std::string &hostname,
short port)
SSL_set_connect_state(_ssl.get());
if ((ret = SSL_connect(_ssl.get())) < 0) {
- log_error("Can't connect to SSL server %s", hostname);
- log_error("Error was: \"%s\"!",
ERR_reason_error_string(ERR_get_error()));
+ log_error(_("Can't connect to SSL server %s"), hostname);
+ log_error(_("Error was: \"%s\"!"),
+ ERR_reason_error_string(ERR_get_error()));
return false;
} else {
- log_debug("Connected to SSL server %s", hostname);
+ log_debug(_("Connected to SSL server %s"), hostname);
}
ERR_clear_error();
@@ -343,10 +348,10 @@ SSLClient::checkCert(std::string &hostname)
char peer_CN[256];
if (SSL_get_verify_result(_ssl.get()) != X509_V_OK) {
- log_error("Certificate doesn't verify");
+ log_error(_("Certificate doesn't verify"));
return false;
} else {
- log_debug("Certificate verified.");
+ log_debug(_("Certificate verified."));
}
// Check the cert chain. The chain length
@@ -355,10 +360,10 @@ SSLClient::checkCert(std::string &hostname)
// Check the common name
if ((peer = SSL_get_peer_certificate(_ssl.get())) == 0) {
- log_debug("Couldn't get Peer certificate!");
+ log_debug(_("Couldn't get Peer certificate!"));
return false;
} else {
- log_debug("Got Peer certificate.");
+ log_debug(_("Got Peer certificate."));
}
ERR_clear_error();
@@ -366,7 +371,7 @@ SSLClient::checkCert(std::string &hostname)
NID_commonName, peer_CN, 256);
if (strcasecmp(peer_CN, hostname.c_str())) {
- log_error("Common name doesn't match host name");
+ log_error(_("Common name doesn't match host name"));
}
return true;
@@ -378,7 +383,7 @@ SSLClient::dump() {
boost::mutex::scoped_lock lock(stl_mutex);
- log_debug (_("==== The SSL header breaks down as follows: ===="));
+ log_debug(_("==== The SSL header breaks down as follows: ===="));
}
// The password is a global variable so it can be set from a C function
@@ -401,11 +406,11 @@ password_cb(char *buf, int size, int /* rwflag */, void *
/* userdata */)
{
GNASH_REPORT_FUNCTION;
- log_debug("Callback executed to set the SSL password, size is: %d",
+ log_debug(_("Callback executed to set the SSL password, size is: %d"),
password.size());
if(size <= static_cast<int>(password.size()+1)) {
- log_error("The buffer for the password needs to be %d bytes larger",
+ log_error(_("The buffer for the password needs to be %d bytes larger"),
password.size() - size);
return(0);
}
@@ -431,12 +436,12 @@ verify_callback(int ok, X509_STORE_CTX *store)
int depth = X509_STORE_CTX_get_error_depth(store);
int err = X509_STORE_CTX_get_error(store);
- log_error("-Error with certificate at depth: %i\n", depth);
+ log_error(_("-Error with certificate at depth: %i\n"), depth);
X509_NAME_oneline(X509_get_issuer_name(cert), data, 256);
- log_error(" issuer = %s\n", data);
+ log_error(_(" issuer = %s\n"), data);
X509_NAME_oneline(X509_get_subject_name(cert), data, 256);
- log_error(" subject = %s\n", data);
- log_error("err %i:%s\n", err, X509_verify_cert_error_string(err));
+ log_error(_(" subject = %s\n"), data);
+ log_error(_("err %i:%s\n"), err, X509_verify_cert_error_string(err));
}
return ok;
@@ -449,5 +454,5 @@ verify_callback(int ok, X509_STORE_CTX *store)
// local Variables:
// mode: C++
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
// End:
diff --git a/cygnal/libnet/sslserver.cpp b/cygnal/libnet/sslserver.cpp
index ed42fec..90e9c25 100644
--- a/cygnal/libnet/sslserver.cpp
+++ b/cygnal/libnet/sslserver.cpp
@@ -133,7 +133,7 @@ SSLServer::loadDhParams(SSL_CTX *ctx, char *file)
if (dh && ctx) {
if (SSL_CTX_set_tmp_dh(ctx, dh) < 0) {
- log_error("ssl!!", "Couldn't set DH parameters: %s ",
+ log_error(_("ssl!!", "Couldn't set DH parameters: %s "),
ERR_reason_error_string(ERR_get_error()));
return false;
}
@@ -166,8 +166,8 @@ SSLServer::sslAccept(int fd)
int ret = 0;
if((ret = SSL_accept(_ssl.get()) <= 0)) {
- log_error("Error was: \"%s\"!",
ERR_reason_error_string(ERR_get_error()));
-
+ log_error(_("Error was: \"%s\"!"),
+ ERR_reason_error_string(ERR_get_error()));
}
return 0;
diff --git a/cygnal/libnet/statistics.cpp b/cygnal/libnet/statistics.cpp
index 696b57c..1933b4b 100644
--- a/cygnal/libnet/statistics.cpp
+++ b/cygnal/libnet/statistics.cpp
@@ -27,7 +27,6 @@
#include "netstats.h"
#include "statistics.h"
-
static boost::mutex io_mutex;
// The string versions of the codec, used for debugging. If you add
diff --git a/cygnal/proc.cpp b/cygnal/proc.cpp
index f61b4f3..bb361b1 100644
--- a/cygnal/proc.cpp
+++ b/cygnal/proc.cpp
@@ -56,7 +56,7 @@ bool
Proc::startCGI(void)
{
// GNASH_REPORT_FUNCTION;
- log_unimpl("%s", __PRETTY_FUNCTION__);
+ log_unimpl(__PRETTY_FUNCTION__);
return false;
}
@@ -103,7 +103,7 @@ Proc::startCGI(const string &filespec, bool outflag,
boost::uint16_t port)
string path;
if (crcfile.getCgiRoot().size() > 0) {
path = crcfile.getCgiRoot().c_str();
- log_debug (_("Document Root for CGI files is: %s"), path);
+ log_debug(_("Document Root for CGI files is: %s"), path);
} else {
// Yes, I know this is a hack.
path = "/var/www/html/cygnal/cgi-bin";
@@ -112,11 +112,11 @@ Proc::startCGI(const string &filespec, bool outflag,
boost::uint16_t port)
path += filespec;
// simple debug junk
- log_debug("Starting \"%s\"", path);
+ log_debug(_("Starting \"%s\""), path);
// See if the file actually exists, otherwise we can't spawn it
if (stat(path.c_str(), &procstats) == -1) {
- log_error("Invalid filespec for CGI: \"%s\"", path);
+ log_error(_("Invalid filespec for CGI: \"%s\""), path);
// perror(filespec.c_str());
return (false);
}
@@ -184,7 +184,7 @@ int
Proc::findCGI(const string &filespec)
{
// GNASH_REPORT_FUNCTION;
- log_debug("Finding \"%s\"", filespec);
+ log_debug(_("Finding \"%s\""), filespec);
boost::mutex::scoped_lock lock(_mutex);
return _pids[filespec];
@@ -194,7 +194,7 @@ bool
Proc::stopCGI(void)
{
// GNASH_REPORT_FUNCTION;
- log_unimpl("%s", __PRETTY_FUNCTION__);
+ log_unimpl(__PRETTY_FUNCTION__);
boost::mutex::scoped_lock lock(_mutex);
return false;
@@ -204,7 +204,7 @@ bool
Proc::stopCGI(const string &filespec)
{
// GNASH_REPORT_FUNCTION;
- log_debug("Stopping \"%s\"", filespec);
+ log_debug(_("Stopping \"%s\""), filespec);
boost::mutex::scoped_lock lock(_mutex);
pid_t pid = _pids[filespec];
diff --git a/cygnal/rtmp_server.cpp b/cygnal/rtmp_server.cpp
index ad34af2..c4cfd37 100644
--- a/cygnal/rtmp_server.cpp
+++ b/cygnal/rtmp_server.cpp
@@ -121,10 +121,10 @@ RTMPServer::processClientHandShake(int fd)
boost::shared_ptr<cygnal::Buffer> handshake1 = RTMP::recvMsg(fd);
// See if we have data in the handshake, we should have 1537 bytes
if (!handshake1) {
- log_error("Failed to read the handshake from the client.");
+ log_error(_("Failed to read the handshake from the client."));
return tcurl; // nc is empty
} else {
- log_network("Read first handshake from the client.");
+ log_network(_("Read first handshake from the client."));
}
// Send our response to the handshake, which primarily is the bytes
@@ -136,17 +136,17 @@ RTMPServer::processClientHandShake(int fd)
boost::shared_ptr<cygnal::Buffer> handshake2 = RTMP::recvMsg(fd);
// See if we have data in the handshake, we should have 1536 bytes
if (handshake2 == 0) {
- log_error("failed to read the handshake from the client.");
+ log_error(_("failed to read the handshake from the client."));
return tcurl; // nc is empty
} else {
- log_network("Read second handshake from the client.");
+ log_network(_("Read second handshake from the client."));
}
// Don't assume the data we just read is a handshake.
pkt = serverFinish(fd, *handshake1, *handshake2);
// Wmake sure we got data before trying to process it
if (!pkt) {
- log_error("Didn't receive any data in handshake!");
+ log_error(_("Didn't receive any data in handshake!"));
tcurl.reset(new cygnal::Element);
return tcurl; // nc is empty
}
@@ -157,7 +157,7 @@ RTMPServer::processClientHandShake(int fd)
boost::shared_ptr<RTMP::rtmp_head_t> qhead =
RTMP::decodeHeader(pkt->reference());
if (!qhead) {
- log_error("RTMP header had parsing error!");
+ log_error(_("RTMP header had parsing error!"));
return tcurl; // nc is empty
}
@@ -165,7 +165,7 @@ RTMPServer::processClientHandShake(int fd)
// the connect() method. These are usually around 300-400 bytes in
// testing, so anything larger than that is suspicios.
if (qhead->bodysize > 1024) {
- log_error("NetConnection unusually large! %d", qhead->bodysize);
+ log_error(_("NetConnection unusually large! %d"), qhead->bodysize);
}
// Get the actual start of the data
@@ -182,7 +182,7 @@ RTMPServer::processClientHandShake(int fd)
// are 1 byte ones.
boost::scoped_ptr<cygnal::Buffer> newptr(new
cygnal::Buffer(qhead->bodysize));
if (qhead->bodysize > RTMP_VIDEO_PACKET_SIZE) {
- log_network("De chunkifying the NetConnection packet.");
+ log_network(_("De chunkifying the NetConnection packet."));
int nbytes = 0;
while (nbytes < qhead->bodysize) {
size_t chunk = RTMP_VIDEO_PACKET_SIZE;
@@ -199,18 +199,18 @@ RTMPServer::processClientHandShake(int fd)
// extract the body of the message from the packet
_netconnect = RTMP::decodeMsgBody(newptr->begin(), qhead->bodysize);
if (!_netconnect) {
- log_error("failed to read the body of the handshake data from the
client.");
+ log_error(_("failed to read the body of the handshake data from the
client."));
return tcurl; // nc is empty
} else {
- log_network("Read handshake data body from the client.");
+ log_network(_("Read handshake data body from the client."));
}
// make sure this is actually a NetConnection packet.
if (_netconnect->getMethodName() != "connect") {
- log_error("Didn't receive NetConnection object in handshake!");
+ log_error(_("Didn't receive NetConnection object in handshake!"));
return tcurl; // nc is empty
} else {
- log_network("Got NetConnection ::connect() INVOKE.");
+ log_network(_("Got NetConnection ::connect() INVOKE."));
_netconnect->dump(); // FIXME: debug crap
}
@@ -229,9 +229,9 @@ RTMPServer::processClientHandShake(int fd)
boost::shared_ptr<cygnal::Buffer> bwdone = encodeBWDone(2.0);
if (RTMP::sendMsg(fd, qhead->channel, RTMP::HEADER_8,
bwdone->size(), RTMP::INVOKE, RTMPMsg::FROM_SERVER,
*bwdone)) {
- log_network("Sent onBWDone to client");
+ log_network(_("Sent onBWDone to client"));
} else {
- log_error("Couldn't send onBWDone to client!");
+ log_error(_("Couldn't send onBWDone to client!"));
tcurl.reset();
return tcurl; // nc is empty
}
@@ -244,9 +244,9 @@ RTMPServer::processClientHandShake(int fd)
*winsize += swapped;
if (RTMP::sendMsg(fd, RTMP_SYSTEM_CHANNEL, RTMP::HEADER_12,
winsize->size(), RTMP::WINDOW_SIZE, RTMPMsg::FROM_CLIENT,
*winsize)) {
- log_network("Sent set Client Window Size to client");
+ log_network(_("Sent set Client Window Size to client"));
} else {
- log_error("Couldn't send set Client Window Size to client!");
+ log_error(_("Couldn't send set Client Window Size to client!"));
tcurl.reset();
return tcurl; // nc is empty
}
@@ -256,9 +256,9 @@ RTMPServer::processClientHandShake(int fd)
encodePing(RTMP::PING_RESET, 0);
if (RTMP::sendMsg(fd, RTMP_SYSTEM_CHANNEL, RTMP::HEADER_8,
ping_reset->size(), RTMP::USER, RTMPMsg::FROM_SERVER,
*ping_reset)) {
- log_network("Sent Ping to client");
+ log_network(_("Sent Ping to client"));
} else {
- log_error("Couldn't send Ping to client!");
+ log_error(_("Couldn't send Ping to client!"));
tcurl.reset();
return tcurl; // nc is empty
}
@@ -270,9 +270,9 @@ RTMPServer::processClientHandShake(int fd)
encodeResult(RTMPMsg::NC_CONNECT_SUCCESS);
if (RTMP::sendMsg(fd, 3, RTMP::HEADER_8, response->allocated(),
RTMP::INVOKE, RTMPMsg::FROM_SERVER, *response)) {
- log_network("Sent response to client.");
+ log_network(_("Sent response to client."));
} else {
- log_error("Couldn't send response to client!");
+ log_error(_("Couldn't send response to client!"));
tcurl.reset();
return tcurl; // nc is empty
}
@@ -333,9 +333,9 @@ RTMPServer::handShakeResponse(int fd, cygnal::Buffer
&handshake)
size_t ret = writeNet(fd, *zeros);
if (ret == zeros->allocated()) {
- log_network("Sent RTMP Handshake response at %d", timestamp);
+ log_network(_("Sent RTMP Handshake response at %d"), timestamp);
} else {
- log_error("Couldn't sent RTMP Handshake response at %d!", timestamp);
+ log_error(_("Couldn't sent RTMP Handshake response at %d!"), timestamp);
}
return true;
@@ -352,11 +352,11 @@ RTMPServer::serverFinish(int fd, cygnal::Buffer
&handshake1, cygnal::Buffer &han
// should never get this far with bad data, but when it comes to
// network programming, a little caution is always good.
if (handshake1.empty()) {
- log_error("No data in original handshake buffer.");
+ log_error(_("No data in original handshake buffer."));
return buf; // return empty buffer
}
if (handshake2.empty()) {
- log_error("No data in response handshake buffer.");
+ log_error(_("No data in response handshake buffer."));
return buf; // return empty buffer
}
@@ -394,7 +394,7 @@ RTMPServer::serverFinish(int fd, cygnal::Buffer
&handshake1, cygnal::Buffer &han
// real performance hit from it.
size_t amf_size = handshake2.allocated() - pkt_size;
if (handshake2.allocated() >= pkt_size) {
- log_network("Got AMF data in handshake, %d bytes for fd #%d",
+ log_network(_("Got AMF data in handshake, %d bytes for fd #%d"),
amf_size, fd);
buf.reset(new Buffer(amf_size));
// populate the buffer with the AMF data
@@ -432,8 +432,8 @@ RTMPServer::packetRead(cygnal::Buffer &buf)
amf_index = *ptr & RTMP_INDEX_MASK;
headersize = headerSize(*ptr);
- log_network (_("The Header size is: %d"), headersize);
- log_network (_("The AMF index is: 0x%x"), amf_index);
+ log_network(_("The Header size is: %d"), headersize);
+ log_network(_("The AMF index is: 0x%x"), amf_index);
// if (headersize > 1) {
// packetsize = parseHeader(ptr);
@@ -486,7 +486,7 @@ RTMPServer::packetRead(cygnal::Buffer &buf)
el.dump();
ptr = amf.extractElement(&el, ptr) + 1;
el.dump();
- log_network (_("Reading AMF packets till we're done..."));
+ log_network(_("Reading AMF packets till we're done..."));
// buf->dump();
while (ptr < end) {
boost::shared_ptr<cygnal::Element> el(new cygnal::Element);
@@ -496,10 +496,11 @@ RTMPServer::packetRead(cygnal::Buffer &buf)
}
ptr += 1;
size_t actual_size = _total_size - RTMP_HEADER_SIZE;
- log_network("Total size in header is %d, buffer size is: %d", _total_size,
buf->size());
+ log_network(_("Total size in header is %d, buffer size is: %d"),
+ _total_size, buf->size());
// buf->dump();
if (buf->size() < actual_size) {
- log_network("FIXME: MERGING");
+ log_network(_("FIXME: MERGING"));
buf = _que->merge(buf);
}
while ((ptr - buf->begin()) < static_cast<int>(actual_size)) {
@@ -551,7 +552,7 @@ RTMPServer::packetRead(cygnal::Buffer &buf)
decodeClient();
break;
case ROUTE:
- log_unimpl("Route");
+ log_unimpl(_("Route"));
break;
case AUDIO_DATA:
decodeAudioData();
@@ -563,13 +564,13 @@ RTMPServer::packetRead(cygnal::Buffer &buf)
decodeSharedObj();
break;
case AMF3_NOTIFY:
- log_unimpl("AMF3 Notify");
+ log_unimpl(_("AMF3 Notify"));
break;
case AMF3_SHARED_OBJ:
log_unimpl("AMF3 Shared Object");
break;
case AMF3_INVOKE:
- log_unimpl("AMF3 Invoke");
+ log_unimpl(_("AMF3 Invoke"));
break;
case NOTIFY:
decodeNotify();
@@ -578,7 +579,7 @@ RTMPServer::packetRead(cygnal::Buffer &buf)
decodeInvoke();
break;
case FLV_DATA:
- log_unimpl("FLV Dat");
+ log_unimpl(_("FLV Dat"));
break;
default:
log_error (_("ERROR: Unidentified RTMP message content type 0x%x"),
_header.type);
@@ -1101,7 +1102,7 @@ RTMPServer::parseEchoRequest(boost::uint8_t *ptr, size_t
size)
// This one has always been an NULL or Undefined object from my tests
boost::shared_ptr<cygnal::Element> el4 = amf.extractAMF(ptr, ptr+size);
if (!el4) {
- log_error("Couldn't reliably extract the echo data!");
+ log_error(_("Couldn't reliably extract the echo data!"));
}
ptr += amf.totalsize();
headers.push_back(el4);
@@ -1384,7 +1385,7 @@ rtmp_handler(Network::thread_params_t *args)
// If we have active disk streams, send those packets first.
// 0 is a reserved stream, so we start with 1, as the reserved
// stream isn't one we care about here.
- log_network("%d active disk streams", hand->getActiveDiskStreams());
+ log_network(_("%d active disk streams"), hand->getActiveDiskStreams());
for (int i=1; i <= hand->getActiveDiskStreams(); i++) {
hand->getDiskStream(i)->dump();
if (hand->getDiskStream(i)->getState() == DiskStream::PLAY) {
@@ -1396,7 +1397,7 @@ rtmp_handler(Network::thread_params_t *args)
ptr, 4096)) {
}
} else {
- log_network("ERROR: No stream for client %d", i);
+ log_network(_("ERROR: No stream for client %d"), i);
}
}
}
@@ -1407,7 +1408,7 @@ rtmp_handler(Network::thread_params_t *args)
// If there is no data left from the previous chunk, process
// that before reading more data.
if (pkt != 0) {
- log_network("data left from previous packet");
+ log_network(_("data left from previous packet"));
} else {
pkt = rtmp->recvMsg(args->netfd);
}
@@ -1438,16 +1439,16 @@ rtmp_handler(Network::thread_params_t *args)
= rtmp->decodeUserControl(tmpptr);
switch (user->type) {
case RTMP::STREAM_START:
- log_unimpl("Stream Start");
+ log_unimpl(_("Stream Start"));
break;
case RTMP::STREAM_EOF:
- log_unimpl("Stream EOF");
+ log_unimpl(_("Stream EOF"));
break;
case RTMP::STREAM_NODATA:
- log_unimpl("Stream No Data");
+ log_unimpl(_("Stream No Data"));
break;
case RTMP::STREAM_BUFFER:
- log_unimpl("Stream Set Buffer: %d",
user->param2);
+ log_unimpl(_("Stream Set Buffer: %d"),
user->param2);
break;
case RTMP::STREAM_LIVE:
log_unimpl("Stream Live");
@@ -1456,34 +1457,34 @@ rtmp_handler(Network::thread_params_t *args)
{
boost::shared_ptr<RTMP::rtmp_ping_t> ping
= rtmp->decodePing(tmpptr);
- log_network("Processed Ping message from
client, type %d",
+ log_network(_("Processed Ping message
from client, type %d"),
ping->type);
break;
}
case RTMP::STREAM_PONG:
- log_unimpl("Stream Pong");
+ log_unimpl(_("Stream Pong"));
break;
default:
break;
};
} else if (qhead->type == RTMP::AUDIO_DATA) {
- log_network("Got the 1st Audio packet!");
+ log_network(_("Got the 1st Audio packet!"));
} else if (qhead->type == RTMP::VIDEO_DATA) {
- log_network("Got the 1st Video packet!");
+ log_network(_("Got the 1st Video packet!"));
} else if (qhead->type == RTMP::WINDOW_SIZE) {
- log_network("Got the Window Set Size packet!");
+ log_network(_("Got the Window Set Size
packet!"));
} else {
- log_network("Got unknown system message!");
+ log_network(_("Got unknown system message!"));
bufptr->dump();
}
}
}
switch (qhead->type) {
case RTMP::CHUNK_SIZE:
- log_unimpl("Set Chunk Size");
+ log_unimpl(_("Set Chunk Size"));
break;
case RTMP::BYTES_READ:
- log_unimpl("Bytes Read");
+ log_unimpl(_("Bytes Read"));
break;
case RTMP::ABORT:
case RTMP::USER:
@@ -1491,38 +1492,41 @@ rtmp_handler(Network::thread_params_t *args)
return true;
break;
case RTMP::WINDOW_SIZE:
- log_unimpl("Set Window Size");
+ log_unimpl(_("Set Window Size"));
break;
case RTMP::SET_BANDWITH:
- log_unimpl("Set Bandwidth");
+ log_unimpl(_("Set Bandwidth"));
break;
case RTMP::ROUTE:
case RTMP::AUDIO_DATA:
case RTMP::VIDEO_DATA:
case RTMP::SHARED_OBJ:
body = rtmp->decodeMsgBody(tmpptr, qhead->bodysize);
- log_network("SharedObject name is \"%s\"",
body->getMethodName());
+ log_network(_("SharedObject name is \"%s\""),
+ body->getMethodName());
break;
case RTMP::AMF3_NOTIFY:
- log_unimpl("RTMP type %d", qhead->type);
+ log_unimpl(_("RTMP type %d"), qhead->type);
break;
case RTMP::AMF3_SHARED_OBJ:
- log_unimpl("RTMP type %d", qhead->type);
+ log_unimpl(_("RTMP type %d"), qhead->type);
break;
case RTMP::AMF3_INVOKE:
- log_unimpl("RTMP type %d", qhead->type);
+ log_unimpl(_("RTMP type %d"), qhead->type);
break;
case RTMP::NOTIFY:
- log_unimpl("RTMP type %d", qhead->type);
+ log_unimpl(_("RTMP type %d"), qhead->type);
break;
case RTMP::INVOKE:
{
body = rtmp->decodeMsgBody(tmpptr, qhead->bodysize);
if (!body) {
- log_error("Error INVOKING method \"%s\"!",
body->getMethodName());
+ log_error(_("Error INVOKING method \"%s\"!"),
+ body->getMethodName());
continue;
}
- log_network("INVOKEing method \"%s\"",
body->getMethodName());
+ log_network(_("INVOKEing method \"%s\""),
+ body->getMethodName());
// log_network("%s", hexify(tmpptr, qhead->bodysize,
true));
// These next Invoke methods are for the
@@ -1530,7 +1534,7 @@ rtmp_handler(Network::thread_params_t *args)
// is a speacial one handled directly by the
// server instead of any cgi-bin plugins.
double transid = body->getTransactionID();
- log_network("The Transaction ID from the client is:
%g", transid);
+ log_network(_("The Transaction ID from the client is:
%g"), transid);
if (body->getMethodName() == "createStream") {
hand->createStream(transid);
response =
rtmp->encodeResult(RTMPMsg::NS_CREATE_STREAM, transid);
@@ -1614,13 +1618,13 @@ rtmp_handler(Network::thread_params_t *args)
int active_stream = hand->getActiveDiskStreams();
boost::uint8_t *ptr =
hand->getDiskStream(active_stream)->get();
if (ptr) {
- log_network("Sending %s to client",
+ log_network(_("Sending %s to client"),
hand->getDiskStream(active_stream)->getFilespec());
if (rtmp->sendMsg(args->netfd, 5,
RTMP::HEADER_12, 400,
RTMP::NOTIFY, RTMPMsg::FROM_SERVER,
ptr, 400)) {
- log_network("Sent first page to client");
+ log_network(_("Sent first page to
client"));
}
}
} else if (body->getMethodName() == "seek") {
@@ -1641,7 +1645,7 @@ rtmp_handler(Network::thread_params_t *args)
} else if (body->getMethodName() == "FCSubscribe") {
hand->setFCSubscribe(body->at(0)->to_string());
} else if (body->getMethodName() == "_error") {
- log_error("Received an _error message from the
client!");
+ log_error(_("Received an _error message from the
client!"));
} else {
/* size_t ret = */ hand->writeToPlugin(tmpptr,
qhead->bodysize);
boost::shared_ptr<cygnal::Buffer> result =
hand->readFromPlugin();
@@ -1650,7 +1654,7 @@ rtmp_handler(Network::thread_params_t *args)
RTMP::HEADER_8,
result->allocated(),
RTMP::INVOKE,
RTMPMsg::FROM_SERVER,
*result)) {
- log_network("Sent response to client.");
+ log_network(_("Sent response to
client."));
}
}
done = true;
@@ -1658,7 +1662,7 @@ rtmp_handler(Network::thread_params_t *args)
break;
}
case RTMP::FLV_DATA:
- log_unimpl("RTMP type %d", qhead->type);
+ log_unimpl(_("RTMP type %d"), qhead->type);
break;
default:
log_error (_("ERROR: Unidentified AMF header data
type 0x%x"), qhead->type);
@@ -1673,11 +1677,11 @@ rtmp_handler(Network::thread_params_t *args)
if (result) { // FIXME: this needs a real channel number
if (rtmp->sendMsg(args->netfd, 0x3, RTMP::HEADER_8, ret,
RTMP::INVOKE, RTMPMsg::FROM_SERVER,
*result)) {
- log_network("Sent response to client.");
+ log_network(_("Sent response to client."));
}
}
#endif
-// log_network("RET is: %d", ret);
+// log_network(_("RET is: %d"), ret);
} // end of processing all the messages in the que
// we're done processing these packets, so get rid of them
@@ -1685,7 +1689,7 @@ rtmp_handler(Network::thread_params_t *args)
} else {
- log_network("Never read any data from fd #%d", args->netfd);
+ log_network(_("Never read any data from fd #%d"), args->netfd);
#if 0
// Send a ping to reset the new stream
boost::shared_ptr<cygnal::Buffer> ping_reset =
@@ -1693,16 +1697,16 @@ rtmp_handler(Network::thread_params_t *args)
if (rtmp->sendMsg(args->netfd, RTMP_SYSTEM_CHANNEL,
RTMP::HEADER_12, ping_reset->size(),
RTMP::PING, RTMPMsg::FROM_SERVER, *ping_reset)) {
- log_network("Sent Ping to client");
+ log_network(_("Sent Ping to client"));
} else {
- log_error("Couldn't send Ping to client!");
+ log_error(_("Couldn't send Ping to client!"));
}
#endif
// initialize = true;
return true;
}
} else {
- // log_error("Communication error with client using fd #%d",
args->netfd);
+ // log_error(_("Communication error with client using fd #%d",
args->netfd));
rtmp->closeNet(args->netfd);
// initialize = true;
return false;
http://git.savannah.gnu.org/cgit//commit/?id=d5dcf1459df918fcb40854d6175e79fbee6c9270
commit d5dcf1459df918fcb40854d6175e79fbee6c9270
Author: Rob Savoye <address@hidden>
Date: Thu Dec 29 17:42:28 2011 -0700
add macro so new strings get found by xgettext, so they can be translated.
diff --git a/libcore/asobj/flash/display/BitmapData_as.cpp
b/libcore/asobj/flash/display/BitmapData_as.cpp
index 74ae89d..55f55dc 100644
--- a/libcore/asobj/flash/display/BitmapData_as.cpp
+++ b/libcore/asobj/flash/display/BitmapData_as.cpp
@@ -714,7 +714,7 @@ bitmapdata_applyFilter(const fn_call& fn)
{
BitmapData_as* ptr = ensure<ThisIsNative<BitmapData_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -756,7 +756,7 @@ bitmapdata_colorTransform(const fn_call& fn)
{
BitmapData_as* ptr = ensure<ThisIsNative<BitmapData_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -813,8 +813,8 @@ bitmapdata_copyChannel(const fn_call& fn)
// nothing happens.
if (!oneBitSet(destchans)) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("BitmapData.copyChannel(). Multiple "
- "destination channels are not supported");
+ log_aserror(_("BitmapData.copyChannel(). Multiple "
+ "destination channels are not supported"));
);
return as_value();
}
@@ -839,8 +839,8 @@ bitmapdata_copyChannel(const fn_call& fn)
if (sourceW == 0 || sourceH == 0) {
// The source rect does not overlap with source bitmap
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("BitmapData.copyChannel(): no part of source rectangle"
- "overlaps with the source BitmapData");
+ log_aserror(_("BitmapData.copyChannel(): no part of source
rectangle"
+ "overlaps with the source BitmapData"));
);
return as_value();
}
@@ -853,8 +853,8 @@ bitmapdata_copyChannel(const fn_call& fn)
if (destW == 0 || destH == 0) {
// The target rect does not overlap with source bitmap
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("BitmapData.copyChannel(): destination area is "
- "wholly outside the destination BitmapData");
+ log_aserror(_("BitmapData.copyChannel(): destination area is "
+ "wholly outside the destination BitmapData"));
);
return as_value();
}
@@ -911,8 +911,8 @@ bitmapdata_copyPixels(const fn_call& fn)
return as_value();
}
if (fn.nargs > 3) {
- LOG_ONCE(log_unimpl("BitmapData.copyPixels(): arguments after "
- "the first three are discarded"));
+ LOG_ONCE(log_unimpl(_("BitmapData.copyPixels(): arguments after "
+ "the first three are discarded")));
}
as_object* o = toObject(fn.arg(0), getVM(fn));
@@ -961,8 +961,8 @@ bitmapdata_copyPixels(const fn_call& fn)
if (sourceW == 0 || sourceH == 0) {
// The source rect does not overlap with source bitmap
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("BitmapData.copyPixels(): no part of source rectangle"
- "overlaps with the source BitmapData");
+ log_aserror(_("BitmapData.copyPixels(): no part of source
rectangle"
+ "overlaps with the source BitmapData"));
);
return as_value();
}
@@ -975,8 +975,8 @@ bitmapdata_copyPixels(const fn_call& fn)
if (destW == 0 || destH == 0) {
// The target rect does not overlap with source bitmap
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("BitmapData.copyPixels(): destination area is "
- "wholly outside the destination BitmapData");
+ log_aserror(_("BitmapData.copyPixels(): destination area is "
+ "wholly outside the destination BitmapData"));
);
return as_value();
}
@@ -1061,7 +1061,7 @@ bitmapdata_draw(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("BitmapData.draw(%s) requires at least one argument",
+ log_aserror(_("BitmapData.draw(%s) requires at least one
argument"),
ss.str());
);
return as_value();
@@ -1073,15 +1073,15 @@ bitmapdata_draw(const fn_call& fn)
BitmapData_as* bitmap;
if (isNativeType(o, bitmap)) {
- LOG_ONCE(log_unimpl("BitmapData.draw() with BitmapData argument"));
+ LOG_ONCE(log_unimpl(_("BitmapData.draw() with BitmapData
argument")));
return as_value();
}
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("BitmapData.draw(%s): first argument must be a "
- "MovieClip", ss.str());
+ log_aserror(_("BitmapData.draw(%s): first argument must be a "
+ "MovieClip"), ss.str());
);
return as_value();
}
@@ -1117,7 +1117,7 @@ bitmapdata_fillRect(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("BitmapData.fillRect(%s): needs an object", ss.str());
+ log_aserror(_("BitmapData.fillRect(%s): needs an object"),
ss.str());
);
return as_value();
}
@@ -1154,7 +1154,7 @@ bitmapdata_floodFill(const fn_call& fn)
if (ptr->disposed()) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("floodFill called on disposed BitmapData!");
+ log_aserror(_("floodFill called on disposed BitmapData!"));
);
return as_value();
}
@@ -1180,7 +1180,7 @@ bitmapdata_generateFilterRect(const fn_call& fn)
{
BitmapData_as* ptr = ensure<ThisIsNative<BitmapData_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -1189,7 +1189,7 @@ bitmapdata_getColorBoundsRect(const fn_call& fn)
{
BitmapData_as* ptr = ensure<ThisIsNative<BitmapData_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -1228,7 +1228,7 @@ bitmapdata_getPixel32(const fn_call& fn)
if (ptr->disposed()) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("getPixel32 called on disposed BitmapData!");
+ log_aserror(_("getPixel32 called on disposed BitmapData!"));
);
return as_value();
}
@@ -1247,7 +1247,7 @@ bitmapdata_hitTest(const fn_call& fn)
{
BitmapData_as* ptr = ensure<ThisIsNative<BitmapData_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -1256,7 +1256,7 @@ bitmapdata_merge(const fn_call& fn)
{
BitmapData_as* ptr = ensure<ThisIsNative<BitmapData_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -1303,7 +1303,7 @@ bitmapdata_paletteMap(const fn_call& fn)
{
BitmapData_as* ptr = ensure<ThisIsNative<BitmapData_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -1358,7 +1358,7 @@ bitmapdata_perlinNoise(const fn_call& fn)
}
if (stitch) {
- LOG_ONCE(log_unimpl("BitmapData.perlinNoise() stitch value"));
+ LOG_ONCE(log_unimpl(_("BitmapData.perlinNoise() stitch value")));
}
if (!octave || (!channels && !greyscale)) {
@@ -1433,7 +1433,7 @@ bitmapdata_pixelDissolve(const fn_call& fn)
{
BitmapData_as* ptr = ensure<ThisIsNative<BitmapData_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -1442,7 +1442,7 @@ bitmapdata_scroll(const fn_call& fn)
{
BitmapData_as* ptr = ensure<ThisIsNative<BitmapData_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -1499,7 +1499,7 @@ bitmapdata_compare(const fn_call& fn)
{
BitmapData_as* ptr = ensure<ThisIsNative<BitmapData_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -1508,7 +1508,7 @@ bitmapdata_threshold(const fn_call& fn)
{
BitmapData_as* ptr = ensure<ThisIsNative<BitmapData_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -1559,7 +1559,7 @@ bitmapdata_rectangle(const fn_call& fn)
if (!rectCtor) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("Failed to construct flash.geom.Rectangle!");
+ log_aserror(_("Failed to construct flash.geom.Rectangle!"));
);
return -1;
}
@@ -1581,7 +1581,7 @@ bitmapdata_loadBitmap(const fn_call& fn)
if (!fn.nargs) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("BitmapData.loadBitmap requires one argument");
+ log_aserror(_("BitmapData.loadBitmap requires one argument"));
);
return as_value();
}
@@ -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);
@@ -1646,8 +1646,8 @@ bitmapdata_ctor(const fn_call& fn)
as_object* ptr = ensure<ValidThis>(fn);
if (fn.nargs < 2) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("BitmapData constructor requires at least two "
- "arguments. Will not construct a BitmapData");
+ log_aserror(_("BitmapData constructor requires at least two "
+ "arguments. Will not construct a BitmapData"));
);
throw ActionTypeError();
}
@@ -1660,8 +1660,8 @@ bitmapdata_ctor(const fn_call& fn)
if (width > 2880 || height > 2880 || width < 1 || height < 1) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("BitmapData width and height must be between "
- "1 and 2880. Will not construct a BitmapData");
+ log_aserror(_("BitmapData width and height must be between "
+ "1 and 2880. Will not construct a BitmapData"));
);
throw ActionTypeError();
}
diff --git a/libcore/asobj/flash/display/display_pkg.cpp
b/libcore/asobj/flash/display/display_pkg.cpp
index 9c3f035..ee554f8 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 8722675..8c18ff0 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,14 +282,14 @@ 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);
// There was an error trying to Invoke the callback
if (result == ExternalInterface::makeString("Error")
|| (result == ExternalInterface::makeString("SecurityError")))
{
- log_trace("VAL: %s", val);
+ log_trace(_("VAL: %s"), val);
val.set_undefined();
}
}
@@ -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);
@@ -420,28 +420,28 @@ externalinterface_uArgumentsToXML(const fn_call& fn)
as_value
externalinterface_uArgumentsToAS(const fn_call& /*fn*/)
{
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
as_value
externalinterface_uAddCallback(const fn_call& /*fn*/)
{
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
as_value
externalinterface_uArrayToAS(const fn_call& /*fn*/)
{
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
as_value
externalinterface_uArrayToJS(const fn_call& /*fn*/)
{
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -465,56 +465,56 @@ externalinterface_uArrayToXML(const fn_call& fn)
as_value
externalinterface_uCallIn(const fn_call& /*fn*/)
{
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
as_value
externalinterface_uCallOut(const fn_call& /*fn*/)
{
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
as_value
externalinterface_uEvalJS(const fn_call& /*fn*/)
{
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
as_value
externalinterface_uInitJS(const fn_call& /*fn*/)
{
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
as_value
externalinterface_uJsQuoteString(const fn_call& /*fn*/)
{
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
as_value
externalinterface_uObjectID(const fn_call& /*fn*/)
{
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
as_value
externalinterface_uObjectToAS(const fn_call& /*fn*/)
{
- LOG_ONCE(log_unimpl("ExternalInterface._objectToAS"));
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
as_value
externalinterface_uObjectToJS(const fn_call& /*fn*/)
{
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -564,7 +564,7 @@ externalinterface_uObjectToXML(const fn_call& fn)
as_value
externalinterface_uToJS(const fn_call& /*fn*/)
{
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
diff --git a/libcore/asobj/flash/external/external_pkg.cpp
b/libcore/asobj/flash/external/external_pkg.cpp
index b44695e..a5214fd 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 ea313af..880928a 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/DisplacementMapFilter_as.cpp
b/libcore/asobj/flash/filters/DisplacementMapFilter_as.cpp
index 11a94dd..2b4437a 100644
--- a/libcore/asobj/flash/filters/DisplacementMapFilter_as.cpp
+++ b/libcore/asobj/flash/filters/DisplacementMapFilter_as.cpp
@@ -91,7 +91,7 @@ displacementmapfilter_clone(const fn_call& fn)
DisplacementMapFilter_as* ptr =
ensure<ThisIsNative<DisplacementMapFilter_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -101,7 +101,7 @@ displacementmapfilter_alpha(const fn_call& fn)
DisplacementMapFilter_as* ptr =
ensure<ThisIsNative<DisplacementMapFilter_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -111,7 +111,7 @@ displacementmapfilter_color(const fn_call& fn)
DisplacementMapFilter_as* ptr =
ensure<ThisIsNative<DisplacementMapFilter_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -121,7 +121,7 @@ displacementmapfilter_componentX(const fn_call& fn)
DisplacementMapFilter_as* ptr =
ensure<ThisIsNative<DisplacementMapFilter_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -131,7 +131,7 @@ displacementmapfilter_componentY(const fn_call& fn)
DisplacementMapFilter_as* ptr =
ensure<ThisIsNative<DisplacementMapFilter_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -141,7 +141,7 @@ displacementmapfilter_mapBitmap(const fn_call& fn)
DisplacementMapFilter_as* ptr =
ensure<ThisIsNative<DisplacementMapFilter_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -151,7 +151,7 @@ displacementmapfilter_mapPoint(const fn_call& fn)
DisplacementMapFilter_as* ptr =
ensure<ThisIsNative<DisplacementMapFilter_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -161,7 +161,7 @@ displacementmapfilter_mode(const fn_call& fn)
DisplacementMapFilter_as* ptr =
ensure<ThisIsNative<DisplacementMapFilter_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -171,7 +171,7 @@ displacementmapfilter_scaleX(const fn_call& fn)
DisplacementMapFilter_as* ptr =
ensure<ThisIsNative<DisplacementMapFilter_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -181,7 +181,7 @@ displacementmapfilter_scaleY(const fn_call& fn)
DisplacementMapFilter_as* ptr =
ensure<ThisIsNative<DisplacementMapFilter_as> >(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -190,7 +190,7 @@ displacementmapfilter_ctor(const fn_call& fn)
{
as_object* obj = ensure<ValidThis>(fn);
obj->setRelay(new DisplacementMapFilter_as);
- return as_value();
+ return as_value();
}
}
diff --git a/libcore/asobj/flash/filters/filters_pkg.cpp
b/libcore/asobj/flash/filters/filters_pkg.cpp
index 83705c4..0ef9a5a 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 9d73e25..7687aa8 100644
--- a/libcore/asobj/flash/geom/ColorTransform_as.cpp
+++ b/libcore/asobj/flash/geom/ColorTransform_as.cpp
@@ -362,8 +362,8 @@ colortransform_ctor(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("ColorTransform(%s): not enough arguments (need 8). "
- "Constructing with default values", ss.str());
+ log_aserror(_("ColorTransform(%s): not enough arguments (need 8). "
+ "Constructing with default values"), ss.str());
);
obj->setRelay(new ColorTransform_as(1, 1, 1, 1, 0, 0, 0, 0));
@@ -377,7 +377,7 @@ colortransform_ctor(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("ColorTransform(%s): discarding extra arguments",
+ log_aserror(_("ColorTransform(%s): discarding extra arguments"),
ss.str());
);
}
@@ -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 3e336be..3a3b290 100644
--- a/libcore/asobj/flash/geom/Matrix_as.cpp
+++ b/libcore/asobj/flash/geom/Matrix_as.cpp
@@ -181,7 +181,7 @@ matrix_concat(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Matrix.concat(%s): needs one argument", ss.str());
+ log_aserror(_("Matrix.concat(%s): needs one argument"), ss.str());
);
return as_value();
}
@@ -195,7 +195,7 @@ matrix_concat(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Matrix.concat(%s): needs a Matrix object", ss.str());
+ log_aserror(_("Matrix.concat(%s): needs a Matrix object"),
ss.str());
);
return as_value();
}
@@ -212,14 +212,17 @@ matrix_concat(const fn_call& fn)
fillMatrix(currentMatrix, *ptr);
#ifdef GNASH_DEBUG_GEOM_MATRIX
- log_debug("(Matrix.concat) This matrix (pre-transform): %s",
currentMatrix);
- log_debug("(Matrix.concat) Transform matrix: %s", concatMatrix);
+ log_debug(_("(Matrix.concat) This matrix (pre-transform): %s"),
+ currentMatrix);
+ 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",
currentMatrix);
+ log_debug(_("(Matrix.concat) This matrix (post-transform): %s"),
+ currentMatrix);
#endif
// Set values of current matrix
@@ -249,7 +252,7 @@ matrix_createBox(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Matrix.createBox(%s): needs at least two arguments",
ss.str());
+ log_aserror(_("Matrix.createBox(%s): needs at least two
arguments"), ss.str());
);
return as_value();
}
@@ -308,8 +311,8 @@ matrix_createGradientBox(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Matrix.createGradientBox(%s): needs at least "
- "two arguments", ss.str());
+ log_aserror(_("Matrix.createGradientBox(%s): needs at least "
+ "two arguments"), ss.str());
);
return as_value();
}
@@ -382,7 +385,7 @@ matrix_deltaTransformPoint(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Matrix.deltaTransformPoint(%s): needs one argument",
+ log_aserror(_("Matrix.deltaTransformPoint(%s): needs one
argument"),
ss.str());
);
return as_value();
@@ -396,7 +399,7 @@ matrix_deltaTransformPoint(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Matrix.deltaTransformPoint(%s): needs an object",
+ log_aserror(_("Matrix.deltaTransformPoint(%s): needs an object"),
ss.str());
);
return as_value();
@@ -415,7 +418,7 @@ matrix_deltaTransformPoint(const fn_call& fn)
as_function* pointCtor = pointClass.to_function();
if (!pointCtor) {
- log_error("Failed to construct flash.geom.Point!");
+ log_error(_("Failed to construct flash.geom.Point!"));
return as_value();
}
@@ -517,7 +520,7 @@ matrix_rotate(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Matrix.rotate(%s): needs one argument", ss.str());
+ log_aserror(_("Matrix.rotate(%s): needs one argument"), ss.str());
);
return as_value();
}
@@ -550,15 +553,17 @@ 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",
currentMatrix);
+ log_debug(_("(Matrix.rotate) This matrix (pre-transform): %s"),
+ currentMatrix);
#endif
// Apply rotation to current matrix.
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",
currentMatrix);
+ log_debug(_("(Matrix.rotate) Transformation matrix: %s"), transformMatrix);
+ log_debug(_("(Matrix.rotate) This matrix (post-transform): %s"),
+ currentMatrix);
#endif
ptr->set_member(NSV::PROP_A, as_value(currentMatrix(0, 0)));
@@ -591,7 +596,7 @@ matrix_scale(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Matrix.translate(%s): needs two arguments", ss.str());
+ log_aserror(_("Matrix.translate(%s): needs two arguments"),
ss.str());
);
return as_value();
}
@@ -625,15 +630,17 @@ 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", currentMatrix);
+ log_debug(_("(Matrix.scale) This matrix (pre-transform): %s"),
+ currentMatrix);
#endif
// Apply scale to current matrix.
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",
currentMatrix);
+ log_debug(_("(Matrix.scale) Transformation matrix: %s"), transformMatrix);
+ log_debug(_("(Matrix.scale) This matrix (post-transform): %s"),
+ currentMatrix);
#endif
ptr->set_member(NSV::PROP_A, currentMatrix(0, 0));
@@ -694,7 +701,7 @@ matrix_transformPoint(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Matrix.translate(%s): needs one argument", ss.str());
+ log_aserror(_("Matrix.translate(%s): needs one argument"),
ss.str());
);
return as_value();
}
@@ -707,7 +714,7 @@ matrix_transformPoint(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Matrix.transformPoint(%s): needs an object",
ss.str());
+ log_aserror(_("Matrix.transformPoint(%s): needs an object"),
ss.str());
);
return as_value();
}
@@ -719,7 +726,7 @@ matrix_transformPoint(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Matrix.transformPoint(%s): object must be a Point",
+ log_aserror(_("Matrix.transformPoint(%s): object must be a Point"),
ss.str());
);
return as_value();
@@ -737,7 +744,7 @@ matrix_transformPoint(const fn_call& fn)
as_function* pointCtor = pointClass.to_function();
if (!pointCtor) {
- log_error("Failed to construct flash.geom.Point!");
+ log_error(_("Failed to construct flash.geom.Point!"));
return as_value();
}
@@ -760,7 +767,7 @@ matrix_translate(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Matrix.translate(%s): needs two arguments", ss.str());
+ log_aserror(_("Matrix.translate(%s): needs two arguments"),
ss.str());
);
return as_value();
}
@@ -888,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 dc90b71..ba39e23 100644
--- a/libcore/asobj/flash/geom/Point_as.cpp
+++ b/libcore/asobj/flash/geom/Point_as.cpp
@@ -125,7 +125,8 @@ point_add(const fn_call& fn)
if ( fn.nargs > 1 )
{
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.add(%s): %s", ss.str(), _("arguments after
first discarded"));
+ log_aserror(_("Point.add(%s): %s"), ss.str(),
+ _("arguments after first discarded"));
}
);
const as_value& arg1 = fn.arg(0);
@@ -134,7 +135,8 @@ point_add(const fn_call& fn)
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.add(%s): %s", ss.str(), _("first argument
doesn't cast to object"));
+ log_aserror(_("Point.add(%s): %s"), ss.str(),
+ _("first argument doesn't cast to object"));
);
}
else
@@ -143,7 +145,7 @@ point_add(const fn_call& fn)
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.add(%s): %s", ss.str(),
+ log_aserror(_("Point.add(%s): %s"), ss.str(),
_("first argument cast to object doesn't contain an 'x'
member"));
);
}
@@ -151,7 +153,7 @@ point_add(const fn_call& fn)
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.add(%s): %s", ss.str(),
+ log_aserror(_("Point.add(%s): %s"), ss.str(),
_("first argument cast to object doesn't contain an 'y'
member"));
);
}
@@ -195,8 +197,8 @@ point_equals(const fn_call& fn)
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.equals(%s): %s", ss.str(),
- _("First arg must be an object"));
+ log_aserror(_("Point.equals(%s): %s"), ss.str(),
+ _("First arg must be an object"));
);
return as_value(false);
}
@@ -206,7 +208,7 @@ point_equals(const fn_call& fn)
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.equals(%s): %s %s", ss.str(),
+ log_aserror(_("Point.equals(%s): %s %s"), ss.str(),
_("First arg must be an instance of"), "flash.geom.Point");
);
return as_value(false);
@@ -243,7 +245,8 @@ point_normalize(const fn_call& fn)
if ( fn.nargs > 1 )
{
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.normalize(%s): %s", ss.str(), _("arguments
after first discarded"));
+ log_aserror(_("Point.normalize(%s): %s"), ss.str(),
+ _("arguments after first discarded"));
}
);
@@ -326,7 +329,8 @@ point_subtract(const fn_call& fn)
if ( fn.nargs > 1 )
{
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.add(%s): %s", ss.str(), _("arguments after
first discarded"));
+ log_aserror(_("Point.add(%s): %s"), ss.str(),
+ _("arguments after first discarded"));
}
);
const as_value& arg1 = fn.arg(0);
@@ -335,7 +339,8 @@ point_subtract(const fn_call& fn)
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.add(%s): %s", ss.str(), _("first argument
doesn't cast to object"));
+ log_aserror(_("Point.add(%s): %s"), ss.str(),
+ _("first argument doesn't cast to object"));
);
}
else
@@ -344,15 +349,15 @@ point_subtract(const fn_call& fn)
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.add(%s): %s", ss.str(),
- _("first argument casted to object doesn't contain an 'x'
member"));
+ log_aserror(_("Point.add(%s): %s"), ss.str(),
+ _("first argument casted to object doesn't
contain an 'x' member"));
);
}
if ( ! o->get_member(NSV::PROP_Y, &y1) )
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.add(%s): %s", ss.str(),
+ log_aserror(_("Point.add(%s): %s"), ss.str(),
_("first argument casted to object doesn't contain an 'y'
member"));
);
}
@@ -418,7 +423,8 @@ point_distance(const fn_call& fn)
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.distance(%s): %s", ss.str(), _("missing
arguments"));
+ log_aserror(_("Point.distance(%s): %s"), ss.str(),
+ _("missing arguments"));
);
return as_value();
}
@@ -427,7 +433,8 @@ point_distance(const fn_call& fn)
if ( fn.nargs > 2 )
{
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.distance(%s): %s", ss.str(), _("arguments after
first two discarded"));
+ log_aserror(_("Point.distance(%s): %s"), ss.str(),
+ _("arguments after first two discarded"));
}
);
@@ -436,7 +443,8 @@ point_distance(const fn_call& fn)
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.distance(%s): %s", ss.str(), _("First arg must be
an object"));
+ log_aserror(_("Point.distance(%s): %s"), ss.str(),
+ _("First arg must be an object"));
);
return as_value();
}
@@ -446,7 +454,8 @@ point_distance(const fn_call& fn)
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.equals(%s): %s %s", ss.str(), _("First arg must be
an instance of"), "flash.geom.Point");
+ log_aserror(_("Point.equals(%s): %s %s"), ss.str(),
+ _("First arg must be an instance of"), "flash.geom.Point");
);
return as_value();
}
@@ -498,7 +507,8 @@ point_interpolate(const fn_call& fn)
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.interpolate(%s): %s", ss.str(), _("missing
arguments"));
+ log_aserror(_("Point.interpolate(%s): %s"), ss.str(),
+ _("missing arguments"));
);
}
else
@@ -507,7 +517,8 @@ point_interpolate(const fn_call& fn)
if ( fn.nargs > 3 )
{
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.interpolate(%s): %s", ss.str(), _("arguments after
first three discarded"));
+ log_aserror(_("Point.interpolate(%s): %s"), ss.str(),
+ _("arguments after first three discarded"));
}
);
@@ -517,7 +528,8 @@ point_interpolate(const fn_call& fn)
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.interpolate(%s): %s", ss.str(), _("first
argument doesn't cast to object"));
+ log_aserror(_("Point.interpolate(%s): %s"), ss.str(),
+ _("first argument doesn't cast to object"));
);
}
else
@@ -532,7 +544,8 @@ point_interpolate(const fn_call& fn)
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.interpolate(%s): %s", ss.str(), _("second
argument doesn't cast to object"));
+ log_aserror(_("Point.interpolate(%s): %s"), ss.str(),
+ _("second argument doesn't cast to object"));
);
}
else
@@ -579,7 +592,8 @@ point_polar(const fn_call& fn)
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.polar(%s): %s", ss.str(), _("missing
arguments"));
+ log_aserror(_("Point.polar(%s): %s"), ss.str(),
+ _("missing arguments"));
);
}
}
@@ -587,7 +601,7 @@ point_polar(const fn_call& fn)
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror("Point.polar(%s): %s", ss.str(), _("missing arguments"));
+ log_aserror(_("Point.polar(%s): %s"), ss.str(), _("missing
arguments"));
);
}
@@ -623,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 c233e39..a1940bd 100644
--- a/libcore/asobj/flash/geom/Rectangle_as.cpp
+++ b/libcore/asobj/flash/geom/Rectangle_as.cpp
@@ -150,7 +150,7 @@ Rectangle_contains(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss;
fn.dump_args(ss);
- log_aserror("flash.geom.Rectangle(%s): %s", ss.str(),
+ log_aserror(_("flash.geom.Rectangle(%s): %s"), ss.str(),
_("missing arguments"));
);
return as_value();
@@ -244,7 +244,7 @@ Rectangle_containsRectangle(const fn_call& fn)
{
as_object* ptr = ensure<ValidThis>(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -290,7 +290,7 @@ Rectangle_inflate(const fn_call& fn)
{
as_object* ptr = ensure<ValidThis>(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -299,7 +299,7 @@ Rectangle_inflatePoint(const fn_call& fn)
{
as_object* ptr = ensure<ValidThis>(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -308,7 +308,7 @@ Rectangle_intersection(const fn_call& fn)
{
as_object* ptr = ensure<ValidThis>(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -317,7 +317,7 @@ Rectangle_intersects(const fn_call& fn)
{
as_object* ptr = ensure<ValidThis>(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -423,7 +423,7 @@ Rectangle_union(const fn_call& fn)
{
as_object* ptr = ensure<ValidThis>(fn);
UNUSED(ptr);
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
@@ -468,7 +468,7 @@ Rectangle_bottomRight(const fn_call& fn)
if (!pointCtor) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("Failed to construct flash.geom.Point!");
+ log_aserror(_("Failed to construct flash.geom.Point!"));
);
return as_value();
}
@@ -542,7 +542,7 @@ Rectangle_size(const fn_call& fn)
as_function* pointCtor = getClassConstructor(fn, "flash.geom.Point");
if (!pointCtor) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("Failed to construct flash.geom.Point!");
+ log_aserror(_("Failed to construct flash.geom.Point!"));
);
return as_value();
}
@@ -600,7 +600,7 @@ Rectangle_topLeft(const fn_call& fn)
as_function* pointCtor = getClassConstructor(fn, "flash.geom.Point");
if (!pointCtor) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("Failed to construct flash.geom.Point!");
+ log_aserror(_("Failed to construct flash.geom.Point!"));
);
return as_value();
}
@@ -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 1bbafdc..ee82a6d 100644
--- a/libcore/asobj/flash/geom/Transform_as.cpp
+++ b/libcore/asobj/flash/geom/Transform_as.cpp
@@ -119,7 +119,7 @@ transform_colorTransform(const fn_call& fn)
if (!colorTransformCtor) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("Failed to construct flash.geom.ColorTransform!");
+ log_aserror(_("Failed to construct
flash.geom.ColorTransform!"));
);
return as_value();
}
@@ -142,8 +142,8 @@ transform_colorTransform(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Transform.colorTransform(%s): extra arguments "
- "discarded", ss.str());
+ log_aserror(_("Transform.colorTransform(%s): extra arguments "
+ "discarded"), ss.str());
);
}
@@ -152,8 +152,8 @@ transform_colorTransform(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Transform.colorTransform(%s): argument is not an "
- "object", ss.str());
+ log_aserror(_("Transform.colorTransform(%s): argument is not an "
+ "object"), ss.str());
);
return as_value();
}
@@ -167,8 +167,8 @@ transform_colorTransform(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Transform.colorTransform(%s): argument is not a "
- "ColorTransform", ss.str());
+ log_aserror(_("Transform.colorTransform(%s): argument is not a "
+ "ColorTransform"), ss.str());
);
return as_value();
}
@@ -195,7 +195,7 @@ transform_concatenatedColorTransform(const fn_call& fn)
if (!colorTransformCtor) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("Failed to construct flash.geom.ColorTransform!");
+ log_aserror(_("Failed to construct
flash.geom.ColorTransform!"));
);
return as_value();
}
@@ -233,7 +233,7 @@ transform_concatenatedMatrix(const fn_call& fn)
if (!matrixCtor) {
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror("Failed to construct flash.geom.Matrix!");
+ log_aserror(_("Failed to construct flash.geom.Matrix!"));
);
return as_value();
}
@@ -302,7 +302,7 @@ transform_matrix(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Transform.matrix(%s): extra arguments discarded",
+ log_aserror(_("Transform.matrix(%s): extra arguments discarded"),
ss.str());
);
}
@@ -312,7 +312,7 @@ transform_matrix(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("Transform.matrix(%s): argument is not an object",
+ log_aserror(_("Transform.matrix(%s): argument is not an object"),
ss.str());
);
return as_value();
@@ -343,7 +343,7 @@ transform_ctor(const fn_call& fn)
IF_VERBOSE_ASCODING_ERRORS(
std::ostringstream ss;
fn.dump_args(ss);
- log_aserror("flash.geom.Transform(%s): needs one argument",
+ log_aserror(_("flash.geom.Transform(%s): needs one argument"),
ss.str());
);
throw ActionTypeError();
@@ -353,7 +353,7 @@ transform_ctor(const fn_call& fn)
if (fn.nargs > 1) {
std::stringstream ss;
fn.dump_args(ss);
- LOG_ONCE(log_unimpl("Transform(%s): %s", ss.str(),
+ LOG_ONCE(log_unimpl(_("Transform(%s): %s"), ss.str(),
_("arguments discarded")) );
}
@@ -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 4e9f672..834a619 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/FileReferenceList_as.cpp
b/libcore/asobj/flash/net/FileReferenceList_as.cpp
index 36cbb2b..8e5b269 100644
--- a/libcore/asobj/flash/net/FileReferenceList_as.cpp
+++ b/libcore/asobj/flash/net/FileReferenceList_as.cpp
@@ -88,10 +88,8 @@ filereferencelist_ctor(const fn_call& fn)
if (fn.nargs) {
std::stringstream ss;
fn.dump_args(ss);
- LOG_ONCE(
- log_unimpl("FileReferenceList(%s): %s", ss.str(),
- _("arguments discarded"))
- );
+ LOG_ONCE(log_unimpl(_("FileReferenceList(%s): %s"), ss.str(),
+ _("arguments discarded")));
}
return as_value();
diff --git a/libcore/asobj/flash/net/FileReference_as.cpp
b/libcore/asobj/flash/net/FileReference_as.cpp
index b1ddcee..707ffa6 100644
--- a/libcore/asobj/flash/net/FileReference_as.cpp
+++ b/libcore/asobj/flash/net/FileReference_as.cpp
@@ -156,10 +156,8 @@ filereference_ctor(const fn_call& fn)
if (fn.nargs) {
std::stringstream ss;
fn.dump_args(ss);
- LOG_ONCE(
- log_unimpl("FileReference(%s): %s", ss.str(),
- _("arguments discarded"))
- );
+ LOG_ONCE(log_unimpl(_("FileReference(%s): %s"), ss.str(),
+ _("arguments discarded")));
}
return as_value();
}
diff --git a/libcore/asobj/flash/net/net_pkg.cpp
b/libcore/asobj/flash/net/net_pkg.cpp
index 22a66f9..3b08443 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/TextRenderer_as.cpp
b/libcore/asobj/flash/text/TextRenderer_as.cpp
index 03b8294..e247e08 100644
--- a/libcore/asobj/flash/text/TextRenderer_as.cpp
+++ b/libcore/asobj/flash/text/TextRenderer_as.cpp
@@ -63,14 +63,14 @@ attachTextRendererStaticProperties(as_object& o)
as_value
textrenderer_setAdvancedAntialiasingTable(const fn_call& /*fn*/)
{
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
as_value
textrenderer_maxLevel(const fn_call& /*fn*/)
{
- LOG_ONCE( log_unimpl (__FUNCTION__) );
+ LOG_ONCE(log_unimpl(__FUNCTION__) );
return as_value();
}
diff --git a/libcore/asobj/flash/text/text_pkg.cpp
b/libcore/asobj/flash/text/text_pkg.cpp
index 4ed891d..31ec129 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);
-----------------------------------------------------------------------
Summary of changes:
cygnal/cvm.cpp | 18 +-
cygnal/cygnal.cpp | 68 +-
cygnal/handler.cpp | 22 +-
cygnal/http_server.cpp | 80 +-
cygnal/libamf/amf.cpp | 28 +-
cygnal/libamf/amf_msg.cpp | 8 +-
cygnal/libamf/buffer.cpp | 6 +-
cygnal/libamf/element.cpp | 6 +-
cygnal/libamf/flv.cpp | 28 +-
cygnal/libamf/lcshm.cpp | 15 +-
cygnal/libamf/sol.cpp | 16 +-
cygnal/libnet/cache.cpp | 6 +-
cygnal/libnet/cque.cpp | 4 +-
cygnal/libnet/diskstream.cpp | 58 +-
cygnal/libnet/http.cpp | 68 +-
cygnal/libnet/network.cpp | 64 +-
cygnal/libnet/rtmp.cpp | 110 +-
cygnal/libnet/rtmp_client.cpp | 94 +-
cygnal/libnet/sshclient.cpp | 66 +-
cygnal/libnet/sshserver.cpp | 4 +-
cygnal/libnet/sslclient.cpp | 61 +-
cygnal/libnet/sslserver.cpp | 6 +-
cygnal/libnet/statistics.cpp | 1 -
cygnal/proc.cpp | 14 +-
cygnal/rtmp_server.cpp | 146 +-
libcore/asobj/flash/display/BitmapData_as.cpp | 76 +-
libcore/asobj/flash/display/display_pkg.cpp | 2 +-
.../asobj/flash/external/ExternalInterface_as.cpp | 38 +-
libcore/asobj/flash/external/external_pkg.cpp | 2 +-
libcore/asobj/flash/filters/BitmapFilter_as.cpp | 2 +-
.../flash/filters/DisplacementMapFilter_as.cpp | 22 +-
libcore/asobj/flash/filters/filters_pkg.cpp | 2 +-
libcore/asobj/flash/geom/ColorTransform_as.cpp | 8 +-
libcore/asobj/flash/geom/Matrix_as.cpp | 57 +-
libcore/asobj/flash/geom/Point_as.cpp | 62 +-
libcore/asobj/flash/geom/Rectangle_as.cpp | 22 +-
libcore/asobj/flash/geom/Transform_as.cpp | 28 +-
libcore/asobj/flash/geom/geom_pkg.cpp | 2 +-
libcore/asobj/flash/net/FileReferenceList_as.cpp | 6 +-
libcore/asobj/flash/net/FileReference_as.cpp | 6 +-
libcore/asobj/flash/net/net_pkg.cpp | 2 +-
libcore/asobj/flash/text/TextRenderer_as.cpp | 4 +-
libcore/asobj/flash/text/text_pkg.cpp | 2 +-
po/gnash.pot | 2480 ++++++++++++++++++--
44 files changed, 2977 insertions(+), 843 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-1360-gc4aa168,
Rob Savoye <=