[Gnash-commit] gnash ChangeLog server/URLAccessManager.cpp ser...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/05/06 12:14:36

Modified files:
        .              : ChangeLog 
        server         : URLAccessManager.cpp sprite_instance.cpp 

Log message:
        More i18n

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6525&r2=1.6526
http://cvs.savannah.gnu.org/viewcvs/gnash/server/URLAccessManager.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.530&r2=1.531

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6525
retrieving revision 1.6526
diff -u -b -r1.6525 -r1.6526
--- ChangeLog   6 May 2008 11:56:39 -0000       1.6525
+++ ChangeLog   6 May 2008 12:14:35 -0000       1.6526
@@ -1,6 +1,7 @@
 2008-05-06 Benjamin Wolsey <address@hidden>
 
        * gui/fb.cpp: internationalization.
+       * server/sprite_instance.cpp, server/URLAccessManager.cpp: i18n
 
 2008-05-06 Benjamin Wolsey <address@hidden>
 

Index: server/URLAccessManager.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/URLAccessManager.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/URLAccessManager.cpp 3 May 2008 21:03:30 -0000       1.27
+++ server/URLAccessManager.cpp 6 May 2008 12:14:36 -0000       1.28
@@ -84,70 +84,6 @@
 /// A global AccessPolicyCache
 static AccessPolicyCache policyCache;
 
-
-#if 0 // @@ this function has been replaced with a wrapper around host_check
-
-// Is access allowed to given url ?
-// This function uses the global AccessPolicyCache
-// so once a policy is defined for an url it will
-// be remembered for the whole run.
-//
-// Prompts the user on the tty. If inut is not a tty
-// uses the global defaultAccessPolicy.
-//
-static bool
-allow(std::string& url)
-{
-       // Look in cached policy first
-       AccessPolicyCache::iterator it = policyCache.find(url);
-       if ( it != policyCache.end() )
-       {
-               log_security("%s access to %s (cached).\n",
-                       accessPolicyString(it->second),
-                       url.c_str());
-
-               return ( it->second == GRANT );
-       }
-
-       if ( ! isatty(fileno(stdin)) )
-       {
-               log_security("%s access to %s (input is not a terminal).\n",
-                       accessPolicyString(defaultAccessPolicy),
-                       url.c_str());
-
-               // If we can't prompt user return default policy
-               return ( defaultAccessPolicy == GRANT );
-       }
-
-       /// I still don't like this method, typing just
-       /// a newline doesn't spit another prompt
-       std::string yesno;
-       do {
-               std::cout << "Attempt to access url " << url << std::endl;
-               std::cout << "Block it [yes/no] ? "; 
-               std::cin >> yesno;
-       } while (yesno != "yes" && yesno != "no");
-
-       AccessPolicy userChoice;
-
-       if ( yesno == "yes" ) {
-               userChoice = BLOCK;
-       } else {
-               userChoice = GRANT;
-       }
-
-       // cache for next time
-       policyCache[url] = userChoice;
-       
-       log_security("%s access to %s (user choice).\n",
-               accessPolicyString(userChoice),
-               url.c_str());
-
-       return userChoice;
-
-}
-#endif
-
 // check host against black/white lists
 // return true if we allow load from host, false otherwise
 // it is assumed localhost/localdomain was already checked
@@ -167,15 +103,15 @@
                // TODO: case-insensitive matching ? 
                it = std::find(whitelist.begin(), whitelist.end(), host);
                if ( it != whitelist.end() ) {
-                       log_security("Load from host %s granted (whitelisted).",
-                               host.c_str());
+                       log_security(_("Load from host %s granted 
(whitelisted)"),
+                               host);
                        return true;
                }
 
                // if there is a whitelist, anything NOT listed is denied
-               log_security("Load from host %s forbidden "
-                       "(not in non-empty whitelist).",
-                       host.c_str());
+               log_security(_("Load from host %s forbidden "
+                       "(not in non-empty whitelist)"),
+                       host);
 
                return false;
        }
