[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-1369-g059b24a |
|
Date: |
Sat, 31 Dec 2011 19:07:33 +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 059b24afced55d89c4b60c66bfb8fc89491dc997 (commit)
via b6976748f75ae93bd5f80e3e942becd1af1ad469 (commit)
from dfa234bbb2386c4be7425077659fb2ef88f70dfa (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=059b24afced55d89c4b60c66bfb8fc89491dc997
commit 059b24afced55d89c4b60c66bfb8fc89491dc997
Author: Rob Savoye <address@hidden>
Date: Sat Dec 31 12:07:27 2011 -0700
updated with new strings
diff --git a/po/gnash.pot b/po/gnash.pot
index 9e2e690..e615222 100644
--- a/po/gnash.pot
+++ b/po/gnash.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-31 11:40-0700\n"
+"POT-Creation-Date: 2011-12-31 12:07-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"
@@ -1455,36 +1455,11 @@ msgstr ""
msgid "Can't convert unknown type %d"
msgstr ""
-#: libcore/ExternalInterface.cpp:152 libcore/ExternalInterface.cpp:347
-#, c-format
-msgid "There are %d bytes in the network buffer"
-msgstr ""
-
-#: libcore/as_value.cpp:269
-#, c-format
-msgid "to_primitive(%s)"
-msgstr ""
-
-#: libcore/as_value.cpp:309
-#, c-format
-msgid "to_primitive: method call returned %s"
-msgstr ""
-
-#: libcore/as_value.cpp:398
-#, c-format
-msgid "to_primitive(%s, NUMBER) threw an ActionTypeError %s"
-msgstr ""
-
#: libcore/as_value.cpp:768
#, c-format
msgid "serialization of as_value of type %d"
msgstr ""
-#: libcore/ClassHierarchy.cpp:77
-#, c-format
-msgid "Loading native class %s"
-msgstr ""
-
#: libcore/ClassHierarchy.cpp:84
#, c-format
msgid "Native class %s is not an object after initialization (%s)"
@@ -1495,186 +1470,11 @@ msgstr ""
msgid "Native class %s is not found after initialization"
msgstr ""
-#: libcore/MovieLoader.cpp:63
-msgid "Starting movie loader thread"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:72
-msgid "Loader thread killed"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:78
-msgid "processRequests: lock on requests: trying"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:84
-msgid "processRequests: lock on requests: obtained"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:95
-msgid "Movie loader thread getting to sleep (nothing more to do)"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:101
-msgid "Movie loader thread waked up"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:105 libcore/MovieLoader.cpp:114
-msgid "processRequests: lock on requests: release"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:135
-#, c-format
-msgid "Movie loader thread processing request for target %s"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:146
-#, c-format
-msgid "Movie loader thread completed request for target %s"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:159
-msgid "clear: lock on requests: trying"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:165
-msgid "clear: lock on requests: obtained"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:169
-msgid "clear: lock on kill: trying"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:175
-msgid "clear: lock on kill: obtained"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:181
-msgid "clear: lock on kill: release for kill"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:186
-msgid "waking up loader thread"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:191
-msgid "clear: lock on requests: release ater notify_all"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:195
-msgid "MovieLoader notified, joining"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:197
-msgid "MovieLoader joined"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:205
-msgid "clear: lock on requests: release if not after notify_all"
-msgstr ""
-
#: libcore/MovieLoader.cpp:259
#, c-format
msgid "Can't create Movie instance for definition loaded from %s"
msgstr ""
-#: libcore/MovieLoader.cpp:276
-#, c-format
-msgid "processCompletedRequest: _level loading (level %u)"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:282
-#, c-format
-msgid "Target %s of a loadMovie request doesn't exist at load complete time"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:344
-msgid "processCompletedRequests: lock on requests: trying"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:350
-msgid "processCompletedRequests: lock on requests: obtained"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:354
-#, c-format
-msgid "Checking %d requests for completeness"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:366
-msgid "processCompletedRequests: lock on requests: releasing"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:373
-#, c-format
-msgid "Load request for target %s completed"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:381
-msgid "processCompletedRequests: lock on requests for removal: trying"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:388
-msgid "processCompletedRequests: lock on requests for removal: obtained"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:395
-msgid "processCompletedRequests: lock on requests for removal: release"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:434
-#, c-format
-msgid "MovieLoader::loadMovie(%s, %s)"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:440
-msgid "loadMovie: lock on requests: trying"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:446
-msgid "loadMovie: lock on requests: obtained"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:461
-msgid "loadMovie: waking up existing thread"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:466
-msgid "loadMovie: lock on requests: release"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:484
-msgid "setReachable: lock on requests: trying"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:490
-msgid "setReachable: lock on requests: obtained"
-msgstr ""
-
-#: libcore/MovieLoader.cpp:497
-msgid "setReachable: lock on requests: release"
-msgstr ""
-
-#: libcore/FreetypeGlyphsProvider.cpp:156
-#, c-format
-msgid "moveTo: %ld,%ld"
-msgstr ""
-
-#: libcore/FreetypeGlyphsProvider.cpp:169
-#, c-format
-msgid "lineTo: %ld,%ld"
-msgstr ""
-
-#: libcore/FreetypeGlyphsProvider.cpp:181
-#, c-format
-msgid "conicTo: %ld,%ld %ld,%ld"
-msgstr ""
-
-#: libcore/FreetypeGlyphsProvider.cpp:196
-#, c-format
-msgid "cubicTo: %ld,%ld %ld,%ld %ld,%ld"
-msgstr ""
-
#: libcore/FreetypeGlyphsProvider.cpp:254
#, c-format
msgid "Can't init FreeType! Error = %d"
@@ -1695,21 +1495,6 @@ msgstr ""
msgid "Can't init fontconfig library, using hard-coded font filename \"%s\""
msgstr ""
-#: libcore/FreetypeGlyphsProvider.cpp:328
-#, c-format
-msgid "Found %d fonts matching the family %s (using first)"
-msgstr ""
-
-#: libcore/FreetypeGlyphsProvider.cpp:336
-#, c-format
-msgid "Matching font %d has unknown filename, skipping"
-msgstr ""
-
-#: libcore/FreetypeGlyphsProvider.cpp:346
-#, c-format
-msgid "Loading font from file %d"
-msgstr ""
-
#: libcore/FreetypeGlyphsProvider.cpp:355
#, c-format
msgid "No device font matches the name '%s', using hard-coded font filename"
@@ -1740,37 +1525,17 @@ msgstr ""
msgid "Some error opening font '%s'"
msgstr ""
-#: libcore/FreetypeGlyphsProvider.cpp:469
-#, c-format
-msgid "EM square for font '%s' is %d, scale is this %g"
-msgstr ""
-
#: libcore/FreetypeGlyphsProvider.cpp:490
#, c-format
msgid "Error loading freetype outline glyph for char '%c' (error: %d)"
msgstr ""
-#: libcore/FreetypeGlyphsProvider.cpp:498
-#, c-format
-msgid "Advance value for glyph '%c' is %g (horiAdvance:%ld, scale:%g)"
-msgstr ""
-
#: libcore/FreetypeGlyphsProvider.cpp:506
#, c-format
msgid ""
"FT_Load_Char() returned a glyph format != FT_GLYPH_FORMAT_OUTLINE (%c%c%c%c)"
msgstr ""
-#: libcore/FreetypeGlyphsProvider.cpp:526
-#, c-format
-msgid "Decomposing glyph outline for DisplayObject %u"
-msgstr ""
-
-#: libcore/FreetypeGlyphsProvider.cpp:538
-#, c-format
-msgid "Decomposed glyph for DisplayObject '%c' has bounds %s"
-msgstr ""
-
#: libcore/FreetypeGlyphsProvider.cpp:561
msgid "Could not release FT face resources"
msgstr ""
@@ -2435,39 +2200,11 @@ msgstr ""
msgid "inflateWrapper() inflateEnd() return %d (%s)"
msgstr ""
-#: libcore/LoadVariablesThread.cpp:37
-msgid "completeLoad called"
-msgstr ""
-
-#: libcore/LoadVariablesThread.cpp:57
-#, c-format
-msgid "Read %u bytes"
-msgstr ""
-
#: libcore/LoadVariablesThread.cpp:74
#, c-format
msgid "%s to utf8 conversion in MovieClip.loadVariables input parsing"
msgstr ""
-#: libcore/LoadVariablesThread.cpp:84
-#, c-format
-msgid "toparse: %s"
-msgstr ""
-
-#: libcore/LoadVariablesThread.cpp:93
-#, c-format
-msgid "parseable: %s"
-msgstr ""
-
-#: libcore/LoadVariablesThread.cpp:98
-#, c-format
-msgid "toparse nextline: %s"
-msgstr ""
-
-#: libcore/LoadVariablesThread.cpp:109
-msgid "Cancelling LoadVariables download thread..."
-msgstr ""
-
#: libcore/LoadVariablesThread.cpp:123
#, c-format
msgid "Stream couldn't seek to end: %s"
@@ -5476,145 +5213,70 @@ msgstr ""
msgid "Collision detection for unidirectionally scaled strokes"
msgstr ""
-#: libcore/TextField.cpp:221
-#, c-format
-msgid ""
-"CHECKME: removeTextField(%s): TextField depth (%d) out of the 'dynamic' zone "
-"[0..1048575], won't remove"
-msgstr ""
-
#: libcore/TextField.cpp:234
#, c-format
msgid "FIXME: attempt to remove a TextField being a child of a %s"
msgstr ""
-#: libcore/TextField.cpp:328
-#, c-format
-msgid "rendering a Pol composed by corners %s"
-msgstr ""
-
#: libcore/TextField.cpp:413 libcore/TextField.cpp:423
#: libcore/TextField.cpp:441 libcore/TextField.cpp:456
msgid "invalid restrict string"
msgstr ""
-#: libcore/TextField.cpp:842
-#, c-format
-msgid ""
-"setTextValue: variable name %s points to a non-existent target, I guess we "
-"would not be registered if this was true, or the sprite we've registered our "
-"variable name has been unloaded"
-msgstr ""
-
-#: libcore/TextField.cpp:907
-#, c-format
-msgid ""
-"TextField text doesn't fit in its boundaries: width %g, margin %g - nothing "
-"to align"
-msgstr ""
-
-#: libcore/TextField.cpp:962
+#: libcore/TextField.cpp:965
#, c-format
msgid ""
"TextField: missing glyph for space char (needed for TAB). Make sure "
"DisplayObject shapes for font %s are being exported into your SWF file."
msgstr ""
-#: libcore/TextField.cpp:1041
+#: libcore/TextField.cpp:1044
msgid "No font for TextField!"
msgstr ""
-#: libcore/TextField.cpp:1373
-msgid ""
-"HTML in a text field is unsupported, gnash will just ignore the tags and "
-"print their content"
-msgstr ""
-
-#: libcore/TextField.cpp:1441
+#: libcore/TextField.cpp:1444
#, c-format
msgid "Unexpected value '%s' in TextField font color attribute"
msgstr ""
-#: libcore/TextField.cpp:1456
+#: libcore/TextField.cpp:1459
msgid "Expected a font name in FACE attribute."
msgstr ""
-#: libcore/TextField.cpp:1510
+#: libcore/TextField.cpp:1513
msgid "<img> html tag in TextField"
msgstr ""
-#: libcore/TextField.cpp:1548
+#: libcore/TextField.cpp:1551
msgid "<span> html tag in TextField"
msgstr ""
-#: libcore/TextField.cpp:1553
-msgid "in textformat"
-msgstr ""
-
-#: libcore/TextField.cpp:1620
+#: libcore/TextField.cpp:1623
msgid "html <textformat> tag tabstops attribute"
msgstr ""
-#: libcore/TextField.cpp:1654
-#, c-format
-msgid "<%s> tag is unsupported"
-msgstr ""
-
-#: libcore/TextField.cpp:1703
+#: libcore/TextField.cpp:1706
#, c-format
msgid ""
"TextField: missing embedded glyph for char %d. Make sure DisplayObject "
"shapes for font %s are being exported into your SWF file"
msgstr ""
-#: libcore/TextField.cpp:1711
+#: libcore/TextField.cpp:1714
#, c-format
msgid ""
"TextField: missing device glyph for char %d. Maybe you don't have font '%s' "
"installed in your system."
msgstr ""
-#: libcore/TextField.cpp:1739
-#, c-format
-msgid "Text in TextField %s exceeds width [ _bounds %s ]"
-msgstr ""
-
-#: libcore/TextField.cpp:1747
-msgid " wordWrap=false, autoSize=none"
-msgstr ""
-
-#: libcore/TextField.cpp:1764
-#, c-format
-msgid "Text bbox expanded to %s (width: %f)"
-msgstr ""
-
-#: libcore/TextField.cpp:1784
-msgid " wordWrap=true"
-msgstr ""
-
-#: libcore/TextField.cpp:1871
-#, c-format
-msgid " wordWrap=%d, autoSize=%d"
-msgstr ""
-
-#: libcore/TextField.cpp:1893
-#, c-format
-msgid "VariableName: %s"
-msgstr ""
-
-#: libcore/TextField.cpp:1902
+#: libcore/TextField.cpp:1905
#, c-format
msgid ""
"Current environment has no target, can't bind VariableName (%s) associated "
"to text field. Gnash will try to register again on next access."
msgstr ""
-#: libcore/TextField.cpp:1917
-#, c-format
-msgid "Variable text Path: %s, Var: %s"
-msgstr ""
-
-#: libcore/TextField.cpp:1928
+#: libcore/TextField.cpp:1931
#, c-format
msgid ""
"VariableName associated to text field refers to an unknown target (%s). It "
@@ -5622,55 +5284,28 @@ msgid ""
"stream. Gnash will try to register again on next access."
msgstr ""
-#: libcore/TextField.cpp:1949
-msgid "registerTextVariable() called"
-msgstr ""
-
-#: libcore/TextField.cpp:1964
-#, c-format
-msgid ""
-"VariableName associated to text field (%s) refer to an unknown target. It is "
-"possible that the DisplayObject will be instantiated later in the SWF "
-"stream. Gnash will try to register again on next access."
-msgstr ""
-
-#: libcore/TextField.cpp:2021 libcore/TextField.cpp:2055
-#: libcore/TextField.cpp:2146
+#: libcore/TextField.cpp:2024 libcore/TextField.cpp:2058
+#: libcore/TextField.cpp:2149
msgid "invalid html tag"
msgstr ""
-#: libcore/TextField.cpp:2032 libcore/TextField.cpp:2068
-#: libcore/TextField.cpp:2099
+#: libcore/TextField.cpp:2035 libcore/TextField.cpp:2071
+#: libcore/TextField.cpp:2102
msgid "found NULL character in htmlText"
msgstr ""
-#: libcore/TextField.cpp:2072
+#: libcore/TextField.cpp:2075
msgid "malformed HTML tag, invalid attribute name"
msgstr ""
-#: libcore/TextField.cpp:2122
+#: libcore/TextField.cpp:2125
msgid "malformed HTML tag, invalid attribute value"
msgstr ""
-#: libcore/TextField.cpp:2153
-#, c-format
-msgid "HTML tag: %s"
-msgstr ""
-
-#: libcore/TextField.cpp:2155
+#: libcore/TextField.cpp:2158
msgid "I declare this a HTML syntax error"
msgstr ""
-#: libcore/TextField.cpp:2171
-msgid "Calling updateText after change of variable name"
-msgstr ""
-
-#: libcore/TextField.cpp:2179
-msgid ""
-"Calling registerTextVariable after change of variable name and updateText "
-"call"
-msgstr ""
-
#: libcore/SWFMovie.cpp:54
#, c-format
msgid "Frame %d never loaded. Total frames: %d"
@@ -5705,11 +5340,6 @@ msgstr ""
msgid "loadMovie against a %s DisplayObject"
msgstr ""
-#: libcore/DisplayObject.cpp:206
-#, c-format
-msgid "%p set_invalidated() of %s in %s:%d"
-msgstr ""
-
#: libcore/DisplayObject.cpp:258
msgid "blendMode"
msgstr ""
@@ -5828,72 +5458,19 @@ msgstr ""
msgid "StaticText::pointInShape"
msgstr ""
-#: libcore/CharacterProxy.cpp:37
-#, c-format
-msgid ""
-"char %s (%s) was destroyed, stored its orig target (%s) for later rebinding"
-msgstr ""
-
-#: libcore/AMFConverter.cpp:69
-msgid "AMF0: skip serialization of FUNCTION property"
-msgstr ""
-
-#: libcore/AMFConverter.cpp:84
-#, c-format
-msgid " skip serialization of specially-named property %s"
-msgstr ""
-
-#: libcore/AMFConverter.cpp:94
-#, c-format
-msgid " serializing property %s"
-msgstr ""
-
#: libcore/AMFConverter.cpp:98
msgid "Problems serializing an object's member"
msgstr ""
-#: libcore/AMFConverter.cpp:135
-#, c-format
-msgid "amf: serializing object (or function) as reference to %d"
-msgstr ""
-
-#: libcore/AMFConverter.cpp:155
-#, c-format
-msgid "amf: serializing date object with index %d and value %g"
-msgstr ""
-
-#: libcore/AMFConverter.cpp:201
-#, c-format
-msgid "amf: serializing array of %d elements as STRICT_ARRAY (index %d)"
-msgstr ""
-
#: libcore/AMFConverter.cpp:212
#, c-format
msgid "Problems serializing strict array member %d=%s"
msgstr ""
-#: libcore/AMFConverter.cpp:223
-#, c-format
-msgid "amf: serializing array of %d elements as ECMA_ARRAY (index %d) "
-msgstr ""
-
-#: libcore/AMFConverter.cpp:233
-#, c-format
-msgid "amf: serializing object (or function) with index %d"
-msgstr ""
-
#: libcore/AMFConverter.cpp:242
msgid "Could not serialize object"
msgstr ""
-#: libcore/AMFConverter.cpp:276
-msgid "amf: serializing undefined"
-msgstr ""
-
-#: libcore/AMFConverter.cpp:286
-msgid "amf: serializing null"
-msgstr ""
-
#: libcore/AMFConverter.cpp:319
#, c-format
msgid "Unknown AMF type %s! Cannot proceed"
@@ -5908,11 +5485,6 @@ msgstr ""
msgid "Read past _end of buffer for strict array length"
msgstr ""
-#: libcore/AMFConverter.cpp:414
-#, c-format
-msgid "amf0 starting read of STRICT_ARRAY with %i elements"
-msgstr ""
-
#: libcore/AMFConverter.cpp:425
msgid "Unable to read array elements"
msgstr ""
@@ -5921,11 +5493,6 @@ msgstr ""
msgid "Read past _end of buffer for array length"
msgstr ""
-#: libcore/AMFConverter.cpp:458
-#, c-format
-msgid "amf0 starting read of ECMA_ARRAY with %i elements"
-msgstr ""
-
#: libcore/AMFConverter.cpp:468 libcore/AMFConverter.cpp:489
msgid "MALFORMED AMF: premature _end of ECMA_ARRAY block"
msgstr ""
@@ -5934,19 +5501,10 @@ msgstr ""
msgid "MALFORMED AMF: empty member name not followed by OBJECT_END_AMF0 byte"
msgstr ""
-#: libcore/AMFConverter.cpp:497
-#, c-format
-msgid "amf0 ECMA_ARRAY prop name is %s"
-msgstr ""
-
#: libcore/AMFConverter.cpp:504
msgid "Unable to read array element"
msgstr ""
-#: libcore/AMFConverter.cpp:518
-msgid "amf0 starting read of OBJECT"
-msgstr ""
-
#: libcore/AMFConverter.cpp:528
msgid "Could not read object property name"
msgstr ""
@@ -5955,21 +5513,11 @@ msgstr ""
msgid "AMF buffer terminated just before object _end byte. continuing anyway."
msgstr ""
-#: libcore/AMFConverter.cpp:563
-#, c-format
-msgid "readAMF0: reference #%d"
-msgstr ""
-
#: libcore/AMFConverter.cpp:566
#, c-format
msgid "readAMF0: invalid reference to object %d (%d known objects)"
msgstr ""
-#: libcore/AMFConverter.cpp:579
-#, c-format
-msgid "amf0 read date: %e"
-msgstr ""
-
#: libcore/AMFConverter.cpp:597
msgid ""
"Date type encoded timezone info %1%, even though this field should not be "
@@ -6619,11 +6167,6 @@ msgstr ""
msgid "Unhandled button event %s"
msgstr ""
-#: libcore/Button.cpp:685
-#, c-format
-msgid "Removed button record shifted from depth %d to depth %d"
-msgstr ""
-
#: libcore/Button.cpp:788
msgid "Button placed with an init object. This will be ignored."
msgstr ""
@@ -6684,11 +6227,6 @@ msgstr ""
msgid "Path target '%s' not found while setting %s=%s"
msgstr ""
-#: libcore/as_environment.cpp:407
-#, c-format
-msgid "path: %s, var: %s"
-msgstr ""
-
#: libcore/as_environment.cpp:445
#, c-format
msgid "Won't set invalid raw variable name: %s"
@@ -6706,56 +6244,11 @@ msgstr ""
msgid "Won't get invalid raw variable name: %s"
msgstr ""
-#: libcore/as_environment.cpp:549
-#, c-format
-msgid "Took %s as _global, returning _global"
-msgstr ""
-
-#: libcore/as_environment.cpp:558
-#, c-format
-msgid "Found %s in _global"
-msgstr ""
-
#: libcore/as_environment.cpp:567
#, c-format
msgid "reference to non-existent variable '%s'"
msgstr ""
-#: libcore/MovieClip.cpp:167
-#, c-format
-msgid ""
-"CHECKME: nested mask in MouseEntityFinder. This mask is %s at depth %d outer "
-"mask masked up to depth %d."
-msgstr ""
-
-#: libcore/MovieClip.cpp:181 libcore/MovieClip.cpp:419
-#, c-format
-msgid ""
-"Character %s at depth %d is a mask not hitting the query point %g,%g and "
-"masking up to depth %d"
-msgstr ""
-
-#: libcore/MovieClip.cpp:190 libcore/MovieClip.cpp:428
-#, c-format
-msgid "Character %s at depth %d is a mask hitting the query point %g,%g"
-msgstr ""
-
-#: libcore/MovieClip.cpp:220
-#, c-format
-msgid "MouseEntityFinder found DisplayObject %s (depth %d) hitting point %g,%g"
-msgstr ""
-
-#: libcore/MovieClip.cpp:403
-#, c-format
-msgid ""
-"CHECKME: nested mask in DropTargetFinder. This mask is %s at depth %d outer "
-"mask masked up to depth %d."
-msgstr ""
-
-#: libcore/MovieClip.cpp:415
-msgid "FIXME: invisible mask in MouseEntityFinder."
-msgstr ""
-
#: libcore/MovieClip.cpp:621
#, c-format
msgid "call_frame('%s') -- invalid frame"
@@ -6770,99 +6263,26 @@ msgstr ""
msgid "%s parent is not a movieclip, can't clone"
msgstr ""
-#: libcore/MovieClip.cpp:720
-#, c-format
-msgid "Event %s invoked for movieclip %s"
-msgstr ""
-
-#: libcore/MovieClip.cpp:726
-#, c-format
-msgid "Sprite %s ignored ENTER_FRAME event (is unloaded)"
-msgstr ""
-
-#: libcore/MovieClip.cpp:734
-#, c-format
-msgid "Sprite %s ignored button-like event %s as not 'enabled'"
-msgstr ""
-
-#: libcore/MovieClip.cpp:793
-#, c-format
-msgid ""
-"Sprite %s (depth %d) won't check for user-defined LOAD event (is not "
-"dynamic, has a parent, no registered class and no clip events defined)"
-msgstr ""
-
#: libcore/MovieClip.cpp:852
msgid "MovieClip.unloadMovie()"
msgstr ""
-#: libcore/MovieClip.cpp:872
-#, c-format
-msgid "Advance movieclip '%s' at frame %u/%u"
-msgstr ""
-
#: libcore/MovieClip.cpp:885
#, c-format
msgid "advance_movieclip: no frames loaded for movieclip/movie %s"
msgstr ""
-#: libcore/MovieClip.cpp:897
-#, c-format
-msgid "Advance_movieclip for movieclip '%s' - frame %u/%u "
-msgstr ""
-
-#: libcore/MovieClip.cpp:910
-msgid "MovieClip::advance_movieclip we're in PLAYSTATE_PLAY mode"
-msgstr ""
-
-#: libcore/MovieClip.cpp:916
-msgid "on_event_load called, incrementing"
-msgstr ""
-
-#: libcore/MovieClip.cpp:920
-#, c-format
-msgid "after increment we are at frame %u/%u"
-msgstr ""
-
#: libcore/MovieClip.cpp:935
msgid ""
"Flushing orphaned tags in movieclip %1%. _currentFrame:%2%, _hasLooped:%3%, "
"frame_count:%4%"
msgstr ""
-#: libcore/MovieClip.cpp:953
-#, c-format
-msgid "Jumping back to frame 0 of movieclip %s"
-msgstr ""
-
-#: libcore/MovieClip.cpp:960
-#, c-format
-msgid "Executing frame%d (0-based) tags of movieclip %s"
-msgstr ""
-
-#: libcore/MovieClip.cpp:974
-msgid "MovieClip::advance_movieclip we're in STOP mode"
-msgstr ""
-
-#: libcore/MovieClip.cpp:986
-msgid ""
-"Queuing init actions for DisplayObject %1% in frame %2% of MovieClip %3%"
-msgstr ""
-
-#: libcore/MovieClip.cpp:996
-msgid "Init actions for DisplayObject %1% already executed"
-msgstr ""
-
#: libcore/MovieClip.cpp:1046
#, c-format
msgid "Executing %d tags in frame %d/%d of movieclip %s"
msgstr ""
-#: libcore/MovieClip.cpp:1070
-#, c-format
-msgid "movieclip %s ::goto_frame(%d) - current frame is %d"
-msgstr ""
-
#: libcore/MovieClip.cpp:1084 libcore/MovieClip.cpp:1125
#, c-format
msgid ""
@@ -6899,37 +6319,6 @@ msgid ""
"%d"
msgstr ""
-#: libcore/MovieClip.cpp:1432
-#, c-format
-msgid ""
-"%s is a dynamic mask and can't handle mouse events, no point will hit it"
-msgstr ""
-
-#: libcore/MovieClip.cpp:1440
-#, c-format
-msgid "%s is dynamically masked by %s, which doesn't hit point %g,%g"
-msgstr ""
-
-#: libcore/MovieClip.cpp:1688
-#, c-format
-msgid "Attached movieclips %s registered class is %p"
-msgstr ""
-
-#: libcore/MovieClip.cpp:1719
-#, c-format
-msgid "Sprite '%s' placed on stage"
-msgstr ""
-
-#: libcore/MovieClip.cpp:1758
-#, c-format
-msgid "Queuing INITIALIZE and CONSTRUCT events for movieclip %s"
-msgstr ""
-
-#: libcore/MovieClip.cpp:1793
-#, c-format
-msgid "Unloading movieclip '%s'"
-msgstr ""
-
#: libcore/MovieClip.cpp:1905
#, c-format
msgid "Could not load variables from %s"
@@ -6942,11 +6331,6 @@ msgid ""
"[0..1048575], won't remove"
msgstr ""
-#: libcore/MovieClip.cpp:2089
-#, c-format
-msgid "Stream sound id from %d to %d, stopping old"
-msgstr ""
-
#: libcore/parser/TypesParser.cpp:212
msgid "No gradients!"
msgstr ""
@@ -7091,26 +6475,6 @@ msgstr ""
msgid "No Video info in video definition"
msgstr ""
-#: libcore/Video.cpp:145
-#, c-format
-msgid "Video instance %s need display video frame (ratio) %d"
-msgstr ""
-
-#: libcore/Video.cpp:154
-#, c-format
-msgid " current frame == _lastDecodedVideoFrameNum (%d)"
-msgstr ""
-
-#: libcore/Video.cpp:169
-#, c-format
-msgid " current frame (%d) < _lastDecodedVideoFrameNum (%d)"
-msgstr ""
-
-#: libcore/Video.cpp:180
-#, c-format
-msgid " decoding embedded frames from %d to %d for Video object %s"
-msgstr ""
-
#: libcore/as_function.cpp:94
#, c-format
msgid "Native function called as constructor threw exception: %s"
@@ -7126,28 +6490,6 @@ msgstr ""
msgid "No user interface registered, assuming 'Yes' answer to question: %s"
msgstr ""
-#: libcore/movie_root.cpp:296
-msgid "Disabling scripts: %1%"
-msgstr ""
-
-#: libcore/movie_root.cpp:338
-msgid "Replacing starting movie"
-msgstr ""
-
-#: libcore/movie_root.cpp:343
-msgid "Loading into _level0"
-msgstr ""
-
-#: libcore/movie_root.cpp:391
-#, c-format
-msgid "Before swapLevels (source depth %d, target depth %d) levels are: "
-msgstr ""
-
-#: libcore/movie_root.cpp:394 libcore/movie_root.cpp:445
-#, c-format
-msgid " %d: %p (%s @ depth %d)"
-msgstr ""
-
#: libcore/movie_root.cpp:402 libcore/movie_root.cpp:412
#, c-format
msgid ""
@@ -7155,15 +6497,6 @@ msgid ""
"swap its depth"
msgstr ""
-#: libcore/movie_root.cpp:423
-#, c-format
-msgid "%s.swapDepth(%d): target depth (%d) contains no movie"
-msgstr ""
-
-#: libcore/movie_root.cpp:443
-msgid "After swapLevels levels are: "
-msgstr ""
-
#: libcore/movie_root.cpp:470
msgid ""
"movie_root::dropLevel called against a movie not found in the levels "
@@ -7203,55 +6536,16 @@ msgstr ""
msgid "Buffer overread during advance: %s"
msgstr ""
-#: libcore/movie_root.cpp:1008
-msgid "original root movie had null bounds, not displaying"
-msgstr ""
-
-#: libcore/movie_root.cpp:1031
-#, c-format
-msgid "_level%u has null frame size, skipping"
-msgstr ""
-
#: libcore/movie_root.cpp:1066
#, c-format
msgid "ActionLimits hit notifying mouse events: %s."
msgstr ""
-#: libcore/movie_root.cpp:1316
-#, c-format
-msgid "Going to or from scaleMode=noScale. Viewport:%dx%d Def:%dx%d"
-msgstr ""
-
-#: libcore/movie_root.cpp:1390
-#, c-format
-msgid "Processing %d actions in priority queue %d (call %u)"
-msgstr ""
-
-#: libcore/movie_root.cpp:1406
-#, c-format
-msgid "Actions pushed in priority %d (< %d), restarting the scan (call %u)"
-msgstr ""
-
-#: libcore/movie_root.cpp:1417
-#, c-format
-msgid "Done processing actions in priority queue %d (call %u)"
-msgstr ""
-
-#: libcore/movie_root.cpp:1505
-#, c-format
-msgid "Pushed action buffer for target %s"
-msgstr ""
-
#: libcore/movie_root.cpp:1558
#, c-format
msgid "Couldn't process ExternalInterface Call %s"
msgstr ""
-#: libcore/movie_root.cpp:1575
-#, c-format
-msgid "Processing %s call from the Browser."
-msgstr ""
-
#: libcore/movie_root.cpp:1603
msgid "ExternalInterface::GotoFrame()"
msgstr ""
@@ -7260,120 +6554,43 @@ msgstr ""
msgid "ExternalInterface::LoadMovie()"
msgstr ""
-#: libcore/movie_root.cpp:1672
-#, c-format
-msgid "Attempt to write response to ExternalInterface requests fd %d"
-msgstr ""
-
#: libcore/movie_root.cpp:1676 gui/Player.cpp:713
#, c-format
msgid "Could not write to user-provided host requests fd %d: %s"
msgstr ""
-#: libcore/movie_root.cpp:1681
-#, c-format
-msgid "No response needed for %s request"
-msgstr ""
-
-#: libcore/movie_root.cpp:1691
-#, c-format
-msgid "Checking %d timers for expiry"
-msgstr ""
-
#: libcore/movie_root.cpp:1837 libcore/movie_root.cpp:1869
#: libcore/movie_root.cpp:1925
#, c-format
msgid "Could not write to browser fd #%d: %s"
msgstr ""
-#: libcore/movie_root.cpp:2043
-#, c-format
-msgid "Global instance list grew to %d entries"
-msgstr ""
-
-#: libcore/movie_root.cpp:2052
-#, c-format
-msgid "---- movie_root::advance: %d live DisplayObjects in the global list"
-msgstr ""
-
-#: libcore/movie_root.cpp:2114
-#, c-format
-msgid ""
-"Evaluating DisplayObject target path: element '%s' of path '%s' not found"
-msgstr ""
-
-#: libcore/movie_root.cpp:2128
-#, c-format
-msgid "%s: HOSTFD is %d"
-msgstr ""
-
-#: libcore/movie_root.cpp:2149
-#, c-format
-msgid "Launching URL: %s"
-msgstr ""
-
-#: libcore/movie_root.cpp:2152
+#: libcore/movie_root.cpp:2153
#, c-format
msgid "Fork failed launching url opener '%s'"
msgstr ""
-#: libcore/movie_root.cpp:2193
-#, c-format
-msgid "Attempt to write geturl requests fd #%d"
-msgstr ""
-
-#: libcore/movie_root.cpp:2199
+#: libcore/movie_root.cpp:2200
#, c-format
msgid "Could only write %d bytes to fd #%d"
msgstr ""
-#: libcore/movie_root.cpp:2213
-msgid ""
-"SWF ScriptLimits tag attempting to set recursionLimit=%1% and scriptsTimeout="
-"%2% ignored as per rcfile directive"
-msgstr ""
-
-#: libcore/movie_root.cpp:2222
-#, c-format
-msgid "Setting script limits: max recursion %d, timeout %d seconds"
-msgstr ""
-
-#: libcore/movie_root.cpp:2287
+#: libcore/movie_root.cpp:2288
msgid "Live MovieClips"
msgstr ""
-#: libcore/movie_root.cpp:2389
-#, c-format
-msgid "LoadableObject Loaded %d bytes, reaching %d/%d"
-msgstr ""
-
-#: libcore/movie_root.cpp:2396
-#, c-format
-msgid "LoadableObject reached EOF (%d/%d loaded)"
-msgstr ""
-
-#: libcore/movie_root.cpp:2416
+#: libcore/movie_root.cpp:2417
#, c-format
msgid "%s to utf8 conversion in LoadableObject input parsing"
msgstr ""
-#: libcore/movie_root.cpp:2439
+#: libcore/movie_root.cpp:2440
#, c-format
msgid ""
"Hosting application registered no callback for events/queries, can't call %s"
"(%s)"
msgstr ""
-#: libcore/movie_root.cpp:2590
-#, c-format
-msgid " advancing DisplayObject %s"
-msgstr ""
-
-#: libcore/movie_root.cpp:2596
-#, c-format
-msgid " DisplayObject %s is unloaded, not advancing it"
-msgstr ""
-
#: libcore/abc/AbcBlock.cpp:64 libcore/abc/AbcBlock.cpp:132
msgid "ABC: Finalizing trait yielded bad type for slot."
msgstr ""
@@ -7542,26 +6759,11 @@ msgstr ""
msgid "Unknown file type"
msgstr ""
-#: libcore/MovieFactory.cpp:121
-#, c-format
-msgid "Movie %s already in library"
-msgstr ""
-
#: libcore/MovieFactory.cpp:133
#, c-format
msgid "Couldn't load library movie '%s'"
msgstr ""
-#: libcore/MovieFactory.cpp:140
-#, c-format
-msgid "Movie %s (SWF%d) added to library"
-msgstr ""
-
-#: libcore/MovieFactory.cpp:144
-#, c-format
-msgid "Movie %s (SWF%d) NOT added to library (resulted from a POST)"
-msgstr ""
-
#: libcore/MovieFactory.cpp:173
msgid "Can't read file header"
msgstr ""
@@ -7599,69 +6801,11 @@ msgstr ""
msgid "streamProvider opener can't open '%s'"
msgstr ""
-#: libcore/PropertyList.cpp:106
-#, c-format
-msgid "Simple AS property %s inserted with flags %s"
-msgstr ""
-
-#: libcore/PropertyList.cpp:195
-#, c-format
-msgid " %s: %s"
-msgstr ""
-
-#: libcore/PropertyList.cpp:215
-#, c-format
-msgid "AS GetterSetter %s replaced copying flags %s"
-msgstr ""
-
-#: libcore/PropertyList.cpp:225
-#, c-format
-msgid "AS GetterSetter %s inserted with flags %s"
-msgstr ""
-
-#: libcore/PropertyList.cpp:248
-#, c-format
-msgid "Native GetterSetter %s replaced copying flags %s"
-msgstr ""
-
-#: libcore/PropertyList.cpp:258
-#, c-format
-msgid "Native GetterSetter %s in namespace %s inserted with flags %s"
-msgstr ""
-
#: libcore/PropertyList.cpp:274
#, c-format
msgid "Property %s already exists, can't addDestructiveGetter"
msgstr ""
-#: libcore/PropertyList.cpp:286
-#, c-format
-msgid "Destructive AS property %s inserted with flags %s"
-msgstr ""
-
-#: libcore/PropertyList.cpp:306
-#, c-format
-msgid "Destructive native property %s with flags %s"
-msgstr ""
-
-#: libcore/as_object.cpp:151
-msgid "Super has no associated prototype"
-msgstr ""
-
-#: libcore/as_object.cpp:169
-msgid "Super has no associated constructor"
-msgstr ""
-
-#: libcore/as_object.cpp:353
-#, c-format
-msgid "add_property: property %s is being watched"
-msgstr ""
-
-#: libcore/as_object.cpp:361
-#, c-format
-msgid "Property %s deleted by trigger on create (getter-setter)"
-msgstr ""
-
#: libcore/as_object.cpp:439
#, c-format
msgid "Caught exception: %s"
@@ -7687,51 +6831,10 @@ msgstr ""
msgid "Attempt to initialize read-only property '%s' on object '%p' twice"
msgstr ""
-#: libcore/as_object.cpp:779
-#, c-format
-msgid "Object %p can't be an instance of an object (%p) with no 'prototype'"
-msgstr ""
-
-#: libcore/as_object.cpp:788
-#, c-format
-msgid ""
-"Object %p can't be an instance of an object (%p) with non-object "
-"'prototype' (%s)"
-msgstr ""
-
-#: libcore/as_object.cpp:807
-#, c-format
-msgid ""
-"Object %p is an instance of constructor %p as the constructor exposes our "
-"__proto__ %p"
-msgstr ""
-
-#: libcore/as_object.cpp:819
-#, c-format
-msgid ""
-"Object %p __proto__ %p had one interface matching with the constructor "
-"prototype %p"
-msgstr ""
-
#: libcore/as_object.cpp:845
msgid "Circular inheritance chain detected during isPrototypeOf call"
msgstr ""
-#: libcore/as_object.cpp:855
-#, c-format
-msgid "%d members of object %p follow"
-msgstr ""
-
-#: libcore/as_object.cpp:997
-#, c-format
-msgid "No watch for property %s"
-msgstr ""
-
-#: libcore/as_object.cpp:1003
-#, c-format
-msgid "Watch on %s not removed (is a getter-setter)"
-msgstr ""
-
#: libdevice/egl/eglDevice.cpp:87 libdevice/egl/eglDevice.cpp:109
msgid "Couldn't initialize EGL device!"
msgstr ""
http://git.savannah.gnu.org/cgit//commit/?id=b6976748f75ae93bd5f80e3e942becd1af1ad469
commit b6976748f75ae93bd5f80e3e942becd1af1ad469
Author: Rob Savoye <address@hidden>
Date: Sat Dec 31 12:07:15 2011 -0700
print messages cleaned up for translations
diff --git a/libcore/AMFConverter.cpp b/libcore/AMFConverter.cpp
index 41e82ed..29f4c39 100644
--- a/libcore/AMFConverter.cpp
+++ b/libcore/AMFConverter.cpp
@@ -66,7 +66,7 @@ public:
// Tested with SharedObject and AMFPHP
if (val.is_function()) {
- log_debug(_("AMF0: skip serialization of FUNCTION property"));
+ log_debug("AMF0: skip serialization of FUNCTION property");
return true;
}
@@ -81,7 +81,7 @@ public:
if (key == NSV::PROP_uuPROTOuu || key == NSV::PROP_CONSTRUCTOR)
{
#ifdef GNASH_DEBUG_AMF_SERIALIZE
- log_debug(_(" skip serialization of specially-named property %s"),
+ log_debug(" skip serialization of specially-named property %s",
_st.value(key));
#endif
return true;
@@ -91,7 +91,7 @@ public:
const std::string& name = _st.value(key);
#ifdef GNASH_DEBUG_AMF_SERIALIZE
- log_debug(_(" serializing property %s"), name);
+ log_debug(" serializing property %s", name);
#endif
_writer.writePropertyName(name);
if (!val.writeAMF0(_writer)) {
@@ -132,8 +132,8 @@ Writer::writeObject(as_object* obj)
if (it != _offsets.end()) {
const size_t idx = it->second;
#ifdef GNASH_DEBUG_AMF_SERIALIZE
- log_debug(_("amf: serializing object (or function) "
- "as reference to %d"), idx);
+ log_debug("amf: serializing object (or function) "
+ "as reference to %d", idx);
#endif
_buf.appendByte(REFERENCE_AMF0);
_buf.appendNetworkShort(idx);
@@ -152,8 +152,8 @@ Writer::writeObject(as_object* obj)
double d = date->getTimeValue();
#ifdef GNASH_DEBUG_AMF_SERIALIZE
- log_debug(_("amf: serializing date object "
- "with index %d and value %g"), idx, d);
+ log_debug("amf: serializing date object "
+ "with index %d and value %g", idx, d);
#endif
_buf.appendByte(DATE_AMF0);
writePlainNumber(_buf, d);
@@ -198,8 +198,8 @@ Writer::writeObject(as_object* obj)
if (s.strict()) {
#ifdef GNASH_DEBUG_AMF_SERIALIZE
- log_debug(_("amf: serializing array of %d "
- "elements as STRICT_ARRAY (index %d)"),
+ log_debug("amf: serializing array of %d "
+ "elements as STRICT_ARRAY (index %d)",
len, idx);
#endif
_buf.appendByte(STRICT_ARRAY_AMF0);
@@ -220,8 +220,8 @@ Writer::writeObject(as_object* obj)
// A normal array.
#ifdef GNASH_DEBUG_AMF_SERIALIZE
- log_debug(_("amf: serializing array of %d "
- "elements as ECMA_ARRAY (index %d) "),
+ log_debug("amf: serializing array of %d "
+ "elements as ECMA_ARRAY (index %d) ",
len, idx);
#endif
_buf.appendByte(ECMA_ARRAY_AMF0);
@@ -230,8 +230,8 @@ Writer::writeObject(as_object* obj)
else {
// It's a simple object
#ifdef GNASH_DEBUG_AMF_SERIALIZE
- log_debug(_("amf: serializing object (or function) "
- "with index %d"), idx);
+ log_debug("amf: serializing object (or function) "
+ "with index %d", idx);
#endif
_buf.appendByte(OBJECT_AMF0);
}
@@ -273,7 +273,7 @@ bool
Writer::writeUndefined()
{
#ifdef GNASH_DEBUG_AMF_SERIALIZE
- log_debug(_("amf: serializing undefined"));
+ log_debug("amf: serializing undefined");
#endif
_buf.appendByte(UNDEFINED_AMF0);
return true;
@@ -283,7 +283,7 @@ bool
Writer::writeNull()
{
#ifdef GNASH_DEBUG_AMF_SERIALIZE
- log_debug(_("amf: serializing null"));
+ log_debug("amf: serializing null");
#endif
_buf.appendByte(NULL_AMF0);
return true;
@@ -411,7 +411,7 @@ Reader::readStrictArray()
_pos += 4;
#ifdef GNASH_DEBUG_AMF_DESERIALIZE
- log_debug(_("amf0 starting read of STRICT_ARRAY with %i elements"), li);
+ log_debug("amf0 starting read of STRICT_ARRAY with %i elements", li);
#endif
as_object* array = _global.createArray();
@@ -455,7 +455,7 @@ Reader::readArray()
array->set_member(NSV::PROP_LENGTH, li);
#ifdef GNASH_DEBUG_AMF_DESERIALIZE
- log_debug(_("amf0 starting read of ECMA_ARRAY with %i elements"), li);
+ log_debug("amf0 starting read of ECMA_ARRAY with %i elements", li);
#endif
as_value objectElement;
@@ -494,7 +494,7 @@ Reader::readArray()
const std::string name(reinterpret_cast<const char*>(_pos), strlen);
#ifdef GNASH_DEBUG_AMF_DESERIALIZE
- log_debug(_("amf0 ECMA_ARRAY prop name is %s"), name);
+ log_debug("amf0 ECMA_ARRAY prop name is %s", name);
#endif
_pos += strlen;
@@ -515,7 +515,7 @@ Reader::readObject()
as_object* obj = createObject(_global);
#ifdef GNASH_DEBUG_AMF_DESERIALIZE
- log_debug(_("amf0 starting read of OBJECT"));
+ log_debug("amf0 starting read of OBJECT");
#endif
_objectRefs.push_back(obj);
@@ -560,7 +560,7 @@ Reader::readReference()
_pos += 2;
#ifdef GNASH_DEBUG_AMF_DESERIALIZE
- log_debug(_("readAMF0: reference #%d"), si);
+ log_debug("readAMF0: reference #%d", si);
#endif
if (si < 1 || si > _objectRefs.size()) {
log_error(_("readAMF0: invalid reference to object %d (%d known "
@@ -576,7 +576,7 @@ Reader::readDate()
const double d = readNumber(_pos, _end);
#ifdef GNASH_DEBUG_AMF_DESERIALIZE
- log_debug(_("amf0 read date: %e"), dub);
+ log_debug("amf0 read date: %e", dub);
#endif
as_function* ctor = getMember(_global, NSV::CLASS_DATE).to_function();
diff --git a/libcore/Button.cpp b/libcore/Button.cpp
index 4c42e9e..a70ee5c 100644
--- a/libcore/Button.cpp
+++ b/libcore/Button.cpp
@@ -682,7 +682,7 @@ Button::set_current_state(MouseState new_state)
int oldDepth = oldch->get_depth();
int newDepth = DisplayObject::removedDepthOffset -
oldDepth;
#ifdef GNASH_DEBUG_BUTTON_DISPLAYLIST
- log_debug(_("Removed button record shifted from depth %d
to depth %d"),
+ log_debug("Removed button record shifted from depth %d to
depth %d",
oldDepth, newDepth);
#endif
oldch->set_depth(newDepth);
diff --git a/libcore/CharacterProxy.cpp b/libcore/CharacterProxy.cpp
index c2744fa..9927e21 100644
--- a/libcore/CharacterProxy.cpp
+++ b/libcore/CharacterProxy.cpp
@@ -34,8 +34,8 @@ CharacterProxy::checkDangling() const
if (_ptr && _ptr->isDestroyed()) {
_tgt = _ptr->getOrigTarget();
#ifdef GNASH_DEBUG_SOFT_REFERENCES
- log_debug(_("char %s (%s) was destroyed, stored its orig target
"
- "(%s) for later rebinding"), _ptr->getTarget(),
typeName(*_ptr),
+ log_debug("char %s (%s) was destroyed, stored its orig target "
+ "(%s) for later rebinding", _ptr->getTarget(),
typeName(*_ptr),
_tgt);
#endif
_ptr = 0;
diff --git a/libcore/ClassHierarchy.cpp b/libcore/ClassHierarchy.cpp
index e7fae18..496f19d 100644
--- a/libcore/ClassHierarchy.cpp
+++ b/libcore/ClassHierarchy.cpp
@@ -74,7 +74,7 @@ public:
virtual as_value call(const fn_call& fn)
{
string_table& st = getStringTable(fn);
- log_debug(_("Loading native class %s"), st.value(getName(_decl.uri)));
+ log_debug("Loading native class %s", st.value(getName(_decl.uri)));
_decl.initializer(*mTarget, _decl.uri);
// Successfully loaded it, now find it, set its proto, and return.
diff --git a/libcore/DisplayObject.cpp b/libcore/DisplayObject.cpp
index c644944..5b0e806 100644
--- a/libcore/DisplayObject.cpp
+++ b/libcore/DisplayObject.cpp
@@ -203,7 +203,7 @@ DisplayObject::set_invalidated(const char* debug_file, int
debug_line)
_invalidated = true;
#ifdef DEBUG_SET_INVALIDATED
- log_debug(_("%p set_invalidated() of %s in %s:%d"),
+ log_debug("%p set_invalidated() of %s in %s:%d",
(void*)this, getTarget(), debug_file, debug_line);
#else
UNUSED(debug_file);
diff --git a/libcore/ExternalInterface.cpp b/libcore/ExternalInterface.cpp
index 66835d1..39974a9 100644
--- a/libcore/ExternalInterface.cpp
+++ b/libcore/ExternalInterface.cpp
@@ -149,7 +149,7 @@ ExternalInterface::ExternalEventCheck(int fd)
if (bytes == 0) {
return error;
}
- log_debug(_("There are %d bytes in the network buffer"), bytes);
+ log_debug("There are %d bytes in the network buffer", bytes);
boost::scoped_array<char> buffer(new char[bytes + 1]);
// Since we know how bytes are in the network buffer, allocate
// some memory to read the data.
@@ -260,7 +260,7 @@ ExternalInterface::parseXML(const std::string &xml)
}
}
-// log_debug(_("Argument is: %s"), value.to_string());
+// log_debug("Argument is: %s", value.to_string());
return value;
}
@@ -344,7 +344,7 @@ ExternalInterface::readBrowser(int fd)
return empty;
}
- log_debug(_("There are %d bytes in the network buffer"), bytes);
+ log_debug("There are %d bytes in the network buffer", bytes);
std::string buf(bytes, '\0');
diff --git a/libcore/FreetypeGlyphsProvider.cpp
b/libcore/FreetypeGlyphsProvider.cpp
index f1b2484..556373f 100644
--- a/libcore/FreetypeGlyphsProvider.cpp
+++ b/libcore/FreetypeGlyphsProvider.cpp
@@ -153,7 +153,7 @@ private:
int moveTo(const FT_Vector* to)
{
#ifdef DEBUG_OUTLINE_DECOMPOSITION
- log_debug(_("moveTo: %ld,%ld"), to->x, to->y);
+ log_debug("moveTo: %ld,%ld", to->x, to->y);
#endif
_x = static_cast<boost::int32_t>(to->x * _scale);
_y = - static_cast<boost::int32_t>(to->y * _scale);
@@ -166,7 +166,7 @@ private:
int lineTo(const FT_Vector* to)
{
#ifdef DEBUG_OUTLINE_DECOMPOSITION
- log_debug(_("lineTo: %ld,%ld"), to->x, to->y);
+ log_debug("lineTo: %ld,%ld", to->x, to->y);
#endif
_x = static_cast<boost::int32_t>(to->x * _scale);
_y = - static_cast<boost::int32_t>(to->y * _scale);
@@ -178,7 +178,7 @@ private:
int conicTo(const FT_Vector* ctrl, const FT_Vector* to)
{
#ifdef DEBUG_OUTLINE_DECOMPOSITION
- log_debug(_("conicTo: %ld,%ld %ld,%ld"), ctrl->x, ctrl->y, to->x,
to->y);
+ log_debug("conicTo: %ld,%ld %ld,%ld", ctrl->x, ctrl->y, to->x, to->y);
#endif
boost::int32_t x1 = static_cast<boost::int32_t>(ctrl->x * _scale);
boost::int32_t y1 = static_cast<boost::int32_t>(ctrl->y * _scale);
@@ -193,7 +193,7 @@ private:
cubicTo(const FT_Vector* ctrl1, const FT_Vector* ctrl2, const FT_Vector*
to)
{
#ifdef DEBUG_OUTLINE_DECOMPOSITION
- log_debug(_("cubicTo: %ld,%ld %ld,%ld %ld,%ld"), ctrl1->x,
+ log_debug("cubicTo: %ld,%ld %ld,%ld %ld,%ld", ctrl1->x,
ctrl1->y, ctrl2->x, ctrl2->y, to->x, to->y);
#endif
float x = ctrl1->x + ( (ctrl2->x - ctrl1->x) * 0.5 );
@@ -325,15 +325,15 @@ FreetypeGlyphsProvider::getFontFilename(const std::string
&name,
if ( fs ) {
#ifdef GNASH_DEBUG_DEVICEFONTS
- log_debug(_("Found %d fonts matching the family %s (using "
- "first)"), fs->nfont, name);
+ log_debug("Found %d fonts matching the family %s (using "
+ "first)", fs->nfont, name);
#endif
for (int j = 0; j < fs->nfont; j++) {
FcChar8 *file;
if (FcPatternGetString (fs->fonts[j], FC_FILE, 0, &file) !=
FcResultMatch) {
#ifdef GNASH_DEBUG_DEVICEFONTS
- log_debug(_("Matching font %d has unknown filename, skipping"),
+ log_debug("Matching font %d has unknown filename, skipping",
j);
#endif
continue;
@@ -343,7 +343,7 @@ FreetypeGlyphsProvider::getFontFilename(const std::string
&name,
FcFontSetDestroy(fs);
#ifdef GNASH_DEBUG_DEVICEFONTS
- log_debug(_("Loading font from file %d"), filename);
+ log_debug("Loading font from file %d", filename);
#endif
return true;
@@ -466,7 +466,7 @@ FreetypeGlyphsProvider::FreetypeGlyphsProvider(const
std::string& name,
scale = (float)unitsPerEM()/_face->units_per_EM;
#ifdef GNASH_DEBUG_DEVICEFONTS
- log_debug(_("EM square for font '%s' is %d, scale is this %g"),
+ log_debug("EM square for font '%s' is %d, scale is this %g",
name, _face->units_per_EM, scale);
#endif
}
@@ -495,8 +495,8 @@ FreetypeGlyphsProvider::getGlyph(boost::uint16_t code,
float& advance)
// Scale advance by current scale, to match expected output coordinate
space
advance = _face->glyph->metrics.horiAdvance * scale;
#ifdef GNASH_DEBUG_DEVICEFONTS
- log_debug(_("Advance value for glyph '%c' is %g (horiAdvance:%ld, "
- "scale:%g)"), code, advance,
+ log_debug("Advance value for glyph '%c' is %g (horiAdvance:%ld, "
+ "scale:%g)", code, advance,
_face->glyph->metrics.horiAdvance, scale);
#endif
@@ -523,7 +523,7 @@ FreetypeGlyphsProvider::getGlyph(boost::uint16_t code,
float& advance)
walk.delta = 0; // ?
#ifdef DEBUG_OUTLINE_DECOMPOSITION
- log_debug(_("Decomposing glyph outline for DisplayObject %u"), code);
+ log_debug("Decomposing glyph outline for DisplayObject %u", code);
#endif
glyph.reset(new SWF::ShapeRecord);
@@ -535,7 +535,7 @@ FreetypeGlyphsProvider::getGlyph(boost::uint16_t code,
float& advance)
#if 0
// Don't use VM::get if this is to be re-enabled.
SWFRect bound; sh->compute_bound(&bound, VM::get().getSWFVersion());
- log_debug(_("Decomposed glyph for DisplayObject '%c' has bounds %s"),
+ log_debug("Decomposed glyph for DisplayObject '%c' has bounds %s",
code, bound.toString());
#endif
#endif
diff --git a/libcore/LoadVariablesThread.cpp b/libcore/LoadVariablesThread.cpp
index 06e4470..6b20ac2 100644
--- a/libcore/LoadVariablesThread.cpp
+++ b/libcore/LoadVariablesThread.cpp
@@ -34,7 +34,7 @@ void
LoadVariablesThread::completeLoad()
{
#ifdef DEBUG_LOAD_VARIABLES
- log_debug(_("completeLoad called"));
+ log_debug("completeLoad called");
#endif
@@ -54,7 +54,7 @@ LoadVariablesThread::completeLoad()
while ( size_t bytesRead = _stream->read(buf.get(), chunkSize) )
{
#ifdef DEBUG_LOAD_VARIABLES
- log_debug(_("Read %u bytes"), bytesRead);
+ log_debug("Read %u bytes", bytesRead);
#endif
if ( _bytesLoaded )
@@ -81,7 +81,7 @@ LoadVariablesThread::completeLoad()
}
#ifdef DEBUG_LOAD_VARIABLES
- log_debug(_("toparse: %s"), toparse);
+ log_debug("toparse: %s", toparse);
#endif
// parse remainder
@@ -90,12 +90,12 @@ LoadVariablesThread::completeLoad()
{
std::string parseable = toparse.substr(0, lastamp);
#ifdef DEBUG_LOAD_VARIABLES
- log_debug(_("parseable: %s"), parseable);
+ log_debug("parseable: %s", parseable);
#endif
parse(parseable);
toparse = toparse.substr(lastamp+1);
#ifdef DEBUG_LOAD_VARIABLES
- log_debug(_("toparse nextline: %s"), toparse);
+ log_debug("toparse nextline: %s", toparse);
#endif
++parsedLines;
}
@@ -106,7 +106,7 @@ LoadVariablesThread::completeLoad()
if ( _stream->eof() ) break;
if ( cancelRequested() ) {
- log_debug(_("Cancelling LoadVariables download
thread..."));
+ log_debug("Cancelling LoadVariables download thread...");
_stream.reset();
return;
}
diff --git a/libcore/MovieClip.cpp b/libcore/MovieClip.cpp
index 8a74b0d..92c480f 100644
--- a/libcore/MovieClip.cpp
+++ b/libcore/MovieClip.cpp
@@ -164,9 +164,9 @@ public:
if (ch->get_depth() <= _highestHiddenDepth) {
if (ch->isMaskLayer()) {
#ifdef DEBUG_MOUSE_ENTITY_FINDING
- log_debug(_("CHECKME: nested mask in MouseEntityFinder. "
+ log_debug("CHECKME: nested mask in MouseEntityFinder. "
"This mask is %s at depth %d outer mask masked "
- "up to depth %d."),
+ "up to depth %d.",
ch->getTarget(), ch->get_depth(),
_highestHiddenDepth);
// Hiding mask still in effect...
@@ -178,17 +178,17 @@ public:
if (ch->isMaskLayer()) {
if (!ch->pointInShape(_wp.x, _wp.y)) {
#ifdef DEBUG_MOUSE_ENTITY_FINDING
- log_debug(_("Character %s at depth %d is a mask not hitting "
+ log_debug("Character %s at depth %d is a mask not hitting "
"the query point %g,%g and masking up to "
- "depth %d"), ch->getTarget(), ch->get_depth(),
+ "depth %d", ch->getTarget(), ch->get_depth(),
_wp.x, _wp.y, ch->get_clip_depth());
#endif
_highestHiddenDepth = ch->get_clip_depth();
}
else {
#ifdef DEBUG_MOUSE_ENTITY_FINDING
- log_debug(_("Character %s at depth %d is a mask hitting the "
- "query point %g,%g"),
+ log_debug("Character %s at depth %d is a mask hitting the "
+ "query point %g,%g",
ch->getTarget(), ch->get_depth(), _wp.x, _wp.y);
#endif
}
@@ -217,8 +217,8 @@ public:
checkCandidates();
#ifdef DEBUG_MOUSE_ENTITY_FINDING
if (_m) {
- log_debug(_("MouseEntityFinder found DisplayObject %s (depth %d) "
- "hitting point %g,%g"),
+ log_debug("MouseEntityFinder found DisplayObject %s (depth %d) "
+ "hitting point %g,%g",
_m->getTarget(), _m->get_depth(), _wp.x, _wp.y);
}
#endif // DEBUG_MOUSE_ENTITY_FINDING
@@ -400,9 +400,9 @@ public:
if (ch->get_depth() <= _highestHiddenDepth) {
if (ch->isMaskLayer()) {
#ifdef DEBUG_MOUSE_ENTITY_FINDING
- log_debug(_("CHECKME: nested mask in DropTargetFinder. "
+ log_debug("CHECKME: nested mask in DropTargetFinder. "
"This mask is %s at depth %d outer mask masked "
- "up to depth %d."),
+ "up to depth %d.",
ch->getTarget(), ch->get_depth(), _highestHiddenDepth);
// Hiding mask still in effect...
#endif
@@ -412,12 +412,12 @@ public:
if (ch->isMaskLayer()) {
if (!ch->visible()) {
- log_debug(_("FIXME: invisible mask in MouseEntityFinder."));
+ log_debug("FIXME: invisible mask in MouseEntityFinder.");
}
if (!ch->pointInShape(_x, _y)) {
#ifdef DEBUG_MOUSE_ENTITY_FINDING
- log_debug(_("Character %s at depth %d is a mask not hitting "
- "the query point %g,%g and masking up to depth %d"),
+ log_debug("Character %s at depth %d is a mask not hitting "
+ "the query point %g,%g and masking up to depth %d",
ch->getTarget(), ch->get_depth(), _x, _y,
ch->get_clip_depth());
#endif
@@ -425,8 +425,8 @@ public:
}
else {
#ifdef DEBUG_MOUSE_ENTITY_FINDING
- log_debug(_("Character %s at depth %d is a mask "
- "hitting the query point %g,%g"),
+ log_debug("Character %s at depth %d is a mask "
+ "hitting the query point %g,%g",
ch->getTarget(), ch->get_depth(), _x, _y);
#endif
}
@@ -717,13 +717,13 @@ void
MovieClip::notifyEvent(const event_id& id)
{
#ifdef GNASH_DEBUG
- log_debug(_("Event %s invoked for movieclip %s"), id, getTarget());
+ log_debug("Event %s invoked for movieclip %s", id, getTarget());
#endif
// We do not execute ENTER_FRAME if unloaded
if (id.id() == event_id::ENTER_FRAME && unloaded()) {
#ifdef GNASH_DEBUG
- log_debug(_("Sprite %s ignored ENTER_FRAME event (is unloaded)"),
+ log_debug("Sprite %s ignored ENTER_FRAME event (is unloaded)",
getTarget());
#endif
return;
@@ -731,7 +731,7 @@ MovieClip::notifyEvent(const event_id& id)
if (isButtonEvent(id) && !isEnabled()) {
#ifdef GNASH_DEBUG
- log_debug(_("Sprite %s ignored button-like event %s as not 'enabled'"),
+ log_debug("Sprite %s ignored button-like event %s as not 'enabled'",
getTarget(), id);
#endif
return;
@@ -790,9 +790,9 @@ MovieClip::notifyEvent(const event_id& id)
if (stage().getRegisteredClass(_def.get())) break;
#ifdef GNASH_DEBUG
- log_debug(_("Sprite %s (depth %d) won't check for user-defined "
+ log_debug("Sprite %s (depth %d) won't check for user-defined "
"LOAD event (is not dynamic, has a parent, "
- "no registered class and no clip events defined)"),
+ "no registered class and no clip events defined)",
getTarget(), get_depth());
#endif
return;
@@ -869,7 +869,7 @@ void
MovieClip::advance()
{
#ifdef GNASH_DEBUG
- log_debug(_("Advance movieclip '%s' at frame %u/%u"),
+ log_debug("Advance movieclip '%s' at frame %u/%u",
getTargetPath(), _currentFrame+1,
get_frame_count());
#endif
@@ -894,7 +894,7 @@ MovieClip::advance()
#ifdef GNASH_DEBUG
size_t frame_count = _def->get_frame_count();
- log_debug(_("Advance_movieclip for movieclip '%s' - frame %u/%u "),
+ log_debug("Advance_movieclip for movieclip '%s' - frame %u/%u ",
getTarget(), _currentFrame+1,
frame_count);
#endif
@@ -907,17 +907,17 @@ MovieClip::advance()
// Update current and next frames.
if (_playState == PLAYSTATE_PLAY) {
#ifdef GNASH_DEBUG
- log_debug(_("MovieClip::advance_movieclip we're in PLAYSTATE_PLAY
mode"));
+ log_debug("MovieClip::advance_movieclip we're in PLAYSTATE_PLAY mode");
#endif
const size_t prev_frame = _currentFrame;
#ifdef GNASH_DEBUG
- log_debug(_("on_event_load called, incrementing"));
+ log_debug("on_event_load called, incrementing");
#endif
increment_frame_and_check_for_loop();
#ifdef GNASH_DEBUG
- log_debug(_("after increment we are at frame %u/%u"), _currentFrame,
frame_count);
+ log_debug("after increment we are at frame %u/%u", _currentFrame,
frame_count);
#endif
// Flush any orphaned tags
@@ -950,15 +950,15 @@ MovieClip::advance()
if (_currentFrame == 0 && _hasLooped) {
#ifdef GNASH_DEBUG
- log_debug(_("Jumping back to frame 0 of movieclip %s"),
+ log_debug("Jumping back to frame 0 of movieclip %s",
getTarget());
#endif
restoreDisplayList(0); // seems OK to me.
}
else {
#ifdef GNASH_DEBUG
- log_debug(_("Executing frame%d (0-based) tags of movieclip "
- "%s"), _currentFrame, getTarget());
+ log_debug("Executing frame%d (0-based) tags of movieclip "
+ "%s", _currentFrame, getTarget());
#endif
// Make sure _currentFrame is 0-based during execution of
// DLIST tags
@@ -971,7 +971,7 @@ MovieClip::advance()
}
#ifdef GNASH_DEBUG
else {
- log_debug(_("MovieClip::advance_movieclip we're in STOP mode"));
+ log_debug("MovieClip::advance_movieclip we're in STOP mode");
}
#endif
}
@@ -983,8 +983,8 @@ MovieClip::execute_init_action_buffer(const action_buffer&
a, int cid)
if (_swf->initializeCharacter(cid)) {
#ifdef GNASH_DEBUG
- log_debug(_("Queuing init actions for DisplayObject %1% "
- "in frame %2% of MovieClip %3%"),
+ log_debug("Queuing init actions for DisplayObject %1% "
+ "in frame %2% of MovieClip %3%",
cid, _currentFrame, getTarget());
#endif
std::auto_ptr<ExecutableCode> code(new GlobalCode(a, this));
@@ -993,7 +993,7 @@ MovieClip::execute_init_action_buffer(const action_buffer&
a, int cid)
}
else {
#ifdef GNASH_DEBUG
- log_debug(_("Init actions for DisplayObject %1% already executed"),
cid);
+ log_debug("Init actions for DisplayObject %1% already executed", cid);
#endif
}
}
@@ -1067,7 +1067,7 @@ void
MovieClip::goto_frame(size_t target_frame_number)
{
#if defined(DEBUG_GOTOFRAME) || defined(GNASH_DEBUG_TIMELINE)
- log_debug(_("movieclip %s ::goto_frame(%d) - current frame is %d"),
+ log_debug("movieclip %s ::goto_frame(%d) - current frame is %d",
getTargetPath(), target_frame_number, _currentFrame);
#endif
@@ -1429,16 +1429,16 @@ MovieClip::pointInVisibleShape(boost::int32_t x,
boost::int32_t y) const
if (isDynamicMask() && ! mouseEnabled()) {
// see testsuite/misc-ming.all/masks_test.swf
#ifdef GNASH_DEBUG_HITTEST
- log_debug(_("%s is a dynamic mask and can't handle mouse "
- "events, no point will hit it"), getTarget());
+ log_debug("%s is a dynamic mask and can't handle mouse "
+ "events, no point will hit it", getTarget());
#endif
return false;
}
const DisplayObject* mask = getMask(); // dynamic one
if (mask && mask->visible() && !mask->pointInShape(x, y)) {
#ifdef GNASH_DEBUG_HITTEST
- log_debug(_("%s is dynamically masked by %s, which "
- "doesn't hit point %g,%g"), getTarget(),
+ log_debug("%s is dynamically masked by %s, which "
+ "doesn't hit point %g,%g", getTarget(),
mask->getTarget(), x, y);
#endif
return false;
@@ -1685,7 +1685,7 @@ MovieClip::constructAsScriptObject()
as_function* ctor = def ? stage().getRegisteredClass(def) : 0;
#ifdef GNASH_DEBUG
- log_debug(_("Attached movieclips %s registered class is %p"),
+ log_debug("Attached movieclips %s registered class is %p",
getTarget(), (void*)ctor);
#endif
@@ -1716,7 +1716,7 @@ MovieClip::construct(as_object* initObj)
saveOriginalTarget();
#ifdef GNASH_DEBUG
- log_debug(_("Sprite '%s' placed on stage"), getTarget());
+ log_debug("Sprite '%s' placed on stage", getTarget());
#endif
// Register this movieclip as a live one
@@ -1755,7 +1755,7 @@ MovieClip::construct(as_object* initObj)
if (!isDynamic()) {
#ifdef GNASH_DEBUG
- log_debug(_("Queuing INITIALIZE and CONSTRUCT events for movieclip
%s"),
+ log_debug("Queuing INITIALIZE and CONSTRUCT events for movieclip %s",
getTarget());
#endif
@@ -1790,7 +1790,7 @@ bool
MovieClip::unloadChildren()
{
#ifdef GNASH_DEBUG
- log_debug(_("Unloading movieclip '%s'"), getTargetPath());
+ log_debug("Unloading movieclip '%s'", getTargetPath());
#endif
// stop any pending streaming sounds
@@ -2086,7 +2086,7 @@ void
MovieClip::setStreamSoundId(int id)
{
if (id != m_sound_stream_id) {
- log_debug(_("Stream sound id from %d to %d, stopping old"),
+ log_debug("Stream sound id from %d to %d, stopping old",
m_sound_stream_id, id);
stopStreamSound();
}
diff --git a/libcore/MovieFactory.cpp b/libcore/MovieFactory.cpp
index 0f9d314..d1a8383 100644
--- a/libcore/MovieFactory.cpp
+++ b/libcore/MovieFactory.cpp
@@ -118,7 +118,7 @@ MovieFactory::makeMovie(const URL& url, const RunResources&
runResources,
// Is the movie already in the library? (don't check if we have post data!)
if (!postdata) {
if (movieLibrary.get(cache_label, &mov)) {
- log_debug(_("Movie %s already in library"), cache_label);
+ log_debug("Movie %s already in library", cache_label);
return mov;
}
}
@@ -137,12 +137,12 @@ MovieFactory::makeMovie(const URL& url, const
RunResources& runResources,
// Movie is good, add to the library, but not if we used POST
if (!postdata) {
movieLibrary.add(cache_label, mov.get());
- log_debug(_("Movie %s (SWF%d) added to library"),
+ log_debug("Movie %s (SWF%d) added to library",
cache_label, mov->get_version());
}
else {
- log_debug(_("Movie %s (SWF%d) NOT added to library (resulted from "
- "a POST)"), cache_label, mov->get_version());
+ log_debug("Movie %s (SWF%d) NOT added to library (resulted from "
+ "a POST)", cache_label, mov->get_version());
}
/// Now complete the load if the movie is an SWF movie
diff --git a/libcore/MovieLoader.cpp b/libcore/MovieLoader.cpp
index 04ba647..fcb9e51 100644
--- a/libcore/MovieLoader.cpp
+++ b/libcore/MovieLoader.cpp
@@ -60,7 +60,7 @@ MovieLoader::processRequests()
_barrier.wait();
#ifdef GNASH_DEBUG_LOADMOVIE_REQUESTS_PROCESSING
- log_debug(_("Starting movie loader thread"));
+ log_debug("Starting movie loader thread");
#endif
@@ -69,19 +69,19 @@ MovieLoader::processRequests()
// check for shutdown/cancel request
if (killed()) {
#ifdef GNASH_DEBUG_LOADMOVIE_REQUESTS_PROCESSING
- log_debug(_("Loader thread killed"));
+ log_debug("Loader thread killed");
#endif
return;
}
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("processRequests: lock on requests: trying"));
+ log_debug("processRequests: lock on requests: trying");
#endif
boost::mutex::scoped_lock lock(_requestsMutex);
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("processRequests: lock on requests: obtained"));
+ log_debug("processRequests: lock on requests: obtained");
#endif
// Find first non-completed request (the others we'll wait)
@@ -92,17 +92,17 @@ MovieLoader::processRequests()
if (it == endIt) {
#ifdef GNASH_DEBUG_LOADMOVIE_REQUESTS_PROCESSING
- log_debug(_("Movie loader thread getting to sleep (nothing more to
do)"));
+ log_debug("Movie loader thread getting to sleep (nothing more to
do)");
#endif
// all completed, we can get to sleep
_wakeup.wait(lock);
#ifdef GNASH_DEBUG_LOADMOVIE_REQUESTS_PROCESSING
- log_debug(_("Movie loader thread waked up"));
+ log_debug("Movie loader thread waked up");
#endif
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("processRequests: lock on requests: release"));
+ log_debug("processRequests: lock on requests: release");
#endif
continue;
@@ -111,7 +111,7 @@ MovieLoader::processRequests()
Request& lr = *it;
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("processRequests: lock on requests: release"));
+ log_debug("processRequests: lock on requests: release");
#endif
lock.unlock(); // now main thread can continue to push requests
@@ -132,7 +132,7 @@ MovieLoader::processRequest(Request& r)
const std::string* postdata = usePost ? &(r.getPostData()) : 0;
#ifdef GNASH_DEBUG_LOADMOVIE_REQUESTS_PROCESSING
- log_debug(_("Movie loader thread processing request for target %s"),
+ log_debug("Movie loader thread processing request for target %s",
r.getTarget());
#endif
@@ -143,7 +143,7 @@ MovieLoader::processRequest(Request& r)
r.setCompleted(md);
#ifdef GNASH_DEBUG_LOADMOVIE_REQUESTS_PROCESSING
- log_debug(_("Movie loader thread completed request for target %s"),
+ log_debug("Movie loader thread completed request for target %s",
r.getTarget());
#endif
}
@@ -156,45 +156,45 @@ MovieLoader::clear()
if (_thread.get()) {
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("clear: lock on requests: trying"));
+ log_debug("clear: lock on requests: trying");
#endif
boost::mutex::scoped_lock requestsLock(_requestsMutex);
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("clear: lock on requests: obtained"));
+ log_debug("clear: lock on requests: obtained");
#endif
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("clear: lock on kill: trying"));
+ log_debug("clear: lock on kill: trying");
#endif
boost::mutex::scoped_lock lock(_killMutex);
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("clear: lock on kill: obtained"));
+ log_debug("clear: lock on kill: obtained");
#endif
_killed = true;
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("clear: lock on kill: release for kill"));
+ log_debug("clear: lock on kill: release for kill");
#endif
lock.unlock();
- log_debug(_("waking up loader thread"));
+ log_debug("waking up loader thread");
_wakeup.notify_all(); // in case it was sleeping
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("clear: lock on requests: release ater notify_all"));
+ log_debug("clear: lock on requests: release ater notify_all");
#endif
requestsLock.unlock(); // allow the thread to die
- log_debug(_("MovieLoader notified, joining"));
+ log_debug("MovieLoader notified, joining");
_thread->join();
- log_debug(_("MovieLoader joined"));
+ log_debug("MovieLoader joined");
_thread.reset();
}
@@ -202,7 +202,7 @@ MovieLoader::clear()
clearRequests();
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("clear: lock on requests: release if not after notify_all"));
+ log_debug("clear: lock on requests: release if not after notify_all");
#endif
}
@@ -273,14 +273,14 @@ MovieLoader::processCompletedRequest(const Request& r)
unsigned int levelno;
const int version = _movieRoot.getVM().getSWFVersion();
if (isLevelTarget(version, target, levelno)) {
- log_debug(_("processCompletedRequest: _level loading "
- "(level %u)"), levelno);
+ log_debug("processCompletedRequest: _level loading "
+ "(level %u)", levelno);
extern_movie->set_depth(levelno +
DisplayObject::staticDepthOffset);
_movieRoot.setLevel(levelno, extern_movie);
}
else {
- log_debug(_("Target %s of a loadMovie request doesn't exist at "
- "load complete time"), target);
+ log_debug("Target %s of a loadMovie request doesn't exist at "
+ "load complete time", target);
return true;
}
}
@@ -341,17 +341,17 @@ MovieLoader::processCompletedRequests()
for (;;) {
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("processCompletedRequests: lock on requests: trying"));
+ log_debug("processCompletedRequests: lock on requests: trying");
#endif
boost::mutex::scoped_lock requestsLock(_requestsMutex);
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("processCompletedRequests: lock on requests: obtained"));
+ log_debug("processCompletedRequests: lock on requests: obtained");
#endif
#ifdef GNASH_DEBUG_LOADMOVIE_REQUESTS_PROCESSING
- log_debug(_("Checking %d requests for completeness"),
+ log_debug("Checking %d requests for completeness",
_requests.size());
#endif
@@ -363,14 +363,14 @@ MovieLoader::processCompletedRequests()
if (it == endIt) break;
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("processCompletedRequests: lock on requests: releasing"));
+ log_debug("processCompletedRequests: lock on requests: releasing");
#endif
requestsLock.unlock();
Request& firstCompleted = *it;
#ifdef GNASH_DEBUG_LOADMOVIE_REQUESTS_PROCESSING
- log_debug(_("Load request for target %s completed"),
+ log_debug("Load request for target %s completed",
firstCompleted->getTarget());
#endif
@@ -378,22 +378,22 @@ MovieLoader::processCompletedRequests()
assert(checkit);
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("processCompletedRequests: lock on requests for removal: "
- "trying"));
+ log_debug("processCompletedRequests: lock on requests for removal: "
+ "trying");
#endif
requestsLock.lock();
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("processCompletedRequests: lock on requests for removal: "
- "obtained"));
+ log_debug("processCompletedRequests: lock on requests for removal: "
+ "obtained")
#endif
_requests.erase(it);
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("processCompletedRequests: lock on requests for removal: "
- "release"));
+ log_debug("processCompletedRequests: lock on requests for removal: "
+ "release");
#endif
}
}
@@ -431,19 +431,19 @@ MovieLoader::loadMovie(const std::string& urlstr,
url.set_querystring(qs + varsToSend);
}
- log_debug(_("MovieLoader::loadMovie(%s, %s)"), url.str(), target);
+ log_debug("MovieLoader::loadMovie(%s, %s)", url.str(), target);
const std::string* postdata = (method == MovieClip::METHOD_POST) ? &data
: 0;
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("loadMovie: lock on requests: trying"));
+ log_debug("loadMovie: lock on requests: trying");
#endif
boost::mutex::scoped_lock lock(_requestsMutex);
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("loadMovie: lock on requests: obtained"));
+ log_debug("loadMovie: lock on requests: obtained");
#endif
_requests.push_front(
@@ -458,12 +458,12 @@ MovieLoader::loadMovie(const std::string& urlstr,
_barrier.wait(); // let execution start before proceeding
}
else {
- log_debug(_("loadMovie: waking up existing thread"));
+ log_debug("loadMovie: waking up existing thread");
_wakeup.notify_all();
}
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("loadMovie: lock on requests: release"));
+ log_debug("loadMovie: lock on requests: release");
#endif
}
@@ -481,20 +481,20 @@ MovieLoader::setReachable() const
{
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("setReachable: lock on requests: trying"));
+ log_debug("setReachable: lock on requests: trying");
#endif
boost::mutex::scoped_lock lock(_requestsMutex);
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("setReachable: lock on requests: obtained"));
+ log_debug("setReachable: lock on requests: obtained");
#endif
std::for_each(_requests.begin(), _requests.end(),
boost::mem_fn(&Request::setReachable));
#ifdef GNASH_DEBUG_LOCKING
- log_debug(_("setReachable: lock on requests: release"));
+ log_debug("setReachable: lock on requests: release");
#endif
}
diff --git a/libcore/PropertyList.cpp b/libcore/PropertyList.cpp
index 19d1664..8f7e6ae 100644
--- a/libcore/PropertyList.cpp
+++ b/libcore/PropertyList.cpp
@@ -103,7 +103,7 @@ PropertyList::setValue(const ObjectURI& uri, const
as_value& val,
_props.push_back(a);
#ifdef GNASH_DEBUG_PROPERTY
ObjectURI::Logger l(getStringTable(_owner));
- log_debug(_("Simple AS property %s inserted with flags %s"),
+ log_debug("Simple AS property %s inserted with flags %s",
l(uri), a.getFlags());
#endif
return true;
@@ -192,7 +192,7 @@ PropertyList::dump()
ObjectURI::Logger l(getStringTable(_owner));
for (const_iterator it=_props.begin(), itEnd=_props.end();
it != itEnd; ++it) {
- log_debug(_(" %s: %s"), l(it->uri()), it->getValue(_owner));
+ log_debug(" %s: %s", l(it->uri()), it->getValue(_owner));
}
}
@@ -212,7 +212,7 @@ PropertyList::addGetterSetter(const ObjectURI& uri,
as_function& getter,
#ifdef GNASH_DEBUG_PROPERTY
ObjectURI::Logger l(getStringTable(_owner));
- log_debug(_("AS GetterSetter %s replaced copying flags %s"), l(uri),
+ log_debug("AS GetterSetter %s replaced copying flags %s", l(uri),
a.getFlags());
#endif
@@ -222,7 +222,7 @@ PropertyList::addGetterSetter(const ObjectURI& uri,
as_function& getter,
_props.push_back(a);
#ifdef GNASH_DEBUG_PROPERTY
ObjectURI::Logger l(getStringTable(_owner));
- log_debug(_("AS GetterSetter %s inserted with flags %s"), l(uri),
+ log_debug("AS GetterSetter %s inserted with flags %s", l(uri),
a.getFlags());
#endif
}
@@ -245,7 +245,7 @@ PropertyList::addGetterSetter(const ObjectURI& uri,
as_c_function_ptr getter,
#ifdef GNASH_DEBUG_PROPERTY
ObjectURI::Logger l(getStringTable(_owner));
- log_debug(_("Native GetterSetter %s replaced copying flags %s"),
l(uri),
+ log_debug("Native GetterSetter %s replaced copying flags %s", l(uri),
a.getFlags());
#endif
@@ -255,8 +255,8 @@ PropertyList::addGetterSetter(const ObjectURI& uri,
as_c_function_ptr getter,
_props.push_back(a);
#ifdef GNASH_DEBUG_PROPERTY
string_table& st = getStringTable(_owner);
- log_debug(_("Native GetterSetter %s in namespace %s inserted
with "
- "flags %s"), st.value(key), st.value(nsId),
a.getFlags());
+ log_debug("Native GetterSetter %s in namespace %s inserted with
"
+ "flags %s", st.value(key), st.value(nsId),
a.getFlags());
#endif
}
@@ -283,7 +283,7 @@ PropertyList::addDestructiveGetter(const ObjectURI& uri,
as_function& getter,
#ifdef GNASH_DEBUG_PROPERTY
ObjectURI::Logger l(getStringTable(_owner));
- log_debug(_("Destructive AS property %s inserted with flags %s"),
+ log_debug("Destructive AS property %s inserted with flags %s",
l(uri), a.getFlags());
#endif
@@ -303,7 +303,7 @@ PropertyList::addDestructiveGetter(const ObjectURI& uri,
#ifdef GNASH_DEBUG_PROPERTY
ObjectURI::Logger l(getStringTable(_owner));
- log_debug(_("Destructive native property %s with flags %s"), l(uri),
+ log_debug("Destructive native property %s with flags %s", l(uri),
a.getFlags());
#endif
return true;
diff --git a/libcore/SWFStream.cpp b/libcore/SWFStream.cpp
index b0a4e1e..e61e608 100644
--- a/libcore/SWFStream.cpp
+++ b/libcore/SWFStream.cpp
@@ -200,7 +200,7 @@ SWFStream::read_sint(unsigned short bitcount)
value |= -1 << bitcount;
}
-// IF_DEBUG(log_debug(_("SWFStream::read_sint(%d) == %d\n", bitcount,
value)));
+// IF_DEBUG(log_debug("SWFStream::read_sint(%d) == %d\n", bitcount,
value)));
return value;
}
@@ -536,7 +536,7 @@ SWFStream::open_tag()
if ( tagLength > 1024*64 )
{
- //log_debug(_("Tag %d has a size of %d bytes !!"), tagType, tagLength);
+ //log_debug("Tag %d has a size of %d bytes !!", tagType, tagLength);
}
unsigned long tagEnd = tell() + tagLength;
@@ -593,7 +593,7 @@ SWFStream::close_tag()
std::streampos endPos = _tagBoundsStack.back().second;
_tagBoundsStack.pop_back();
- //log_debug(_("Close tag called at %d, stream size: %d"), endPos);
+ //log_debug("Close tag called at %d, stream size: %d", endPos);
if (!m_input->seek(endPos))
{
diff --git a/libcore/TextField.cpp b/libcore/TextField.cpp
index a6503e6..428e1d2 100644
--- a/libcore/TextField.cpp
+++ b/libcore/TextField.cpp
@@ -218,8 +218,8 @@ TextField::removeTextField()
if ( depth < 0 || depth > 1048575 )
{
//IF_VERBOSE_ASCODING_ERRORS(
- log_debug(_("CHECKME: removeTextField(%s): TextField depth (%d) "
- "out of the 'dynamic' zone [0..1048575], won't remove"),
+ log_debug("CHECKME: removeTextField(%s): TextField depth (%d) "
+ "out of the 'dynamic' zone [0..1048575], won't remove",
getTarget(), depth);
//);
return;
@@ -325,7 +325,7 @@ TextField::display(Renderer& renderer, const Transform&
base)
if (drawBackground) backgroundColor = cx.transform(backgroundColor);
#ifdef GNASH_DEBUG_TEXTFIELDS
- log_debug(_("rendering a Pol composed by corners %s"), _bounds);
+ log_debug("rendering a Pol composed by corners %s", _bounds);
#endif
renderer.draw_poly(coords, backgroundColor,
@@ -839,7 +839,10 @@ TextField::setTextValue(const std::wstring& wstr)
}
else {
// nothing to do (too early ?)
- log_debug(_("setTextValue: variable name %s points to a
non-existent target, I guess we would not be registered if this was true, or
the sprite we've registered our variable name has been unloaded"),
_variable_name);
+ log_debug("setTextValue: variable name %s points to a non-existent"
+ "target, I guess we would not be registered if this was"
+ "true, or the sprite we've registered our variable name"
+ "has been unloaded", _variable_name);
}
}
}
@@ -904,8 +907,8 @@ TextField::align_line(TextAlignment align, int
last_line_start_record, float x)
if (extra_space <= 0.0f) {
#ifdef GNASH_DEBUG_TEXTFIELDS
- log_debug(_("TextField text doesn't fit in its boundaries: "
- "width %g, margin %g - nothing to align"),
+ log_debug("TextField text doesn't fit in its boundaries: "
+ "width %g, margin %g - nothing to align",
width, right_margin);
#endif
return 0.0f;
@@ -1370,9 +1373,9 @@ TextField::handleChar(std::wstring::const_iterator& it,
++it;
return;
}
- LOG_ONCE(log_debug(_("HTML in a text field is unsupported,
"
+ LOG_ONCE(log_debug("HTML in a text field is unsupported, "
"gnash will just ignore the tags and "
- "print their content")));
+ "print their content"));
std::wstring discard;
std::map<std::string,std::string> attributes;
@@ -1550,7 +1553,7 @@ TextField::handleChar(std::wstring::const_iterator& it,
last_space_glyph, last_line_start_record);
}
else if (s == "TEXTFORMAT") {
- log_debug(_("in textformat"));
+ log_debug("in textformat");
//textformat
boost::uint16_t originalblockindent =
getBlockIndent();
boost::uint16_t originalindent = getIndent();
@@ -1651,7 +1654,7 @@ TextField::handleChar(std::wstring::const_iterator& it,
last_line_start_record, 1.0);
}
else {
- log_debug(_("<%s> tag is unsupported"), s);
+ log_debug("<%s> tag is unsupported", s);
if (!selfclosing) { //then recurse, look for
closing tag
handleChar(it, e, x, y, newrec, last_code,
last_space_glyph,
last_line_start_record);
@@ -1736,7 +1739,7 @@ TextField::handleChar(std::wstring::const_iterator& it,
if (x >= width - getRightMargin() - PADDING_TWIPS)
{
#ifdef GNASH_DEBUG_TEXT_FORMATTING
- log_debug(_("Text in TextField %s exceeds width [ _bounds %s ]"),
+ log_debug("Text in TextField %s exceeds width [ _bounds %s ]",
getTarget(), _bounds);
#endif
@@ -1744,7 +1747,7 @@ TextField::handleChar(std::wstring::const_iterator& it,
if (!doWordWrap() && getAutoSize() == AUTOSIZE_NONE)
{
#ifdef GNASH_DEBUG_TEXT_FORMATTING
- log_debug(_(" wordWrap=false, autoSize=none"));
+ log_debug(" wordWrap=false, autoSize=none");
#endif
// Truncate long line, but keep expanding text box
bool newlinefound = false;
@@ -1761,7 +1764,7 @@ TextField::handleChar(std::wstring::const_iterator& it,
// of each glyph, even if we don't display it
m_text_bounding_box.expand_to_point(x, y + fontDescent);
#ifdef GNASH_DEBUG_TEXT_FORMATTING
- log_debug(_("Text bbox expanded to %s (width: %f)"),
+ log_debug("Text bbox expanded to %s (width: %f)",
m_text_bounding_box, m_text_bounding_box.width());
#endif
@@ -1781,7 +1784,7 @@ TextField::handleChar(std::wstring::const_iterator& it,
else if (doWordWrap()) {
#ifdef GNASH_DEBUG_TEXT_FORMATTING
- log_debug(_(" wordWrap=true"));
+ log_debug(" wordWrap=true");
#endif
// Insert newline if there's space or autosize != none
@@ -1868,7 +1871,7 @@ TextField::handleChar(std::wstring::const_iterator& it,
else
{
#ifdef GNASH_DEBUG_TEXT_FORMATTING
- log_debug(_(" wordWrap=%d, autoSize=%d"), _wordWrap,
_autoSize);
+ log_debug(" wordWrap=%d, autoSize=%d", _wordWrap, _autoSize);
#endif
}
}
@@ -1890,7 +1893,7 @@ TextField::parseTextVariableRef(const std::string&
variableName) const
ret.first = 0;
#ifdef DEBUG_DYNTEXT_VARIABLES
- log_debug(_("VariableName: %s"), variableName);
+ log_debug("VariableName: %s", variableName);
#endif
/// Why isn't get_environment const again ?
@@ -1914,7 +1917,7 @@ TextField::parseTextVariableRef(const std::string&
variableName) const
std::string path, var;
if (parsePath(variableName, path, var)) {
#ifdef DEBUG_DYNTEXT_VARIABLES
- log_debug(_("Variable text Path: %s, Var: %s"), path, var);
+ log_debug("Variable text Path: %s, Var: %s", path, var);
#endif
// find target for the path component
// we use our parent's environment for this
@@ -1946,7 +1949,7 @@ TextField::registerTextVariable()
//#define DEBUG_DYNTEXT_VARIABLES 1
#ifdef DEBUG_DYNTEXT_VARIABLES
- log_debug(_("registerTextVariable() called"));
+ log_debug("registerTextVariable() called");
#endif
if (_text_variable_registered) {
@@ -1961,10 +1964,10 @@ TextField::registerTextVariable()
VariableRef varRef = parseTextVariableRef(_variable_name);
as_object* target = varRef.first;
if (!target) {
- log_debug(_("VariableName associated to text field (%s) refer to "
+ log_debug("VariableName associated to text field (%s) refer to "
"an unknown target. It is possible that the DisplayObject "
"will be instantiated later in the SWF stream. "
- "Gnash will try to register again on next access."),
+ "Gnash will try to register again on next access.",
_variable_name);
return;
}
@@ -2150,7 +2153,7 @@ TextField::parseHTML(std::wstring& tag,
}
#ifdef GNASH_DEBUG_TEXTFIELDS
- log_debug(_("HTML tag: %s"), utf8::encodeCanonicalString(tag, 7));
+ log_debug("HTML tag: %s", utf8::encodeCanonicalString(tag, 7));
#endif
log_error(_("I declare this a HTML syntax error"));
return false; //since we did not return already, must be malformed...?
@@ -2168,7 +2171,7 @@ TextField::set_variable_name(const std::string& newname)
_text_variable_registered = false;
#ifdef DEBUG_DYNTEXT_VARIABLES
- log_debug(_("Calling updateText after change of variable name"));
+ log_debug("Calling updateText after change of variable name");
#endif
// Use the original definition text if this isn't dynamically
@@ -2176,8 +2179,8 @@ TextField::set_variable_name(const std::string& newname)
if (_tag) updateText(_tag->defaultText());
#ifdef DEBUG_DYNTEXT_VARIABLES
- log_debug(_("Calling registerTextVariable after change of variable "
- "name and updateText call"));
+ log_debug("Calling registerTextVariable after change of variable "
+ "name and updateText call");
#endif
registerTextVariable();
}
@@ -2420,13 +2423,13 @@ TextField::typeValueName(TypeValue val)
{
switch (val) {
case typeInput:
- //log_debug(_("typeInput returned as 'input'"));
+ //log_debug("typeInput returned as 'input'");
return "input";
case typeDynamic:
- //log_debug(_("typeDynamic returned as 'dynamic'"));
+ //log_debug("typeDynamic returned as 'dynamic'");
return "dynamic";
default:
- //log_debug(_("invalid type %d returned as 'invalid'"), (int)val);
+ //log_debug("invalid type %d returned as 'invalid'", (int)val);
return "invalid";
}
diff --git a/libcore/Video.cpp b/libcore/Video.cpp
index d14c0f3..e02a15b 100644
--- a/libcore/Video.cpp
+++ b/libcore/Video.cpp
@@ -142,7 +142,7 @@ Video::getVideoFrame()
const boost::uint16_t current_frame = get_ratio();
#ifdef DEBUG_EMBEDDED_VIDEO_DECODING
- log_debug(_("Video instance %s need display video frame (ratio) %d"),
+ log_debug("Video instance %s need display video frame (ratio) %d",
getTarget(), current_frame);
#endif
@@ -151,7 +151,7 @@ Video::getVideoFrame()
if (_lastDecodedVideoFrameNum >= 0 &&
_lastDecodedVideoFrameNum == current_frame) {
#ifdef DEBUG_EMBEDDED_VIDEO_DECODING
- log_debug(_(" current frame == _lastDecodedVideoFrameNum
(%d)"),
+ log_debug(" current frame == _lastDecodedVideoFrameNum
(%d)",
current_frame);
#endif
return _lastDecodedVideoFrame.get();
@@ -166,7 +166,7 @@ Video::getVideoFrame()
// we restart decoding from scratch
if (current_frame <
static_cast<size_t>(_lastDecodedVideoFrameNum)) {
#ifdef DEBUG_EMBEDDED_VIDEO_DECODING
- log_debug(_(" current frame (%d) <
_lastDecodedVideoFrameNum (%d)"),
+ log_debug(" current frame (%d) <
_lastDecodedVideoFrameNum (%d)",
current_frame, _lastDecodedVideoFrameNum);
#endif
from_frame = 0;
@@ -177,7 +177,9 @@ Video::getVideoFrame()
_lastDecodedVideoFrameNum = current_frame;
#ifdef DEBUG_EMBEDDED_VIDEO_DECODING
- log_debug(_(" decoding embedded frames from %d to %d for Video
object %s"), from_frame, current_frame, getTarget());
+ log_debug(" decoding embedded frames from %d to %d"
+ "for Video object %s", from_frame,
+ current_frame, getTarget());
#endif
const size_t frames = m_def->visitSlice(
diff --git a/libcore/as_environment.cpp b/libcore/as_environment.cpp
index 9c98b4b..4247678 100644
--- a/libcore/as_environment.cpp
+++ b/libcore/as_environment.cpp
@@ -404,7 +404,7 @@ parsePath(const std::string& var_path_in, std::string&
path, std::string& var)
const std::string v(var_path_in, lastDotOrColon + 1, var_path_in.size());
#ifdef DEBUG_TARGET_FINDING
- log_debug(_("path: %s, var: %s"), p, v);
+ log_debug("path: %s, var: %s", p, v);
#endif
if (p.empty()) return false;
@@ -546,7 +546,7 @@ getVariableRaw(const as_environment& env, const
std::string& varname,
as_object* global = vm.getGlobal();
if (swfVersion > 5 && eq(key, NSV::PROP_uGLOBAL)) {
#ifdef GNASH_DEBUG_GET_VARIABLE
- log_debug(_("Took %s as _global, returning _global"), varname);
+ log_debug("Took %s as _global, returning _global", varname);
#endif
// The "_global" ref was added in SWF6
if (retTarget) *retTarget = NULL; // correct ??
@@ -555,7 +555,7 @@ getVariableRaw(const as_environment& env, const
std::string& varname,
if (global->get_member(key, &val)) {
#ifdef GNASH_DEBUG_GET_VARIABLE
- log_debug(_("Found %s in _global"), varname);
+ log_debug("Found %s in _global", varname);
#endif
if (retTarget) *retTarget = global;
return val;
diff --git a/libcore/as_function.cpp b/libcore/as_function.cpp
index 9c6d516..56a7b16 100644
--- a/libcore/as_function.cpp
+++ b/libcore/as_function.cpp
@@ -91,7 +91,7 @@ as_function::construct(as_object& newobj, const
as_environment& env,
// This is very effective at confusing debugging tools.
// We only throw GnashExceptions. A std::bad_alloc may also be
// reasonable, but anything else shouldn't be caught here.
- log_debug(_("Native function called as constructor threw exception:
%s")
+ log_error(_("Native function called as constructor threw exception:
%s")
, ex.what());
// If a constructor throws an exception, throw it back to the
diff --git a/libcore/as_object.cpp b/libcore/as_object.cpp
index 52149ce..df8a54c 100644
--- a/libcore/as_object.cpp
+++ b/libcore/as_object.cpp
@@ -148,7 +148,7 @@ public:
{
as_object* proto = prototype();
if (proto) return proto->get_member(uri, val);
- log_debug(_("Super has no associated prototype"));
+ log_debug("Super has no associated prototype");
return false;
}
@@ -166,7 +166,7 @@ public:
assert(fn2.isInstantiation());
as_function* ctor = constructor();
if (ctor) return ctor->call(fn2);
- log_debug(_("Super has no associated constructor"));
+ log_debug("Super has no associated constructor");
return as_value();
}
@@ -350,7 +350,7 @@ as_object::add_property(const std::string& name,
as_function& getter,
Trigger& trig = trigIter->second;
- log_debug(_("add_property: property %s is being watched"), name);
+ log_debug("add_property: property %s is being watched", name);
as_value v = trig.call(as_value(), as_value(), *this);
// The trigger call could have deleted the property,
@@ -358,7 +358,7 @@ as_object::add_property(const std::string& name,
as_function& getter,
// it back in if it was deleted
prop = _members.getProperty(uri);
if (!prop) {
- log_debug(_("Property %s deleted by trigger on create
(getter-setter)"), name);
+ log_debug("Property %s deleted by trigger on create
(getter-setter)", name);
return;
}
prop->setCache(v);
@@ -776,7 +776,7 @@ as_object::instanceOf(as_object* ctor)
as_value protoVal;
if (!ctor->get_member(NSV::PROP_PROTOTYPE, &protoVal)) {
#ifdef GNASH_DEBUG_INSTANCE_OF
- log_debug(_("Object %p can't be an instance of an object (%p) with no
'prototype'"),
+ log_debug("Object %p can't be an instance of an object (%p) with no
'prototype'",
(void*)this, (void*)ctor);
#endif
return false;
@@ -785,7 +785,7 @@ as_object::instanceOf(as_object* ctor)
as_object* ctorProto = toObject(protoVal, getVM(*this));
if (!ctorProto) {
#ifdef GNASH_DEBUG_INSTANCE_OF
- log_debug(_("Object %p can't be an instance of an object (%p) with
non-object 'prototype' (%s)"),
+ log_debug("Object %p can't be an instance of an object (%p) with
non-object 'prototype' (%s)",
(void*)this, (void*)ctor, protoVal);
#endif
return false;
@@ -804,7 +804,7 @@ as_object::instanceOf(as_object* ctor)
// Check our proto
if (thisProto == ctorProto) {
#ifdef GNASH_DEBUG_INSTANCE_OF
- log_debug(_("Object %p is an instance of constructor %p as the
constructor exposes our __proto__ %p"),
+ log_debug("Object %p is an instance of constructor %p as the
constructor exposes our __proto__ %p",
(void*)obj, (void*)ctor, (void*)thisProto);
#endif
return true;
@@ -816,7 +816,7 @@ as_object::instanceOf(as_object* ctor)
!= thisProto->_interfaces.end()) {
#ifdef GNASH_DEBUG_INSTANCE_OF
- log_debug(_("Object %p __proto__ %p had one interface matching
with the constructor prototype %p"),
+ log_debug("Object %p __proto__ %p had one interface matching with
the constructor prototype %p",
(void*)obj, (void*)thisProto, (void*)ctorProto);
#endif
return true;
@@ -852,7 +852,7 @@ as_object::prototypeOf(as_object& instance)
void
as_object::dump_members()
{
- log_debug(_("%d members of object %p follow"), _members.size(),
+ log_debug("%d members of object %p follow", _members.size(),
static_cast<const void*>(this));
_members.dump();
}
@@ -994,13 +994,13 @@ as_object::unwatch(const ObjectURI& uri)
TriggerContainer::iterator trigIter = _trigs->find(uri);
if (trigIter == _trigs->end()) {
- log_debug(_("No watch for property %s"),
+ log_debug("No watch for property %s",
getStringTable(*this).value(getName(uri)));
return false;
}
Property* prop = _members.getProperty(uri);
if (prop && prop->isGetterSetter()) {
- log_debug(_("Watch on %s not removed (is a getter-setter)"),
+ log_debug("Watch on %s not removed (is a getter-setter)",
getStringTable(*this).value(getName(uri)));
return false;
}
diff --git a/libcore/as_value.cpp b/libcore/as_value.cpp
index 40c40fc..c2b6aa8 100644
--- a/libcore/as_value.cpp
+++ b/libcore/as_value.cpp
@@ -266,7 +266,7 @@ as_value::to_primitive(AsType hint) const
if (_type != OBJECT) return *this;
#if GNASH_DEBUG_CONVERSION_TO_PRIMITIVE
- log_debug(_("to_primitive(%s)"), hint==NUMBER ? "NUMBER" : "STRING");
+ log_debug("to_primitive(%s)", hint==NUMBER ? "NUMBER" : "STRING");
#endif
// TODO: implement as_object::DefaultValue (ECMA-262 - 8.6.2.6)
@@ -306,7 +306,7 @@ as_value::to_primitive(AsType hint) const
as_value ret = invoke(method, env, obj, args);
#if GNASH_DEBUG_CONVERSION_TO_PRIMITIVE
- log_debug(_("to_primitive: method call returned %s"), ret);
+ log_debug("to_primitive: method call returned %s", ret);
#endif
if (ret._type == OBJECT) {
@@ -395,8 +395,8 @@ as_value::to_number(const int version) const
}
catch (const ActionTypeError& e) {
#if GNASH_DEBUG_CONVERSION_TO_PRIMITIVE
- log_debug(_("to_primitive(%s, NUMBER) threw an "
- "ActionTypeError %s"), *this, e.what());
+ log_debug("to_primitive(%s, NUMBER) threw an "
+ "ActionTypeError %s", *this, e.what());
#endif
if (is_function() && version < 6) {
return 0;
diff --git a/libcore/movie_root.cpp b/libcore/movie_root.cpp
index fd18182..81e8d87 100644
--- a/libcore/movie_root.cpp
+++ b/libcore/movie_root.cpp
@@ -293,7 +293,7 @@ movie_root::getRegisteredClass(const SWF::DefinitionTag*
sprite) const
void
movie_root::handleActionLimitHit(const std::string& msg)
{
- log_debug(_("Disabling scripts: %1%"), msg);
+ log_debug("Disabling scripts: %1%", msg);
disableScripts();
clear(_actionQueue);
}
@@ -335,12 +335,12 @@ movie_root::setLevel(unsigned int num, Movie* movie)
// use swapDepths against _level0
// and load into the new target while
// a timeout/interval is active.
- log_debug(_("Replacing starting movie"));
+ log_debug("Replacing starting movie");
}
if (num == 0) {
- log_debug(_("Loading into _level0"));
+ log_debug("Loading into _level0");
// NOTE: this was tested but not automated, the
// test sets an interval and then loads something
@@ -388,10 +388,10 @@ movie_root::swapLevels(MovieClip* movie, int depth)
const int oldDepth = movie->get_depth();
#ifdef GNASH_DEBUG_LEVELS_SWAPPING
- log_debug(_("Before swapLevels (source depth %d, target depth %d) levels
are: "),
+ log_debug("Before swapLevels (source depth %d, target depth %d) levels
are: ",
oldDepth, depth);
for (Levels::const_iterator i=_movies.begin(), e=_movies.end(); i!=e; ++i)
{
- log_debug(_(" %d: %p (%s @ depth %d)"), i->first,
+ log_debug(" %d: %p (%s @ depth %d)", i->first,
(void*)(i->second), i->second->getTarget(),
i->second->get_depth());
}
@@ -420,7 +420,7 @@ movie_root::swapLevels(MovieClip* movie, int depth)
const int oldNum = oldDepth;
Levels::iterator oldIt = _movies.find(oldNum);
if (oldIt == _movies.end()) {
- log_debug(_("%s.swapDepth(%d): target depth (%d) contains no movie"),
+ log_debug("%s.swapDepth(%d): target depth (%d) contains no movie",
movie->getTarget(), depth, oldNum);
return;
}
@@ -440,9 +440,9 @@ movie_root::swapLevels(MovieClip* movie, int depth)
}
#ifdef GNASH_DEBUG_LEVELS_SWAPPING
- log_debug(_("After swapLevels levels are: "));
+ log_debug("After swapLevels levels are: ");
for (Levels::const_iterator i=_movies.begin(), e=_movies.end(); i!=e; ++i)
{
- log_debug(_(" %d: %p (%s @ depth %d)"), i->first,
+ log_debug(" %d: %p (%s @ depth %d)", i->first,
(void*)(i->second), i->second->getTarget(),
i->second->get_depth());
}
@@ -1005,7 +1005,7 @@ movie_root::display()
{
// TODO: check what we should do if other levels
// have valid bounds
- log_debug(_("original root movie had null bounds, not displaying"));
+ log_debug("original root movie had null bounds, not displaying");
return;
}
@@ -1028,7 +1028,7 @@ movie_root::display()
const SWFRect& sub_frame_size = movie->get_frame_size();
if (sub_frame_size.is_null()) {
- log_debug(_("_level%u has null frame size, skipping"), i->first);
+ log_debug("_level%u has null frame size, skipping", i->first);
continue;
}
@@ -1313,7 +1313,7 @@ movie_root::setStageScaleMode(ScaleMode sm)
(sm == SCALEMODE_NOSCALE || _scaleMode == SCALEMODE_NOSCALE)) {
const movie_definition* md = _rootMovie->definition();
- log_debug(_("Going to or from scaleMode=noScale. Viewport:%dx%d
Def:%dx%d"),
+ log_debug("Going to or from scaleMode=noScale. Viewport:%dx%d
Def:%dx%d",
_stageWidth, _stageHeight,
md->get_width_pixels(), md->get_height_pixels());
@@ -1387,7 +1387,7 @@ movie_root::processActionQueue(size_t lvl)
++calls;
bool actionsToProcess = !q.empty();
if (actionsToProcess) {
- log_debug(_("Processing %d actions in priority queue %d (call %u)"),
+ log_debug("Processing %d actions in priority queue %d (call %u)",
q.size(), lvl, calls);
}
#endif
@@ -1403,7 +1403,7 @@ movie_root::processActionQueue(size_t lvl)
size_t minLevel = minPopulatedPriorityQueue();
if (minLevel < lvl) {
#ifdef GNASH_DEBUG
- log_debug(_("Actions pushed in priority %d (< %d), restarting the
scan (call %u)"),
+ log_debug("Actions pushed in priority %d (< %d), restarting the
scan (call %u)",
minLevel, lvl, calls);
#endif
return minLevel;
@@ -1414,7 +1414,7 @@ movie_root::processActionQueue(size_t lvl)
#ifdef GNASH_DEBUG
if (actionsToProcess) {
- log_debug(_("Done processing actions in priority queue %d (call %u)"),
+ log_debug("Done processing actions in priority queue %d (call %u)",
lvl, calls);
}
#endif
@@ -1502,7 +1502,7 @@ void
movie_root::pushAction(const action_buffer& buf, DisplayObject* target)
{
#ifdef GNASH_DEBUG
- log_debug(_("Pushed action buffer for target %s"),
+ log_debug("Pushed action buffer for target %s",
target->getTargetPath());
#endif
@@ -1572,7 +1572,7 @@ movie_root::processInvoke(ExternalInterface::invoke_t
*invoke)
if (!invoke || invoke->name.empty()) return false;
- log_debug(_("Processing %s call from the Browser."), invoke->name);
+ log_debug("Processing %s call from the Browser.", invoke->name);
std::stringstream ss; // ss is the response string
@@ -1669,8 +1669,8 @@ movie_root::processInvoke(ExternalInterface::invoke_t
*invoke)
if (!ss.str().empty()) {
if (_hostfd >= 0) {
- log_debug(_("Attempt to write response to ExternalInterface "
- "requests fd %d"), _hostfd);
+ log_debug("Attempt to write response to ExternalInterface "
+ "requests fd %d", _hostfd);
int ret = write(_hostfd, ss.str().c_str(), ss.str().size());
if (ret == -1) {
log_error(_("Could not write to user-provided host requests "
@@ -1678,7 +1678,7 @@ movie_root::processInvoke(ExternalInterface::invoke_t
*invoke)
}
}
} else {
- log_debug(_("No response needed for %s request"), invoke->name);
+ log_debug("No response needed for %s request", invoke->name);
}
return true;
@@ -1688,7 +1688,7 @@ void
movie_root::executeTimers()
{
#ifdef GNASH_DEBUG_TIMERS_EXPIRATION
- log_debug(_("Checking %d timers for expiry"), _intervalTimers.size());
+ log_debug("Checking %d timers for expiry", _intervalTimers.size());
#endif
// Don't do anything if we have no timers, just return so we don't
@@ -2040,7 +2040,7 @@ movie_root::cleanupDisplayList()
#ifdef GNASH_DEBUG_INSTANCE_LIST
if (_liveChars.size() > maxLiveChars) {
maxLiveChars = _liveChars.size();
- log_debug(_("Global instance list grew to %d entries"), maxLiveChars);
+ log_debug("Global instance list grew to %d entries", maxLiveChars);
}
#endif
}
@@ -2049,7 +2049,7 @@ void
movie_root::advanceLiveChars()
{
#ifdef GNASH_DEBUG
- log_debug(_("---- movie_root::advance: %d live DisplayObjects in the
global list"),
+ log_debug("---- movie_root::advance: %d live DisplayObjects in the global
list",
_liveChars.size());
#endif
@@ -2111,7 +2111,8 @@ movie_root::findCharacterByTarget(const std::string&
tgtstr) const
if (!o) {
#ifdef GNASH_DEBUG_TARGET_RESOLUTION
- log_debug(_("Evaluating DisplayObject target path: element '%s' of
path '%s' not found"), part, tgtstr);
+ log_debug("Evaluating DisplayObject target path: element"
+ "'%s' of path '%s' not found", part, tgtstr);
#endif
return NULL;
}
@@ -2125,7 +2126,7 @@ void
movie_root::getURL(const std::string& urlstr, const std::string& target,
const std::string& data, MovieClip::VariablesMethod method)
{
- log_network(_("%s: HOSTFD is %d"), __FUNCTION__, _hostfd);
+ log_network("%s: HOSTFD is %d", __FUNCTION__, _hostfd);
if (_hostfd < 0) {
/// If there is no hosting application, call the URL launcher. For
@@ -2146,7 +2147,7 @@ movie_root::getURL(const std::string& urlstr, const
std::string& target,
std::string safeurl = url.encode(urlstr);
boost::replace_all(command, "%u", safeurl);
- log_debug(_("Launching URL: %s"), command);
+ log_debug("Launching URL: %s", command);
const int ret = std::system(command.c_str());
if (ret == -1) {
log_error(_("Fork failed launching url opener '%s'"), command);
@@ -2190,7 +2191,7 @@ movie_root::getURL(const std::string& urlstr, const
std::string& target,
// TODO: should mutex-protect this ?
// NOTE: we are assuming the hostfd is set in blocking mode here..
- log_debug(_("Attempt to write geturl requests fd #%d"), _hostfd);
+ log_debug("Attempt to write geturl requests fd #%d", _hostfd);
std::string msg = ExternalInterface::makeInvoke("getURL", fnargs);
@@ -2210,17 +2211,17 @@ movie_root::setScriptLimits(boost::uint16_t recursion,
boost::uint16_t timeout)
}
if (RcInitFile::getDefaultInstance().lockScriptLimits()) {
- LOG_ONCE(log_debug(_("SWF ScriptLimits tag attempting to set "
+ LOG_ONCE(log_debug("SWF ScriptLimits tag attempting to set "
"recursionLimit=%1% and scriptsTimeout=%2% ignored "
- "as per rcfile directive"), recursion, timeout) );
+ "as per rcfile directive", recursion, timeout) );
return;
}
// This tag reported in some sources to be ignored for movies
// below SWF7. However, on Linux with PP version 9, the tag
// takes effect on SWFs of any version.
- log_debug(_("Setting script limits: max recursion %d, "
- "timeout %d seconds"), recursion, timeout);
+ log_debug("Setting script limits: max recursion %d, "
+ "timeout %d seconds", recursion, timeout);
_recursionLimit = recursion;
_timeoutLimit = timeout;
@@ -2386,14 +2387,14 @@ movie_root::LoadCallback::processLoad()
_obj->set_member(NSV::PROP_uBYTES_LOADED, _buf.size());
- log_debug(_("LoadableObject Loaded %d bytes, reaching %d/%d"),
+ log_debug("LoadableObject Loaded %d bytes, reaching %d/%d",
actuallyRead, _buf.size(), _stream->size());
}
// We haven't finished till EOF
if (!_stream->eof()) return false;
- log_debug(_("LoadableObject reached EOF (%d/%d loaded)"),
+ log_debug("LoadableObject reached EOF (%d/%d loaded)",
_buf.size(), _stream->size());
// got nothing, won't bother BOFs of nulls
@@ -2587,13 +2588,13 @@ advanceLiveChar(MovieClip* mo)
{
if (!mo->unloaded()) {
#ifdef GNASH_DEBUG
- log_debug(_(" advancing DisplayObject %s"), mo->getTarget());
+ log_debug(" advancing DisplayObject %s", mo->getTarget());
#endif
mo->advance();
}
#ifdef GNASH_DEBUG
else {
- log_debug(_(" DisplayObject %s is unloaded, not advancing it"),
+ log_debug(" DisplayObject %s is unloaded, not advancing it",
mo->getTarget());
}
#endif
-----------------------------------------------------------------------
Summary of changes:
libcore/AMFConverter.cpp | 42 +-
libcore/Button.cpp | 2 +-
libcore/CharacterProxy.cpp | 4 +-
libcore/ClassHierarchy.cpp | 2 +-
libcore/DisplayObject.cpp | 2 +-
libcore/ExternalInterface.cpp | 6 +-
libcore/FreetypeGlyphsProvider.cpp | 26 +-
libcore/LoadVariablesThread.cpp | 12 +-
libcore/MovieClip.cpp | 84 ++--
libcore/MovieFactory.cpp | 8 +-
libcore/MovieLoader.cpp | 86 ++--
libcore/PropertyList.cpp | 18 +-
libcore/SWFStream.cpp | 6 +-
libcore/TextField.cpp | 57 ++-
libcore/Video.cpp | 10 +-
libcore/as_environment.cpp | 6 +-
libcore/as_function.cpp | 2 +-
libcore/as_object.cpp | 22 +-
libcore/as_value.cpp | 8 +-
libcore/movie_root.cpp | 69 ++--
po/gnash.pot | 945 +-----------------------------------
21 files changed, 263 insertions(+), 1154 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-1369-g059b24a,
Rob Savoye <=