[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-1362-gdb90367 |
|
Date: |
Sat, 31 Dec 2011 16:30:12 +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 db903670bf710686a2ab93e08ff1b1d7274356f4 (commit)
via ebaa55fc6f6fa0ec7ca09d670a66f76a5ffb599a (commit)
from c4aa168cd114979f454c42f57dc4c09dac23bfdd (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=db903670bf710686a2ab93e08ff1b1d7274356f4
commit db903670bf710686a2ab93e08ff1b1d7274356f4
Author: Rob Savoye <address@hidden>
Date: Sat Dec 31 09:30:04 2011 -0700
print messages cleaned up for translations
diff --git a/gui/Player.cpp b/gui/Player.cpp
index a8f1f28..edbef64 100644
--- a/gui/Player.cpp
+++ b/gui/Player.cpp
@@ -128,7 +128,7 @@ public:
return (_gui.isStopped()) ? false : true;
case HostMessage::EXTERNALINTERFACE_PAN:
- log_unimpl("GUI ExternalInterface.Pan event");
+ log_unimpl(_("GUI ExternalInterface.Pan event"));
return boost::blank();
case HostMessage::EXTERNALINTERFACE_PLAY:
@@ -140,7 +140,7 @@ public:
return boost::blank();
case HostMessage::EXTERNALINTERFACE_SETZOOMRECT:
- log_unimpl("GUI ExternalInterface.SetZoomRect event");
+ log_unimpl(_("GUI ExternalInterface.SetZoomRect event"));
return boost::blank();
case HostMessage::EXTERNALINTERFACE_STOPPLAY:
@@ -148,7 +148,7 @@ public:
return boost::blank();
case HostMessage::EXTERNALINTERFACE_ZOOM:
- log_unimpl("GUI ExternalInterface.Zoom event");
+ log_unimpl(_("GUI ExternalInterface.Zoom event"));
return boost::blank();
case HostMessage::SCREEN_RESOLUTION:
@@ -259,7 +259,7 @@ Player::init_logfile()
//
if (!_delay && rcfile.getTimerDelay() > 0) {
_delay = rcfile.getTimerDelay();
- log_debug (_("Timer delay set to %d milliseconds"), _delay);
+ log_debug ("Timer delay set to %d milliseconds", _delay);
}
}
@@ -305,7 +305,7 @@ Player::init_gui()
#ifdef GNASH_FPS_DEBUG
if (_fpsDebugTime) {
- log_debug(_("Activating FPS debugging every %g seconds"),
+ log_debug("Activating FPS debugging every %g seconds",
_fpsDebugTime);
_gui->setFpsTimerInterval(_fpsDebugTime);
}
@@ -329,7 +329,7 @@ Player::load_movie()
size_t lastSlash = path.find_last_of('/');
std::string dir = path.substr(0, lastSlash+1);
rcfile.addLocalSandboxPath(dir);
- log_debug(_("%s appended to local sandboxes"), dir.c_str());
+ log_debug("%s appended to local sandboxes", dir.c_str());
}
try {
@@ -350,7 +350,7 @@ Player::load_movie()
// would not be able to load anything
//
rcfile.addLocalSandboxPath(path);
- log_debug(_("%s appended to local sandboxes"), path.c_str());
+ log_debug("%s appended to local sandboxes", path.c_str());
}
// _url should be always set at this point...
@@ -478,9 +478,9 @@ Player::run(int argc, char* argv[], const std::string&
infile,
}
if (!_width || !_height) {
- log_debug(_("Input movie has collapsed dimensions "
- "%d/%d. Setting to 1/1 and going on."),
- _width, _height);
+ log_debug("Input movie has collapsed dimensions "
+ "%d/%d. Setting to 1/1 and going on.",
+ _width, _height);
if (!_width) _width = 1;
if (!_height) _height = 1;
}
@@ -505,8 +505,7 @@ Player::run(int argc, char* argv[], const std::string&
infile,
// Register Player to receive FsCommand events from the core.
root.registerFSCommandCallback(_callbacksHandler.get());
- log_debug("Player Host FD #%d, Player Control FD #%d",
- _hostfd, _controlfd);
+ // log_debug("Player Host FD #%d, Player Control FD #%d", _hostfd,
_controlfd);
// Set host requests fd (if any)
if ( _hostfd != -1 ) {
@@ -543,7 +542,7 @@ Player::run(int argc, char* argv[], const std::string&
infile,
if (! _delay) {
float fps = _movieDef->get_frame_rate();
- log_debug("Movie Frame Rate is %d, adjusting delay", fps);
+ log_debug(_("Movie Frame Rate is %d, adjusting delay"), fps);
// FIXME: this value is arbitrary, and will make any movie with
// less than 12 frames eat up more of the cpu. It should probably
// be a much lower value, like 2.
@@ -711,18 +710,18 @@ Player::CallbacksHandler::notify(const std::string&
command,
//log_debug("Attempt to write INVOKE requests fd %d", hostfd);
int ret = write(hostfd, cmd, len);
if ( ret == -1 ) {
- log_error("Could not write to user-provided host "
- "requests fd %d: %s", hostfd, strerror(errno));
+ log_error(_("Could not write to user-provided host "
+ "requests fd %d: %s"), hostfd, strerror(errno));
}
if ( static_cast<size_t>(ret) < len ) {
- log_error("Could only write %d bytes over %d required to "
- "user-provided host requests fd %d",
+ log_error(_("Could only write %d bytes over %d required to "
+ "user-provided host requests fd %d"),
ret, len, hostfd);
}
// Remove the newline for logging
requestString.resize(requestString.size() - 1);
- log_debug(_("Sent FsCommand '%s' to host fd %d"),
+ log_debug("Sent FsCommand '%s' to host fd %d",
requestString, hostfd);
}
@@ -730,8 +729,8 @@ Player::CallbacksHandler::notify(const std::string& command,
/// plugin they are always ignored.
if (_gui.isPlugin()) {
// We log the request to the fd above
- log_debug(_("Running as plugin: skipping internal "
- "handling of FsCommand %s%s."));
+ log_debug("Running as plugin: skipping internal "
+ "handling of FsCommand %s%s.");
return;
}
diff --git a/gui/ScreenShotter.cpp b/gui/ScreenShotter.cpp
index 15ba945..42d0633 100644
--- a/gui/ScreenShotter.cpp
+++ b/gui/ScreenShotter.cpp
@@ -96,7 +96,7 @@ ScreenShotter::saveImage(const Renderer& r, const
std::string& id) const
r.renderToImage(t, _type, _quality);
}
else {
- log_error("Failed to open screenshot file \"%s\"!", outfile);
+ log_error(_("Failed to open screenshot file \"%s\"!"), outfile);
}
}
diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index c60e1df..6c33630 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -172,7 +172,7 @@ FBGui::~FBGui()
if (_fd > 0) {
enable_terminal();
- log_debug(_("Closing framebuffer device"));
+ // log_debug("Closing framebuffer device");
close(_fd);
}
}
@@ -199,7 +199,7 @@ FBGui::init(int argc, char *** argv)
// Set "window" size
_width = ovg->getWidth();
_height = ovg->getHeight();
- log_debug(_("Width:%d, Height:%d"), _width, _height);
+ log_debug("Width:%d, Height:%d", _width, _height);
_renderer.reset(renderer::openvg::create_handler(0));
renderer::openvg::Renderer_ovg *rend = reinterpret_cast
<renderer::openvg::Renderer_ovg *>(_renderer.get());
@@ -221,7 +221,7 @@ FBGui::init(int argc, char *** argv)
// Set "window" size
_width = agg->width();
_height = agg->height();
- log_debug(_("Width:%d, Height:%d"), _width, _height);
+ log_debug("Width:%d, Height:%d", _width, _height);
_renderer.reset(agg->createRenderHandler());
}
#endif
@@ -248,7 +248,7 @@ FBGui::init(int argc, char *** argv)
if (possibles.empty()) {
log_error(_("Found no accessible input event devices"));
} else {
- log_debug(_("Found %d input event devices."), possibles.size());
+ log_debug("Found %d input event devices.", possibles.size());
}
std::vector<boost::shared_ptr<InputDevice> >::iterator it;
@@ -320,7 +320,7 @@ FBGui::init(int argc, char *** argv)
if ( _ypos < 0 ) _ypos += _var_screeninfo.yres - _height;
_ypos = clamp<int>(_ypos, 0, _var_screeninfo.yres-_height);
- log_debug(_("X:%d, Y:%d"), _xpos, _ypos);
+ log_debug("X:%d, Y:%d", _xpos, _ypos);
#endif
_validbounds.setTo(0, 0, _width - 1, _height - 1);
@@ -529,7 +529,6 @@ FBGui::disable_terminal()
_original_kd = -1;
-
// Find the TTY device name
char* tty = find_accessible_tty(0);
@@ -537,39 +536,38 @@ FBGui::disable_terminal()
int fd;
if (!tty) {
- log_debug(_("WARNING: Could not detect controlling TTY"));
+ log_error(_("Could not detect controlling TTY"));
return false;
}
-
// Detect the currently active virtual terminal (so we can switch back to
// it later)
fd = open(tty, O_RDWR);
if (fd < 0) {
- log_debug(_("WARNING: Could not open %s"), tty);
+ log_error(_("Could not open %s"), tty);
return false;
}
struct vt_stat vts;
if (ioctl(fd, VT_GETSTATE, &vts) == -1) {
- log_debug(_("WARNING: Could not get current VT state"));
+ log_error(_("Could not get current VT state"));
close(_fd);
return false;
}
_original_vt = vts.v_active;
- log_debug(_("Original TTY NO = %d"), _original_vt);
+ // log_debug("Original TTY NO = %d", _original_vt);
#ifdef REQUEST_NEW_VT
// Request a new VT number
if (ioctl(fd, VT_OPENQRY, &_own_vt) == -1) {
- log_debug(_("WARNING: Could not request a new VT"));
+ log_error(_("Could not request a new VT"));
close(fd);
return false;
}
- log_debug(_("Own TTY NO = %d"), _own_vt);
+ // log_debug("Own TTY NO = %d", _own_vt);
if (fd > 0) {
close(fd);
@@ -578,24 +576,24 @@ FBGui::disable_terminal()
// Activate our new VT
tty = find_accessible_tty(_own_vt);
if (!tty) {
- log_debug(_("WARNING: Could not find device for VT number %d"),
_own_vt);
+ log_error(_("Could not find device for VT number %d"), _own_vt);
return false;
}
_fd = open(tty, O_RDWR);
if (fd < 0) {
- log_debug(_("WARNING: Could not open %s"), tty);
+ log_error(_("Could not open %s"), tty);
return false;
}
if (ioctl(fd, VT_ACTIVATE, _own_vt) == -1) {
- log_debug(_("WARNING: Could not activate VT number %d"), _own_vt);
+ log_error(_("Could not activate VT number %d"), _own_vt);
close(fd);
return false;
}
if (ioctl(fd, VT_WAITACTIVE, _own_vt) == -1) {
- log_debug(_("WARNING: Error waiting for VT %d becoming active"),
+ log_error(_("Error waiting for VT %d becoming active"),
_own_vt);
//close(tty);
//return false; don't abort
@@ -612,14 +610,13 @@ FBGui::disable_terminal()
// Activate our new VT
tty = find_accessible_tty(_own_vt);
if (!tty) {
- log_debug(_("WARNING: Could not find device for VT number %d"),
- _own_vt);
+ log_error(_("Could not find device for VT number %d"), _own_vt);
return false;
}
fd = open(tty, O_RDWR);
if (fd < 0) {
- log_debug(_("WARNING: Could not open %s"), tty);
+ log_error(_("Could not open %s"), tty);
return false;
}
@@ -627,7 +624,7 @@ FBGui::disable_terminal()
// Become session leader and attach to terminal
setsid();
if (ioctl(fd, TIOCSCTTY, 0) == -1) {
- log_debug(_("WARNING: Could not attach controlling terminal (%s)"), tty);
+ log_error(_("Could not attach controlling terminal (%s)"), tty);
}
#endif
#endif // end of if REQUEST_NEW_VT
@@ -635,18 +632,18 @@ FBGui::disable_terminal()
// Disable keyboard cursor
if (ioctl(fd, KDGETMODE, &_original_kd) == -1) {
- log_debug(_("WARNING: Could not query current keyboard mode on VT"));
+ log_error(_("Could not query current keyboard mode on VT"));
}
if (ioctl(fd, KDSETMODE, KD_GRAPHICS) == -1) {
- log_debug(_("WARNING: Could not switch to graphics mode on new VT"));
+ log_error(_("Could not switch to graphics mode on new VT"));
}
if (fd > 0) {
close(fd);
}
- log_debug(_("VT %d ready"), _own_vt);
+ // log_debug("VT %d ready", _own_vt);
// NOTE: We could also implement virtual console switching by using
// VT_GETMODE / VT_SETMODE ioctl calls and handling their signals, but
@@ -660,28 +657,28 @@ FBGui::enable_terminal()
{
// GNASH_REPORT_FUNCTION;
- log_debug(_("Restoring terminal..."));
+ // log_debug("Restoring terminal...");
char* tty = find_accessible_tty(_own_vt);
if (!tty) {
- log_debug(_("WARNING: Could not find device for VT number %d"),
_own_vt);
+ log_error(_("Could not find device for VT number %d"), _own_vt);
return false;
}
int fd = open(tty, O_RDWR);
if (fd < 0) {
- log_debug(_("WARNING: Could not open %s"), tty);
+ log_error(_("Could not open %s"), tty);
return false;
}
if (ioctl(fd, VT_ACTIVATE, _original_vt)) {
- log_debug(_("WARNING: Could not activate VT number %d"), _original_vt);
+ log_error(_("Could not activate VT number %d"), _original_vt);
close(_fd);
return false;
}
if (ioctl(fd, VT_WAITACTIVE, _original_vt)) {
- log_debug(_("WARNING: Error waiting for VT %d becoming active"),
+ log_error(_("Error waiting for VT %d becoming active"),
_original_vt);
//close(tty);
//return false; don't abort
@@ -690,7 +687,7 @@ FBGui::enable_terminal()
// Restore keyboard
if (ioctl(fd, KDSETMODE, _original_kd)) {
- log_debug(_("WARNING: Could not restore keyboard mode"));
+ log_error(_("Could not restore keyboard mode"));
}
if (fd > 0) {
@@ -737,7 +734,7 @@ FBGui::checkForData()
#if 1
double x = 0.655 * ie->x;
double y = 0.46875 * ie->y;
- log_debug(_("Mouse clicked at: %g:%g"), x, y);
+ // log_debug("Mouse clicked at: %g:%g", x, y);
notifyMouseMove(int(x), int(y));
#else
notifyMouseMove(ie->x, ie->y);
diff --git a/gui/fb/fb_glue_agg.cpp b/gui/fb/fb_glue_agg.cpp
index 864ac9a..9eaa8f2 100644
--- a/gui/fb/fb_glue_agg.cpp
+++ b/gui/fb/fb_glue_agg.cpp
@@ -161,13 +161,13 @@ FBAggGlue::createRenderHandler()
renderer::rawfb::RawFBDevice *rawfb = reinterpret_cast
<renderer::rawfb::RawFBDevice *>(_device.get());
- log_debug(_("red channel: %d / %d"), rawfb->getRedOffset(),
+ log_debug("red channel: %d / %d", rawfb->getRedOffset(),
rawfb->getRedSize());
- log_debug(_("green channel: %d / %d"), rawfb->getGreenOffset(),
+ log_debug("green channel: %d / %d", rawfb->getGreenOffset(),
rawfb->getGreenSize());
- log_debug(_("blue channel: %d / %d"), rawfb->getBlueOffset(),
+ log_debug("blue channel: %d / %d", rawfb->getBlueOffset(),
rawfb->getBlueSize());
- log_debug(_("Total bits per pixel: %d"), rawfb->getDepth());
+ log_debug("Total bits per pixel: %d", rawfb->getDepth());
const char* pixelformat = agg_detect_pixel_format(
rawfb->getRedOffset(), rawfb->getRedSize(),
@@ -218,7 +218,7 @@ FBAggGlue::render()
// GNASH_REPORT_FUNCTION;
if (_drawbounds.size() == 0 ) {
- log_debug(_("No Drawbounds set in %s!"), __FUNCTION__);
+ log_error(_("No Drawbounds set in %s!"), __FUNCTION__);
return; // nothing to do..
}
diff --git a/gui/fb/fb_glue_gles1.cpp b/gui/fb/fb_glue_gles1.cpp
index 84ee763..16ea2f1 100644
--- a/gui/fb/fb_glue_gles1.cpp
+++ b/gui/fb/fb_glue_gles1.cpp
@@ -143,7 +143,7 @@ FBgles1Glue::init(int /*argc*/, char *** /*argv*/)
if (result == EGL_FALSE || numOfConfigs == 0) {
return false;
}
- log_trace(_("EGL: pbuffer config ok"));
+ // log_trace("EGL: pbuffer config ok");
const EGLint pbuffer_attrib_list[] = {
EGL_WIDTH, EGL_MAX_PBUFFER_WIDTH,
@@ -159,7 +159,7 @@ FBgles1Glue::init(int /*argc*/, char *** /*argv*/)
if (eglGetError () != EGL_SUCCESS) {
return false;
}
- log_trace(_("EGL: pbuffer surface ok"));
+ log_trace("EGL: pbuffer surface ok");
return true;
}
@@ -168,7 +168,7 @@ int
FBgles1Glue::width() {
EGLint result;
eglQuerySurface (_display, _surface, EGL_WIDTH, &result);
- log_trace(_("EGL: width %d"), result);
+ log_trace("EGL: width %d", result);
return result;
}
@@ -176,7 +176,7 @@ int
FBgles1Glue::height() {
EGLint result;
eglQuerySurface (_display, _surface, EGL_HEIGHT, &result);
- log_trace(_("EGL: height %d"), result);
+ log_trace("EGL: height %d", result);
return result;
}
diff --git a/gui/gnash.cpp b/gui/gnash.cpp
index 1086de4..600ab1f 100644
--- a/gui/gnash.cpp
+++ b/gui/gnash.cpp
@@ -206,8 +206,7 @@ setupFDs(gnash::Player& p, const std::string& fds)
hostfd = std::strtol(fds.substr(0, fds.find(":")).c_str(), NULL, 0);
std::string csub = fds.substr(fds.find(":")+1, fds.size());
controlfd = strtol(csub.c_str(), 0, 0);
- gnash::log_debug(_("Host FD #%d, Control FD #%d\n"),
- hostfd, controlfd);
+ // gnash::log_debug("Host FD #%d, Control FD #%d\n", hostfd, controlfd);
if (hostfd < 0) {
std::cerr << boost::format(_("Invalid host communication "
diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 78e95b9..5967332 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -156,7 +156,7 @@ GtkGui::init(int argc, char **argv[])
{
#ifdef HAVE_X11
if (!XInitThreads()) {
- log_debug(_("Failed to initialize X threading support\n"));
+ log_error(_("Failed to initialize X threading support\n"));
return false;
}
#endif
@@ -170,10 +170,10 @@ GtkGui::init(int argc, char **argv[])
#else
_window = gtk_plug_new(_xid);
#endif
- log_debug (_("Created XEmbedded window"));
+ // log_debug("Created XEmbedded window");
} else {
_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- log_debug (_("Created top level window"));
+ // log_debug ("Created top level window");
}
addGnashIcon(GTK_WINDOW(_window));
@@ -186,14 +186,14 @@ GtkGui::init(int argc, char **argv[])
// there is no point in trying to use OpenGL.
bool dri = false;
if (checkX11Extension("DRI")) {
- log_debug(_("DRI extension found"));
+ log_debug("DRI extension found");
dri = true;
}
bool glx = false;
// See if our X11 server supports the GLX extension, otherwise
// there is no point in trying to use OpenGL.
if (checkX11Extension("GLX")) {
- log_debug(_("GLX extension found"));
+ log_debug("GLX extension found");
glx = true;
}
// If we don't have these extensions, don't bother with OpenGl,
@@ -208,7 +208,7 @@ GtkGui::init(int argc, char **argv[])
// See if our X11 server supports the Xvideo extension, otherwise
// there is no point in trying to use Xvideo for scaling.
if (checkX11Extension("XVideo")) {
- log_debug(_("Xvideo extension found"));
+ log_debug("Xvideo extension found");
}
}
@@ -730,7 +730,7 @@ GtkGui::createMenuAlt()
void
GtkGui::resizeWindow(int width, int height)
{
- log_debug(_("GtkGui: Window resize request received"));
+ // log_debug("GtkGui: Window resize request received");
if (!_xid) {
diff --git a/gui/gtk/gtk_canvas.cpp b/gui/gtk/gtk_canvas.cpp
index 3798dbd..6dc2964 100644
--- a/gui/gtk/gtk_canvas.cpp
+++ b/gui/gtk/gtk_canvas.cpp
@@ -120,7 +120,7 @@ gnash_canvas_size_allocate(GtkWidget *widget, GtkAllocation
*allocation)
{
GnashCanvas *canvas = GNASH_CANVAS(widget);
- gnash::log_debug(_("gnash_canvas_size_allocate %d %d"), allocation->width,
+ gnash::log_debug("gnash_canvas_size_allocate %d %d", allocation->width,
allocation->height);
if (canvas->renderer.get()) {
diff --git a/gui/gtk/gtk_glue_agg_vaapi.cpp b/gui/gtk/gtk_glue_agg_vaapi.cpp
index e40cfbc..c3d02d3 100644
--- a/gui/gtk/gtk_glue_agg_vaapi.cpp
+++ b/gui/gtk/gtk_glue_agg_vaapi.cpp
@@ -160,7 +160,7 @@ GtkAggVaapiGlue::init(int /*argc*/, char ** /*argv*/[])
{
VaapiGlobalContext *const gvactx = VaapiGlobalContext::get();
if (!gvactx) {
- log_debug(_("WARNING: failed to create VA-API display."));
+ log_error(_("WARNING: failed to create VA-API display."));
return false;
}
return true;
@@ -201,7 +201,8 @@ GtkAggVaapiGlue::createRenderHandler()
const char *agg_pixel_format;
agg_pixel_format = find_pixel_format(_vaapi_image_format);
if (!agg_pixel_format) {
- log_debug(_("GTK-AGG: Unknown RGB format %s reported by VA-API. Please
report this to the gnash-dev mailing list."),
+ log_error(_("GTK-AGG: Unknown RGB format %s reported by VA-API."
+ "Please report this to the gnash-dev mailing list."),
string_of_FOURCC(_vaapi_image_format));
return NULL;
}
@@ -217,8 +218,8 @@ GtkAggVaapiGlue::resetRenderSurface(unsigned int width,
unsigned int height)
/* XXX: round up to 128-byte boundaries to workaround GMA500 bugs */
const unsigned int aligned_width = (width + 31) & -32U;
- dprintf("GtkAggVaapiGlue::resetRenderSurface(): size %ux%u\n",
- width, height);
+ // dprintf("GtkAggVaapiGlue::resetRenderSurface(): size %ux%u\n",
+ // width, height);
_vaapi_surface.reset(new VaapiSurface(width, height));
_vaapi_image.reset(new VaapiImage(aligned_width, height,
_vaapi_image_format));
@@ -227,13 +228,13 @@ GtkAggVaapiGlue::resetRenderSurface(unsigned int width,
unsigned int height)
_vaapi_subpicture.reset(new VaapiSubpicture(_vaapi_image));
if (!_vaapi_image->map()) {
- log_debug(_("ERROR: failed to map VA-API image."));
+ log_error(_("failed to map VA-API image."));
return;
}
VaapiRectangle r(width, height);
if (!_vaapi_surface->associateSubpicture(_vaapi_subpicture, r, r)) {
- log_debug(_("ERROR: failed to associate VA-API subpicture."));
+ log_error(_("failed to associate VA-API subpicture."));
return;
}
_vaapi_surface->clear();
@@ -285,7 +286,7 @@ GtkAggVaapiGlue::beforeRendering(movie_root* stage)
resetRenderSurface(_window_width, _window_height);
if (!_vaapi_image->map()) {
- log_debug(_("ERROR: failed to map VA-API image."));
+ log_error(_("failed to map VA-API image."));
return;
}
}
@@ -367,14 +368,14 @@ GtkAggVaapiGlue::render()
VaapiVideoWindow *videoWindow;
videoWindow = getVideoWindow(surface, _drawing_area->window,
dst_rect);
if (!videoWindow) {
- log_debug(_("ERROR: failed to setup video window for surface
0x%08x."), surface->get());
+ log_error(_("failed to setup video window for surface
0x%08x."), surface->get());
continue;
}
videoWindow->moveResize(dst_rect);
VaapiRectangle pic_rect(surface->width(), surface->height());
if (!surface->associateSubpicture(_vaapi_subpicture, src_rect,
pic_rect)) {
- log_debug(_("ERROR: failed to associate subpicture to surface
0x%08x."), surface->get());
+ log_error(_("failed to associate subpicture to surface
0x%08x."), surface->get());
continue;
}
diff --git a/gui/gtk/gtk_glue_gtkglext.cpp b/gui/gtk/gtk_glue_gtkglext.cpp
index 66cebbc..fc94fb0 100644
--- a/gui/gtk/gtk_glue_gtkglext.cpp
+++ b/gui/gtk/gtk_glue_gtkglext.cpp
@@ -60,8 +60,7 @@ GtkGlExtGlue::init(int argc, char** argv[])
gint major, minor;
gdk_gl_query_version (&major, &minor);
- log_debug (_("OpenGL extension version - %d.%d"),
- (int)major, (int)minor);
+ log_debug ("OpenGL extension version - %d.%d", (int)major, (int)minor);
GdkGLConfigMode glcmode = (GdkGLConfigMode)(GDK_GL_MODE_RGB |
GDK_GL_MODE_STENCIL |
@@ -79,10 +78,10 @@ GtkGlExtGlue::init(int argc, char** argv[])
log_error (_("No appropriate OpenGL-capable visual found."));
gtk_main_quit(); // XXX
} else {
- log_debug (_("Got single-buffered visual."));
+ log_debug ("Got single-buffered visual.");
}
} else {
- log_debug (_("Got double-buffered visual."));
+ log_debug ("Got double-buffered visual.");
}
return true;
diff --git a/gui/gtk/gtk_glue_ovg.cpp b/gui/gtk/gtk_glue_ovg.cpp
index 9a202d4..001d03e 100644
--- a/gui/gtk/gtk_glue_ovg.cpp
+++ b/gui/gtk/gtk_glue_ovg.cpp
@@ -388,7 +388,7 @@ GtkOvgGlue::queryEGLConfig(EGLDisplay display)
log_error(_("No EGLconfigs found\n"));
return 0;
}
- log_debug(_("Max number of EGL Configs is %d"), max_num_config);
+ log_debug("Max number of EGL Configs is %d", max_num_config);
configs = new EGLConfig[max_num_config];
if (0 == configs) {
@@ -402,7 +402,7 @@ GtkOvgGlue::queryEGLConfig(EGLDisplay display)
return 0;
}
for (int i=0; i<max_num_config; i++ ) {
- log_debug(_("Config[%d] is:"), i);
+ log_debug("Config[%d] is:", i);
printEGLConfig(configs[i]);
}
diff --git a/gui/gui.cpp b/gui/gui.cpp
index bc51bc4..61cc5c9 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -279,7 +279,7 @@ Gui::updateStageMatrix()
if (!_stage) {
// When VM initializes, we'll get a call to resize_view, which
// would call us again.
- log_debug("Can't update stage matrix till VM is initialized");
+ log_error(_("Can't update stage matrix till VM is initialized"));
return;
}
@@ -331,7 +331,7 @@ Gui::updateStageMatrix()
break;
default:
- log_error("Invalid scaleMode %d", scaleMode);
+ log_error(_("Invalid scaleMode %d"), scaleMode);
break;
}
@@ -371,7 +371,7 @@ Gui::updateStageMatrix()
default:
{
- log_error("Invalid horizontal align %d", valign);
+ log_error(_("Invalid horizontal align %d"), valign);
break;
}
}
@@ -402,7 +402,7 @@ Gui::updateStageMatrix()
default:
{
- log_error("Invalid vertical align %d", valign);
+ log_error(_("Invalid vertical align %d"), valign);
break;
}
}
@@ -480,7 +480,7 @@ Gui::notifyMouseMove(int ux, int uy)
boost::int32_t y = (uy-_yoffset) / _yscale;
#ifdef DEBUG_MOUSE_COORDINATES
- log_debug(_("mouse @ %d,%d"), x, y);
+ log_debug("mouse @ %d,%d", x, y);
#endif
if ( m->mouseMoved(x, y) ) {
@@ -839,7 +839,7 @@ Gui::play()
sound::sound_handler* s = _stage->runResources().soundHandler();
if ( s ) s->unpause();
- log_debug("Starting virtual clock");
+ // log_debug("Starting virtual clock");
_virtualClock.resume();
}
@@ -862,7 +862,7 @@ Gui::stop()
sound::sound_handler* s = _stage->runResources().soundHandler();
if ( s ) s->pause();
- log_debug("Pausing virtual clock");
+ // log_debug("Pausing virtual clock");
_virtualClock.pause();
stopHook();
@@ -886,7 +886,7 @@ Gui::pause()
if (s) s->pause();
_stopped = true;
- log_debug("Pausing virtual clock");
+ // log_debug("Pausing virtual clock");
_virtualClock.pause();
stopHook();
@@ -897,7 +897,7 @@ Gui::start()
{
assert ( ! _started );
if (_stopped) {
- log_debug("Gui is in stop mode, won't start application");
+ log_error(_("Gui is in stop mode, won't start application"));
return;
}
@@ -920,9 +920,8 @@ Gui::start()
s->unpause();
}
_started = true;
-
- log_debug("Starting virtual clock");
+ // log_debug("Starting virtual clock");
_virtualClock.resume();
}
@@ -956,7 +955,7 @@ Gui::advanceMovie(bool doDisplay)
m->getRootMovie().ensureFrameLoaded(tot_frames);
m->goto_frame(cur_frame + 1);
m->getRootMovie().setPlayState(gnash::MovieClip::PLAYSTATE_PLAY);
- log_debug(_("Frame %d"), m->getRootMovie().get_current_frame());
+ // log_debug("Frame %d", m->getRootMovie().get_current_frame());
#endif
#ifdef GNASH_FPS_DEBUG
@@ -1259,8 +1258,8 @@ Gui::setStage(movie_root* stage)
bool
Gui::yesno(const std::string& question)
{
- log_error("This gui didn't override 'yesno', assuming 'yes' answer to "
- "question: %s", question);
+ log_error(_("This gui didn't override 'yesno', assuming 'yes' answer to "
+ "question: %s"), question);
return true;
}
@@ -1268,7 +1267,7 @@ void
Gui::setQuality(Quality q)
{
if (!_stage) {
- log_error("Gui::setQuality called before a movie_root was available");
+ log_error(_("Gui::setQuality called before a movie_root was
available"));
return;
}
_stage->setQuality(q);
@@ -1278,7 +1277,7 @@ Quality
Gui::getQuality() const
{
if (!_stage) {
- log_error("Gui::getQuality called before a movie_root was available");
+ log_error(_("Gui::getQuality called before a movie_root was
available"));
// just a guess..
return QUALITY_HIGH;
}
diff --git a/gui/qt/Qt4Gui.cpp b/gui/qt/Qt4Gui.cpp
index 43f34f9..b3375f6 100644
--- a/gui/qt/Qt4Gui.cpp
+++ b/gui/qt/Qt4Gui.cpp
@@ -205,11 +205,11 @@ Qt4Gui::createWindow(const char* windowtitle, int width,
int height,
_validbounds.setTo(0, 0, _width, _height);
_glue->initBuffer(_width, _height);
- log_debug(_("Setting renderer"));
+ // log_debug("Setting renderer");
_runResources.setRenderer(_renderer);
- log_debug(_("Set renderer"));
+ // log_debug("Set renderer");
return true;
}
http://git.savannah.gnu.org/cgit//commit/?id=ebaa55fc6f6fa0ec7ca09d670a66f76a5ffb599a
commit ebaa55fc6f6fa0ec7ca09d670a66f76a5ffb599a
Author: Rob Savoye <address@hidden>
Date: Sat Dec 31 09:29:39 2011 -0700
updated with new strings
diff --git a/po/gnash.pot b/po/gnash.pot
index faca603..c414d51 100644
--- a/po/gnash.pot
+++ b/po/gnash.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-29 18:59-0700\n"
+"POT-Creation-Date: 2011-12-31 09:29-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"
@@ -7651,7 +7651,7 @@ msgstr ""
msgid "Attempt to write response to ExternalInterface requests fd %d"
msgstr ""
-#: libcore/movie_root.cpp:1676
+#: libcore/movie_root.cpp:1676 gui/Player.cpp:713
#, c-format
msgid "Could not write to user-provided host requests fd %d: %s"
msgstr ""
@@ -8164,7 +8164,6 @@ msgid "No EGLconfigs found\n"
msgstr ""
#: libdevice/egl/eglDevice.cpp:217 libdevice/egl/eglDevice.cpp:552
-#: gui/gtk/gtk_glue_ovg.cpp:391
#, c-format
msgid "Max number of EGL Configs is %d"
msgstr ""
@@ -9182,7 +9181,7 @@ msgstr ""
#: utilities/processor.cpp:456 utilities/processor.cpp:459 cygnal/cvm.cpp:407
#: cygnal/cvm.cpp:410 gui/pythonmod/gnash-view.cpp:438
-#: gui/pythonmod/gnash-view.cpp:441 gui/Player.cpp:332 gui/Player.cpp:353
+#: gui/pythonmod/gnash-view.cpp:441
#, c-format
msgid "%s appended to local sandboxes"
msgstr ""
@@ -11696,15 +11695,6 @@ msgstr ""
msgid "Stopping \"%s\""
msgstr ""
-#: gui/fb/fb.cpp:175
-msgid "Closing framebuffer device"
-msgstr ""
-
-#: gui/fb/fb.cpp:202 gui/fb/fb.cpp:224
-#, c-format
-msgid "Width:%d, Height:%d"
-msgstr ""
-
#: gui/fb/fb.cpp:229
#, c-format
msgid "No renderer! %s not supported."
@@ -11718,11 +11708,6 @@ msgstr ""
msgid "Found no accessible input event devices"
msgstr ""
-#: gui/fb/fb.cpp:251
-#, c-format
-msgid "Found %d input event devices."
-msgstr ""
-
#: gui/fb/fb.cpp:262
msgid "WARNING: Mouse support may conflict with the input event support."
msgstr ""
@@ -11743,11 +11728,6 @@ msgstr ""
msgid "Enabling Power Button support"
msgstr ""
-#: gui/fb/fb.cpp:323
-#, c-format
-msgid "X:%d, Y:%d"
-msgstr ""
-
#: gui/fb/fb.cpp:368
#, c-format
msgid "Movie Frame Rate is %d, adjusting delay to %dms"
@@ -11761,77 +11741,53 @@ msgstr ""
msgid "This GUI does not yet support a mouse pointer"
msgstr ""
-#: gui/fb/fb.cpp:540
-msgid "WARNING: Could not detect controlling TTY"
-msgstr ""
-
-#: gui/fb/fb.cpp:550 gui/fb/fb.cpp:587 gui/fb/fb.cpp:622 gui/fb/fb.cpp:673
-#, c-format
-msgid "WARNING: Could not open %s"
-msgstr ""
-
-#: gui/fb/fb.cpp:556
-msgid "WARNING: Could not get current VT state"
+#: gui/fb/fb.cpp:539
+msgid "Could not detect controlling TTY"
msgstr ""
-#: gui/fb/fb.cpp:562
+#: gui/fb/fb.cpp:548 gui/fb/fb.cpp:585 gui/fb/fb.cpp:619 gui/fb/fb.cpp:670
#, c-format
-msgid "Original TTY NO = %d"
+msgid "Could not open %s"
msgstr ""
-#: gui/fb/fb.cpp:567
-msgid "WARNING: Could not request a new VT"
+#: gui/fb/fb.cpp:554
+msgid "Could not get current VT state"
msgstr ""
-#: gui/fb/fb.cpp:572
-#, c-format
-msgid "Own TTY NO = %d"
+#: gui/fb/fb.cpp:565
+msgid "Could not request a new VT"
msgstr ""
-#: gui/fb/fb.cpp:581 gui/fb/fb.cpp:615 gui/fb/fb.cpp:667
+#: gui/fb/fb.cpp:579 gui/fb/fb.cpp:613 gui/fb/fb.cpp:664
#, c-format
-msgid "WARNING: Could not find device for VT number %d"
+msgid "Could not find device for VT number %d"
msgstr ""
-#: gui/fb/fb.cpp:592 gui/fb/fb.cpp:678
+#: gui/fb/fb.cpp:590 gui/fb/fb.cpp:675
#, c-format
-msgid "WARNING: Could not activate VT number %d"
+msgid "Could not activate VT number %d"
msgstr ""
-#: gui/fb/fb.cpp:598 gui/fb/fb.cpp:684
+#: gui/fb/fb.cpp:596 gui/fb/fb.cpp:681
#, c-format
-msgid "WARNING: Error waiting for VT %d becoming active"
+msgid "Error waiting for VT %d becoming active"
msgstr ""
-#: gui/fb/fb.cpp:630
+#: gui/fb/fb.cpp:627
#, c-format
-msgid "WARNING: Could not attach controlling terminal (%s)"
-msgstr ""
-
-#: gui/fb/fb.cpp:638
-msgid "WARNING: Could not query current keyboard mode on VT"
+msgid "Could not attach controlling terminal (%s)"
msgstr ""
-#: gui/fb/fb.cpp:642
-msgid "WARNING: Could not switch to graphics mode on new VT"
+#: gui/fb/fb.cpp:635
+msgid "Could not query current keyboard mode on VT"
msgstr ""
-#: gui/fb/fb.cpp:649
-#, c-format
-msgid "VT %d ready"
-msgstr ""
-
-#: gui/fb/fb.cpp:663
-msgid "Restoring terminal..."
+#: gui/fb/fb.cpp:639
+msgid "Could not switch to graphics mode on new VT"
msgstr ""
-#: gui/fb/fb.cpp:693
-msgid "WARNING: Could not restore keyboard mode"
-msgstr ""
-
-#: gui/fb/fb.cpp:740
-#, c-format
-msgid "Mouse clicked at: %g:%g"
+#: gui/fb/fb.cpp:690
+msgid "Could not restore keyboard mode"
msgstr ""
#: gui/fb/fb_glue_ovg.cpp:73 gui/gtk/gtk_glue_ovg.cpp:88
@@ -11886,24 +11842,6 @@ msgstr ""
msgid "EGL: current ok"
msgstr ""
-#: gui/fb/fb_glue_gles1.cpp:146
-msgid "EGL: pbuffer config ok"
-msgstr ""
-
-#: gui/fb/fb_glue_gles1.cpp:162
-msgid "EGL: pbuffer surface ok"
-msgstr ""
-
-#: gui/fb/fb_glue_gles1.cpp:171
-#, c-format
-msgid "EGL: width %d"
-msgstr ""
-
-#: gui/fb/fb_glue_gles1.cpp:179
-#, c-format
-msgid "EGL: height %d"
-msgstr ""
-
#: gui/fb/fb_glue_agg.cpp:87
#, c-format
msgid "No renderer set in %s!"
@@ -11917,26 +11855,6 @@ msgstr ""
msgid "No Device layer initialized yet!"
msgstr ""
-#: gui/fb/fb_glue_agg.cpp:164
-#, c-format
-msgid "red channel: %d / %d"
-msgstr ""
-
-#: gui/fb/fb_glue_agg.cpp:166
-#, c-format
-msgid "green channel: %d / %d"
-msgstr ""
-
-#: gui/fb/fb_glue_agg.cpp:168
-#, c-format
-msgid "blue channel: %d / %d"
-msgstr ""
-
-#: gui/fb/fb_glue_agg.cpp:170
-#, c-format
-msgid "Total bits per pixel: %d"
-msgstr ""
-
#: gui/fb/fb_glue_agg.cpp:182
msgid "The pixel format of your framebuffer could not be detected."
msgstr ""
@@ -11963,224 +11881,219 @@ msgstr ""
msgid "Error: no input file was specified. Exiting.\n"
msgstr ""
-#: gui/gnash.cpp:209
-#, c-format
-msgid "Host FD #%d, Control FD #%d\n"
-msgstr ""
-
-#: gui/gnash.cpp:213
+#: gui/gnash.cpp:212
msgid "Invalid host communication filedescriptor %1%\n"
msgstr ""
-#: gui/gnash.cpp:220
+#: gui/gnash.cpp:219
msgid "Invalid control communication filedescriptor %1%\n"
msgstr ""
-#: gui/gnash.cpp:252
+#: gui/gnash.cpp:251
msgid "ERROR: -r must be followed by 0, 1, 2 or 3 "
msgstr ""
-#: gui/gnash.cpp:268
+#: gui/gnash.cpp:267
msgid "Debugging options"
msgstr ""
-#: gui/gnash.cpp:274
+#: gui/gnash.cpp:273
msgid "Produce verbose output"
msgstr ""
-#: gui/gnash.cpp:281
+#: gui/gnash.cpp:280
msgid "Produce the disk based debug log"
msgstr ""
-#: gui/gnash.cpp:286
+#: gui/gnash.cpp:285
msgid "Be (very) verbose about action execution"
msgstr ""
-#: gui/gnash.cpp:292
+#: gui/gnash.cpp:291
msgid "Be (very) verbose about parsing"
msgstr ""
-#: gui/gnash.cpp:298
+#: gui/gnash.cpp:297
msgid "Print FPS every num seconds"
msgstr ""
-#: gui/gnash.cpp:321
+#: gui/gnash.cpp:320
msgid "Options"
msgstr ""
-#: gui/gnash.cpp:326
+#: gui/gnash.cpp:325
msgid "Print this help and exit"
msgstr ""
-#: gui/gnash.cpp:329
+#: gui/gnash.cpp:328
msgid "Print version information and exit"
msgstr ""
-#: gui/gnash.cpp:334
+#: gui/gnash.cpp:333
msgid "Scale the movie by the specified factor"
msgstr ""
-#: gui/gnash.cpp:338
+#: gui/gnash.cpp:337
msgid "Number of milliseconds to delay in main loop"
msgstr ""
-#: gui/gnash.cpp:342
+#: gui/gnash.cpp:341
msgid "Audio dump file (wave format)"
msgstr ""
-#: gui/gnash.cpp:347
+#: gui/gnash.cpp:346
msgid "Hardware Video Accelerator to use"
msgstr ""
-#: gui/gnash.cpp:352
+#: gui/gnash.cpp:351
msgid "X11 Window ID for display"
msgstr ""
-#: gui/gnash.cpp:356
+#: gui/gnash.cpp:355
msgid "Set window width"
msgstr ""
-#: gui/gnash.cpp:360
+#: gui/gnash.cpp:359
msgid "Set window height"
msgstr ""
-#: gui/gnash.cpp:364
+#: gui/gnash.cpp:363
msgid "Set window x position"
msgstr ""
-#: gui/gnash.cpp:368
+#: gui/gnash.cpp:367
msgid "Set window y position"
msgstr ""
-#: gui/gnash.cpp:373
+#: gui/gnash.cpp:372
msgid "Exit when/if movie reaches the last frame"
msgstr ""
-#: gui/gnash.cpp:379
+#: gui/gnash.cpp:378
msgid "disable rendering and sound"
msgstr ""
-#: gui/gnash.cpp:381
+#: gui/gnash.cpp:380
msgid "enable rendering, disable sound"
msgstr ""
-#: gui/gnash.cpp:383
+#: gui/gnash.cpp:382
msgid "enable sound, disable rendering"
msgstr ""
-#: gui/gnash.cpp:385
+#: gui/gnash.cpp:384
msgid "enable rendering and sound"
msgstr ""
-#: gui/gnash.cpp:393
+#: gui/gnash.cpp:392
msgid "The media handler to use"
msgstr ""
-#: gui/gnash.cpp:401
+#: gui/gnash.cpp:400
msgid "The renderer to use"
msgstr ""
-#: gui/gnash.cpp:407
+#: gui/gnash.cpp:406
msgid "Exit after the specified number of seconds"
msgstr ""
-#: gui/gnash.cpp:410
+#: gui/gnash.cpp:409
msgid "Set \"real\" URL of the movie"
msgstr ""
-#: gui/gnash.cpp:414
+#: gui/gnash.cpp:413
msgid "Set \"base\" URL for resolving relative URLs"
msgstr ""
-#: gui/gnash.cpp:419
+#: gui/gnash.cpp:418
msgid "Set parameter (e.g. \"FlashVars=A=1&b=2\")"
msgstr ""
-#: gui/gnash.cpp:423
+#: gui/gnash.cpp:422
msgid "Filedescriptor to use for external communications"
msgstr ""
-#: gui/gnash.cpp:429
+#: gui/gnash.cpp:428
msgid "Exit after specified number of frame advances"
msgstr ""
-#: gui/gnash.cpp:433
+#: gui/gnash.cpp:432
msgid "Start in fullscreen mode"
msgstr ""
-#: gui/gnash.cpp:438
+#: gui/gnash.cpp:437
msgid "Start without displaying the menu bar"
msgstr ""
-#: gui/gnash.cpp:443
+#: gui/gnash.cpp:442
msgid "List of frames to save as screenshots"
msgstr ""
-#: gui/gnash.cpp:447
+#: gui/gnash.cpp:446
msgid "Filename pattern for screenshot images"
msgstr ""
-#: gui/gnash.cpp:451
+#: gui/gnash.cpp:450
msgid "Quality for screenshot output (not all formats)"
msgstr ""
-#: gui/gnash.cpp:454
+#: gui/gnash.cpp:453
msgid "Input files"
msgstr ""
-#: gui/gnash.cpp:465
+#: gui/gnash.cpp:464
msgid "Dump options"
msgstr ""
-#: gui/gnash.cpp:470
+#: gui/gnash.cpp:469
msgid "Video dump file (raw format) and optional video FPS (@<num>)"
msgstr ""
-#: gui/gnash.cpp:472
+#: gui/gnash.cpp:471
msgid "Number of milliseconds to sleep between advances"
msgstr ""
-#: gui/gnash.cpp:474
+#: gui/gnash.cpp:473
msgid "Trigger expression to start dumping"
msgstr ""
-#: gui/gnash.cpp:486
+#: gui/gnash.cpp:485
msgid "Keys:\n"
msgstr ""
-#: gui/gnash.cpp:488
+#: gui/gnash.cpp:487
msgid "Quit\n"
msgstr ""
-#: gui/gnash.cpp:490
+#: gui/gnash.cpp:489
msgid "Toggle fullscreen\n"
msgstr ""
-#: gui/gnash.cpp:492
+#: gui/gnash.cpp:491
msgid "Toggle pause\n"
msgstr ""
-#: gui/gnash.cpp:494
+#: gui/gnash.cpp:493
msgid "Restart the movie\n"
msgstr ""
-#: gui/gnash.cpp:496
+#: gui/gnash.cpp:495
msgid "Take a screenshot\n"
msgstr ""
-#: gui/gnash.cpp:498
+#: gui/gnash.cpp:497
msgid "Force immediate redraw\n"
msgstr ""
-#: gui/gnash.cpp:504
+#: gui/gnash.cpp:503
msgid "Usage: gnash [options] movie_file.swf\n"
msgstr ""
-#: gui/gnash.cpp:505
+#: gui/gnash.cpp:504
msgid "Plays a SWF (Shockwave Flash) movie\n"
msgstr ""
-#: gui/gnash.cpp:522
+#: gui/gnash.cpp:521
msgid ""
"Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software "
"Foundation, Inc.\n"
@@ -12190,31 +12103,31 @@ msgid ""
"\n"
msgstr ""
-#: gui/gnash.cpp:533
+#: gui/gnash.cpp:532
msgid "Build options "
msgstr ""
-#: gui/gnash.cpp:534
+#: gui/gnash.cpp:533
msgid " Renderers: "
msgstr ""
-#: gui/gnash.cpp:535
+#: gui/gnash.cpp:534
msgid " Hardware Acceleration: "
msgstr ""
-#: gui/gnash.cpp:536
+#: gui/gnash.cpp:535
msgid " GUI: "
msgstr ""
-#: gui/gnash.cpp:537
+#: gui/gnash.cpp:536
msgid " Media handlers: "
msgstr ""
-#: gui/gnash.cpp:539
+#: gui/gnash.cpp:538
msgid " Configured with: "
msgstr ""
-#: gui/gnash.cpp:540
+#: gui/gnash.cpp:539
msgid " CXXFLAGS: "
msgstr ""
@@ -12243,6 +12156,11 @@ msgstr ""
msgid "Unable to write file '%s'."
msgstr ""
+#: gui/ScreenShotter.cpp:99
+#, c-format
+msgid "Failed to open screenshot file \"%s\"!"
+msgstr ""
+
#: gui/haiku/haiku.cpp:141
msgid "spawn_thread failed"
msgstr ""
@@ -12288,14 +12206,6 @@ msgstr ""
msgid "AGG renderer not supported!"
msgstr ""
-#: gui/qt/Qt4Gui.cpp:208
-msgid "Setting renderer"
-msgstr ""
-
-#: gui/qt/Qt4Gui.cpp:212
-msgid "Set renderer"
-msgstr ""
-
#: gui/qt/Qt4Gui.cpp:467 gui/gtk/gtk.cpp:1708
msgid "Movie properties"
msgstr ""
@@ -12635,75 +12545,94 @@ msgstr ""
msgid "Mouse show/hide not yet supported in this GUI"
msgstr ""
-#: gui/gui.cpp:483
+#: gui/gui.cpp:282
+msgid "Can't update stage matrix till VM is initialized"
+msgstr ""
+
+#: gui/gui.cpp:334
#, c-format
-msgid "mouse @ %d,%d"
+msgid "Invalid scaleMode %d"
msgstr ""
-#: gui/gui.cpp:959
+#: gui/gui.cpp:374
#, c-format
-msgid "Frame %d"
+msgid "Invalid horizontal align %d"
msgstr ""
-#: gui/Player.cpp:169
+#: gui/gui.cpp:405
#, c-format
-msgid "Unhandled callback %s with arguments %s"
+msgid "Invalid vertical align %d"
+msgstr ""
+
+#: gui/gui.cpp:900
+msgid "Gui is in stop mode, won't start application"
msgstr ""
-#: gui/Player.cpp:262
+#: gui/gui.cpp:1261
#, c-format
-msgid "Timer delay set to %d milliseconds"
+msgid "This gui didn't override 'yesno', assuming 'yes' answer to question: %s"
+msgstr ""
+
+#: gui/gui.cpp:1270
+msgid "Gui::setQuality called before a movie_root was available"
+msgstr ""
+
+#: gui/gui.cpp:1280
+msgid "Gui::getQuality called before a movie_root was available"
+msgstr ""
+
+#: gui/Player.cpp:131
+msgid "GUI ExternalInterface.Pan event"
msgstr ""
-#: gui/Player.cpp:308
+#: gui/Player.cpp:143
+msgid "GUI ExternalInterface.SetZoomRect event"
+msgstr ""
+
+#: gui/Player.cpp:151
+msgid "GUI ExternalInterface.Zoom event"
+msgstr ""
+
+#: gui/Player.cpp:169
#, c-format
-msgid "Activating FPS debugging every %g seconds"
+msgid "Unhandled callback %s with arguments %s"
msgstr ""
#: gui/Player.cpp:434
msgid "Non-existent media handler %1% specified"
msgstr ""
-#: gui/Player.cpp:481
+#: gui/Player.cpp:545
#, c-format
-msgid ""
-"Input movie has collapsed dimensions %d/%d. Setting to 1/1 and going on."
+msgid "Movie Frame Rate is %d, adjusting delay"
msgstr ""
-#: gui/Player.cpp:683
+#: gui/Player.cpp:682
msgid "Got unexpected argument type for message %1%"
msgstr ""
-#: gui/Player.cpp:725
+#: gui/Player.cpp:717
#, c-format
-msgid "Sent FsCommand '%s' to host fd %d"
-msgstr ""
-
-#: gui/Player.cpp:733
-#, c-format
-msgid "Running as plugin: skipping internal handling of FsCommand %s%s."
+msgid ""
+"Could only write %d bytes over %d required to user-provided host requests fd "
+"%d"
msgstr ""
-#: gui/Player.cpp:774
+#: gui/Player.cpp:773
#, c-format
msgid "FsCommand exec called with argument %s"
msgstr ""
-#: gui/Player.cpp:791
+#: gui/Player.cpp:790
#, c-format
msgid "FsCommand trapallkeys called with argument %s"
msgstr ""
-#: gui/Player.cpp:797
+#: gui/Player.cpp:796
#, c-format
msgid "FsCommand '%s(%s)' not handled internally"
msgstr ""
-#: gui/gtk/gtk_canvas.cpp:123
-#, c-format
-msgid "gnash_canvas_size_allocate %d %d"
-msgstr ""
-
#: gui/gtk/gtk_glue_cairo.cpp:223
msgid "Cairo: failed to create a rendering buffer!"
msgstr ""
@@ -12716,11 +12645,6 @@ msgstr ""
msgid "No off screen buffer!"
msgstr ""
-#: gui/gtk/gtk_glue_ovg.cpp:405
-#, c-format
-msgid "Config[%d] is:"
-msgstr ""
-
#: gui/gtk/gtk_glue_agg_vaapi.cpp:163
msgid "WARNING: failed to create VA-API display."
msgstr ""
@@ -12728,56 +12652,36 @@ msgstr ""
#: gui/gtk/gtk_glue_agg_vaapi.cpp:204
#, c-format
msgid ""
-"GTK-AGG: Unknown RGB format %s reported by VA-API. Please report this to the "
+"GTK-AGG: Unknown RGB format %s reported by VA-API.Please report this to the "
"gnash-dev mailing list."
msgstr ""
-#: gui/gtk/gtk_glue_agg_vaapi.cpp:230 gui/gtk/gtk_glue_agg_vaapi.cpp:288
-msgid "ERROR: failed to map VA-API image."
+#: gui/gtk/gtk_glue_agg_vaapi.cpp:231 gui/gtk/gtk_glue_agg_vaapi.cpp:289
+msgid "failed to map VA-API image."
msgstr ""
-#: gui/gtk/gtk_glue_agg_vaapi.cpp:236
-msgid "ERROR: failed to associate VA-API subpicture."
+#: gui/gtk/gtk_glue_agg_vaapi.cpp:237
+msgid "failed to associate VA-API subpicture."
msgstr ""
-#: gui/gtk/gtk_glue_agg_vaapi.cpp:370
+#: gui/gtk/gtk_glue_agg_vaapi.cpp:371
#, c-format
-msgid "ERROR: failed to setup video window for surface 0x%08x."
+msgid "failed to setup video window for surface 0x%08x."
msgstr ""
-#: gui/gtk/gtk_glue_agg_vaapi.cpp:377
+#: gui/gtk/gtk_glue_agg_vaapi.cpp:378
#, c-format
-msgid "ERROR: failed to associate subpicture to surface 0x%08x."
+msgid "failed to associate subpicture to surface 0x%08x."
msgstr ""
#: gui/gtk/gtk.cpp:159
msgid "Failed to initialize X threading support\n"
msgstr ""
-#: gui/gtk/gtk.cpp:173
-msgid "Created XEmbedded window"
-msgstr ""
-
-#: gui/gtk/gtk.cpp:176
-msgid "Created top level window"
-msgstr ""
-
-#: gui/gtk/gtk.cpp:189
-msgid "DRI extension found"
-msgstr ""
-
-#: gui/gtk/gtk.cpp:196
-msgid "GLX extension found"
-msgstr ""
-
#: gui/gtk/gtk.cpp:202
msgid "This system lacks a hardware OpenGL driver!"
msgstr ""
-#: gui/gtk/gtk.cpp:211
-msgid "Xvideo extension found"
-msgstr ""
-
#: gui/gtk/gtk.cpp:223
msgid "Click to play"
msgstr ""
@@ -12791,10 +12695,6 @@ msgstr ""
msgid "Sound"
msgstr ""
-#: gui/gtk/gtk.cpp:733
-msgid "GtkGui: Window resize request received"
-msgstr ""
-
#: gui/gtk/gtk.cpp:1274
msgid "_Network"
msgstr ""
@@ -13022,29 +12922,16 @@ msgstr ""
msgid "Open file"
msgstr ""
-#: gui/gtk/gtk_glue_gtkglext.cpp:63
-#, c-format
-msgid "OpenGL extension version - %d.%d"
-msgstr ""
-
-#: gui/gtk/gtk_glue_gtkglext.cpp:73
+#: gui/gtk/gtk_glue_gtkglext.cpp:72
msgid ""
"Cannot find the double-buffered visual.\n"
"Trying single-buffered visual."
msgstr ""
-#: gui/gtk/gtk_glue_gtkglext.cpp:79
+#: gui/gtk/gtk_glue_gtkglext.cpp:78
msgid "No appropriate OpenGL-capable visual found."
msgstr ""
-#: gui/gtk/gtk_glue_gtkglext.cpp:82
-msgid "Got single-buffered visual."
-msgstr ""
-
-#: gui/gtk/gtk_glue_gtkglext.cpp:85
-msgid "Got double-buffered visual."
-msgstr ""
-
#: extensions/mysql/mysql_db.cpp:186
msgid "Couldn't initialize database"
msgstr ""
-----------------------------------------------------------------------
Summary of changes:
gui/Player.cpp | 39 ++--
gui/ScreenShotter.cpp | 2 +-
gui/fb/fb.cpp | 59 +++---
gui/fb/fb_glue_agg.cpp | 10 +-
gui/fb/fb_glue_gles1.cpp | 8 +-
gui/gnash.cpp | 3 +-
gui/gtk/gtk.cpp | 14 +-
gui/gtk/gtk_canvas.cpp | 2 +-
gui/gtk/gtk_glue_agg_vaapi.cpp | 19 +-
gui/gtk/gtk_glue_gtkglext.cpp | 7 +-
gui/gtk/gtk_glue_ovg.cpp | 4 +-
gui/gui.cpp | 31 ++--
gui/qt/Qt4Gui.cpp | 4 +-
po/gnash.pot | 413 +++++++++++++++-------------------------
14 files changed, 248 insertions(+), 367 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-1362-gdb90367,
Rob Savoye <=