@@ -185,13 +121,13 @@
        it = std::find(blacklist.begin(), blacklist.end(), host);
        if ( it != blacklist.end() )
        {
-               log_security("Load from host %s forbidden (blacklisted).",
-                       host.c_str());
+               log_security(_("Load from host %s forbidden (blacklisted)"),
+                       host);
                return false;
        }
 
-       log_security("Load from host %s granted (default).",
-               host.c_str());
+       log_security(_("Load from host %s granted (default)"),
+               host);
        return true;
 }
 
@@ -227,9 +163,9 @@
        URL baseUrl(VM::get().getSWFUrl());
        if ( baseUrl.protocol() != "file" )
        {
-          log_security("Load of file %s forbidden"
-              " (starting url %s is not a local resource).",
-              path.c_str(), baseUrl.str().c_str());
+          log_security(_("Load of file %s forbidden"
+              " (starting url %s is not a local resource)"),
+              path, baseUrl.str());
           return false;
        }
     } // else we didn't start yet, so path *is* the starting movie
@@ -245,16 +181,16 @@
         const std::string& dir = *i;
         if ( pathIsUnderDir(path, dir) ) 
         {
-            log_security("Load of file %s granted (under local sandbox %s).",
-                path.c_str(), dir.c_str());
+            log_security(_("Load of file %s granted (under local sandbox %s)"),
+                path, dir);
             return true;
         }
     }
 
     // TODO: dump local sandboxes here ? (or maybe send the info to the GUI 
properties
     //       view
-    log_security("Load of file %s forbidden (not under local sandboxes).",
-        path.c_str());
+    log_security(_("Load of file %s forbidden (not under local sandboxes)"),
+        path);
     return false;
 
 }
@@ -293,7 +229,7 @@
     if ( -1 == gethostname(name, MAXHOSTNAMELEN) )
     {
         // FIXME: strerror is NOT thread-safe
-        log_error("gethostname failed: %s", strerror(errno)); 
+        log_error(_("gethostname failed: %s"), strerror(errno)); 
         return host_check_blackwhite_lists(host);
     }
     // From GETHOSTNAME(2): 
@@ -315,14 +251,14 @@
     }
 
     if ( check_domain && domainname != host ) {
-       log_security("Load from host %s forbidden (not in the local domain).",
-               host.c_str());
+       log_security(_("Load from host %s forbidden (not in the local domain)"),
+               host);
         return false;
        }
     
     if ( check_localhost && hostname != host ) {
-       log_security("Load from host %s forbidden (not on the local host).",
-               host.c_str());
+       log_security(_("Load from host %s forbidden (not on the local host)"),
+               host);
         return false;
     }
 
@@ -349,7 +285,7 @@
 bool
 allow(const URL& url)
 {
-       log_security("Checking security of URL '%s'", url);
+       log_security(_("Checking security of URL '%s'"), url);
 
        // We might reintroduce use of an AccessPolicy cache
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.530
retrieving revision 1.531
diff -u -b -r1.530 -r1.531
--- server/sprite_instance.cpp  5 May 2008 18:50:06 -0000       1.530
+++ server/sprite_instance.cpp  6 May 2008 12:14:36 -0000       1.531
@@ -688,7 +688,7 @@
  
        if ( usePost )
        {
-               log_debug("POSTING: %s", data);
+               log_debug(_("POSTING: %s"), data);
                mr.loadMovie(url, target, &data);
        }
        else
@@ -697,7 +697,7 @@
                if ( qs.empty() ) data.insert(0, 1, '?');
                else data.insert(0, 1, '&');
                url.set_querystring(qs+data);
-               log_debug("GETTING: %s", url.str());
+               log_debug(_("GETTING: %s"), url.str());
                mr.loadMovie(url, target); 
        }
   }
@@ -953,14 +953,14 @@
   boost::intrusive_ptr<as_object> o = v.to_object();
   if ( ! o )
   {
-    log_debug("meth(%s): first argument doesn't cast to object", 
v.to_debug_string());
+    log_debug(_("meth(%s): first argument doesn't cast to object"), 
v.to_debug_string());
     return as_value(0);
   }
 
   string_table& st = sprite->getVM().getStringTable();
   as_value lc = o->callMethod(st.find(PROPNAME("toLowerCase")));
 
