[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-1367-gdfa234b |
|
Date: |
Sat, 31 Dec 2011 18:40:39 +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 dfa234bbb2386c4be7425077659fb2ef88f70dfa (commit)
via 5c44ec2d24f906b034e8fa14475c9fed4cf27433 (commit)
from cee2210be30b17121c416bd820a74fd933b3376b (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=dfa234bbb2386c4be7425077659fb2ef88f70dfa
commit dfa234bbb2386c4be7425077659fb2ef88f70dfa
Author: Rob Savoye <address@hidden>
Date: Sat Dec 31 11:40:36 2011 -0700
print messages cleaned up for translations
diff --git a/libbase/AMF.cpp b/libbase/AMF.cpp
index 634cf1f..42f8e13 100644
--- a/libbase/AMF.cpp
+++ b/libbase/AMF.cpp
@@ -56,7 +56,7 @@ readBoolean(const boost::uint8_t*& pos, const boost::uint8_t*
_end)
const bool val = *pos;
++pos;
#ifdef GNASH_DEBUG_AMF_DESERIALIZE
- log_debug(_("amf0 read bool: %d"), val);
+ log_debug("amf0 read bool: %d", val);
#endif
return val;
}
@@ -77,7 +77,7 @@ readNumber(const boost::uint8_t*& pos, const boost::uint8_t*
end)
swapBytes(&d, 8);
#ifdef GNASH_DEBUG_AMF_DESERIALIZE
- log_debug(_("amf0 read double: %e"), dub);
+ log_debug("amf0 read double: %e", dub);
#endif
return d;
@@ -100,7 +100,7 @@ readString(const boost::uint8_t*& pos, const
boost::uint8_t* end)
const std::string str(reinterpret_cast<const char*>(pos), si);
pos += si;
#ifdef GNASH_DEBUG_AMF_DESERIALIZE
- log_debug(_("amf0 read string: %s"), str);
+ log_debug("amf0 read string: %s", str);
#endif
return str;
}
@@ -122,7 +122,7 @@ readLongString(const boost::uint8_t*& pos, const
boost::uint8_t* end)
pos += si;
#ifdef GNASH_DEBUG_AMF_DESERIALIZE
- log_debug(_("amf0 read long string: %s"), str);
+ log_debug("amf0 read long string: %s", str);
#endif
return str;
diff --git a/libbase/ClockTime.cpp b/libbase/ClockTime.cpp
index d6c8e2e..aa95615 100644
--- a/libbase/ClockTime.cpp
+++ b/libbase/ClockTime.cpp
@@ -147,7 +147,7 @@ clocktime::getTimeZoneOffset(double time)
// tm_gmtoff is in seconds east of GMT; convert to minutes.
offset = tm.tm_gmtoff / 60;
- //gnash::log_debug(_("Using tm.tm_gmtoff. Offset is %d"), offset);
+ //gnash::log_debug("Using tm.tm_gmtoff. Offset is %d", offset);
return offset;
#else
@@ -167,7 +167,7 @@ clocktime::getTimeZoneOffset(double time)
tzset();
// timezone is seconds west of GMT
offset = -timezone / 60;
- //gnash::log_debug(_("Using tzset. Offset is %d"), offset);
+ //gnash::log_debug("Using tzset. Offset is %d", offset);
# elif !defined(WIN32) && defined(HAVE_GETTIMEOFDAY)
@@ -185,7 +185,7 @@ clocktime::getTimeZoneOffset(double time)
struct timezone tz;
gettimeofday(&tv, &tz);
offset = -tz.tz_minuteswest;
- //gnash::log_debug(_("Using gettimeofday. Offset is %d"), offset);
+ //gnash::log_debug("Using gettimeofday. Offset is %d", offset);
# elif defined(HAVE_FTIME)
// ftime(3): "These days the contents of the timezone and dstflag
diff --git a/libbase/GC.cpp b/libbase/GC.cpp
index fef0676..afd01fa 100644
--- a/libbase/GC.cpp
+++ b/libbase/GC.cpp
@@ -43,7 +43,7 @@ GC::GC(GcRoot& root)
#endif
{
#ifdef GNASH_GC_DEBUG
- log_debug(_("GC %p created"), (void*)this);
+ log_debug("GC %p created", (void*)this);
#endif
char* gcgap = std::getenv("GNASH_GC_TRIGGER_THRESHOLD");
if (gcgap) {
@@ -55,7 +55,7 @@ GC::GC(GcRoot& root)
GC::~GC()
{
#ifdef GNASH_GC_DEBUG
- log_debug(_("GC deleted, deleting all managed resources - collector run %d
times"), _collectorRuns);
+ log_debug("GC deleted, deleting all managed resources - collector run %d
times", _collectorRuns);
#endif
for (ResList::const_iterator i = _resList.begin(), e = _resList.end();
i != e; ++i) {
@@ -68,7 +68,7 @@ GC::cleanUnreachable()
{
#if (GNASH_GC_DEBUG > 1)
- log_debug(_("GC: sweep scan started"));
+ log_debug("GC: sweep scan started");
#endif
size_t deleted = 0;
@@ -78,7 +78,7 @@ GC::cleanUnreachable()
if (!res->isReachable()) {
#if GNASH_GC_DEBUG > 1
- log_debug(_("GC: recycling object %p (%s)"), res, typeName(*res));
+ log_debug("GC: recycling object %p (%s)", res, typeName(*res));
#endif
++deleted;
delete res;
@@ -93,7 +93,7 @@ GC::cleanUnreachable()
_resListSize -= deleted;
#ifdef GNASH_GC_DEBUG
- log_debug(_("GC: recycled %d unreachable resources - %d left"),
+ log_debug("GC: recycled %d unreachable resources - %d left",
deleted, _resListSize);
#endif
@@ -112,8 +112,8 @@ GC::runCycle()
#endif
#ifdef GNASH_GC_DEBUG
- log_debug(_("GC: collection cycle started - %d/%d new resources "
- "allocated since last run (from %d to %d)"),
+ log_debug("GC: collection cycle started - %d/%d new resources "
+ "allocated since last run (from %d to %d)",
_resListSize - _lastResCount, _maxNewCollectablesCount,
_lastResCount, _resListSize);
#endif // GNASH_GC_DEBUG
diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp
index 8abfd23..b4478a2 100644
--- a/libbase/GnashImageGif.cpp
+++ b/libbase/GnashImageGif.cpp
@@ -207,7 +207,7 @@ GifInput::processRecord(GifRecordType record)
// Handle interlaced data in four passes.
if (_gif->Image.Interlace) {
- log_debug(_("Found interlaced GIF (%d x %d)"),
+ log_debug("Found interlaced GIF (%d x %d)",
screenWidth, screenHeight);
// The order of interlaced GIFs.
@@ -234,7 +234,7 @@ GifInput::processRecord(GifRecordType record)
}
// Non-interlaced data.
- log_debug(_("Found non-interlaced GIF (%d x %d)"),
+ log_debug("Found non-interlaced GIF (%d x %d)",
screenWidth, screenHeight);
for (size_t i = imageTop; i < imageHeight; ++i) {
diff --git a/libbase/GnashImageJpeg.cpp b/libbase/GnashImageJpeg.cpp
index e035620..ec36d97 100644
--- a/libbase/GnashImageJpeg.cpp
+++ b/libbase/GnashImageJpeg.cpp
@@ -280,7 +280,7 @@ JpegInput::readHeader(unsigned int maxHeaderBytes)
// Found valid table-specs-only datastream
break;
default:
- log_debug(_("unexpected: jpeg_read_header returned %d"), ret);
+ log_error(_("unexpected: jpeg_read_header returned %d"), ret);
break;
}
@@ -326,7 +326,7 @@ JpegInput::read()
// Found valid table-specs-only datastream
break;
default:
- log_debug(_("unexpected: jpeg_read_header returned %d
[%s:%d]"),
+ log_error(_("unexpected: jpeg_read_header returned %d
[%s:%d]"),
ret, __FILE__, __LINE__);
break;
}
@@ -429,7 +429,8 @@ JpegInput::readScanline(unsigned char* rgb_data)
void
JpegInput::errorOccurred(const char* msg)
{
- log_debug(_("Long jump: banzaaaaaai!"));
+ log_error("Long jump: banzaaaaaai!");
+
_errorOccurred = msg;
// Mark the compressor as closed so we can open another image
diff --git a/libbase/GnashImagePng.cpp b/libbase/GnashImagePng.cpp
index 724f065..1eead12 100644
--- a/libbase/GnashImagePng.cpp
+++ b/libbase/GnashImagePng.cpp
@@ -55,7 +55,7 @@ error(png_struct*, const char* msg)
void
warning(png_struct*, const char* msg)
{
- log_debug(_("PNG warning: %s"), msg);
+ log_debug("PNG warning: %s", msg);
}
void
@@ -245,13 +245,13 @@ PngInput::read()
// Convert indexed images to RGB
if (type == PNG_COLOR_TYPE_PALETTE) {
- log_debug(_("Converting palette PNG to RGB(A)"));
+ log_debug("Converting palette PNG to RGB(A)");
png_set_palette_to_rgb(_pngPtr);
}
// Convert less-than-8-bit greyscale to 8 bit.
if (type == PNG_COLOR_TYPE_GRAY && bitDepth < 8) {
- log_debug(_("Setting grey bit depth(%d) to 8"), bitDepth);
+ log_debug("Setting grey bit depth(%d) to 8", bitDepth);
#if PNG_LIBPNG_VER_MINOR < 4
png_set_gray_1_2_4_to_8(_pngPtr);
#else
@@ -261,7 +261,7 @@ PngInput::read()
// Apply the transparency block if it exists.
if (png_get_valid(_pngPtr, _infoPtr, PNG_INFO_tRNS)) {
- log_debug(_("Applying transparency block, image is RGBA"));
+ log_debug("Applying transparency block, image is RGBA");
png_set_tRNS_to_alpha(_pngPtr);
_type = TYPE_RGBA;
}
@@ -272,18 +272,18 @@ PngInput::read()
// Set the type of the image if it hasn't been set already.
if (_type == GNASH_IMAGE_INVALID) {
if (type & PNG_COLOR_MASK_ALPHA) {
- log_debug(_("Loading PNG image with alpha"));
+ log_debug("Loading PNG image with alpha");
_type = TYPE_RGBA;
}
else {
- log_debug(_("Loading PNG image without alpha"));
+ log_debug("Loading PNG image without alpha");
_type = TYPE_RGB;
}
}
// Convert 1-channel grey images to 3-channel RGB.
if (type == PNG_COLOR_TYPE_GRAY || type == PNG_COLOR_TYPE_GRAY_ALPHA) {
- log_debug(_("Converting greyscale PNG to RGB(A)"));
+ log_debug("Converting greyscale PNG to RGB(A)");
png_set_gray_to_rgb(_pngPtr);
}
diff --git a/libbase/RTMP.cpp b/libbase/RTMP.cpp
index 880f0d9..ccda0bc 100644
--- a/libbase/RTMP.cpp
+++ b/libbase/RTMP.cpp
@@ -202,7 +202,7 @@ RTMP::call(const SimpleBuffer& amf)
bool
RTMP::connect(const URL& url)
{
- log_debug(_("Connecting to %s"), url.str());
+ log_debug("Connecting to %s", url.str());
const std::string& hostname = url.hostname();
const std::string& p = url.port();
@@ -254,7 +254,7 @@ RTMP::update()
// If we haven't finished reading a packet, retrieve it; otherwise
// use an empty one.
if (_incompletePacket.get()) {
- log_debug(_("Doing incomplete packet"));
+ log_debug("Doing incomplete packet");
p = *_incompletePacket;
_incompletePacket.reset();
}
@@ -289,7 +289,7 @@ RTMP::handlePacket(const RTMPPacket& packet)
{
const PacketType t = packet.header.packetType;
- log_debug(_("Received %s"), t);
+ log_debug("Received %s", t);
switch (t) {
@@ -379,7 +379,7 @@ RTMP::readSocket(boost::uint8_t* buffer, int n)
// Doesn't seem very likely to be the way the pp does it.
if (_bytesIn > _bytesInSent + _bandwidth / 2) {
sendBytesReceived(this);
- log_debug(_("Sent bytes received"));
+ log_debug("Sent bytes received");
}
buffer += bytesRead;
@@ -440,13 +440,13 @@ RTMP::readPacketHeader(RTMPPacket& packet)
return false;
}
- //log_debug(_("Packet is %s"), boost::io::group(std::hex,
(unsigned)hbuf[0]));
+ //log_debug("Packet is %s", boost::io::group(std::hex, (unsigned)hbuf[0]));
const int htype = ((hbuf[0] & 0xc0) >> 6);
- //log_debug(_("Thingy whatsit (packet size type): %s"), htype);
+ //log_debug("Thingy whatsit (packet size type): %s", htype);
const int channel = (hbuf[0] & 0x3f);
- //log_debug(_("Channel: %s"), channel);
+ //log_debug("Channel: %s", channel);
hr.headerType = static_cast<PacketSize>(htype);
hr.channel = channel;
@@ -468,7 +468,7 @@ RTMP::readPacketHeader(RTMPPacket& packet)
const boost::uint32_t tmp = (hbuf[2] << 8) + hbuf[1];
hr.channel = tmp + 64;
- log_debug(_("%s, channel: %0x"), __FUNCTION__, hr.channel);
+ log_debug("%s, channel: %0x", __FUNCTION__, hr.channel);
header += 2;
}
@@ -625,19 +625,19 @@ RTMP::sendPacket(RTMPPacket& packet)
// If this timestamp is later than the other and the difference fits
// in 3 bytes, encode a relative one.
if (uptime >= oldh._timestamp && uptime - prevTimestamp < 0xffffff) {
- //log_debug(_("Shrinking to medium"));
+ //log_debug("Shrinking to medium");
hr.headerType = RTMP_PACKET_SIZE_MEDIUM;
hr._timestamp = uptime - prevTimestamp;
// It can be still smaller if the data size is the same.
if (oldh.dataSize == hr.dataSize &&
oldh.packetType == hr.packetType) {
- //log_debug(_("Shrinking to small"));
+ //log_debug("Shrinking to small");
hr.headerType = RTMP_PACKET_SIZE_SMALL;
// If there is no timestamp difference, the minimum size
// is possible.
if (hr._timestamp == 0) {
- //log_debug(_("Shrinking to minimum"));
+ //log_debug("Shrinking to minimum");
hr.headerType = RTMP_PACKET_SIZE_MINIMUM;
}
}
@@ -780,7 +780,7 @@ RTMP::sendPacket(RTMPPacket& packet)
const boost::uint8_t* pos = payloadData(packet) + 1;
const boost::uint8_t* end = payloadEnd(packet);
const std::string& s = amf::readString(pos, end);
- log_debug(_("Calling remote method %s"), s);
+ log_debug("Calling remote method %s", s);
}
RTMPPacket& storedpacket = storePacket(CHANNELS_OUT, hr.channel, packet);
@@ -854,7 +854,7 @@ HandShaker::call()
_stage = 3;
case 3:
if (!stage3()) return;
- log_debug(_("Handshake completed"));
+ log_debug("Handshake completed");
_complete = true;
}
}
@@ -906,9 +906,9 @@ HandShaker::stage1()
std::memcpy(&suptime, serverSig, 4);
suptime = ntohl(suptime);
- log_debug(_("Server Uptime : %d"), suptime);
- log_debug(_("FMS Version : %d.%d.%d.%d"),
- +serverSig[4], +serverSig[5], +serverSig[6], +serverSig[7]);
+ log_debug("Server Uptime : %d", suptime);
+ log_debug("FMS Version : %d.%d.%d.%d",
+ +serverSig[4], +serverSig[5], +serverSig[6], +serverSig[7]);
return true;
}
@@ -969,7 +969,7 @@ HandShaker::stage3()
bool
sendCtrl(RTMP& r, ControlType t, unsigned int nObject, unsigned int nTime)
{
- log_debug(_("Sending control type %s %s"), +t, t);
+ log_debug("Sending control type %s %s", +t, t);
RTMPPacket packet(256);
@@ -1026,7 +1026,7 @@ handleChangeChunkSize(RTMP& r, const RTMPPacket& packet)
{
if (payloadSize(packet) >= 4) {
r._inChunkSize = amf::readNetworkLong(payloadData(packet));
- log_debug(_("Changed chunk size to %d"), r._inChunkSize);
+ log_debug("Changed chunk size to %d", r._inChunkSize);
}
}
@@ -1050,7 +1050,7 @@ handleControl(RTMP& r, const RTMPPacket& packet)
}
const int arg = amf::readNetworkLong(payloadData(packet) + 2);
- log_debug(_("Received control packet %s with argument %s"), t, arg);
+ log_debug("Received control packet %s with argument %s", t, arg);
switch (t)
{
@@ -1067,7 +1067,7 @@ handleControl(RTMP& r, const RTMPPacket& packet)
break;
case CONTROL_RESET_STREAM:
- log_debug(_("Stream is recorded: %s"), arg);
+ log_debug("Stream is recorded: %s", arg);
break;
case CONTROL_PING:
@@ -1093,7 +1093,7 @@ void
handleServerBW(RTMP& r, const RTMPPacket& packet)
{
const boost::uint32_t bw = amf::readNetworkLong(payloadData(packet));
- log_debug(_("Server bandwidth is %s"), bw);
+ log_debug("Server bandwidth is %s", bw);
r.setServerBandwidth(bw);
}
@@ -1107,7 +1107,7 @@ handleClientBW(RTMP& r, const RTMPPacket& packet)
if (payloadSize(packet) > 4) r.m_nClientBW2 = payloadData(packet)[4];
else r.m_nClientBW2 = -1;
- log_debug(_("Client bandwidth is %d %d"), r.bandwidth(), +r.m_nClientBW2);
+ log_debug("Client bandwidth is %d %d", r.bandwidth(), +r.m_nClientBW2);
}
diff --git a/libbase/SharedMem.cpp b/libbase/SharedMem.cpp
index 150e9c5..549fdf3 100644
--- a/libbase/SharedMem.cpp
+++ b/libbase/SharedMem.cpp
@@ -118,11 +118,11 @@ SharedMem::attach()
// Check rcfile for key; if there isn't one, use the Adobe key.
if (_shmkey == 0) {
- log_debug(_("No shared memory key specified in rcfile. Using default
for communication with other players"));
+ log_debug("No shared memory key specified in rcfile. Using default for
communication with other players");
_shmkey = 0xdd3adabd;
}
- log_debug(_("Using shared memory key %s"),
+ log_debug("Using shared memory key %s",
boost::io::group(std::hex, std::showbase, _shmkey));
// First get semaphore.
diff --git a/libbase/SharedMemHaiku.cpp b/libbase/SharedMemHaiku.cpp
index 2ab688f..55b944c 100644
--- a/libbase/SharedMemHaiku.cpp
+++ b/libbase/SharedMemHaiku.cpp
@@ -51,32 +51,32 @@ SharedMem::SharedMem(size_t size)
_shmid(0),
_shmkey(0)
{
- log_unimpl(_("%s on Haiku"), __FUNCTION__);
+ log_unimpl("%s on Haiku", __FUNCTION__);
}
SharedMem::~SharedMem()
{
- log_unimpl(_("%s on Haiku"), __FUNCTION__);
+ log_unimpl("%s on Haiku", __FUNCTION__);
}
bool
SharedMem::lock() const
{
- log_unimpl(_("%s on Haiku"), __FUNCTION__);
+ log_unimpl("%s on Haiku", __FUNCTION__);
return false;
}
bool
SharedMem::unlock() const
{
- log_unimpl(_("%s on Haiku"), __FUNCTION__);
+ log_unimpl("%s on Haiku", __FUNCTION__);
return false;
}
bool
SharedMem::attach()
{
- log_unimpl(_("%s on Haiku"), __FUNCTION__);
+ log_unimpl("%s on Haiku", __FUNCTION__);
return false;
}
@@ -84,5 +84,5 @@ SharedMem::attach()
// Local Variables:
// mode: C++
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
// End:
diff --git a/libbase/SharedMemW32.cpp b/libbase/SharedMemW32.cpp
index f9c3713..0d46eac 100644
--- a/libbase/SharedMemW32.cpp
+++ b/libbase/SharedMemW32.cpp
@@ -44,32 +44,32 @@ SharedMem::SharedMem(size_t size)
_shmid(0),
_shmkey(0)
{
- log_unimpl(_("%s on w32"), __FUNCTION__);
+ log_unimpl("%s on w32", __FUNCTION__);
}
SharedMem::~SharedMem()
{
- log_unimpl(_("%s on w32"), __FUNCTION__);
+ log_unimpl("%s on w32", __FUNCTION__);
}
bool
SharedMem::lock() const
{
- log_unimpl(_("%s on w32"), __FUNCTION__);
+ log_unimpl("%s on w32", __FUNCTION__);
return false;
}
bool
SharedMem::unlock() const
{
- log_unimpl(_("%s on w32"), __FUNCTION__);
+ log_unimpl("%s on w32", __FUNCTION__);
return false;
}
bool
SharedMem::attach()
{
- log_unimpl(_("%s on w32"), __FUNCTION__);
+ log_unimpl("%s on w32", __FUNCTION__);
return false;
}
@@ -77,5 +77,5 @@ SharedMem::attach()
// Local Variables:
// mode: C++
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
// End:
diff --git a/libbase/Socket.cpp b/libbase/Socket.cpp
index 8b0a4fc..9cade25 100644
--- a/libbase/Socket.cpp
+++ b/libbase/Socket.cpp
@@ -74,7 +74,7 @@ Socket::connected() const
// for POSIX.
if (::getsockopt(_socket, SOL_SOCKET, SO_ERROR,
reinterpret_cast<char*>(&val), &len) < 0) {
- log_debug(_("Error"));
+ log_debug("Socket Error");
_error = true;
return false;
}
@@ -91,7 +91,7 @@ Socket::connected() const
if (ret == -1) {
const int err = errno;
if (err == EINTR) {
- log_debug(_("Socket interrupted by a system call"));
+ log_debug("Socket interrupted by a system call");
continue;
}
@@ -151,7 +151,7 @@ Socket::connect(const std::string& hostname,
boost::uint16_t port)
if (_socket < 0) {
const int err = errno;
- log_debug(_("Socket creation failed: %s"), std::strerror(err));
+ log_error(_("Socket creation failed: %s"), std::strerror(err));
_socket = 0;
return false;
}
diff --git a/libbase/curl_adapter.cpp b/libbase/curl_adapter.cpp
index f0d2bb5..437e9ad 100644
--- a/libbase/curl_adapter.cpp
+++ b/libbase/curl_adapter.cpp
@@ -235,7 +235,7 @@ CurlSession::get()
CurlSession::~CurlSession()
{
- log_debug(_("~CurlSession"));
+ log_debug("~CurlSession");
exportCookies();
CURLSHcode code;
@@ -321,19 +321,19 @@ CurlSession::lockSharedHandle(CURL* handle,
curl_lock_data data,
switch (data) {
case CURL_LOCK_DATA_DNS:
- //log_debug(_("Locking DNS cache mutex"));
+ //log_debug("Locking DNS cache mutex");
lock(_dnscacheMutex);
- //log_debug(_("DNS cache mutex locked"));
+ //log_debug("DNS cache mutex locked");
break;
case CURL_LOCK_DATA_COOKIE:
- //log_debug(_("Locking cookies mutex"));
+ //log_debug("Locking cookies mutex");
lock(_cookieMutex);
- //log_debug(_("Cookies mutex locked"));
+ //log_debug("Cookies mutex locked");
break;
case CURL_LOCK_DATA_SHARE:
- //log_debug(_("Locking share mutex"));
+ //log_debug("Locking share mutex");
lock(_shareMutex);
- //log_debug(_("Share mutex locked"));
+ //log_debug("Share mutex locked");
break;
case CURL_LOCK_DATA_SSL_SESSION:
log_error(_("lockSharedHandle: SSL session locking unsupported"));
@@ -359,15 +359,15 @@ CurlSession::unlockSharedHandle(CURL* handle,
curl_lock_data data)
// sure that only one lock is given at any time for each kind of data.
switch (data) {
case CURL_LOCK_DATA_DNS:
- //log_debug(_("Unlocking DNS cache mutex"));
+ //log_debug("Unlocking DNS cache mutex");
unlock(_dnscacheMutex);
break;
case CURL_LOCK_DATA_COOKIE:
- //log_debug(_("Unlocking cookies mutex"));
+ //log_debug("Unlocking cookies mutex");
unlock(_cookieMutex);
break;
case CURL_LOCK_DATA_SHARE:
- //log_debug(_("Unlocking share mutex"));
+ //log_debug("Unlocking share mutex");
unlock(_shareMutex);
break;
case CURL_LOCK_DATA_SSL_SESSION:
@@ -531,7 +531,7 @@ size_t
CurlStreamFile::recv(void *buf, size_t size, size_t nmemb, void *userp)
{
#ifdef GNASH_CURL_VERBOSE
- log_debug(_("curl write callback called for (%d) bytes"),
+ log_debug("curl write callback called for (%d) bytes",
size * nmemb);
#endif
CurlStreamFile* stream = static_cast<CurlStreamFile*>(userp);
@@ -572,7 +572,7 @@ CurlStreamFile::fillCacheNonBlocking()
{
if ( ! _running ) {
#if GNASH_CURL_VERBOSE
- log_debug(_("Not running: fillCacheNonBlocking returning"));
+ log_debug("Not running: fillCacheNonBlocking returning");
#endif
return;
}
@@ -598,15 +598,15 @@ CurlStreamFile::fillCache(std::streampos size)
{
#if GNASH_CURL_VERBOSE
- log_debug(_("fillCache(%d), called, currently cached: %d"), size, _cached);
+ log_debug("fillCache(%d), called, currently cached: %d", size, _cached);
#endif
assert(size >= 0);
if ( ! _running || _cached >= size) {
#if GNASH_CURL_VERBOSE
- if (!_running) log_debug(_("Not running: returning"));
- else log_debug(_("Already enough bytes cached: returning"));
+ if (!_running) log_debug("Not running: returning");
+ else log_debug("Already enough bytes cached: returning");
#endif
return;
}
@@ -625,7 +625,7 @@ CurlStreamFile::fillCache(std::streampos size)
RcInitFile::getDefaultInstance().getStreamsTimeout()*1000);
#ifdef GNASH_CURL_VERBOSE
- log_debug(_("User timeout is %u milliseconds"), userTimeout);
+ log_debug("User timeout is %u milliseconds", userTimeout);
#endif
WallClockTimer lastProgress; // timer since last progress
@@ -638,7 +638,7 @@ CurlStreamFile::fillCache(std::streampos size)
if (_cached >= size || !_running) break;
#if GNASH_CURL_VERBOSE
- //log_debug(_("cached: %d, size: %d"), _cached, size);
+ //log_debug("cached: %d, size: %d", _cached, size);
#endif
// Zero these out _before_ calling curl_multi_fdset!
@@ -656,13 +656,13 @@ CurlStreamFile::fillCache(std::streampos size)
}
#ifdef GNASH_CURL_VERBOSE
- log_debug(_("Max fd: %d"), maxfd);
+ log_debug("Max fd: %d", maxfd);
#endif
// A value of -1 means no file descriptors were added.
if (maxfd < 0) {
#if GNASH_CURL_VERBOSE
- log_debug(_("curl_multi_fdset: maxfd == %1%"), maxfd);
+ log_debug("curl_multi_fdset: maxfd == %1%", maxfd);
#endif
// As of libcurl 7.21.x, the DNS resolving appears to be going
// on in the background, so curl_multi_fdset fails to return
@@ -682,7 +682,7 @@ CurlStreamFile::fillCache(std::streampos size)
tv.tv_usec = maxSleepUsec;
#ifdef GNASH_CURL_VERBOSE
- log_debug(_("select() with %d milliseconds timeout"),
maxSleepUsec*1000);
+ log_debug("select() with %d milliseconds timeout", maxSleepUsec*1000);
#endif
// Wait for data on the filedescriptors until a timeout set
@@ -697,7 +697,7 @@ CurlStreamFile::fillCache(std::streampos size)
// we got interrupted by a signal
// let's consider this as a timeout
#ifdef GNASH_CURL_VERBOSE
- log_debug(_("select() was interrupted by a signal"));
+ log_debug("select() was interrupted by a signal");
#endif
ret = 0;
} else {
@@ -713,7 +713,7 @@ CurlStreamFile::fillCache(std::streampos size)
// Timeout, check the clock to see
// if we expired the user Timeout
#ifdef GNASH_CURL_VERBOSE
- log_debug(_("select() timed out, elapsed is %u"),
+ log_debug("select() timed out, elapsed is %u",
lastProgress.elapsed());
#endif
if (userTimeout && lastProgress.elapsed() > userTimeout) {
@@ -725,7 +725,7 @@ CurlStreamFile::fillCache(std::streampos size)
} else {
// Activity, reset the timer...
#ifdef GNASH_CURL_VERBOSE
- log_debug(_("FD activity, resetting progress timer"));
+ log_debug("FD activity, resetting progress timer");
#endif
lastProgress.restart();
}
@@ -765,7 +765,7 @@ CurlStreamFile::processMessages()
_error = true;
_running = false;
} else {
- log_debug(_("HTTP response %ld from url %s"),
+ log_debug("HTTP response %ld from url %s",
code, _url);
}
@@ -914,7 +914,7 @@ are not honored during the DNS lookup - which you can work
around by
CurlStreamFile::CurlStreamFile(const std::string& url,
const std::string& cachefile)
{
- log_debug(_("CurlStreamFile %p created"), this);
+ log_debug("CurlStreamFile %p created", this);
init(url, cachefile);
// CURLMcode ret =
@@ -928,7 +928,7 @@ CurlStreamFile::CurlStreamFile(const std::string& url,
CurlStreamFile::CurlStreamFile(const std::string& url, const std::string& vars,
const std::string& cachefile)
{
- log_debug(_("CurlStreamFile %p created"), this);
+ log_debug("CurlStreamFile %p created", this);
init(url, cachefile);
_postdata = vars;
@@ -981,7 +981,7 @@ CurlStreamFile::CurlStreamFile(const std::string& url,
const std::string& vars,
const NetworkAdapter::RequestHeaders& headers,
const std::string& cachefile)
{
- log_debug(_("CurlStreamFile %p created"), this);
+ log_debug("CurlStreamFile %p created", this);
init(url, cachefile);
_postdata = vars;
@@ -1047,7 +1047,7 @@ CurlStreamFile::CurlStreamFile(const std::string& url,
const std::string& vars,
/*public*/
CurlStreamFile::~CurlStreamFile()
{
- log_debug(_("CurlStreamFile %p deleted"), this);
+ log_debug("CurlStreamFile %p deleted", this);
curl_multi_remove_handle(_mhandle, _handle);
curl_easy_cleanup(_handle);
curl_multi_cleanup(_mhandle);
@@ -1062,18 +1062,17 @@ CurlStreamFile::read(void *dst, std::streamsize bytes)
if ( eof() || _error ) return 0;
#ifdef GNASH_CURL_VERBOSE
- log_debug(_("read(%d) called"), bytes);
+ log_debug("read(%d) called", bytes);
#endif
fillCache(bytes + tell());
if ( _error ) return 0; // error can be set by fillCache
#ifdef GNASH_CURL_VERBOSE
- log_debug(_("_cache.tell = %d"), tell());
+ log_debug("_cache.tell = %d", tell());
#endif
return std::fread(dst, 1, bytes, _cache);
-
}
/*public*/
@@ -1081,7 +1080,7 @@ std::streamsize
CurlStreamFile::readNonBlocking(void *dst, std::streamsize bytes)
{
#ifdef GNASH_CURL_VERBOSE
- log_debug(_("readNonBlocking(%d) called"), bytes);
+ log_debug("readNonBlocking(%d) called", bytes);
#endif
if ( eof() || _error ) return 0;
@@ -1111,7 +1110,7 @@ CurlStreamFile::eof() const
bool ret = ( ! _running && feof(_cache) );
#ifdef GNASH_CURL_VERBOSE
- log_debug(_("eof() returning %d"), ret);
+ log_debug("eof() returning %d", ret);
#endif
return ret;
@@ -1124,7 +1123,7 @@ CurlStreamFile::tell() const
std::streampos ret = std::ftell(_cache);
#ifdef GNASH_CURL_VERBOSE
- log_debug(_("tell() returning %ld"), ret);
+ log_debug("tell() returning %ld", ret);
#endif
return ret;
@@ -1145,7 +1144,7 @@ CurlStreamFile::seek(std::streampos pos)
#ifdef GNASH_CURL_WARN_SEEKSBACK
if ( pos < tell() ) {
- log_debug(_("Warning: seek backward requested (%ld from %ld)"),
+ log_debug("Warning: seek backward requested (%ld from %ld)",
pos, tell());
}
#endif
@@ -1210,7 +1209,7 @@ CurlStreamFile::size() const
}
#ifdef GNASH_CURL_VERBOSE
- log_debug(_("get_stream_size() returning %lu"), _size);
+ log_debug("get_stream_size() returning %lu", _size);
#endif
return _size;
@@ -1271,7 +1270,7 @@ CurlSession::importCookies()
// there's no way to detect actual cookies import errors
// other then using curl debugging output routines
//
- log_debug(_("Importing cookies from file '%s'"), cookiesIn);
+ log_debug("Importing cookies from file '%s'", cookiesIn);
curl_easy_perform(fakeHandle);
curl_easy_cleanup(fakeHandle);
@@ -1315,7 +1314,7 @@ CurlSession::exportCookies()
}
// Cleanup, to trigger actual cookie file flushing
- log_debug(_("Exporting cookies file '%s'"), cookiesOut);
+ log_debug("Exporting cookies file '%s'", cookiesOut);
curl_easy_cleanup(fakeHandle);
}
@@ -1331,7 +1330,7 @@ std::auto_ptr<IOChannel>
NetworkAdapter::makeStream(const std::string& url, const std::string&
cachefile)
{
#ifdef GNASH_CURL_VERBOSE
- log_debug(_("making curl stream for %s"), url);
+ log_debug("making curl stream for %s", url);
#endif
std::auto_ptr<IOChannel> stream;
@@ -1350,7 +1349,7 @@ NetworkAdapter::makeStream(const std::string& url, const
std::string& postdata,
const std::string& cachefile)
{
#ifdef GNASH_CURL_VERBOSE
- log_debug(_("making curl stream for %s"), url);
+ log_debug("making curl stream for %s", url);
#endif
std::auto_ptr<IOChannel> stream;
@@ -1427,5 +1426,5 @@ NetworkAdapter::reservedNames()
// Local Variables:
// mode: C++
-// indent-tabs-mode: nill
+// indent-tabs-mode: nil
// End:
diff --git a/libbase/extension.cpp b/libbase/extension.cpp
index 412af32..f6488d9 100644
--- a/libbase/extension.cpp
+++ b/libbase/extension.cpp
@@ -71,7 +71,7 @@ Extension::Extension()
_pluginsdir = env;
}
- log_debug(_("Plugins path: %s"), _pluginsdir);
+ log_debug("Plugins path: %s", _pluginsdir);
#ifdef HAVE_LTDL
lt_dlsetsearchpath(_pluginsdir.c_str());
#endif
@@ -195,7 +195,7 @@ Extension::scanDir(const std::string& dirlist)
const std::string& dir = *i;
- log_debug(_("Scanning directory \"%s\" for plugins"), dir);
+ log_debug("Scanning directory \"%s\" for plugins", dir);
DIR *libdir = opendir(dir.c_str());
if (!libdir) {
@@ -223,7 +223,7 @@ Extension::scanDir(const std::string& dirlist)
name.erase(pos);
if (suffix == ".so") {
- log_debug(_("Gnash Plugin name: %s"), name);
+ log_debug("Gnash Plugin name: %s", name);
_modules.push_back(name);
}
else {
diff --git a/libbase/sharedlib.cpp b/libbase/sharedlib.cpp
index cf751ef..073884f 100644
--- a/libbase/sharedlib.cpp
+++ b/libbase/sharedlib.cpp
@@ -158,10 +158,10 @@ SharedLib::getDllSymbol(const std::string& symbol)
Markus: 'Id est NULL.'
*/
if (run == NULL) {
- log_error (_("Couldn't find symbol: %s"), symbol);
+ log_error("Couldn't find symbol: %s", symbol);
return NULL;
} else {
- log_debug (_("Found symbol %s @ %p"), symbol, (void *)run);
+ log_debug("Found symbol %s @ %p", symbol, (void *)run);
}
return (entrypoint*)(run);
diff --git a/libbase/zlib_adapter.cpp b/libbase/zlib_adapter.cpp
index 8b6db48..f40ff11 100644
--- a/libbase/zlib_adapter.cpp
+++ b/libbase/zlib_adapter.cpp
@@ -138,7 +138,7 @@ InflaterIOChannel::reset()
m_at_eof = 0;
const int err = inflateReset(&m_zstream);
if (err != Z_OK) {
- log_error(_("inflater_impl::reset() inflateReset() returned %d"),
+ log_error("inflater_impl::reset() inflateReset() returned %d",
err);
m_error = 1;
return;
@@ -257,14 +257,14 @@ bool
InflaterIOChannel::seek(std::streampos pos)
{
if (m_error) {
- log_debug(_("Inflater is in error condition"));
+ log_error("Inflater is in error condition");
return false;
}
// If we're seeking backwards, then restart from the beginning.
if (pos < m_logical_stream_pos) {
- log_debug(_("inflater reset due to seek back from %d to %d"),
- m_logical_stream_pos, pos );
+ log_debug("inflater reset due to seek back from %d to %d",
+ m_logical_stream_pos, pos );
reset();
}
@@ -281,7 +281,7 @@ InflaterIOChannel::seek(std::streampos pos)
std::streamsize bytes_read = inflate_from_stream(temp, readNow);
assert(bytes_read <= readNow);
if (bytes_read == 0) {
- log_debug(_("Trouble: can't seek any further.. "));
+ log_error("Trouble: can't seek any further.. ");
return false;
}
}
@@ -304,7 +304,7 @@
InflaterIOChannel::InflaterIOChannel(std::auto_ptr<IOChannel> in)
const int err = inflateInit(&m_zstream);
if (err != Z_OK) {
- log_error(_("inflateInit() returned %d"), err);
+ log_error("inflateInit() returned %d", err);
m_error = 1;
return;
}
@@ -326,5 +326,5 @@ std::auto_ptr<IOChannel>
make_inflater(std::auto_ptr<IOChannel> in)
// mode: C++
// c-basic-offset: 8
// tab-width: 8
-// indent-tabs-mode: t
+// indent-tabs-mode: nil
// End:
http://git.savannah.gnu.org/cgit//commit/?id=5c44ec2d24f906b034e8fa14475c9fed4cf27433
commit 5c44ec2d24f906b034e8fa14475c9fed4cf27433
Author: Rob Savoye <address@hidden>
Date: Sat Dec 31 11:40:26 2011 -0700
updated with new strings
diff --git a/po/gnash.pot b/po/gnash.pot
index f39372d..9e2e690 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 09:40-0700\n"
+"POT-Creation-Date: 2011-12-31 11:40-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"
@@ -17,38 +17,10 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: libbase/SharedMemHaiku.cpp:54 libbase/SharedMemHaiku.cpp:59
-#: libbase/SharedMemHaiku.cpp:65 libbase/SharedMemHaiku.cpp:72
-#: libbase/SharedMemHaiku.cpp:79
-#, c-format
-msgid "%s on Haiku"
-msgstr ""
-
-#: libbase/SharedMemW32.cpp:47 libbase/SharedMemW32.cpp:52
-#: libbase/SharedMemW32.cpp:58 libbase/SharedMemW32.cpp:65
-#: libbase/SharedMemW32.cpp:72
-#, c-format
-msgid "%s on w32"
-msgstr ""
-
-#: libbase/RTMP.cpp:205
-#, c-format
-msgid "Connecting to %s"
-msgstr ""
-
#: libbase/RTMP.cpp:221
msgid "Initial connection failed"
msgstr ""
-#: libbase/RTMP.cpp:257
-msgid "Doing incomplete packet"
-msgstr ""
-
-#: libbase/RTMP.cpp:292
-#, c-format
-msgid "Received %s"
-msgstr ""
-
#: libbase/RTMP.cpp:324 libbase/RTMP.cpp:328
msgid "unsupported packet received"
msgstr ""
@@ -68,10 +40,6 @@ msgstr ""
msgid "Unknown packet %s received"
msgstr ""
-#: libbase/RTMP.cpp:382
-msgid "Sent bytes received"
-msgstr ""
-
#: libbase/RTMP.cpp:457
msgid "failed to read RTMP packet header 2nd byte"
msgstr ""
@@ -80,11 +48,6 @@ msgstr ""
msgid "Failed to read RTMP packet header 3nd byte"
msgstr ""
-#: libbase/RTMP.cpp:471
-#, c-format
-msgid "%s, channel: %0x"
-msgstr ""
-
#: libbase/RTMP.cpp:483
#, c-format
msgid "Incomplete packet received on channel %s"
@@ -100,15 +63,6 @@ msgstr ""
msgid "%s, failed to read extended timestamp"
msgstr ""
-#: libbase/RTMP.cpp:783
-#, c-format
-msgid "Calling remote method %s"
-msgstr ""
-
-#: libbase/RTMP.cpp:857
-msgid "Handshake completed"
-msgstr ""
-
#: libbase/RTMP.cpp:870
msgid "Stage 1 socket not ready. This should not happen."
msgstr ""
@@ -122,16 +76,6 @@ msgstr ""
msgid "Type mismatch: client sent %d, server answered %d"
msgstr ""
-#: libbase/RTMP.cpp:909
-#, c-format
-msgid "Server Uptime : %d"
-msgstr ""
-
-#: libbase/RTMP.cpp:910
-#, c-format
-msgid "FMS Version : %d.%d.%d.%d"
-msgstr ""
-
#: libbase/RTMP.cpp:926
msgid "Could not send complete signature."
msgstr ""
@@ -140,16 +84,6 @@ msgstr ""
msgid "Signatures do not match during handshake!"
msgstr ""
-#: libbase/RTMP.cpp:972
-#, c-format
-msgid "Sending control type %s %s"
-msgstr ""
-
-#: libbase/RTMP.cpp:1029
-#, c-format
-msgid "Changed chunk size to %d"
-msgstr ""
-
#: libbase/RTMP.cpp:1040
msgid "Control packet too short"
msgstr ""
@@ -159,88 +93,15 @@ msgstr ""
msgid "Control packet (%s) data too short"
msgstr ""
-#: libbase/RTMP.cpp:1053
-#, c-format
-msgid "Received control packet %s with argument %s"
-msgstr ""
-
-#: libbase/RTMP.cpp:1070
-#, c-format
-msgid "Stream is recorded: %s"
-msgstr ""
-
#: libbase/RTMP.cpp:1086
#, c-format
msgid "Received unknown or unhandled control %s"
msgstr ""
-#: libbase/RTMP.cpp:1096
-#, c-format
-msgid "Server bandwidth is %s"
-msgstr ""
-
-#: libbase/RTMP.cpp:1110
-#, c-format
-msgid "Client bandwidth is %d %d"
-msgstr ""
-
#: libbase/GnashImagePng.cpp:51
msgid "PNG error: "
msgstr ""
-#: libbase/GnashImagePng.cpp:58
-#, c-format
-msgid "PNG warning: %s"
-msgstr ""
-
-#: libbase/GnashImagePng.cpp:248
-msgid "Converting palette PNG to RGB(A)"
-msgstr ""
-
-#: libbase/GnashImagePng.cpp:254
-#, c-format
-msgid "Setting grey bit depth(%d) to 8"
-msgstr ""
-
-#: libbase/GnashImagePng.cpp:264
-msgid "Applying transparency block, image is RGBA"
-msgstr ""
-
-#: libbase/GnashImagePng.cpp:275
-msgid "Loading PNG image with alpha"
-msgstr ""
-
-#: libbase/GnashImagePng.cpp:279
-msgid "Loading PNG image without alpha"
-msgstr ""
-
-#: libbase/GnashImagePng.cpp:286
-msgid "Converting greyscale PNG to RGB(A)"
-msgstr ""
-
-#: libbase/zlib_adapter.cpp:141
-#, c-format
-msgid "inflater_impl::reset() inflateReset() returned %d"
-msgstr ""
-
-#: libbase/zlib_adapter.cpp:260
-msgid "Inflater is in error condition"
-msgstr ""
-
-#: libbase/zlib_adapter.cpp:266
-#, c-format
-msgid "inflater reset due to seek back from %d to %d"
-msgstr ""
-
-#: libbase/zlib_adapter.cpp:284
-msgid "Trouble: can't seek any further.. "
-msgstr ""
-
-#: libbase/zlib_adapter.cpp:307
-#, c-format
-msgid "inflateInit() returned %d"
-msgstr ""
-
#: libbase/StreamProvider.cpp:84 libbase/StreamProvider.cpp:149
msgid "Could not open file %1%: %2%"
msgstr ""
@@ -258,14 +119,6 @@ msgstr ""
msgid "Error reading %d bytes from input stream"
msgstr ""
-#: libbase/Socket.cpp:77
-msgid "Error"
-msgstr ""
-
-#: libbase/Socket.cpp:94
-msgid "Socket interrupted by a system call"
-msgstr ""
-
#: libbase/Socket.cpp:98
msgid "XMLSocket: The socket was never available"
msgstr ""
@@ -361,11 +214,6 @@ msgstr ""
msgid "# Generated by Gnash. Manual changes to this file may be overridden."
msgstr ""
-#: libbase/extension.cpp:74
-#, c-format
-msgid "Plugins path: %s"
-msgstr ""
-
#: libbase/extension.cpp:115
#, c-format
msgid "Loading module: %s from %s"
@@ -390,30 +238,16 @@ msgstr ""
msgid "Couldn't get class_init symbol: \"%s\""
msgstr ""
-#: libbase/extension.cpp:198
-#, c-format
-msgid "Scanning directory \"%s\" for plugins"
-msgstr ""
-
#: libbase/extension.cpp:202 cygnal/cgi-bin/oflaDemo/oflaDemo.cpp:313
#, c-format
msgid "Can't open directory %s"
msgstr ""
-#: libbase/extension.cpp:226
-#, c-format
-msgid "Gnash Plugin name: %s"
-msgstr ""
-
#: libbase/curl_adapter.cpp:48
msgid ""
"libcurl is not available, but Gnash has attempted to use the curl adapter"
msgstr ""
-#: libbase/curl_adapter.cpp:238
-msgid "~CurlSession"
-msgstr ""
-
#: libbase/curl_adapter.cpp:245
#, c-format
msgid "Failed cleaning up share handle: %s. Giving up after %d retries."
@@ -458,71 +292,17 @@ msgstr ""
msgid "unlockSharedHandle: unknown shared data %d"
msgstr ""
-#: libbase/curl_adapter.cpp:534
-#, c-format
-msgid "curl write callback called for (%d) bytes"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:575
-msgid "Not running: fillCacheNonBlocking returning"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:601
-#, c-format
-msgid "fillCache(%d), called, currently cached: %d"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:608
-msgid "Not running: returning"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:609
-msgid "Already enough bytes cached: returning"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:628
-#, c-format
-msgid "User timeout is %u milliseconds"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:659
-#, c-format
-msgid "Max fd: %d"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:665
-msgid "curl_multi_fdset: maxfd == %1%"
-msgstr ""
-
#: libbase/curl_adapter.cpp:672
#, c-format
msgid "FIXME: Timeout (%u milliseconds) while loading from url %s"
msgstr ""
-#: libbase/curl_adapter.cpp:685
-#, c-format
-msgid "select() with %d milliseconds timeout"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:700
-msgid "select() was interrupted by a signal"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:716
-#, c-format
-msgid "select() timed out, elapsed is %u"
-msgstr ""
-
#: libbase/curl_adapter.cpp:720
#, c-format
msgid "Timeout (%u milliseconds) while loading from url %s"
msgstr ""
-#: libbase/curl_adapter.cpp:728
-msgid "FD activity, resetting progress timer"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:763 libbase/curl_adapter.cpp:768
+#: libbase/curl_adapter.cpp:763
#, c-format
msgid "HTTP response %ld from url %s"
msgstr ""
@@ -545,84 +325,23 @@ msgstr ""
msgid "Allowing connections to SSL sites with invalid certificates"
msgstr ""
-#: libbase/curl_adapter.cpp:917 libbase/curl_adapter.cpp:931
-#: libbase/curl_adapter.cpp:984
-#, c-format
-msgid "CurlStreamFile %p created"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:1050
-#, c-format
-msgid "CurlStreamFile %p deleted"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:1065
-#, c-format
-msgid "read(%d) called"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:1072
-#, c-format
-msgid "_cache.tell = %d"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:1084
-#, c-format
-msgid "readNonBlocking(%d) called"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:1092
+#: libbase/curl_adapter.cpp:1091
msgid ""
"curl adaptor's fillCacheNonBlocking set _error rather then throwing an "
"exception"
msgstr ""
-#: libbase/curl_adapter.cpp:1114
-#, c-format
-msgid "eof() returning %d"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:1127
-#, c-format
-msgid "tell() returning %ld"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:1148
-#, c-format
-msgid "Warning: seek backward requested (%ld from %ld)"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:1157
+#: libbase/curl_adapter.cpp:1156
#, c-format
msgid "Warning: could not cache enough bytes on seek: %d requested, %d cached"
msgstr ""
-#: libbase/curl_adapter.cpp:1163
+#: libbase/curl_adapter.cpp:1162
msgid "Warning: fseek failed"
msgstr ""
-#: libbase/curl_adapter.cpp:1213
-#, c-format
-msgid "get_stream_size() returning %lu"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:1274
-#, c-format
-msgid "Importing cookies from file '%s'"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:1318
-#, c-format
-msgid "Exporting cookies file '%s'"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:1334 libbase/curl_adapter.cpp:1353
-#, c-format
-msgid "making curl stream for %s"
-msgstr ""
-
-#: libbase/curl_adapter.cpp:1343 libbase/curl_adapter.cpp:1362
-#: libbase/curl_adapter.cpp:1378
+#: libbase/curl_adapter.cpp:1342 libbase/curl_adapter.cpp:1361
+#: libbase/curl_adapter.cpp:1377
#, c-format
msgid "curl stream: %s"
msgstr ""
@@ -645,17 +364,6 @@ msgstr ""
msgid "No shared memory users left. Removing segment and semaphore."
msgstr ""
-#: libbase/SharedMem.cpp:121
-msgid ""
-"No shared memory key specified in rcfile. Using default for communication "
-"with other players"
-msgstr ""
-
-#: libbase/SharedMem.cpp:125
-#, c-format
-msgid "Using shared memory key %s"
-msgstr ""
-
#: libbase/SharedMem.cpp:150
msgid "Failed to get semaphore for shared memory!"
msgstr ""
@@ -698,20 +406,10 @@ msgstr ""
msgid "GIF: invalid image data (bounds outside GIF screen)"
msgstr ""
-#: libbase/GnashImageGif.cpp:210
-#, c-format
-msgid "Found interlaced GIF (%d x %d)"
-msgstr ""
-
#: libbase/GnashImageGif.cpp:226 libbase/GnashImageGif.cpp:244
msgid "GIF: failed reading pixel data"
msgstr ""
-#: libbase/GnashImageGif.cpp:237
-#, c-format
-msgid "Found non-interlaced GIF (%d x %d)"
-msgstr ""
-
#: libbase/GnashImageGif.cpp:283
msgid "GIF: Error retrieving record type"
msgstr ""
@@ -778,12 +476,12 @@ msgstr ""
msgid "Opened dynamic library \"%s\""
msgstr ""
-#: libbase/sharedlib.cpp:131 libbase/sharedlib.cpp:161
+#: libbase/sharedlib.cpp:131
#, c-format
msgid "Couldn't find symbol: %s"
msgstr ""
-#: libbase/sharedlib.cpp:134 libbase/sharedlib.cpp:164
+#: libbase/sharedlib.cpp:134
#, c-format
msgid "Found symbol %s @ %p"
msgstr ""
@@ -823,59 +521,14 @@ msgstr ""
msgid "Internal jpeg error during decompression: "
msgstr ""
-#: libbase/GnashImageJpeg.cpp:432
-msgid "Long jump: banzaaaaaai!"
-msgstr ""
-
-#: libbase/GnashImageJpeg.cpp:519
+#: libbase/GnashImageJpeg.cpp:520
msgid "rw_dest_IOChannel couldn't write data."
msgstr ""
-#: libbase/GnashImageJpeg.cpp:544
+#: libbase/GnashImageJpeg.cpp:545
msgid "rw_dest_IOChannel::term_destination couldn't write data."
msgstr ""
-#: libbase/GC.cpp:46
-#, c-format
-msgid "GC %p created"
-msgstr ""
-
-#: libbase/GC.cpp:58
-#, c-format
-msgid "GC deleted, deleting all managed resources - collector run %d times"
-msgstr ""
-
-#: libbase/GC.cpp:71
-msgid "GC: sweep scan started"
-msgstr ""
-
-#: libbase/GC.cpp:81
-#, c-format
-msgid "GC: recycling object %p (%s)"
-msgstr ""
-
-#: libbase/GC.cpp:96
-#, c-format
-msgid "GC: recycled %d unreachable resources - %d left"
-msgstr ""
-
-#: libbase/GC.cpp:115
-#, c-format
-msgid ""
-"GC: collection cycle started - %d/%d new resources allocated since last run "
-"(from %d to %d)"
-msgstr ""
-
-#: libbase/AMF.cpp:59
-#, c-format
-msgid "amf0 read bool: %d"
-msgstr ""
-
-#: libbase/AMF.cpp:80
-#, c-format
-msgid "amf0 read double: %e"
-msgstr ""
-
#: libbase/AMF.cpp:90
msgid "Read past _end of buffer for string length"
msgstr ""
@@ -884,16 +537,6 @@ msgstr ""
msgid "Read past _end of buffer for string type"
msgstr ""
-#: libbase/AMF.cpp:103
-#, c-format
-msgid "amf0 read string: %s"
-msgstr ""
-
-#: libbase/AMF.cpp:125
-#, c-format
-msgid "amf0 read long string: %s"
-msgstr ""
-
#: libbase/AMF.cpp:138
msgid "writePlainString called with invalid type!"
msgstr ""
-----------------------------------------------------------------------
Summary of changes:
libbase/AMF.cpp | 8 +-
libbase/ClockTime.cpp | 6 +-
libbase/GC.cpp | 14 +-
libbase/GnashImageGif.cpp | 4 +-
libbase/GnashImageJpeg.cpp | 7 +-
libbase/GnashImagePng.cpp | 14 +-
libbase/RTMP.cpp | 44 +++---
libbase/SharedMem.cpp | 4 +-
libbase/SharedMemHaiku.cpp | 12 +-
libbase/SharedMemW32.cpp | 12 +-
libbase/Socket.cpp | 6 +-
libbase/curl_adapter.cpp | 81 +++++-----
libbase/extension.cpp | 6 +-
libbase/sharedlib.cpp | 4 +-
libbase/zlib_adapter.cpp | 14 +-
po/gnash.pot | 379 ++------------------------------------------
16 files changed, 129 insertions(+), 486 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-1367-gdfa234b,
Rob Savoye <=