-  log_debug("after call to toLowerCase with arg %s we got %s", 
v.to_debug_string(), lc.to_debug_string());
+  log_debug(_("after call to toLowerCase with arg %s we got %s"), 
v.to_debug_string(), lc.to_debug_string());
 
   //if ( ! v.is_string() ) return as_value(0);
   std::string s = lc.to_string();
@@ -1252,8 +1252,8 @@
   {
     IF_VERBOSE_ASCODING_ERRORS(
     std::stringstream ss; fn.dump_args(ss);
-    log_aserror("%s.lineTo(%s) : non-finite first argument (%s), "
-      "converted to zero", sprite->getTarget(),
+    log_aserror(_("%s.lineTo(%s) : non-finite first argument (%s), "
+      "converted to zero"), sprite->getTarget(),
       ss.str(), fn.arg(0).to_debug_string());
     );
     x = 0;
@@ -1263,8 +1263,8 @@
   {
     IF_VERBOSE_ASCODING_ERRORS(
     std::stringstream ss; fn.dump_args(ss);
-    log_aserror("%s.lineTo(%s) : non-finite second argument (%s), "
-      "converted to zero", sprite->getTarget(),
+    log_aserror(_("%s.lineTo(%s) : non-finite second argument (%s), "
+      "converted to zero"), sprite->getTarget(),
       ss.str(), fn.arg(1).to_debug_string());
     );
     y = 0;
@@ -1306,8 +1306,8 @@
   {
     IF_VERBOSE_ASCODING_ERRORS(
     std::stringstream ss; fn.dump_args(ss);
-    log_aserror("%s.moveTo(%s) : non-finite first argument (%s), "
-      "converted to zero", sprite->getTarget(),
+    log_aserror(_("%s.moveTo(%s) : non-finite first argument (%s), "
+      "converted to zero"), sprite->getTarget(),
       ss.str(), fn.arg(0).to_debug_string());
     );
     x = 0;
@@ -1317,15 +1317,15 @@
   {
     IF_VERBOSE_ASCODING_ERRORS(
     std::stringstream ss; fn.dump_args(ss);
-    log_aserror("%s.moveTo(%s) : non-finite second argument (%s), "
-      "converted to zero", sprite->getTarget(),
+    log_aserror(_("%s.moveTo(%s) : non-finite second argument (%s), "
+      "converted to zero"), sprite->getTarget(),
       ss.str(), fn.arg(1).to_debug_string());
     );
     y = 0;
   }
 
 #ifdef DEBUG_DRAWING_API
-  log_debug("%s.moveTo(%g,%g);", sprite->getTarget(), x, y);
+  log_debug(_("%s.moveTo(%g,%g);"), sprite->getTarget(), x, y);
 #endif
   sprite->moveTo(x, y);
 
@@ -1532,8 +1532,8 @@
   {
     IF_VERBOSE_ASCODING_ERRORS(
     std::stringstream ss; fn.dump_args(ss);
-    log_aserror("%s.curveTo(%s) : non-finite first argument (%s), "
-      "converted to zero", sprite->getTarget(),
+    log_aserror(_("%s.curveTo(%s) : non-finite first argument (%s), "
+      "converted to zero"), sprite->getTarget(),
       ss.str(), fn.arg(0).to_debug_string());
     );
     cx = 0;
@@ -1543,8 +1543,8 @@
   {
     IF_VERBOSE_ASCODING_ERRORS(
     std::stringstream ss; fn.dump_args(ss);
-    log_aserror("%s.curveTo(%s) : non-finite second argument (%s), "
-      "converted to zero", sprite->getTarget(),
+    log_aserror(_("%s.curveTo(%s) : non-finite second argument (%s), "
+      "converted to zero"), sprite->getTarget(),
       ss.str(), fn.arg(1).to_debug_string());
     );
     cy = 0;
@@ -1554,8 +1554,8 @@
   {
     IF_VERBOSE_ASCODING_ERRORS(
     std::stringstream ss; fn.dump_args(ss);
-    log_aserror("%s.curveTo(%s) : non-finite third argument (%s), "
-      "converted to zero", sprite->getTarget(),
+    log_aserror(_("%s.curveTo(%s) : non-finite third argument (%s), "
+      "converted to zero"), sprite->getTarget(),
       ss.str(), fn.arg(0).to_debug_string());
     );
     ax = 0;
@@ -1565,15 +1565,15 @@
   {
     IF_VERBOSE_ASCODING_ERRORS(
     std::stringstream ss; fn.dump_args(ss);
-    log_aserror("%s.curveTo(%s) : non-finite fourth argument (%s), "
-      "converted to zero", sprite->getTarget(),
+    log_aserror(_("%s.curveTo(%s) : non-finite fourth argument (%s), "
+      "converted to zero"), sprite->getTarget(),
       ss.str(), fn.arg(1).to_debug_string());
     );
     ay = 0;
   }
 
 #ifdef DEBUG_DRAWING_API
-  log_debug("%s.curveTo(%g,%g,%g,%g);", sprite->getTarget(), cx, cy, ax, ay);
+  log_debug(_("%s.curveTo(%g,%g,%g,%g);"), sprite->getTarget(), cx, cy, ax, 
ay);
 #endif
   sprite->curveTo(cx, cy, ax, ay);
 
@@ -1594,7 +1594,7 @@
   );
 
 #ifdef DEBUG_DRAWING_API
-  log_debug("%s.clear();", sprite->getTarget());
+  log_debug(_("%s.clear();"), sprite->getTarget());
 #endif
   sprite->clear();
 
@@ -1636,7 +1636,7 @@
   rgba color(r, g, b, a);
 
 #ifdef DEBUG_DRAWING_API
-  log_debug("%s.beginFill(%d,%d,%d);", sprite->getTarget(), r, g, b);
+  log_debug(_("%s.beginFill(%d,%d,%d);"), sprite->getTarget(), r, g, b);
 #endif
   sprite->beginFill(color);
 
@@ -1863,8 +1863,8 @@
   if ( ngradients > 8 )
   {
     std::stringstream ss; fn.dump_args(ss);
-    log_debug("%s.beginGradientFill(%s) : too many array elements"
-      " for colors and ratios (%d), trim to 8", 
+    log_debug(_("%s.beginGradientFill(%s) : too many array elements"
+      " for colors and ratios (%d), will trim to 8"), 
       sprite->getTarget(), ss.str(), ngradients); 
     ngradients = 8;
   }
@@ -2755,14 +2755,14 @@
   testInvariant();
 
 #ifdef GNASH_DEBUG
-  log_debug("Event %s invoked for sprite %s", id.get_function_name(), 
getTarget());
+  log_debug(_("Event %s invoked for sprite %s"), id.get_function_name(), 
getTarget());
 #endif
 
   // We do not execute ENTER_FRAME if unloaded
   if ( id.m_id == event_id::ENTER_FRAME && isUnloaded() )
   {
 #ifdef GNASH_DEBUG
-    log_debug("Sprite %s ignored ENTER_FRAME event (is unloaded)", 
getTarget());
+    log_debug(_("Sprite %s ignored ENTER_FRAME event (is unloaded)"), 
getTarget());
 #endif
     return false;
   }
@@ -2770,7 +2770,7 @@
   if ( id.is_button_event() && ! 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.get_function_name());
 #endif
     return false;
@@ -2831,8 +2831,8 @@
         if ( def->getRegisteredClass() ) break; // if it has a registered 
class it can have an onLoad in prototype...
 
 #ifdef GNASH_DEBUG
-        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)",
+        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)"),
                getTarget(), get_depth());
         testInvariant();
 #endif
@@ -3021,14 +3021,14 @@
       if ( m_current_frame == 0 && has_looped() )
       {
 #ifdef GNASH_DEBUG
-        log_debug("Jumping back to frame 0 of sprite %s", getTarget());
+        log_debug(_("Jumping back to frame 0 of sprite %s"), getTarget());
 #endif
         restoreDisplayList(0); // seems OK to me.
       }
       else
       {
 #ifdef GNASH_DEBUG
-        log_debug("Executing frame%d (0-based) tags of sprite %s", 
m_current_frame, getTarget());
+        log_debug(_("Executing frame%d (0-based) tags of sprite %s"), 
m_current_frame, getTarget());
 #endif
         // Make sure m_current_frame is 0-based during execution of DLIST tags
         execute_frame_tags(m_current_frame, m_display_list, 
TAG_DLIST|TAG_ACTION);
@@ -3070,7 +3070,7 @@
   if ( mi->setCharacterInitialized(cid) )
   {
 #ifdef GNASH_DEBUG
-    log_debug("Queuing init actions in frame %d of sprite %s", 
m_current_frame, getTarget());
+    log_debug(_("Queuing init actions in frame %d of sprite %s"), 
m_current_frame, getTarget());
 #endif
     std::auto_ptr<ExecutableCode> code ( new GlobalCode(a, 
boost::intrusive_ptr<sprite_instance>(this)) );
 
@@ -3090,7 +3090,7 @@
   else
   {
 #ifdef GNASH_DEBUG
-    log_debug("Init actions for character %d already executed", cid);
+    log_debug(_("Init actions for character %d already executed"), cid);
 #endif
   }
 }
@@ -3199,7 +3199,8 @@
 
     if ( ! m_def->ensure_frame_loaded(target_frame_number+1) )
     {
-      log_error("Target frame of a gotoFrame(%d) was never loaded, although 
frame count in header (%d) said we would have found it",
+      log_error(_("Target frame of a gotoFrame(%d) was never loaded,"
+                  "although frame count in header (%d) said we should have 
found it"),
         target_frame_number+1, m_def->get_frame_count());
       return; // ... I guess, or not ?
     }
@@ -3241,7 +3242,8 @@
     );
     if ( ! m_def->ensure_frame_loaded(target_frame_number+1) )
     {
-      log_error("Target frame of a gotoFrame(%d) was never loaded, although 
frame count in header (%d) said we would have found it",
+      log_error(_("Target frame of a gotoFrame(%d) was never loaded, "
+                "although frame count in header (%d) said we should have found 
it"),
         target_frame_number+1, m_def->get_frame_count());
       return; // ... I guess, or not ?
     }
@@ -3483,7 +3485,8 @@
     }
     else // non-existing character
     {
-        log_error("sprite_instance::replace_display_object: could not find any 
character at depth %d", tag->getDepth());
+        log_error(_("sprite_instance::replace_display_object: could not "
+                "find any character at depth %d"), tag->getDepth());
     } 
 }
 
@@ -3589,7 +3592,8 @@
     {
       if ( ch->isMaskLayer() )
       {
-        log_debug("CHECKME: nested mask in MouseEntityFinder. This mask is %s 
at depth %d outer mask masked up to depth %d.",
+        log_debug(_("CHECKME: nested mask in MouseEntityFinder. This mask "
+                "is %s at depth %d outer mask masked up to depth %d."),
           ch->getTarget(), ch->get_depth(), _highestHiddenDepth);
         // Hiding mask still in effect...
       }
@@ -3602,7 +3606,8 @@
       if ( ! ch->pointInShape(_wp.x, _wp.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(), _wp.x, _wp.y, 
ch->get_clip_depth());
 #endif // DEBUG_MOUSE_ENTITY_FINDING
         _highestHiddenDepth = ch->get_clip_depth();
@@ -3610,7 +3615,7 @@
       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 // DEBUG_MOUSE_ENTITY_FINDING
       }
@@ -3647,7 +3652,7 @@
 #ifdef DEBUG_MOUSE_ENTITY_FINDING
     if ( _m ) 
     {
-      log_debug("MouseEntityFinder found character %s (depth %d) hitting point 
%g,%g",
+      log_debug(_("MouseEntityFinder found character %s (depth %d) hitting 
point %g,%g"),
         _m->getTarget(), _m->get_depth(), _wp.x, _wp.y);
     }
 #endif // DEBUG_MOUSE_ENTITY_FINDING
@@ -3739,7 +3744,8 @@
   {
       // 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;
   }
@@ -3747,7 +3753,8 @@
   if ( mask && mask->get_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(), mask->getTarget(), x, y);
+    log_debug(_("%s is dynamically masked by %s, which "
+        "doesn't hit point %g,%g"), getTarget(), mask->getTarget(), x, y);
 #endif
     return false;
   }
@@ -3848,7 +3855,8 @@
     {
       if ( ch->isMaskLayer() )
       {
-        log_debug("CHECKME: nested mask in DropTargetFinder. This mask is %s 
at depth %d outer mask masked up to depth %d.",
+        log_debug(_("CHECKME: nested mask in DropTargetFinder. "
+                "This mask is %s at depth %d outer mask masked up to depth 
%d."),
           ch->getTarget(), ch->get_depth(), _highestHiddenDepth);
         // Hiding mask still in effect...
       }
@@ -3859,12 +3867,13 @@
     {
       if ( ! ch->get_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 // DEBUG_MOUSE_ENTITY_FINDING
         _highestHiddenDepth = ch->get_clip_depth();
@@ -3872,7 +3881,7 @@
       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 // DEBUG_MOUSE_ENTITY_FINDING
       }
@@ -4177,7 +4186,8 @@
   if ( isDynamic() )
   {
 #ifdef GNASH_DEBUG
-    log_debug("Sprite %s is dynamic, sending INITIALIZE and CONSTRUCT events 
immediately", getTarget());
+    log_debug(_("Sprite %s is dynamic, sending "
+        "INITIALIZE and CONSTRUCT events immediately"), getTarget());
 #endif
     on_event(event_id::INITIALIZE);
     constructAsScriptObject(); 
@@ -4185,12 +4195,12 @@
   else
   {
 #ifdef GNASH_DEBUG
-    log_debug("Queuing INITIALIZE event for sprite %s", getTarget());
+    log_debug(_("Queuing INITIALIZE event for sprite %s"), getTarget());
 #endif
     queueEvent(event_id::INITIALIZE, movie_root::apINIT);
 
 #ifdef GNASH_DEBUG
-    log_debug("Queuing CONSTRUCT event for sprite %s", getTarget());
+    log_debug(_("Queuing CONSTRUCT event for sprite %s"), getTarget());
 #endif
     std::auto_ptr<ExecutableCode> code ( new ConstructEvent(this) );
     _vm.getRoot().pushAction(code, movie_root::apCONSTRUCT);
@@ -4241,7 +4251,7 @@
 sprite_instance::constructAsScriptObject()
 {
 #ifdef GNASH_DEBUG
-  log_debug("constructAsScriptObject called for sprite %s", getTarget());
+  log_debug(_("constructAsScriptObject called for sprite %s"), getTarget());
 #endif
 
   bool eventHandlersInvoked = false;
@@ -4355,7 +4365,7 @@
   character* parent = get_parent();
   if ( parent )
   {
-       if ( postdata ) log_debug("Posting data '%s' to url '%s'", postdata, 
url.str());
+       if ( postdata ) log_debug(_("Posting data '%s' to url '%s'"), postdata, 
url.str());
     boost::intrusive_ptr<movie_definition> md ( create_library_movie(url, 
NULL, true, postdata) );
     if (md == NULL)
     {
@@ -4767,7 +4777,7 @@
 {
        if ( id != m_sound_stream_id )
        {
-               log_debug("Stream sound id from %d to %d, stopping old", 
m_sound_stream_id, id);
+               log_debug(_("Stream sound id from %d to %d, stopping old"), 
m_sound_stream_id, id);
                stopStreamSound();
        }
        m_sound_stream_id = id;