OSDN Git Service

ゴミデーターを削除 master
authorLogue <logue@hotmail.co.jp>
Sat, 25 Feb 2012 02:54:47 +0000 (11:54 +0900)
committerLogue <logue@hotmail.co.jp>
Sat, 25 Feb 2012 02:54:47 +0000 (11:54 +0900)
翻訳するべき語句をwxT()から_()に変更した。

21 files changed:
.gitignore
Physics/PhysicsDocument.cpp
ShapeFusionApp.cpp
ShapeFusionDocManager.cpp
Shapes/BitmapBrowser.cpp
Shapes/BitmapView.cpp
Shapes/FrameBrowser.cpp
Shapes/FrameView.cpp
Shapes/Makefile.in [deleted file]
Shapes/SequenceView.cpp
Shapes/ShapesDocument.cpp
Shapes/ShapesElements.cpp
Shapes/ShapesView.cpp
Shapes/utilities.cpp
Sounds/Makefile.in [deleted file]
Sounds/SoundsDocument.cpp
Sounds/SoundsElements.cpp
Sounds/SoundsView.cpp
locale/ShapeFusion.pot
locale/ja/ShapeFusion.mo
locale/ja/ShapeFusion.po

index 208c024..345483d 100644 (file)
@@ -30,4 +30,7 @@ Makefile.in
 # Compiled Binary
 *.exe
 \r
-*.in
\ No newline at end of file
+*.in
+/Physics/Makefile.in\r
+/Sounds/Makefile.in\r
+/Shapes/Makefile.in
\ No newline at end of file
index bf8630c..f3cd09a 100644 (file)
@@ -50,7 +50,7 @@ bool PhysicsDocument::DoOpenDocument(const wxString& file)
        bool wxOpen = wxDocument::DoOpenDocument(file);
 
        if (!(wxOpen && mGoodData)) {
-               wxLogError(wxT("[PhysicsDocument] There was an error while opening, see log"));
+               wxLogError(_("[PhysicsDocument] There was an error while opening, see log"));
                return false;
        }
        return true;
@@ -74,7 +74,7 @@ wxInputStream& PhysicsDocument::LoadObject(wxInputStream& stream)
        int data_version = wad_header.ReadShort();
 
        if (!(version == 1 || version == 2) || !(data_version == 0 || data_version == 1)) {
-               wxLogError(wxT("[PhysicsDocument] Error loading: Incorrect version/data version (%i/%i)"), version, data_version);
+               wxLogError(_("[PhysicsDocument] Error loading: Incorrect version/data version (%i/%i)"), version, data_version);
                return stream;
        }
 
@@ -89,7 +89,7 @@ wxInputStream& PhysicsDocument::LoadObject(wxInputStream& stream)
        int entry_header_size = wad_header.ReadShort();
        
        if (wad_count != 1) {
-               wxLogError(wxT("[PhysicsDocument] Error loading: wad count must be 1"));
+               wxLogError(_("[PhysicsDocument] Error loading: wad count must be 1"));
                return stream;
        }
 
@@ -108,7 +108,7 @@ wxInputStream& PhysicsDocument::LoadObject(wxInputStream& stream)
        int wad_index = directory_entry.ReadShort();
 
        if (wad_index != 0) {
-               wxLogError(wxT("[PhysicsDocument] Error loading: first wad index must be 0"));
+               wxLogError(_("[PhysicsDocument] Error loading: first wad index must be 0"));
                return stream;
        }
 
index 793f592..0d166bd 100644 (file)
@@ -51,12 +51,12 @@ bool ShapeFusionApp::OnInit(void)
        m_docManager = new ShapeFusionDocManager;
 
        // Create a template relating drawing documents to their views
-       (void) new wxDocTemplate(m_docManager, wxT("Shapes"), wxT("*"), wxT(""), wxT(""), wxT("Shapes"), wxT("Shapes"),
+       (void) new wxDocTemplate(m_docManager, wxT("Shapes"), wxT("*"), wxT(""), wxT(""), _("Shapes"), _("Shapes"),
                CLASSINFO(ShapesDocument), CLASSINFO(ShapesView));
-       (void) new wxDocTemplate(m_docManager, wxT("Sounds"), wxT("*"), wxT(""), wxT(""), wxT("Sounds"), wxT("Sounds"),
+       (void) new wxDocTemplate(m_docManager, wxT("Sounds"), wxT("*"), wxT(""), wxT(""), _("Sounds"), _("Sounds"),
                CLASSINFO(SoundsDocument), CLASSINFO(SoundsView));
 
-       (void) new wxDocTemplate(m_docManager, wxT("Physics"), wxT("*"), wxT(""), wxT(""), wxT("Physics"), wxT("Physics"), CLASSINFO(PhysicsDocument), CLASSINFO(PhysicsView));
+       (void) new wxDocTemplate(m_docManager, wxT("Physics"), wxT("*"), wxT(""), wxT(""), _("Physics"), _("Physics"), CLASSINFO(PhysicsDocument), CLASSINFO(PhysicsView));
 
 #ifdef __WXMAC__
        //TODO: Put correct file extension values here
index d1b71a2..245b8bf 100644 (file)
@@ -42,9 +42,9 @@ wxDocTemplate* ShapeFusionDocManager::FindTemplateForPath(const wxString& path)
        wxString ext = filename.GetExt();
        
        if (ext == wxT("sndA") || ext == wxT("snd2")) {
-               return ::FindTemplate(GetTemplates(), _("Sounds"));
+               return ::FindTemplate(GetTemplates(), wxT("Sounds"));
        } else if (ext == wxT("shpA") || ext == wxT("shp2")) {
-               return ::FindTemplate(GetTemplates(), _("Shapes"));
+               return ::FindTemplate(GetTemplates(), wxT("Shapes"));
        }
 
        wxFileInputStream stream(path);
@@ -65,7 +65,7 @@ wxDocTemplate* ShapeFusionDocManager::FindTemplateForPath(const wxString& path)
                unsigned long version = buffer.ReadULong();
                if ((version == 0 || version == 1) 
                    && strncmp(reinterpret_cast<const char*>(&header[4]), "snd2", 4) == 0) {
-                       return ::FindTemplate(GetTemplates(), _("Sounds"));
+                       return ::FindTemplate(GetTemplates(), wxT("Sounds"));
                }
        }
 
@@ -96,7 +96,7 @@ wxDocTemplate* ShapeFusionDocManager::FindTemplateForPath(const wxString& path)
                }
 
                if (is_shapes) {
-                       return ::FindTemplate(GetTemplates(), _("Shapes"));
+                       return ::FindTemplate(GetTemplates(), wxT("Shapes"));
                }
        }
 
@@ -118,7 +118,7 @@ wxDocTemplate* ShapeFusionDocManager::FindTemplateForPath(const wxString& path)
                        unsigned char tag[4];
                        stream.Read(tag, 4);
                        if (strncmp(reinterpret_cast<const char*>(tag), "MNpx", 4) == 0) {
-                               return ::FindTemplate(GetTemplates(), _("Physics"));
+                               return ::FindTemplate(GetTemplates(), wxT("Physics"));
                        }
                }
        }
index e3a69c4..4d0d6c6 100644 (file)
@@ -254,7 +254,7 @@ void BitmapBrowser::AddBitmap(ShapesBitmap *bp)
                                Refresh();
                        }
                } else {
-                       wxLogError(wxT("[BitmapBrowser] Added a bitmap with NULL pixels"));
+                       wxLogError(_("[BitmapBrowser] Added a bitmap with NULL pixels"));
                }
        }
 }
index c949df6..3c41292 100644 (file)
@@ -116,7 +116,7 @@ void BitmapView::SetBitmap(ShapesBitmap *bp)
                                mDecBmp = wxBitmap(ShapesBitmapToImage(mEncBmp, mColorTable, mWhiteTransparency));
                        Refresh();
                } else {
-                       wxLogError(wxT("[BitmapView] Addes a bitmap with NULL pixels"));
+                       wxLogError(_("[BitmapView] Addes a bitmap with NULL pixels"));
                        SetVirtualSize(0, 0);
                }
        } else {
index 025df93..5514c12 100644 (file)
@@ -269,7 +269,7 @@ void FrameBrowser::AddBitmap(ShapesBitmap *bp)
                if (bp->Pixels() != NULL)
                        mBitmaps.push_back(bp);
                else
-                       wxLogError(wxT("FrameBrowser: someone tried to add a bitmap with NULL pixels"));
+                       wxLogError(_("FrameBrowser: someone tried to add a bitmap with NULL pixels"));
        }
 }
 
index abad672..10d9131 100644 (file)
@@ -77,8 +77,8 @@ void FrameView::OnPaint(wxPaintEvent& e)
                        tempdc.CrossHair(mFrame->KeyX() + origin_x, mFrame->KeyY() + origin_y);
                        tempdc.DrawCircle(mFrame->KeyX() + origin_x, mFrame->KeyY() + origin_y, 2);
                        // origin & key labels
-                       wxString        origin_label = wxT("Origin"),
-                                               key_label = wxT("Keypoint");
+                       wxString        origin_label = _("Origin"),
+                                               key_label = _("Keypoint");
                        int                     text1w, text1h, text2w, text2h;
 
                        tempdc.SetFont(*wxSMALL_FONT);
@@ -95,7 +95,7 @@ void FrameView::OnPaint(wxPaintEvent& e)
                        else
                                tempdc.DrawText(key_label, vw - text2w - 2, mFrame->KeyY() + origin_y + 2);
                } else {
-                       wxString        no_bmp_label = wxT("No associated bitmap");
+                       wxString        no_bmp_label = _("No associated bitmap");
                        int                     text_w, text_h,
                                                origin_x = vw/2, origin_y = vh/2;
 
@@ -297,7 +297,7 @@ void FrameView::SetBitmap(ShapesBitmap *bp)
                        }
                        Refresh();
                } else {
-                       wxLogError(wxT("[FrameView] Added a bitmap with NULL pixels"));
+                       wxLogError(_("[FrameView] Added a bitmap with NULL pixels"));
                        SetVirtualSize(cw, ch);
                }
        } else {
diff --git a/Shapes/Makefile.in b/Shapes/Makefile.in
deleted file mode 100644 (file)
index 9ddd44c..0000000
+++ /dev/null
@@ -1,484 +0,0 @@
-# Makefile.in generated by automake 1.11.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = Shapes
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
-ARFLAGS = cru
-libshapes_a_AR = $(AR) $(ARFLAGS)
-libshapes_a_LIBADD =
-am_libshapes_a_OBJECTS = BitmapBrowser.$(OBJEXT) BitmapView.$(OBJEXT) \
-       CTBrowser.$(OBJEXT) CTView.$(OBJEXT) FrameBrowser.$(OBJEXT) \
-       FrameView.$(OBJEXT) SequenceView.$(OBJEXT) \
-       ShapesDocument.$(OBJEXT) ShapesElements.$(OBJEXT) \
-       ShapesView.$(OBJEXT) ShapesTreeItemData.$(OBJEXT) \
-       utilities.$(OBJEXT)
-libshapes_a_OBJECTS = $(am_libshapes_a_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-       -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libshapes_a_SOURCES)
-DIST_SOURCES = $(libshapes_a_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
-SNDFILE_LIBS = @SNDFILE_LIBS@
-STRIP = @STRIP@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WX_CFLAGS = @WX_CFLAGS@
-WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
-WX_CONFIG_PATH = @WX_CONFIG_PATH@
-WX_CPPFLAGS = @WX_CPPFLAGS@
-WX_CXXFLAGS = @WX_CXXFLAGS@
-WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
-WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
-WX_RESCOMP = @WX_RESCOMP@
-WX_VERSION = @WX_VERSION@
-WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
-WX_VERSION_MICRO = @WX_VERSION_MICRO@
-WX_VERSION_MINOR = @WX_VERSION_MINOR@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-noinst_LIBRARIES = libshapes.a
-libshapes_a_SOURCES = BitmapBrowser.h BitmapView.h CTBrowser.h         \
-       CTView.h FrameBrowser.h FrameView.h SequenceView.h              \
-       ShapesDocument.h ShapesElements.h ShapesTreeItemData.h          \
-       ShapesView.h utilities.h BitmapBrowser.cpp BitmapView.cpp       \
-       CTBrowser.cpp CTView.cpp FrameBrowser.cpp FrameView.cpp         \
-       SequenceView.cpp ShapesDocument.cpp ShapesElements.cpp          \
-       ShapesView.cpp ShapesTreeItemData.cpp utilities.cpp
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-               && { if test -f $@; then exit 0; else break; fi; }; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Shapes/Makefile'; \
-       $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --foreign Shapes/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLIBRARIES:
-       -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libshapes.a: $(libshapes_a_OBJECTS) $(libshapes_a_DEPENDENCIES) 
-       -rm -f libshapes.a
-       $(libshapes_a_AR) libshapes.a $(libshapes_a_OBJECTS) $(libshapes_a_LIBADD)
-       $(RANLIB) libshapes.a
-
-mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
-
-distclean-compile:
-       -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BitmapBrowser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BitmapView.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CTBrowser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CTView.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FrameBrowser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FrameView.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SequenceView.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ShapesDocument.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ShapesElements.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ShapesTreeItemData.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ShapesView.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utilities.Po@am__quote@
-
-.cpp.o:
-@am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       set x; \
-       here=`pwd`; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       shift; \
-       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-         test -n "$$unique" || unique=$$empty_fix; \
-         if test $$# -gt 0; then \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             "$$@" $$unique; \
-         else \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$unique; \
-         fi; \
-       fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       test -z "$(CTAGS_ARGS)$$unique" \
-         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$unique
-
-GTAGS:
-       here=`$(am__cd) $(top_builddir) && pwd` \
-         && $(am__cd) $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       list='$(DISTFILES)'; \
-         dist_files=`for file in $$list; do echo $$file; done | \
-         sed -e "s|^$$srcdirstrip/||;t" \
-             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-       case $$dist_files in \
-         */*) $(MKDIR_P) `echo "$$dist_files" | \
-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                          sort -u` ;; \
-       esac; \
-       for file in $$dist_files; do \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         if test -d $$d/$$file; then \
-           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-           if test -d "$(distdir)/$$file"; then \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-         else \
-           test -f "$(distdir)/$$file" \
-           || cp -p $$d/$$file "$(distdir)/$$file" \
-           || exit 1; \
-         fi; \
-       done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-       if test -z '$(STRIP)'; then \
-         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-             install; \
-       else \
-         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-           "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-       fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-       distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-       clean-noinstLIBRARIES ctags distclean distclean-compile \
-       distclean-generic distclean-tags distdir dvi dvi-am html \
-       html-am info info-am install install-am install-data \
-       install-data-am install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am install-info \
-       install-info-am install-man install-pdf install-pdf-am \
-       install-ps install-ps-am install-strip installcheck \
-       installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-compile \
-       mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-       uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
index 3d02513..25cc76a 100644 (file)
@@ -388,7 +388,7 @@ void SequenceView::AddBitmap(ShapesBitmap *bp)
                if (bp->Pixels() != NULL)
                        mBitmaps.push_back(bp);
                else
-                       wxLogError(wxT("SequenceView: someone tried to add a bitmap with NULL pixels"));
+                       wxLogError(_("SequenceView: someone tried to add a bitmap with NULL pixels"));
        }
 }
 
index ea279ce..4274d29 100644 (file)
@@ -169,7 +169,7 @@ bool ShapesDocument::DoOpenDocument(const wxString& file)
        bool wxOpen = wxDocument::DoOpenDocument(file);
        
        if (!(wxOpen && mGoodData)) {
-               wxLogError(wxT("[ShapesDocument] There was an error while loading, see log"));
+               wxLogError(_("[ShapesDocument] There was an error while loading, see log"));
                return false;
        }
        return true;
@@ -236,7 +236,7 @@ wxOutputStream& ShapesDocument::SavePatch(wxOutputStream& stream, const ShapesDo
 #endif
 {
        if (mCollections.size() != other.mCollections.size()) {
-               wxLogError(wxT("[ShapesDocument] Shapes files must contain the same number of collections to generate a patch"));
+               wxLogError(_("[ShapesDocument] Shapes files must contain the same number of collections to generate a patch"));
                return stream;
        }
 
@@ -269,7 +269,7 @@ wxInputStream& ShapesDocument::LoadObject(wxInputStream& stream)
        wxInt32 filesize = stream.GetSize();
 #endif
        if (filesize < COLLECTIONS_PER_FILE * SIZEOF_collection_header) {
-               wxLogError(wxT("[ShapesDocument] File too small to be a Marathon shapes file"));
+               wxLogError(_("[ShapesDocument] File too small to be a Marathon shapes file"));
                return stream;
        }
 
@@ -280,7 +280,7 @@ wxInputStream& ShapesDocument::LoadObject(wxInputStream& stream)
                ShapesCollection        *c = new ShapesCollection(IsVerbose());
 
                if (IsVerbose())
-                       wxLogDebug(wxT("[ShapesDocument] Trying to load collection %d"), i);
+                       wxLogDebug(_("[ShapesDocument] Trying to load collection %d"), i);
 
 #if wxUSE_STD_IOSTREAM
                stream.seekg(i * SIZEOF_collection_header, std::ios::beg);
@@ -299,7 +299,7 @@ wxInputStream& ShapesDocument::LoadObject(wxInputStream& stream)
        if (i >= COLLECTIONS_PER_FILE)
                mGoodData = true;
        else
-               wxLogError(wxT("[ShapesDocument] Could not find enough collections. This may not be a Marathon Shapes file."));
+               wxLogError(_("[ShapesDocument] Could not find enough collections. This may not be a Marathon Shapes file."));
 
        return stream;
 }
@@ -335,7 +335,7 @@ bool ShapesDocument::LoadPatch(wxInputStream& stream)
                                return false;
                        }
                } else {
-                       wxLogError(wxT("Shapes patches cannot add entire collections"));
+                       wxLogError(_("Shapes patches cannot add entire collections"));
                        return false;
                }
        }
index 90182c6..bcc711d 100644 (file)
@@ -135,7 +135,7 @@ ShapesColorTable::ShapesColorTable(std::ifstream& ifs, wxString file_ext): Shape
                        colorCount = 256;
                } else {
                        // we need at least 3*256 bytes
-                       wxLogError(wxT("This Adobe Color Table file has an invalid size: will not try to load it."));
+                       wxLogError(_("This Adobe Color Table file has an invalid size: will not try to load it."));
                        return;
                }
                ifs.seekg(0, std::ios::beg);
@@ -211,7 +211,7 @@ BigEndianBuffer& ShapesColorTable::LoadObject(BigEndianBuffer& buffer, unsigned
                color->LoadObject(buffer);
                
                if (!color->IsGood()) {
-                       wxLogError(wxT("[ShapesColorTable] Error loading color table"));
+                       wxLogError(_("[ShapesColorTable] Error loading color table"));
                        mGoodData = false;
                        return buffer;
                }
@@ -434,15 +434,15 @@ BigEndianBuffer& ShapesBitmap::LoadObject(BigEndianBuffer& buffer, unsigned int
        mBytesPerRow = buffer.ReadShort();
 
        if (mWidth < 0) {
-               wxLogError(wxT("[ShapesBitmap] Invalid bitmap width %d"), mWidth);
+               wxLogError(_("[ShapesBitmap] Invalid bitmap width %d"), mWidth);
                return buffer;
        }
        if (mHeight < 0) {
-               wxLogError(wxT("[ShapesBitmap] Invalid bitmap height %d"), mHeight);
+               wxLogError(_("[ShapesBitmap] Invalid bitmap height %d"), mHeight);
                return buffer;
        }
        if (mBytesPerRow < -1) {
-               wxLogError(wxT("[ShapesBitmap] Invalid bitmap bytes-per-row %d"), mBytesPerRow);
+               wxLogError(_("[ShapesBitmap] Invalid bitmap bytes-per-row %d"), mBytesPerRow);
                return buffer;
        }
 
@@ -453,16 +453,16 @@ BigEndianBuffer& ShapesBitmap::LoadObject(BigEndianBuffer& buffer, unsigned int
 
        mBitDepth = buffer.ReadShort();
        if (mBitDepth != 8) {
-               wxLogError(wxT("[ShapesBitmap] Invalid bitmap depth %d"), mBitDepth);
+               wxLogError(_("[ShapesBitmap] Invalid bitmap depth %d"), mBitDepth);
                return buffer;
        }
 
        if (IsVerbose()) {
-               wxLogDebug(wxT("[ShapesBitmap]         Width:           %d"), mWidth);
-               wxLogDebug(wxT("[ShapesBitmap]         Height:          %d"), mHeight);
-               wxLogDebug(wxT("[ShapesBitmap]         Bytes/Row:       %d"), mBytesPerRow);
-               wxLogDebug(wxT("[ShapesBitmap]         Flags:           %d"), flags);
-               wxLogDebug(wxT("[ShapesBitmap]         Bit Depth:       %d"), mBitDepth);
+               wxLogDebug(_("[ShapesBitmap]         Width:             %d"), mWidth);
+               wxLogDebug(_("[ShapesBitmap]         Height:            %d"), mHeight);
+               wxLogDebug(_("[ShapesBitmap]         Bytes/Row: %d"), mBytesPerRow);
+               wxLogDebug(_("[ShapesBitmap]         Flags:             %d"), flags);
+               wxLogDebug(_("[ShapesBitmap]         Bit Depth: %d"), mBitDepth);
        }
 
        // skip unused fields and placeholders
@@ -473,7 +473,7 @@ BigEndianBuffer& ShapesBitmap::LoadObject(BigEndianBuffer& buffer, unsigned int
        // load pixel data
        mPixels = new unsigned char[mWidth * mHeight];
        if (mPixels == NULL) {
-               wxLogError(wxT("[ShapesBitmap] Could not allocate pixel buffer"));
+               wxLogError(_("[ShapesBitmap] Could not allocate pixel buffer"));
                return buffer;
        }
        if (mBytesPerRow > -1) {
@@ -694,7 +694,7 @@ void ShapesBitmap::FromImage(wxImage image, ShapesColorTable* colortable)
 
        mPixels = new unsigned char[mWidth * mHeight];
        if (mPixels == NULL) {
-               wxLogError(wxT("Could not allocate new %dx%d bitmap\n"), mWidth, mHeight);
+               wxLogError(_("Could not allocate new %dx%d bitmap\n"), mWidth, mHeight);
                return;
        }
        dst = mPixels;
@@ -823,19 +823,19 @@ BigEndianBuffer& ShapesFrame::LoadObject(BigEndianBuffer& buffer, unsigned int o
        mWorldY0 = buffer.ReadShort();
        
        if (IsVerbose()) {
-               wxLogDebug(wxT("[ShapesFrame]         Flags:                    %d"), flags);
-               wxLogDebug(wxT("[ShapesFrame]         Min. Light Intensity:     %f"), mMinimumLightIntensity);
-               wxLogDebug(wxT("[ShapesFrame]         Bitmap Index:     %d"), mBitmapIndex);
-               wxLogDebug(wxT("[ShapesFrame]         Origin (X):               %d"), mOriginX);
-               wxLogDebug(wxT("[ShapesFrame]         Origin (Y):               %d"), mOriginY);
-               wxLogDebug(wxT("[ShapesFrame]         Key (X):          %d"), mKeyX);
-               wxLogDebug(wxT("[ShapesFrame]         Key (Y):          %d"), mKeyY);
-               wxLogDebug(wxT("[ShapesFrame]         World (Left):     %d"), mWorldLeft);
-               wxLogDebug(wxT("[ShapesFrame]         World (Right):    %d"), mWorldRight);
-               wxLogDebug(wxT("[ShapesFrame]         World (Top):      %d"), mWorldTop);
-               wxLogDebug(wxT("[ShapesFrame]         World (Bottom):   %d"), mWorldBottom);
-               wxLogDebug(wxT("[ShapesFrame]         World (X0):               %d"), mWorldX0);
-               wxLogDebug(wxT("[ShapesFrame]         World (Y0):               %d"), mWorldY0);
+               wxLogDebug(_("[ShapesFrame]         Flags:                      %d"), flags);
+               wxLogDebug(_("[ShapesFrame]         Min. Light Intensity:       %f"), mMinimumLightIntensity);
+               wxLogDebug(_("[ShapesFrame]         Bitmap Index:       %d"), mBitmapIndex);
+               wxLogDebug(_("[ShapesFrame]         Origin (X):         %d"), mOriginX);
+               wxLogDebug(_("[ShapesFrame]         Origin (Y):         %d"), mOriginY);
+               wxLogDebug(_("[ShapesFrame]         Key (X):            %d"), mKeyX);
+               wxLogDebug(_("[ShapesFrame]         Key (Y):            %d"), mKeyY);
+               wxLogDebug(_("[ShapesFrame]         World (Left):       %d"), mWorldLeft);
+               wxLogDebug(_("[ShapesFrame]         World (Right):      %d"), mWorldRight);
+               wxLogDebug(_("[ShapesFrame]         World (Top):        %d"), mWorldTop);
+               wxLogDebug(_("[ShapesFrame]         World (Bottom):     %d"), mWorldBottom);
+               wxLogDebug(_("[ShapesFrame]         World (X0):         %d"), mWorldX0);
+               wxLogDebug(_("[ShapesFrame]         World (Y0):         %d"), mWorldY0);
        }
 
        mGoodData = true;
@@ -951,7 +951,7 @@ BigEndianBuffer& ShapesSequence::LoadObject(BigEndianBuffer& buffer, long offset
        unsigned char   namelen = buffer.ReadUChar();
 
        if (namelen > 32) {
-               wxLogError(wxT("[ShapesSequence] Sequence name too long (%d/32)"), namelen);
+               wxLogError(_("[ShapesSequence] Sequence name too long (%d/32)"), namelen);
                return buffer;
        }
 
@@ -980,35 +980,35 @@ BigEndianBuffer& ShapesSequence::LoadObject(BigEndianBuffer& buffer, long offset
        buffer.Position(buffer.Position() + 28);
 
        if (IsVerbose()) {
-               wxLogDebug(wxT("[ShapesSequence]         Type:                                  %d"), mType);
-               wxLogDebug(wxT("[ShapesSequence]         Flags:                                 %d"), mFlags);
-               wxLogDebug(wxT("[ShapesSequence]         Name:                                  %s"), mName.c_str());
-               wxLogDebug(wxT("[ShapesSequence]         Number of Views:               %d"), mNumberOfViews);
-               wxLogDebug(wxT("[ShapesSequence]         Frames/Views:                  %d"), mFramesPerView);
-               wxLogDebug(wxT("[ShapesSequence]         Ticks/Frame:                   %d"), mTicksPerFrame);
-               wxLogDebug(wxT("[ShapesSequence]         Key Frame:                             %d"), mKeyFrame);
-               wxLogDebug(wxT("[ShapesSequence]         Transfer Mode:                 %d"), mTransferMode);
-               wxLogDebug(wxT("[ShapesSequence]         Transfer Mode Period:  %d"), mTransferModePeriod);
-               wxLogDebug(wxT("[ShapesSequence]         First Frame Sound:             %d"), mFirstFrameSound);
-               wxLogDebug(wxT("[ShapesSequence]         Key Frame Sound:               %d"), mKeyFrameSound);
-               wxLogDebug(wxT("[ShapesSequence]         Last Frame Sound:              %d"), mLastFrameSound);
-               wxLogDebug(wxT("[ShapesSequence]         Pixels to World:               %d"), mPixelsToWorld);
-               wxLogDebug(wxT("[ShapesSequence]         Loop Frame:                    %d"), mLoopFrame);
+               wxLogDebug(_("[ShapesSequence]         Type:                                    %d"), mType);
+               wxLogDebug(_("[ShapesSequence]         Flags:                                   %d"), mFlags);
+               wxLogDebug(_("[ShapesSequence]         Name:                                    %s"), mName.c_str());
+               wxLogDebug(_("[ShapesSequence]         Number of Views:         %d"), mNumberOfViews);
+               wxLogDebug(_("[ShapesSequence]         Frames/Views:                    %d"), mFramesPerView);
+               wxLogDebug(_("[ShapesSequence]         Ticks/Frame:                     %d"), mTicksPerFrame);
+               wxLogDebug(_("[ShapesSequence]         Key Frame:                               %d"), mKeyFrame);
+               wxLogDebug(_("[ShapesSequence]         Transfer Mode:                   %d"), mTransferMode);
+               wxLogDebug(_("[ShapesSequence]         Transfer Mode Period:    %d"), mTransferModePeriod);
+               wxLogDebug(_("[ShapesSequence]         First Frame Sound:               %d"), mFirstFrameSound);
+               wxLogDebug(_("[ShapesSequence]         Key Frame Sound:         %d"), mKeyFrameSound);
+               wxLogDebug(_("[ShapesSequence]         Last Frame Sound:                %d"), mLastFrameSound);
+               wxLogDebug(_("[ShapesSequence]         Pixels to World:         %d"), mPixelsToWorld);
+               wxLogDebug(_("[ShapesSequence]         Loop Frame:                      %d"), mLoopFrame);
        }
 
        if (mNumberOfViews < 0 || mFramesPerView < 0) {
-               wxLogError(wxT("[ShapesSequence] Invalid sequence type parameters: numberOfViews=%d, framesPerView=%d"),
+               wxLogError(_("[ShapesSequence] Invalid sequence type parameters: numberOfViews=%d, framesPerView=%d"),
                                                mNumberOfViews, mFramesPerView);
                return buffer;
        }
        // guess these shouldn't be < 0, but RED Shapes have a case with mKeyFrame=-1
        if (mKeyFrame < -1 || mLoopFrame < -1) {
-               wxLogError(wxT("[ShapesSequence] Invalid key/loop frame values in sequence data: keyFrame=%d, loopFrame=%d"),
+               wxLogError(_("[ShapesSequence] Invalid key/loop frame values in sequence data: keyFrame=%d, loopFrame=%d"),
                                                mKeyFrame, mLoopFrame);
                return buffer;
        }
        if (mFirstFrameSound < -1 || mKeyFrameSound < -1 || mLastFrameSound < -1) {
-               wxLogError(wxT("[ShapesSequence] Invalid sound values in sequence data: firstFrameSound=%d, keyFrameSound=%d, lastFrameSound=%d"),
+               wxLogError(_("[ShapesSequence] Invalid sound values in sequence data: firstFrameSound=%d, keyFrameSound=%d, lastFrameSound=%d"),
                                                mFirstFrameSound, mKeyFrameSound, mLastFrameSound);
                return buffer;
        }
@@ -1046,7 +1046,7 @@ int ActualNumberOfViews(int t)
                case ANIMATED_8:
                        return 8;
                default:
-                       wxLogError(wxT("[ShapesSequence] Unknown sequence type %d, don't know the number of views"), t);
+                       wxLogError(_("[ShapesSequence] Unknown sequence type %d, don't know the number of views"), t);
                        return t;
        }
        return -1;
@@ -1491,12 +1491,12 @@ BigEndianBuffer& ShapesChunk::LoadObject(BigEndianBuffer& buffer)
 
        // validate values
        if (mVersion != COLLECTION_VERSION) {
-               wxLogError(wxT("[ShapesChunk] Unknown collection version %d"), mVersion);
+               wxLogError(_("[ShapesChunk] Unknown collection version %d"), mVersion);
                return buffer;
        }
 
        if ((unsigned long)size != buffer.Size()) {
-               wxLogError(wxT("[ShapesChunk] Chunk size mismatch (%ld/%d): this may not be a Marathon shapes file"), size, buffer.Size());
+               wxLogError(_("[ShapesChunk] Chunk size mismatch (%ld/%d): this may not be a Marathon shapes file"), size, buffer.Size());
                return buffer;
        }
        if (color_table_offset < SIZEOF_collection_definition
@@ -1507,22 +1507,22 @@ BigEndianBuffer& ShapesChunk::LoadObject(BigEndianBuffer& buffer)
                || low_level_shape_offset_table_offset >= size
                || bitmap_offset_table_offset < SIZEOF_collection_definition
                || bitmap_offset_table_offset >= size) {
-               wxLogError(wxT("[ShapesChunk] Invalid offsets in collection definition: this may not be a Marathon shapes file"));
+               wxLogError(_("[ShapesChunk] Invalid offsets in collection definition: this may not be a Marathon shapes file"));
                return buffer;
        }
        if (color_count < 0 || clut_count < 0 || high_level_shape_count < 0 || low_level_shape_count < 0 || bitmap_count < 0) {
-               wxLogError(wxT("[ShapesChunk] Invalid object counts in collection definition: this may not be a Marathon shapes file"));
+               wxLogError(_("[ShapesChunk] Invalid object counts in collection definition: this may not be a Marathon shapes file"));
                return buffer;
        }
 
        if (IsVerbose()) {
-               wxLogDebug(wxT("[ShapesChunk]         Version: %d"), mVersion);
-               wxLogDebug(wxT("[ShapesChunk]         Type:    %d"), mType);
-               wxLogDebug(wxT("[ShapesChunk]         Flags:   %d"), mFlags);
-               wxLogDebug(wxT("[ShapesChunk]         %d color tables, %d colors per table"), clut_count, color_count);
-               wxLogDebug(wxT("[ShapesChunk]         %d sequences"), high_level_shape_count);
-               wxLogDebug(wxT("[ShapesChunk]         %d frames"), low_level_shape_count);
-               wxLogDebug(wxT("[ShapesChunk]         %d bitmaps"), bitmap_count);
+               wxLogDebug(_("[ShapesChunk]         Version: %d"), mVersion);
+               wxLogDebug(_("[ShapesChunk]         Type:    %d"), mType);
+               wxLogDebug(_("[ShapesChunk]         Flags:   %d"), mFlags);
+               wxLogDebug(_("[ShapesChunk]         %d color tables, %d colors per table"), clut_count, color_count);
+               wxLogDebug(_("[ShapesChunk]         %d sequences"), high_level_shape_count);
+               wxLogDebug(_("[ShapesChunk]         %d frames"), low_level_shape_count);
+               wxLogDebug(_("[ShapesChunk]         %d bitmaps"), bitmap_count);
        }
 
        // load color tables
@@ -1530,7 +1530,7 @@ BigEndianBuffer& ShapesChunk::LoadObject(BigEndianBuffer& buffer)
                ShapesColorTable        *color_table = new ShapesColorTable(IsVerbose());
 
                if (IsVerbose())
-                       wxLogDebug(wxT("[ShapesChunk] Loading colortable %d/%d"), i+1, clut_count);
+                       wxLogDebug(_("[ShapesChunk] Loading colortable %d/%d"), i+1, clut_count);
 
                oldpos = buffer.Position();
 
@@ -1540,7 +1540,7 @@ BigEndianBuffer& ShapesChunk::LoadObject(BigEndianBuffer& buffer)
                
                // we stop if an error occured
                if (!color_table->IsGood()) {
-                       wxLogError(wxT("[ShapesChunk] Error loading color table %d... Dropped"), i);
+                       wxLogError(_("[ShapesChunk] Error loading color table %d... Dropped"), i);
                        return buffer;
                }
                
@@ -1552,13 +1552,13 @@ BigEndianBuffer& ShapesChunk::LoadObject(BigEndianBuffer& buffer)
        for (i = 0; i < bitmap_count; i++) {
                offset = buffer.ReadLong();
                if (offset < SIZEOF_collection_definition || offset >= size) {
-                       wxLogError(wxT("[ShapesChunk] Invalid bitmap offset: this may not be a Marathon shapes file"));
+                       wxLogError(_("[ShapesChunk] Invalid bitmap offset: this may not be a Marathon shapes file"));
                        return buffer;
                }
                
                ShapesBitmap    *bitmap = new ShapesBitmap(IsVerbose());
                if (IsVerbose())
-                       wxLogDebug(wxT("[ShapesChunk] Loading bitmap %d/%d"), i+1, bitmap_count);
+                       wxLogDebug(_("[ShapesChunk] Loading bitmap %d/%d"), i+1, bitmap_count);
                        
                oldpos = buffer.Position();
                
@@ -1568,7 +1568,7 @@ BigEndianBuffer& ShapesChunk::LoadObject(BigEndianBuffer& buffer)
                
                // we stop if an error occured
                if (!bitmap->IsGood()) {
-                       wxLogError(wxT("[ShapesDocument] Error loading bitmap %d... Dropped"), i);
+                       wxLogError(_("[ShapesDocument] Error loading bitmap %d... Dropped"), i);
                        return buffer;
                }
                
@@ -1580,13 +1580,13 @@ BigEndianBuffer& ShapesChunk::LoadObject(BigEndianBuffer& buffer)
        for (i = 0; i < high_level_shape_count; i++) {
                offset = buffer.ReadLong();
                if (offset < SIZEOF_collection_definition || offset >= size) {
-                       wxLogError(wxT("[ShapesChunk] Invalid sequence offset: this may not be a Marathon shapes file"));
+                       wxLogError(_("[ShapesChunk] Invalid sequence offset: this may not be a Marathon shapes file"));
                        return buffer;
                }
                
                ShapesSequence  *sequence = new ShapesSequence(IsVerbose());
                if (IsVerbose())
-                       wxLogDebug(wxT("[ShapesChunk] Loading sequence %d/%d"), i+1, high_level_shape_count);
+                       wxLogDebug(_("[ShapesChunk] Loading sequence %d/%d"), i+1, high_level_shape_count);
                
                oldpos = buffer.Position();
                
@@ -1596,7 +1596,7 @@ BigEndianBuffer& ShapesChunk::LoadObject(BigEndianBuffer& buffer)
                
                // we stop if an error occured
                if (!sequence->IsGood()) {
-                       wxLogError(wxT("[ShapesDocument] Error loading sequence... Dropped"));
+                       wxLogError(_("[ShapesDocument] Error loading sequence... Dropped"));
                        return buffer;
                }
                
@@ -1608,13 +1608,13 @@ BigEndianBuffer& ShapesChunk::LoadObject(BigEndianBuffer& buffer)
        for (i = 0; i < low_level_shape_count; i++) {
                offset = buffer.ReadLong();
                if (offset < SIZEOF_collection_definition || offset >= size) {
-                       wxLogError(wxT("[ShapesChunk] Invalid frame offset: this may not be a Marathon shapes file"));
+                       wxLogError(_("[ShapesChunk] Invalid frame offset: this may not be a Marathon shapes file"));
                        return buffer;
                }
                
                ShapesFrame     *frame = new ShapesFrame(IsVerbose());
                if (IsVerbose())
-                       wxLogDebug(wxT("[ShapesChunk] Loading frame %d/%d"), i+1, low_level_shape_count);
+                       wxLogDebug(_("[ShapesChunk] Loading frame %d/%d"), i+1, low_level_shape_count);
 
                oldpos = buffer.Position();
                
@@ -1636,7 +1636,7 @@ BigEndianBuffer& ShapesChunk::LoadObject(BigEndianBuffer& buffer)
                
                // store if correct
                if (!frame->IsGood()) {
-                       wxLogError(wxT("[ShapesDocument] Error loading frame %d... Dropped"), i);
+                       wxLogError(_("[ShapesDocument] Error loading frame %d... Dropped"), i);
                        return buffer;
                }
                
@@ -1659,7 +1659,7 @@ BigEndianBuffer& ShapesChunk::LoadPatch(BigEndianBuffer& buffer)
                case FOUR_CHARS_TO_INT('c','l','d','f'): {
                        mVersion = buffer.ReadShort();
                        if (mVersion != COLLECTION_VERSION) {
-                               wxLogError(wxT("[ShapesChunk] Unknown 'cldf' version %d in patch"), mVersion);
+                               wxLogError(_("[ShapesChunk] Unknown 'cldf' version %d in patch"), mVersion);
                                mGoodData = false;
                                return buffer;
                        }
@@ -1693,7 +1693,7 @@ BigEndianBuffer& ShapesChunk::LoadPatch(BigEndianBuffer& buffer)
                                        return buffer;
                                }
                        } else {
-                               wxLogError(wxT("[ShapesChunk] Invliad 'ctab' index"));
+                               wxLogError(_("[ShapesChunk] Invliad 'ctab' index"));
                                mGoodData = false;
                                return buffer;
                        }
@@ -1715,7 +1715,7 @@ BigEndianBuffer& ShapesChunk::LoadPatch(BigEndianBuffer& buffer)
                                        return buffer;
                                }
                        } else {
-                               wxLogError(wxT("[ShapesChunk] Invalid 'hlsh' index"));
+                               wxLogError(_("[ShapesChunk] Invalid 'hlsh' index"));
                                mGoodData = false;
                                return buffer;
                        }
@@ -1734,7 +1734,7 @@ BigEndianBuffer& ShapesChunk::LoadPatch(BigEndianBuffer& buffer)
                                        return buffer;
                                }
                        } else {
-                               wxLogError(wxT("[ShapesChunk] Invalid 'llsh' index"));
+                               wxLogError(_("[ShapesChunk] Invalid 'llsh' index"));
                                mGoodData = false;
                                return buffer;
                        }
@@ -1757,7 +1757,7 @@ BigEndianBuffer& ShapesChunk::LoadPatch(BigEndianBuffer& buffer)
                                        return buffer;
                                }
                        } else {
-                               wxLogError(wxT("[ShapesChunk] Invalid 'bmap' index"));
+                               wxLogError(_("[ShapesChunk] Invalid 'bmap' index"));
                                mGoodData = false;
                                return buffer;
                        }
@@ -2007,14 +2007,14 @@ wxInputStream& ShapesCollection::LoadObject(wxInputStream& stream)
                return stream;
        
        if (IsVerbose()) {
-               wxLogDebug(wxT("[ShapesCollection]     Status: %d"), mStatus);
-               wxLogDebug(wxT("[ShapesCollection]     Flags:  %d"), mFlags);
+               wxLogDebug(_("[ShapesCollection]     Status: %d"), mStatus);
+               wxLogDebug(_("[ShapesCollection]     Flags:  %d"), mFlags);
        }
        
        // is there the 8-bit version?
        if (offset8 != -1) {
                if (IsVerbose())
-                       wxLogDebug(wxT("[ShapesCollection]     8-bit chunk present"));
+                       wxLogDebug(_("[ShapesCollection]     8-bit chunk present"));
                
                BigEndianBuffer chunkbuffer(length8);
                
@@ -2030,7 +2030,7 @@ wxInputStream& ShapesCollection::LoadObject(wxInputStream& stream)
                pc->LoadObject(chunkbuffer);
                
                if (!pc->IsGood()) {
-                       wxLogError(wxT("[ShapesCollection] Error loading 8-bit chunk... Dropped"));
+                       wxLogError(_("[ShapesCollection] Error loading 8-bit chunk... Dropped"));
                        return stream;
                }
                mChunks[0] = pc;
@@ -2039,7 +2039,7 @@ wxInputStream& ShapesCollection::LoadObject(wxInputStream& stream)
        // is there the 16-bit version?
        if (offset16 != -1) {
                if (IsVerbose())
-                       wxLogDebug(wxT("[ShapesCollection]     16/32-bit chunk present"));
+                       wxLogDebug(_("[ShapesCollection]     16/32-bit chunk present"));
                
                BigEndianBuffer chunkbuffer(length16);
                
@@ -2055,7 +2055,7 @@ wxInputStream& ShapesCollection::LoadObject(wxInputStream& stream)
                pc->LoadObject(chunkbuffer);
                
                if (!pc->IsGood()) {
-                       wxLogError(wxT("[ShapesCollection] Error loading 16/32-bit chunk... Dropped"));
+                       wxLogError(_("[ShapesCollection] Error loading 16/32-bit chunk... Dropped"));
                        return stream;
                }
                mChunks[1] = pc;
@@ -2080,7 +2080,7 @@ BigEndianBuffer& ShapesCollection::LoadPatch(BigEndianBuffer& buffer)
                }
                chunk = mChunks[1];
        } else {
-               wxLogError(wxT("[ShapesCollection] Error loading patch chunk; invalid depth"));
+               wxLogError(_("[ShapesCollection] Error loading patch chunk; invalid depth"));
                mGoodData = false;
                return buffer;
        }
index c435875..b9bd44a 100644 (file)
@@ -812,7 +812,7 @@ void ShapesView::MenuShapesExportBitmapMask(wxCommandEvent &e)
                if (selection >= 0) {
                        wxString        prompt = wxString::Format(_("Export bitmap %d mask"), selection),
                        name = wxString::Format(_("bitmap%.3dmask.bmp"), selection),
-                       path = wxFileSelector(prompt, wxT(""), name, _(""), _("BMP image|*.bmp"), wxSAVE | wxOVERWRITE_PROMPT);
+                       path = wxFileSelector(prompt, wxT(""), name, wxT(""), _("BMP image|*.bmp"), wxSAVE | wxOVERWRITE_PROMPT);
                        
                        if (!path.empty()) {
                                ShapesBitmap    *bitmap = ((ShapesDocument*)GetDocument())->GetBitmap(mSelectedColl, mSelectedVers, selection);
index 7eeeb3e..e5d9328 100644 (file)
@@ -46,7 +46,7 @@ wxImage ShapesBitmapToImage(ShapesBitmap *bp, ShapesColorTable *ct, bool white_t
                        *outp++ = color->Green() >> 8;
                        *outp++ = color->Blue() >> 8;
                } else {
-                       wxLogError(wxT("[utilities ShapesBitmapToImage] Pixel value %u with just %u colors/table. Aborting"),
+                       wxLogError(_("[utilities ShapesBitmapToImage] Pixel value %u with just %u colors/table. Aborting"),
                                                        value, colors_per_table);
                        break;
                }
diff --git a/Sounds/Makefile.in b/Sounds/Makefile.in
deleted file mode 100644 (file)
index a06e37e..0000000
+++ /dev/null
@@ -1,466 +0,0 @@
-# Makefile.in generated by automake 1.11.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = Sounds
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
-ARFLAGS = cru
-libsounds_a_AR = $(AR) $(ARFLAGS)
-libsounds_a_LIBADD =
-am_libsounds_a_OBJECTS = SoundsDocument.$(OBJEXT) SoundsView.$(OBJEXT) \
-       SoundsElements.$(OBJEXT)
-libsounds_a_OBJECTS = $(am_libsounds_a_OBJECTS)
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-       -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-       $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libsounds_a_SOURCES)
-DIST_SOURCES = $(libsounds_a_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SNDFILE_CFLAGS = @SNDFILE_CFLAGS@
-SNDFILE_LIBS = @SNDFILE_LIBS@
-STRIP = @STRIP@
-VERSION = @VERSION@
-WINDRES = @WINDRES@
-WX_CFLAGS = @WX_CFLAGS@
-WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
-WX_CONFIG_PATH = @WX_CONFIG_PATH@
-WX_CPPFLAGS = @WX_CPPFLAGS@
-WX_CXXFLAGS = @WX_CXXFLAGS@
-WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
-WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
-WX_RESCOMP = @WX_RESCOMP@
-WX_VERSION = @WX_VERSION@
-WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
-WX_VERSION_MICRO = @WX_VERSION_MICRO@
-WX_VERSION_MINOR = @WX_VERSION_MINOR@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-noinst_LIBRARIES = libsounds.a
-libsounds_a_SOURCES = SoundsDocument.h SoundsElements.h SoundsView.h   \
-       SoundsDocument.cpp SoundsView.cpp SoundsElements.cpp
-
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-               && { if test -f $@; then exit 0; else break; fi; }; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Sounds/Makefile'; \
-       $(am__cd) $(top_srcdir) && \
-         $(AUTOMAKE) --foreign Sounds/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLIBRARIES:
-       -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libsounds.a: $(libsounds_a_OBJECTS) $(libsounds_a_DEPENDENCIES) 
-       -rm -f libsounds.a
-       $(libsounds_a_AR) libsounds.a $(libsounds_a_OBJECTS) $(libsounds_a_LIBADD)
-       $(RANLIB) libsounds.a
-
-mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
-
-distclean-compile:
-       -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SoundsDocument.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SoundsElements.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SoundsView.Po@am__quote@
-
-.cpp.o:
-@am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@  $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       set x; \
-       here=`pwd`; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       shift; \
-       if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-         test -n "$$unique" || unique=$$empty_fix; \
-         if test $$# -gt 0; then \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             "$$@" $$unique; \
-         else \
-           $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-             $$unique; \
-         fi; \
-       fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-             END { if (nonempty) { for (i in files) print i; }; }'`; \
-       test -z "$(CTAGS_ARGS)$$unique" \
-         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$unique
-
-GTAGS:
-       here=`$(am__cd) $(top_builddir) && pwd` \
-         && $(am__cd) $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       list='$(DISTFILES)'; \
-         dist_files=`for file in $$list; do echo $$file; done | \
-         sed -e "s|^$$srcdirstrip/||;t" \
-             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-       case $$dist_files in \
-         */*) $(MKDIR_P) `echo "$$dist_files" | \
-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                          sort -u` ;; \
-       esac; \
-       for file in $$dist_files; do \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         if test -d $$d/$$file; then \
-           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-           if test -d "$(distdir)/$$file"; then \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-             find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-           fi; \
-           cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-         else \
-           test -f "$(distdir)/$$file" \
-           || cp -p $$d/$$file "$(distdir)/$$file" \
-           || exit 1; \
-         fi; \
-       done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LIBRARIES)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-       if test -z '$(STRIP)'; then \
-         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-             install; \
-       else \
-         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-           "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-       fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-       -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
-
-distclean: distclean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-       distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-       clean-noinstLIBRARIES ctags distclean distclean-compile \
-       distclean-generic distclean-tags distdir dvi dvi-am html \
-       html-am info info-am install install-am install-data \
-       install-data-am install-dvi install-dvi-am install-exec \
-       install-exec-am install-html install-html-am install-info \
-       install-info-am install-man install-pdf install-pdf-am \
-       install-ps install-ps-am install-strip installcheck \
-       installcheck-am installdirs maintainer-clean \
-       maintainer-clean-generic mostlyclean mostlyclean-compile \
-       mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-       uninstall-am
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
index 6ab6fb6..3e8142d 100644 (file)
@@ -111,7 +111,7 @@ bool SoundsDocument::DoOpenDocument(const wxString& file)
        bool wxOpen = wxDocument::DoOpenDocument(file);
        
        if (!(wxOpen && mGoodData)) {
-               wxLogError(wxT("[SoundsDocument] There was an error while loading, see log"));
+               wxLogError(_("[SoundsDocument] There was an error while loading, see log"));
                return false;
        }
        return true;
@@ -198,12 +198,12 @@ wxInputStream& SoundsDocument::LoadObject(wxInputStream& stream)
        mSoundCount = filebuffer.ReadShort();
        
        if ((mVersion != 0 && mVersion != 1) || mTag != FOUR_CHARS_TO_INT('s','n','d','2')) {
-               wxLogError(wxT("[SoundsDocument] Error loading : Incorrect version/tag, (%d/%x)"), mVersion, mTag);
+               wxLogError(_("[SoundsDocument] Error loading : Incorrect version/tag, (%d/%x)"), mVersion, mTag);
                return stream;
        }
        
        if (mSoundCount < 0 || mSourceCount < 0) {
-               wxLogError(wxT("[SoundsDocument] Error loading : Incorrect Sound/Source count (%d/%d)"), mSoundCount, mSourceCount);
+               wxLogError(_("[SoundsDocument] Error loading : Incorrect Sound/Source count (%d/%d)"), mSoundCount, mSourceCount);
                return stream;
        }
        
@@ -217,10 +217,10 @@ wxInputStream& SoundsDocument::LoadObject(wxInputStream& stream)
        }
        
        if (IsVerbose()) {
-               wxLogDebug(wxT("[SoundsDocument] Version:               %d"), mVersion);
-               wxLogDebug(wxT("[SoundsDocument] Tag:                   %d"), mTag);
-               wxLogDebug(wxT("[SoundsDocument] Source Count:  %d"), mSourceCount);
-               wxLogDebug(wxT("[SoundsDocument] Sound Count:   %d"), mSoundCount);
+               wxLogDebug(_("[SoundsDocument] Version:         %d"), mVersion);
+               wxLogDebug(_("[SoundsDocument] Tag:                     %d"), mTag);
+               wxLogDebug(_("[SoundsDocument] Source Count:    %d"), mSourceCount);
+               wxLogDebug(_("[SoundsDocument] Sound Count:     %d"), mSoundCount);
        }
        
        /* We move to the end of the Sound file header */
@@ -232,14 +232,14 @@ wxInputStream& SoundsDocument::LoadObject(wxInputStream& stream)
                        SoundsDefinition *snd = new SoundsDefinition(IsVerbose());
                        
                        if (IsVerbose())
-                               wxLogDebug(wxT("[SoundsDocument] Loading source %d, sound %d"), i, j);
+                               wxLogDebug(_("[SoundsDocument] Loading source %d, sound %d"), i, j);
                        
                        unsigned int oldpos = filebuffer.Position();
                        
                        snd->LoadObject(filebuffer);
                        
                        if (!snd->IsGood()) {
-                               wxLogError(wxT("[SoundsDocument] Error loading sound definition. Skipping..."));
+                               wxLogError(_("[SoundsDocument] Error loading sound definition. Skipping..."));
                                return stream;
                        }
                        
index efb19c9..fea1a87 100644 (file)
@@ -185,7 +185,7 @@ BigEndianBuffer& AppleSoundHeader::LoadObject(BigEndianBuffer& buffer)
                                buffer.ReadULong(); // leftOverSamples
                                short comp_id = buffer.ReadShort();
                                if (format != FOUR_CHARS_TO_INT('t', 'w', 'o', 's') || comp_id != -1) {
-                                       wxLogError(wxT("[AppleSoundHeader] Unsupported compression format '%.4s.'"), &format);
+                                       wxLogError(_("[AppleSoundHeader] Unsupported compression format '%.4s.'"), &format);
                                        mGoodData = false;
                                        return buffer;
                                }
@@ -206,7 +206,7 @@ BigEndianBuffer& AppleSoundHeader::LoadObject(BigEndianBuffer& buffer)
                        break;
                }
                default:
-                       wxLogError(wxT("[AppleSoundHeader] Unknown header type %.2x."), headerType);
+                       wxLogError(_("[AppleSoundHeader] Unknown header type %.2x."), headerType);
                        mGoodData = false;
                        return buffer;
        }
@@ -280,7 +280,7 @@ bool AppleSoundHeader::LoadFromFile(wxString path)
        SF_INFO inputInfo;
        SNDFILE_ptr infile(sf_open(path.fn_str(), SFM_READ, &inputInfo));
        if (!infile.get()) {
-               wxLogError(wxT("[AppleSoundHeader] libsndfile could not open file."));
+               wxLogError(_("[AppleSoundHeader] libsndfile could not open file."));
                return false;
        }
 
@@ -317,7 +317,7 @@ bool AppleSoundHeader::LoadFromFile(wxString path)
 
        SNDFILE_ptr outfile(sf_open_virtual(&virtual_io, SFM_WRITE, &outputInfo, &adapter));
        if (!outfile.get()) {
-               wxLogError(wxT("[AppleSoundHeader] libsndfile write error."));
+               wxLogError(_("[AppleSoundHeader] libsndfile write error."));
                return false;
        }
 
@@ -327,11 +327,11 @@ bool AppleSoundHeader::LoadFromFile(wxString path)
                int frames = std::min(kBufferSize, frames_remaining);
                
                if (sf_readf_int(infile.get(), buf, frames) != frames) {
-                       wxLogError(wxT("[AppleSoundHeader] libsndfile read error."));
+                       wxLogError(_("[AppleSoundHeader] libsndfile read error."));
                        return false;
                }
                if (sf_writef_int(outfile.get(), buf, frames) != frames) {
-                       wxLogError(wxT("[AppleSoundHeader] libsndfile write error."));
+                       wxLogError(_("[AppleSoundHeader] libsndfile write error."));
                        return false;
                }
 
@@ -387,13 +387,13 @@ bool AppleSoundHeader::SaveToWaveOrAiff(wxString path, bool aiff)
                int buf[kBufferSize * 2];
                int frames = std::min(kBufferSize, frames_remaining);
                if (sf_readf_int(infile, buf, frames) != frames) {
-                       wxLogError(wxT("[AppleSoundHeader] libsndfile read error"));
+                       wxLogError(_("[AppleSoundHeader] libsndfile read error"));
                        sf_close(infile);
                        sf_close(outfile);
                        return false;
                }
                if (sf_writef_int(outfile, buf, frames) != frames) {
-                       wxLogError(wxT("[AppleSoundHeader] libsndfile write error"));
+                       wxLogError(_("[AppleSoundHeader] libsndfile write error"));
                        sf_close(infile);
                        sf_close(outfile);
                        return false;
@@ -487,14 +487,14 @@ short SoundsDefinition::GetChance(void) const
                if (mChance == 32768*i/10)
                        return i;
        }
-       wxLogDebug(wxT("Invalid chance %d"), mChance);
+       wxLogDebug(_("Invalid chance %d"), mChance);
        return -1;
 }
 
 void SoundsDefinition::SetChance(short chance)
 {
        if (chance < 0 || chance > 10)
-               wxLogDebug(wxT("Invalid chance %d"), mChance);
+               wxLogDebug(_("Invalid chance %d"), mChance);
        mChance = 32768*chance/10;
 }
 
@@ -582,7 +582,7 @@ BigEndianBuffer& SoundsDefinition::LoadObject(BigEndianBuffer& buffer)
        mChance = buffer.ReadUShort();
        
        if ((mBehaviorIndex > NUMBER_OF_SOUND_BEHAVIOR_DEFINITIONS) || (mChance > _ten_percent)) {
-               wxLogError(wxT("[SoundsDefinition] incorrect Behavior/Chance (%d/%d)"), mBehaviorIndex, mChance);
+               wxLogError(_("[SoundsDefinition] incorrect Behavior/Chance (%d/%d)"), mBehaviorIndex, mChance);
                return buffer;
        }
        
@@ -597,7 +597,7 @@ BigEndianBuffer& SoundsDefinition::LoadObject(BigEndianBuffer& buffer)
        short permutations = buffer.ReadShort();
        
        if (permutations < 0 || permutations > MAXIMUM_PERMUTATIONS_PER_SOUND) {
-               wxLogError(wxT("[SoundsDefinition] incorrect permutation count : %d"), permutations);
+               wxLogError(_("[SoundsDefinition] incorrect permutation count : %d"), permutations);
                return buffer;
        }
        
@@ -611,7 +611,7 @@ BigEndianBuffer& SoundsDefinition::LoadObject(BigEndianBuffer& buffer)
                permutations = 0;
        
        if (permutations != 0 && (unsigned int)(groupOffset + totalLength) > buffer.Size()) {
-               wxLogError(wxT("[SoundsDefinition] incorrect group offset / total length (%d/%d)"), groupOffset, totalLength);
+               wxLogError(_("[SoundsDefinition] incorrect group offset / total length (%d/%d)"), groupOffset, totalLength);
                return buffer;
        }
        
@@ -625,18 +625,18 @@ BigEndianBuffer& SoundsDefinition::LoadObject(BigEndianBuffer& buffer)
        mLastPlayed = buffer.ReadULong();
        
        if (IsVerbose()) {
-               wxLogDebug(wxT("[SoundsDefinition] Sound Code:                  %d"), mSoundCode);
-               wxLogDebug(wxT("[SoundsDefinition] Behavior Index:              %d"), mBehaviorIndex);
-               wxLogDebug(wxT("[SoundsDefinition] Flags:                               %d"), mFlags);
-               wxLogDebug(wxT("[SoundsDefinition] Chance:                              %d"), mChance);
-               wxLogDebug(wxT("[SoundsDefinition] Low Pitch:                   %f"), mLowPitch);
-               wxLogDebug(wxT("[SoundsDefinition] High Pitch:                  %f"), mHighPitch);
-               wxLogDebug(wxT("[SoundsDefinition] Permutations:                %d"), permutations);
-               wxLogDebug(wxT("[SoundsDefinition] Permutations Played: %d"), mPermutationsPlayed);
-               wxLogDebug(wxT("[SoundsDefinition] Group Offset:                %d"), groupOffset);
-               wxLogDebug(wxT("[SoundsDefinition] Single Length:               %d"), singleLength);
-               wxLogDebug(wxT("[SoundsDefinition] Total Length:                %d"), totalLength);
-               wxLogDebug(wxT("[SoundsDefinition] Last Played:                 %d"), mLastPlayed);
+               wxLogDebug(_("[SoundsDefinition] Sound Code:                    %d"), mSoundCode);
+               wxLogDebug(_("[SoundsDefinition] Behavior Index:                %d"), mBehaviorIndex);
+               wxLogDebug(_("[SoundsDefinition] Flags:                         %d"), mFlags);
+               wxLogDebug(_("[SoundsDefinition] Chance:                                %d"), mChance);
+               wxLogDebug(_("[SoundsDefinition] Low Pitch:                     %f"), mLowPitch);
+               wxLogDebug(_("[SoundsDefinition] High Pitch:                    %f"), mHighPitch);
+               wxLogDebug(_("[SoundsDefinition] Permutations:          %d"), permutations);
+               wxLogDebug(_("[SoundsDefinition] Permutations Played:   %d"), mPermutationsPlayed);
+               wxLogDebug(_("[SoundsDefinition] Group Offset:          %d"), groupOffset);
+               wxLogDebug(_("[SoundsDefinition] Single Length:         %d"), singleLength);
+               wxLogDebug(_("[SoundsDefinition] Total Length:          %d"), totalLength);
+               wxLogDebug(_("[SoundsDefinition] Last Played:                   %d"), mLastPlayed);
        }
        
        // Now we load actual sound data
index dd87f2d..dc224de 100644 (file)
@@ -69,7 +69,7 @@ SoundsView::SoundsView(): mSoundClass(wxNOT_FOUND), mSoundSource(wxNOT_FOUND), m
 // windows for displaying the view.
 bool SoundsView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
 {
-       wxString frameTitle = _T("ShapeFusion : Sounds : ");
+       wxString frameTitle = _("ShapeFusion : Sounds : ");
 
        frameTitle.Append(doc->GetFilename());
        
@@ -83,52 +83,52 @@ bool SoundsView::OnCreate(wxDocument *doc, long WXUNUSED(flags))
        // Because we can always add sound classes
        menubar->Enable(SOUNDS_MENU_ADDCLASS, true);
 
-       wxString volume_labels[] = { wxT("Soft"), wxT("Medium"), wxT("Loud") };
+       wxString volume_labels[] = { _("Soft"), _("Medium"), _("Loud") };
        wxString chances_labels[] = { wxT("100%"), wxT("90%"), wxT("80%"), wxT("70%"), wxT("60%"), wxT("50%"), wxT("40%"), wxT("30%"), wxT("20%"), wxT("10%") };
 
        main_panel = new wxPanel(frame);
        main_panel->Show();
        
-       sound_class_text = new wxStaticText(main_panel, wxID_ANY, wxT("Sound classes: "));
-       sound_class_id_text = new wxStaticText(main_panel, wxID_ANY, wxT("Class ID: "));
+       sound_class_text = new wxStaticText(main_panel, wxID_ANY, _("Sound classes: "));
+       sound_class_id_text = new wxStaticText(main_panel, wxID_ANY, _("Class ID: "));
        sound_class_id_field = new wxTextCtrl(main_panel, SOUND_CLASS_ID_FIELD, wxT(""));
        
-       sound_class_number_text = new wxStaticText(main_panel, wxID_ANY, wxT("Class number: "));
+       sound_class_number_text = new wxStaticText(main_panel, wxID_ANY, _("Class number: "));
        sound_class_number_field = new wxStaticText(main_panel, SOUND_CLASS_NUMBER_FIELD, wxT(""));
        
        sound_class_list = new wxListBox(main_panel, (wxWindowID)SOUND_CLASS_LIST);
        
-       sound_flag_restart_checkbox = new wxCheckBox(main_panel, SOUND_FLAGS_RESTART, wxT("Cannot be restarted"));
-       sound_flag_abort_checkbox = new wxCheckBox(main_panel, SOUND_FLAGS_ABORT, wxT("Does not self-abort"));
-       sound_flag_resist_checkbox = new wxCheckBox(main_panel, SOUND_FLAGS_RESIST, wxT("Resists pitch changes"));
-       sound_flag_change_checkbox = new wxCheckBox(main_panel, SOUND_FLAGS_CHANGE, wxT("Can't change pitch"));
-       sound_flag_obstructed_checkbox = new wxCheckBox(main_panel, SOUND_FLAGS_OBSTRUCTED, wxT("Can't be obstructed"));
-       sound_flag_mobstructed_checkbox = new wxCheckBox(main_panel, SOUND_FLAGS_MOBSTRUCTED, wxT("Can't be media obstructed"));
-       sound_flag_ambient_checkbox = new wxCheckBox(main_panel, SOUND_FLAGS_AMBIENT, wxT("Is ambient"));
+       sound_flag_restart_checkbox = new wxCheckBox(main_panel, SOUND_FLAGS_RESTART, _("Cannot be restarted"));
+       sound_flag_abort_checkbox = new wxCheckBox(main_panel, SOUND_FLAGS_ABORT, _("Does not self-abort"));
+       sound_flag_resist_checkbox = new wxCheckBox(main_panel, SOUND_FLAGS_RESIST, _("Resists pitch changes"));
+       sound_flag_change_checkbox = new wxCheckBox(main_panel, SOUND_FLAGS_CHANGE, _("Can't change pitch"));
+       sound_flag_obstructed_checkbox = new wxCheckBox(main_panel, SOUND_FLAGS_OBSTRUCTED, _("Can't be obstructed"));
+       sound_flag_mobstructed_checkbox = new wxCheckBox(main_panel, SOUND_FLAGS_MOBSTRUCTED, _("Can't be media obstructed"));
+       sound_flag_ambient_checkbox = new wxCheckBox(main_panel, SOUND_FLAGS_AMBIENT, _("Is ambient"));
        
-       sound_volume_radio_button = new wxRadioBox(main_panel, SOUND_VOLUME_RADIO_BUTTON, wxT("Volume"), wxDefaultPosition, wxDefaultSize, 3, volume_labels, 3, wxRA_SPECIFY_COLS);
+       sound_volume_radio_button = new wxRadioBox(main_panel, SOUND_VOLUME_RADIO_BUTTON, _("Volume"), wxDefaultPosition, wxDefaultSize, 3, volume_labels, 3, wxRA_SPECIFY_COLS);
        
-       sound_chance_text = new wxStaticText(main_panel, wxID_ANY, wxT("Chance: "));
+       sound_chance_text = new wxStaticText(main_panel, wxID_ANY, _("Chance: "));
        sound_chance_menu = new wxChoice(main_panel, SOUND_CHANCE_MENU, wxDefaultPosition, wxDefaultSize, 10, chances_labels);
        
-       sound_low_pitch_text = new wxStaticText(main_panel, wxID_ANY, wxT("Low pitch: "));
+       sound_low_pitch_text = new wxStaticText(main_panel, wxID_ANY, _("Low pitch: "));
        sound_low_pitch_field = new wxTextCtrl(main_panel, SOUND_LOW_PITCH_FIELD);
-       sound_high_pitch_text = new wxStaticText(main_panel, wxID_ANY, wxT("High pitch: "));
+       sound_high_pitch_text = new wxStaticText(main_panel, wxID_ANY, _("High pitch: "));
        sound_high_pitch_field = new wxTextCtrl(main_panel, SOUND_HIGH_PITCH_FIELD);
        
-       sound_eight_bit_text = new wxStaticText(main_panel, wxID_ANY, wxT("8-bit sounds:"));
+       sound_eight_bit_text = new wxStaticText(main_panel, wxID_ANY, _("8-bit sounds:"));
        sound_eight_bit_list = new wxListBox(main_panel, (wxWindowID)SOUND_EIGHT_BIT_PERMUTATIONS_LIST);
        
-       sound_sixteen_bit_text = new wxStaticText(main_panel, wxID_ANY, wxT("16-bit sounds: "));
+       sound_sixteen_bit_text = new wxStaticText(main_panel, wxID_ANY, _("16-bit sounds: "));
        sound_sixteen_bit_list = new wxListBox(main_panel, (wxWindowID)SOUND_SIXTEEN_BIT_PERMUTATIONS_LIST);
        
-       sound_remap_check_box = new wxCheckBox(main_panel, SOUND_REMAP_CHECK_BOX, wxT("Remap 8-bit"));
+       sound_remap_check_box = new wxCheckBox(main_panel, SOUND_REMAP_CHECK_BOX, _("Remap 8-bit"));
        
        frame_sizer = new wxBoxSizer(wxHORIZONTAL);
        sound_class_sizer = new wxBoxSizer(wxVERTICAL);
        sound_class_header_sizer = new wxFlexGridSizer(2, 2, 0, 0);
        sound_editor_sizer = new wxBoxSizer(wxVERTICAL);
-       sound_flags_sizer = new wxStaticBoxSizer(wxVERTICAL, main_panel, wxT("Flags"));
+       sound_flags_sizer = new wxStaticBoxSizer(wxVERTICAL, main_panel, _("Flags"));
        sound_menus_sizer = new wxFlexGridSizer(2, 3, 0, 0);
        sound_permutation_sizer = new wxBoxSizer(wxHORIZONTAL);
        sound_eight_bit_sizer = new wxBoxSizer(wxVERTICAL);
@@ -206,7 +206,7 @@ void SoundsView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
 
        sound_class_list->Clear();
        for (unsigned int i = 0; i < payload->GetSoundCount(); i++) {
-               sound_class_list->Append(GetName(wxT("sound"), i));
+               sound_class_list->Append(GetName(_("sound"), i));
                // We check if there is a difference between 8-bit and 16-bit
                // SoundsDefinitions
                SoundsDefinition        *def8 = payload->Get8BitSoundDefinition(i),
@@ -535,7 +535,7 @@ void SoundsView::MenuExportSound(wxCommandEvent &e)
                return;
        }
        
-       wxFileDialog dlg(frame, _("Choose a file name :"), wxT(""), wxString::Format(wxT("Sound %d-%d.wav"), mSoundClass, mSoundPermutation), _("WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif"), wxSAVE | wxOVERWRITE_PROMPT);
+       wxFileDialog dlg(frame, _("Choose a file name :"), wxT(""), wxString::Format(_("Sound %d-%d.wav"), mSoundClass, mSoundPermutation), _("WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif"), wxSAVE | wxOVERWRITE_PROMPT);
 
        if (dlg.ShowModal() == wxID_OK) {
                SoundsDefinition        *def = payload->GetSoundDefinition(mSoundSource, mSoundClass);
index b452741..22d99a7 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""\r
 "Project-Id-Version: ShapeFusion\n"\r
 "Report-Msgid-Bugs-To: \n"\r
-"POT-Creation-Date: 2012-02-25 11:18+0900\n"\r
+"POT-Creation-Date: 2012-02-25 11:48+0900\n"\r
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"\r
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"\r
 "Language-Team: LANGUAGE <LL@li.org>\n"\r
@@ -1934,7 +1934,7 @@ msgstr ""
 msgid "Small"\r
 msgstr ""\r
 \r
-#: ../ShapeFusionMenus.cpp:119\r
+#: ../ShapeFusionMenus.cpp:119 ../Sounds/SoundsView.cpp:86\r
 msgid "Medium"\r
 msgstr ""\r
 \r
@@ -2034,6 +2034,23 @@ msgstr ""
 msgid "S&ounds"\r
 msgstr ""\r
 \r
+#: ../Physics/PhysicsDocument.cpp:53\r
+msgid "[PhysicsDocument] There was an error while opening, see log"\r
+msgstr ""\r
+\r
+#: ../Physics/PhysicsDocument.cpp:77\r
+#, c-format\r
+msgid "[PhysicsDocument] Error loading: Incorrect version/data version (%i/%i)"\r
+msgstr ""\r
+\r
+#: ../Physics/PhysicsDocument.cpp:92\r
+msgid "[PhysicsDocument] Error loading: wad count must be 1"\r
+msgstr ""\r
+\r
+#: ../Physics/PhysicsDocument.cpp:111\r
+msgid "[PhysicsDocument] Error loading: first wad index must be 0"\r
+msgstr ""\r
+\r
 #: ../Physics/PhysicsView.cpp:38 ../Physics/PhysicsView.cpp:1050\r
 msgid "Appearance"\r
 msgstr ""\r
@@ -2414,7 +2431,7 @@ msgid "Chooses Weapon Randomly"
 msgstr ""\r
 \r
 #: ../Physics/PhysicsView.cpp:525 ../Physics/PhysicsView.cpp:972\r
-#: ../Physics/PhysicsView.cpp:1183\r
+#: ../Physics/PhysicsView.cpp:1183 ../Sounds/SoundsView.cpp:131\r
 msgid "Flags"\r
 msgstr ""\r
 \r
@@ -2998,6 +3015,38 @@ msgstr ""
 msgid "Trigger Settings"\r
 msgstr ""\r
 \r
+#: ../Shapes/BitmapBrowser.cpp:257\r
+msgid "[BitmapBrowser] Added a bitmap with NULL pixels"\r
+msgstr ""\r
+\r
+#: ../Shapes/BitmapView.cpp:119\r
+msgid "[BitmapView] Addes a bitmap with NULL pixels"\r
+msgstr ""\r
+\r
+#: ../Shapes/FrameBrowser.cpp:272\r
+msgid "FrameBrowser: someone tried to add a bitmap with NULL pixels"\r
+msgstr ""\r
+\r
+#: ../Shapes/FrameView.cpp:80\r
+msgid "Origin"\r
+msgstr ""\r
+\r
+#: ../Shapes/FrameView.cpp:81\r
+msgid "Keypoint"\r
+msgstr ""\r
+\r
+#: ../Shapes/FrameView.cpp:98\r
+msgid "No associated bitmap"\r
+msgstr ""\r
+\r
+#: ../Shapes/FrameView.cpp:300\r
+msgid "[FrameView] Added a bitmap with NULL pixels"\r
+msgstr ""\r
+\r
+#: ../Shapes/SequenceView.cpp:391\r
+msgid "SequenceView: someone tried to add a bitmap with NULL pixels"\r
+msgstr ""\r
+\r
 #: ../Shapes/SequenceView.cpp:571\r
 msgid "Change frame:"\r
 msgstr ""\r
@@ -3006,6 +3055,408 @@ msgstr ""
 msgid "Chage frame"\r
 msgstr ""\r
 \r
+#: ../Shapes/ShapesDocument.cpp:172\r
+msgid "[ShapesDocument] There was an error while loading, see log"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesDocument.cpp:239\r
+msgid "[ShapesDocument] Shapes files must contain the same number of collections to generate a patch"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesDocument.cpp:272\r
+msgid "[ShapesDocument] File too small to be a Marathon shapes file"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesDocument.cpp:283\r
+#, c-format\r
+msgid "[ShapesDocument] Trying to load collection %d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesDocument.cpp:302\r
+msgid "[ShapesDocument] Could not find enough collections. This may not be a Marathon Shapes file."\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesDocument.cpp:338\r
+msgid "Shapes patches cannot add entire collections"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:138\r
+msgid "This Adobe Color Table file has an invalid size: will not try to load it."\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:214\r
+msgid "[ShapesColorTable] Error loading color table"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:437\r
+#, c-format\r
+msgid "[ShapesBitmap] Invalid bitmap width %d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:441\r
+#, c-format\r
+msgid "[ShapesBitmap] Invalid bitmap height %d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:445\r
+#, c-format\r
+msgid "[ShapesBitmap] Invalid bitmap bytes-per-row %d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:456\r
+#, c-format\r
+msgid "[ShapesBitmap] Invalid bitmap depth %d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:461\r
+#, c-format\r
+msgid "[ShapesBitmap]         Width:\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:462\r
+#, c-format\r
+msgid "[ShapesBitmap]         Height:\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:463\r
+#, c-format\r
+msgid "[ShapesBitmap]         Bytes/Row:\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:464\r
+#, c-format\r
+msgid "[ShapesBitmap]         Flags:\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:465\r
+#, c-format\r
+msgid "[ShapesBitmap]         Bit Depth:\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:476\r
+msgid "[ShapesBitmap] Could not allocate pixel buffer"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:697\r
+#, c-format\r
+msgid "Could not allocate new %dx%d bitmap\n"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:826\r
+#, c-format\r
+msgid "[ShapesFrame]         Flags:\t\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:827\r
+#, c-format\r
+msgid "[ShapesFrame]         Min. Light Intensity:\t%f"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:828\r
+#, c-format\r
+msgid "[ShapesFrame]         Bitmap Index:\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:829\r
+#, c-format\r
+msgid "[ShapesFrame]         Origin (X):\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:830\r
+#, c-format\r
+msgid "[ShapesFrame]         Origin (Y):\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:831\r
+#, c-format\r
+msgid "[ShapesFrame]         Key (X):\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:832\r
+#, c-format\r
+msgid "[ShapesFrame]         Key (Y):\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:833\r
+#, c-format\r
+msgid "[ShapesFrame]         World (Left):\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:834\r
+#, c-format\r
+msgid "[ShapesFrame]         World (Right):\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:835\r
+#, c-format\r
+msgid "[ShapesFrame]         World (Top):\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:836\r
+#, c-format\r
+msgid "[ShapesFrame]         World (Bottom):\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:837\r
+#, c-format\r
+msgid "[ShapesFrame]         World (X0):\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:838\r
+#, c-format\r
+msgid "[ShapesFrame]         World (Y0):\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:954\r
+#, c-format\r
+msgid "[ShapesSequence] Sequence name too long (%d/32)"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:983\r
+#, c-format\r
+msgid "[ShapesSequence]         Type:\t\t\t\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:984\r
+#, c-format\r
+msgid "[ShapesSequence]         Flags:\t\t\t\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:985\r
+#, c-format\r
+msgid "[ShapesSequence]         Name:\t\t\t\t\t%s"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:986\r
+#, c-format\r
+msgid "[ShapesSequence]         Number of Views:\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:987\r
+#, c-format\r
+msgid "[ShapesSequence]         Frames/Views:\t\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:988\r
+#, c-format\r
+msgid "[ShapesSequence]         Ticks/Frame:\t\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:989\r
+#, c-format\r
+msgid "[ShapesSequence]         Key Frame:\t\t\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:990\r
+#, c-format\r
+msgid "[ShapesSequence]         Transfer Mode:\t\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:991\r
+#, c-format\r
+msgid "[ShapesSequence]         Transfer Mode Period:\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:992\r
+#, c-format\r
+msgid "[ShapesSequence]         First Frame Sound:\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:993\r
+#, c-format\r
+msgid "[ShapesSequence]         Key Frame Sound:\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:994\r
+#, c-format\r
+msgid "[ShapesSequence]         Last Frame Sound:\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:995\r
+#, c-format\r
+msgid "[ShapesSequence]         Pixels to World:\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:996\r
+#, c-format\r
+msgid "[ShapesSequence]         Loop Frame:\t\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1000\r
+#, c-format\r
+msgid "[ShapesSequence] Invalid sequence type parameters: numberOfViews=%d, framesPerView=%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1006\r
+#, c-format\r
+msgid "[ShapesSequence] Invalid key/loop frame values in sequence data: keyFrame=%d, loopFrame=%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1011\r
+#, c-format\r
+msgid "[ShapesSequence] Invalid sound values in sequence data: firstFrameSound=%d, keyFrameSound=%d, lastFrameSound=%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1049\r
+#, c-format\r
+msgid "[ShapesSequence] Unknown sequence type %d, don't know the number of views"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1494\r
+#, c-format\r
+msgid "[ShapesChunk] Unknown collection version %d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1499\r
+#, c-format\r
+msgid "[ShapesChunk] Chunk size mismatch (%ld/%d): this may not be a Marathon shapes file"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1510\r
+msgid "[ShapesChunk] Invalid offsets in collection definition: this may not be a Marathon shapes file"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1514\r
+msgid "[ShapesChunk] Invalid object counts in collection definition: this may not be a Marathon shapes file"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1519\r
+#, c-format\r
+msgid "[ShapesChunk]         Version: %d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1520\r
+#, c-format\r
+msgid "[ShapesChunk]         Type:    %d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1521\r
+#, c-format\r
+msgid "[ShapesChunk]         Flags:   %d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1522\r
+#, c-format\r
+msgid "[ShapesChunk]         %d color tables, %d colors per table"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1523\r
+#, c-format\r
+msgid "[ShapesChunk]         %d sequences"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1524\r
+#, c-format\r
+msgid "[ShapesChunk]         %d frames"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1525\r
+#, c-format\r
+msgid "[ShapesChunk]         %d bitmaps"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1533\r
+#, c-format\r
+msgid "[ShapesChunk] Loading colortable %d/%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1543\r
+#, c-format\r
+msgid "[ShapesChunk] Error loading color table %d... Dropped"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1555\r
+msgid "[ShapesChunk] Invalid bitmap offset: this may not be a Marathon shapes file"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1561\r
+#, c-format\r
+msgid "[ShapesChunk] Loading bitmap %d/%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1571\r
+#, c-format\r
+msgid "[ShapesDocument] Error loading bitmap %d... Dropped"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1583\r
+msgid "[ShapesChunk] Invalid sequence offset: this may not be a Marathon shapes file"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1589\r
+#, c-format\r
+msgid "[ShapesChunk] Loading sequence %d/%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1599\r
+msgid "[ShapesDocument] Error loading sequence... Dropped"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1611\r
+msgid "[ShapesChunk] Invalid frame offset: this may not be a Marathon shapes file"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1617\r
+#, c-format\r
+msgid "[ShapesChunk] Loading frame %d/%d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1639\r
+#, c-format\r
+msgid "[ShapesDocument] Error loading frame %d... Dropped"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1662\r
+#, c-format\r
+msgid "[ShapesChunk] Unknown 'cldf' version %d in patch"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1696\r
+msgid "[ShapesChunk] Invliad 'ctab' index"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1718\r
+msgid "[ShapesChunk] Invalid 'hlsh' index"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1737\r
+msgid "[ShapesChunk] Invalid 'llsh' index"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:1760\r
+msgid "[ShapesChunk] Invalid 'bmap' index"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:2010\r
+#, c-format\r
+msgid "[ShapesCollection]     Status: %d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:2011\r
+#, c-format\r
+msgid "[ShapesCollection]     Flags:  %d"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:2017\r
+msgid "[ShapesCollection]     8-bit chunk present"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:2033\r
+msgid "[ShapesCollection] Error loading 8-bit chunk... Dropped"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:2042\r
+msgid "[ShapesCollection]     16/32-bit chunk present"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:2058\r
+msgid "[ShapesCollection] Error loading 16/32-bit chunk... Dropped"\r
+msgstr ""\r
+\r
+#: ../Shapes/ShapesElements.cpp:2083\r
+msgid "[ShapesCollection] Error loading patch chunk; invalid depth"\r
+msgstr ""\r
+\r
 #: ../Shapes/ShapesView.cpp:100\r
 msgid "ShapeFusion : Shapes : "\r
 msgstr ""\r
@@ -3603,6 +4054,248 @@ msgstr ""
 msgid "Delete frame"\r
 msgstr ""\r
 \r
+#: ../Shapes/utilities.cpp:49\r
+#, c-format\r
+msgid "[utilities ShapesBitmapToImage] Pixel value %u with just %u colors/table. Aborting"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsDocument.cpp:114\r
+msgid "[SoundsDocument] There was an error while loading, see log"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsDocument.cpp:201\r
+#, c-format\r
+msgid "[SoundsDocument] Error loading : Incorrect version/tag, (%d/%x)"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsDocument.cpp:206\r
+#, c-format\r
+msgid "[SoundsDocument] Error loading : Incorrect Sound/Source count (%d/%d)"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsDocument.cpp:220\r
+#, c-format\r
+msgid "[SoundsDocument] Version:\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsDocument.cpp:221\r
+#, c-format\r
+msgid "[SoundsDocument] Tag:\t\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsDocument.cpp:222\r
+#, c-format\r
+msgid "[SoundsDocument] Source Count:\t%d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsDocument.cpp:223\r
+#, c-format\r
+msgid "[SoundsDocument] Sound Count:\t%d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsDocument.cpp:235\r
+#, c-format\r
+msgid "[SoundsDocument] Loading source %d, sound %d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsDocument.cpp:242\r
+msgid "[SoundsDocument] Error loading sound definition. Skipping..."\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:188\r
+#, c-format\r
+msgid "[AppleSoundHeader] Unsupported compression format '%.4s.'"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:209\r
+#, c-format\r
+msgid "[AppleSoundHeader] Unknown header type %.2x."\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:283\r
+msgid "[AppleSoundHeader] libsndfile could not open file."\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:320 ../Sounds/SoundsElements.cpp:334\r
+msgid "[AppleSoundHeader] libsndfile write error."\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:330\r
+msgid "[AppleSoundHeader] libsndfile read error."\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:390\r
+msgid "[AppleSoundHeader] libsndfile read error"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:396\r
+msgid "[AppleSoundHeader] libsndfile write error"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:490 ../Sounds/SoundsElements.cpp:497\r
+#, c-format\r
+msgid "Invalid chance %d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:585\r
+#, c-format\r
+msgid "[SoundsDefinition] incorrect Behavior/Chance (%d/%d)"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:600\r
+#, c-format\r
+msgid "[SoundsDefinition] incorrect permutation count : %d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:614\r
+#, c-format\r
+msgid "[SoundsDefinition] incorrect group offset / total length (%d/%d)"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:628\r
+#, c-format\r
+msgid "[SoundsDefinition] Sound Code:\t\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:629\r
+#, c-format\r
+msgid "[SoundsDefinition] Behavior Index:\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:630\r
+#, c-format\r
+msgid "[SoundsDefinition] Flags:\t\t\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:631\r
+#, c-format\r
+msgid "[SoundsDefinition] Chance:\t\t\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:632\r
+#, c-format\r
+msgid "[SoundsDefinition] Low Pitch:\t\t\t%f"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:633\r
+#, c-format\r
+msgid "[SoundsDefinition] High Pitch:\t\t\t%f"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:634\r
+#, c-format\r
+msgid "[SoundsDefinition] Permutations:\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:635\r
+#, c-format\r
+msgid "[SoundsDefinition] Permutations Played:\t%d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:636\r
+#, c-format\r
+msgid "[SoundsDefinition] Group Offset:\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:637\r
+#, c-format\r
+msgid "[SoundsDefinition] Single Length:\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:638\r
+#, c-format\r
+msgid "[SoundsDefinition] Total Length:\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsElements.cpp:639\r
+#, c-format\r
+msgid "[SoundsDefinition] Last Played:\t\t\t%d"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:72\r
+msgid "ShapeFusion : Sounds : "\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:86\r
+msgid "Soft"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:86\r
+msgid "Loud"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:92\r
+msgid "Sound classes: "\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:93\r
+msgid "Class ID: "\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:96\r
+msgid "Class number: "\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:101\r
+msgid "Cannot be restarted"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:102\r
+msgid "Does not self-abort"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:103\r
+msgid "Resists pitch changes"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:104\r
+msgid "Can't change pitch"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:105\r
+msgid "Can't be obstructed"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:106\r
+msgid "Can't be media obstructed"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:107\r
+msgid "Is ambient"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:109\r
+msgid "Volume"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:111\r
+msgid "Chance: "\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:114\r
+msgid "Low pitch: "\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:116\r
+msgid "High pitch: "\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:119\r
+msgid "8-bit sounds:"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:122\r
+msgid "16-bit sounds: "\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:125\r
+msgid "Remap 8-bit"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:209\r
+msgid "sound"\r
+msgstr ""\r
+\r
 #: ../Sounds/SoundsView.cpp:222\r
 #, c-format\r
 msgid "Sound source different at %d"\r
@@ -3682,6 +4375,11 @@ msgid "Choose a file name :"
 msgstr ""\r
 \r
 #: ../Sounds/SoundsView.cpp:538\r
+#, c-format\r
+msgid "Sound %d-%d.wav"\r
+msgstr ""\r
+\r
+#: ../Sounds/SoundsView.cpp:538\r
 msgid "WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif"\r
 msgstr ""\r
 \r
index e9ebba7..e428284 100644 (file)
Binary files a/locale/ja/ShapeFusion.mo and b/locale/ja/ShapeFusion.mo differ
index 6802643..ca3b3f4 100644 (file)
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ShapeFusion\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-25 11:18+0900\n"
-"PO-Revision-Date: 2012-02-25 11:29+0900\n"
+"POT-Creation-Date: 2012-02-25 11:48+0900\n"
+"PO-Revision-Date: 2012-02-25 11:51+0900\n"
 "Last-Translator: Logue <logue@hotmail.co.jp>\n"
 "Language-Team: Logue <logue@hotmail.co.jp>\n"
 "MIME-Version: 1.0\n"
@@ -2001,6 +2001,7 @@ msgid "Small"
 msgstr "小"
 
 #: ../ShapeFusionMenus.cpp:119
+#: ../Sounds/SoundsView.cpp:86
 msgid "Medium"
 msgstr "中"
 
@@ -2100,6 +2101,23 @@ msgstr "サウンドをインポート"
 msgid "S&ounds"
 msgstr "サウンド(&S)"
 
+#: ../Physics/PhysicsDocument.cpp:53
+msgid "[PhysicsDocument] There was an error while opening, see log"
+msgstr ""
+
+#: ../Physics/PhysicsDocument.cpp:77
+#, c-format
+msgid "[PhysicsDocument] Error loading: Incorrect version/data version (%i/%i)"
+msgstr ""
+
+#: ../Physics/PhysicsDocument.cpp:92
+msgid "[PhysicsDocument] Error loading: wad count must be 1"
+msgstr ""
+
+#: ../Physics/PhysicsDocument.cpp:111
+msgid "[PhysicsDocument] Error loading: first wad index must be 0"
+msgstr ""
+
 #: ../Physics/PhysicsView.cpp:38
 #: ../Physics/PhysicsView.cpp:1050
 msgid "Appearance"
@@ -2114,9 +2132,8 @@ msgstr ""
 #: ../Physics/PhysicsView.cpp:49
 #: ../Physics/PhysicsView.cpp:847
 #: ../Physics/PhysicsView.cpp:1060
-#, fuzzy
 msgid "Color Table:"
-msgstr "カラーテーブルを使用"
+msgstr "カラーテーブル"
 
 #: ../Physics/PhysicsView.cpp:53
 msgid "Sequence IDs:"
@@ -2151,14 +2168,12 @@ msgid "Moving:"
 msgstr ""
 
 #: ../Physics/PhysicsView.cpp:88
-#, fuzzy
 msgid "Teleport In:"
-msgstr "ã\83\86ã\83¬ã\83\9dã\83¼ã\82¿ã\83¼"
+msgstr "ã\83\86ã\83¬ã\83\9dã\83¼ã\83\88ã\82¤ã\83³ï¼\9a"
 
 #: ../Physics/PhysicsView.cpp:92
-#, fuzzy
 msgid "Teleport Out:"
-msgstr "ã\83\86ã\83¬ã\83\9dã\83¼ã\82¿ã\83¼"
+msgstr "ã\83\86ã\83¬ã\83\9dã\83¼ã\83\88ã\82¢ã\82¦ã\83\88ï¼\9a"
 
 #: ../Physics/PhysicsView.cpp:96
 msgid "Melee Attack:"
@@ -2500,6 +2515,7 @@ msgstr ""
 #: ../Physics/PhysicsView.cpp:525
 #: ../Physics/PhysicsView.cpp:972
 #: ../Physics/PhysicsView.cpp:1183
+#: ../Sounds/SoundsView.cpp:131
 msgid "Flags"
 msgstr "フラグ:"
 
@@ -2674,7 +2690,7 @@ msgstr "ショット"
 
 #: ../Physics/PhysicsView.cpp:857
 msgid "Damage"
-msgstr ""
+msgstr "ダメージ"
 
 #: ../Physics/PhysicsView.cpp:872
 msgid "Damage Base:"
@@ -2937,7 +2953,7 @@ msgstr ""
 
 #: ../Physics/PhysicsView.cpp:1186
 msgid "Disappears after use"
-msgstr ""
+msgstr "使用後見えなくなる"
 
 #: ../Physics/PhysicsView.cpp:1187
 msgid "Plays instant shell casing sound"
@@ -2945,7 +2961,7 @@ msgstr ""
 
 #: ../Physics/PhysicsView.cpp:1188
 msgid "Overloads"
-msgstr ""
+msgstr "オーバーロード"
 
 #: ../Physics/PhysicsView.cpp:1189
 msgid "Random ammo on pickup"
@@ -2973,11 +2989,11 @@ msgstr ""
 
 #: ../Physics/PhysicsView.cpp:1218
 msgid "Main Trigger"
-msgstr ""
+msgstr "主砲"
 
 #: ../Physics/PhysicsView.cpp:1219
 msgid "Secondary Trigger"
-msgstr ""
+msgstr "副砲"
 
 #: ../Physics/PhysicsView.cpp:1238
 msgid "Projectile:"
@@ -2989,7 +3005,7 @@ msgstr ""
 
 #: ../Physics/PhysicsView.cpp:1261
 msgid "Click:"
-msgstr ""
+msgstr "クリック:"
 
 #: ../Physics/PhysicsView.cpp:1269
 msgid "Shell Casing:"
@@ -3041,7 +3057,7 @@ msgstr ""
 
 #: ../Physics/PhysicsView.cpp:1440
 msgid "Aliens"
-msgstr ""
+msgstr "エイリアン"
 
 #: ../Physics/PhysicsView.cpp:1445
 msgid "Appearance and Sounds"
@@ -3065,7 +3081,7 @@ msgstr ""
 
 #: ../Physics/PhysicsView.cpp:1452
 msgid "Effects"
-msgstr ""
+msgstr "効果"
 
 #: ../Physics/PhysicsView.cpp:1458
 msgid "Shots"
@@ -3073,15 +3089,15 @@ msgstr "ショット"
 
 #: ../Physics/PhysicsView.cpp:1465
 msgid "Walking"
-msgstr ""
+msgstr "歩行"
 
 #: ../Physics/PhysicsView.cpp:1466
 msgid "Running"
-msgstr ""
+msgstr "走行"
 
 #: ../Physics/PhysicsView.cpp:1468
 msgid "Weapons"
-msgstr ""
+msgstr "武器"
 
 #: ../Physics/PhysicsView.cpp:1473
 msgid "Weapon Definition"
@@ -3091,6 +3107,38 @@ msgstr ""
 msgid "Trigger Settings"
 msgstr ""
 
+#: ../Shapes/BitmapBrowser.cpp:257
+msgid "[BitmapBrowser] Added a bitmap with NULL pixels"
+msgstr ""
+
+#: ../Shapes/BitmapView.cpp:119
+msgid "[BitmapView] Addes a bitmap with NULL pixels"
+msgstr ""
+
+#: ../Shapes/FrameBrowser.cpp:272
+msgid "FrameBrowser: someone tried to add a bitmap with NULL pixels"
+msgstr ""
+
+#: ../Shapes/FrameView.cpp:80
+msgid "Origin"
+msgstr ""
+
+#: ../Shapes/FrameView.cpp:81
+msgid "Keypoint"
+msgstr ""
+
+#: ../Shapes/FrameView.cpp:98
+msgid "No associated bitmap"
+msgstr ""
+
+#: ../Shapes/FrameView.cpp:300
+msgid "[FrameView] Added a bitmap with NULL pixels"
+msgstr ""
+
+#: ../Shapes/SequenceView.cpp:391
+msgid "SequenceView: someone tried to add a bitmap with NULL pixels"
+msgstr ""
+
 #: ../Shapes/SequenceView.cpp:571
 msgid "Change frame:"
 msgstr "フレーム変更:"
@@ -3099,6 +3147,409 @@ msgstr "フレーム変更:"
 msgid "Chage frame"
 msgstr "チャージフレーム:"
 
+#: ../Shapes/ShapesDocument.cpp:172
+msgid "[ShapesDocument] There was an error while loading, see log"
+msgstr ""
+
+#: ../Shapes/ShapesDocument.cpp:239
+msgid "[ShapesDocument] Shapes files must contain the same number of collections to generate a patch"
+msgstr ""
+
+#: ../Shapes/ShapesDocument.cpp:272
+msgid "[ShapesDocument] File too small to be a Marathon shapes file"
+msgstr ""
+
+#: ../Shapes/ShapesDocument.cpp:283
+#, c-format
+msgid "[ShapesDocument] Trying to load collection %d"
+msgstr ""
+
+#: ../Shapes/ShapesDocument.cpp:302
+msgid "[ShapesDocument] Could not find enough collections. This may not be a Marathon Shapes file."
+msgstr ""
+
+#: ../Shapes/ShapesDocument.cpp:338
+msgid "Shapes patches cannot add entire collections"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:138
+msgid "This Adobe Color Table file has an invalid size: will not try to load it."
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:214
+#, fuzzy
+msgid "[ShapesColorTable] Error loading color table"
+msgstr "カラーテーブル読み込み時にエラーが発生しました。"
+
+#: ../Shapes/ShapesElements.cpp:437
+#, c-format
+msgid "[ShapesBitmap] Invalid bitmap width %d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:441
+#, c-format
+msgid "[ShapesBitmap] Invalid bitmap height %d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:445
+#, c-format
+msgid "[ShapesBitmap] Invalid bitmap bytes-per-row %d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:456
+#, c-format
+msgid "[ShapesBitmap] Invalid bitmap depth %d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:461
+#, c-format
+msgid "[ShapesBitmap]         Width:\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:462
+#, c-format
+msgid "[ShapesBitmap]         Height:\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:463
+#, c-format
+msgid "[ShapesBitmap]         Bytes/Row:\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:464
+#, c-format
+msgid "[ShapesBitmap]         Flags:\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:465
+#, c-format
+msgid "[ShapesBitmap]         Bit Depth:\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:476
+msgid "[ShapesBitmap] Could not allocate pixel buffer"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:697
+#, c-format
+msgid "Could not allocate new %dx%d bitmap\n"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:826
+#, c-format
+msgid "[ShapesFrame]         Flags:\t\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:827
+#, c-format
+msgid "[ShapesFrame]         Min. Light Intensity:\t%f"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:828
+#, c-format
+msgid "[ShapesFrame]         Bitmap Index:\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:829
+#, c-format
+msgid "[ShapesFrame]         Origin (X):\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:830
+#, c-format
+msgid "[ShapesFrame]         Origin (Y):\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:831
+#, c-format
+msgid "[ShapesFrame]         Key (X):\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:832
+#, c-format
+msgid "[ShapesFrame]         Key (Y):\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:833
+#, c-format
+msgid "[ShapesFrame]         World (Left):\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:834
+#, c-format
+msgid "[ShapesFrame]         World (Right):\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:835
+#, c-format
+msgid "[ShapesFrame]         World (Top):\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:836
+#, c-format
+msgid "[ShapesFrame]         World (Bottom):\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:837
+#, c-format
+msgid "[ShapesFrame]         World (X0):\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:838
+#, c-format
+msgid "[ShapesFrame]         World (Y0):\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:954
+#, c-format
+msgid "[ShapesSequence] Sequence name too long (%d/32)"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:983
+#, c-format
+msgid "[ShapesSequence]         Type:\t\t\t\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:984
+#, c-format
+msgid "[ShapesSequence]         Flags:\t\t\t\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:985
+#, c-format
+msgid "[ShapesSequence]         Name:\t\t\t\t\t%s"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:986
+#, c-format
+msgid "[ShapesSequence]         Number of Views:\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:987
+#, c-format
+msgid "[ShapesSequence]         Frames/Views:\t\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:988
+#, c-format
+msgid "[ShapesSequence]         Ticks/Frame:\t\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:989
+#, c-format
+msgid "[ShapesSequence]         Key Frame:\t\t\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:990
+#, c-format
+msgid "[ShapesSequence]         Transfer Mode:\t\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:991
+#, c-format
+msgid "[ShapesSequence]         Transfer Mode Period:\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:992
+#, c-format
+msgid "[ShapesSequence]         First Frame Sound:\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:993
+#, c-format
+msgid "[ShapesSequence]         Key Frame Sound:\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:994
+#, c-format
+msgid "[ShapesSequence]         Last Frame Sound:\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:995
+#, c-format
+msgid "[ShapesSequence]         Pixels to World:\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:996
+#, c-format
+msgid "[ShapesSequence]         Loop Frame:\t\t\t%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1000
+#, c-format
+msgid "[ShapesSequence] Invalid sequence type parameters: numberOfViews=%d, framesPerView=%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1006
+#, c-format
+msgid "[ShapesSequence] Invalid key/loop frame values in sequence data: keyFrame=%d, loopFrame=%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1011
+#, c-format
+msgid "[ShapesSequence] Invalid sound values in sequence data: firstFrameSound=%d, keyFrameSound=%d, lastFrameSound=%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1049
+#, c-format
+msgid "[ShapesSequence] Unknown sequence type %d, don't know the number of views"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1494
+#, c-format
+msgid "[ShapesChunk] Unknown collection version %d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1499
+#, c-format
+msgid "[ShapesChunk] Chunk size mismatch (%ld/%d): this may not be a Marathon shapes file"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1510
+msgid "[ShapesChunk] Invalid offsets in collection definition: this may not be a Marathon shapes file"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1514
+msgid "[ShapesChunk] Invalid object counts in collection definition: this may not be a Marathon shapes file"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1519
+#, c-format
+msgid "[ShapesChunk]         Version: %d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1520
+#, c-format
+msgid "[ShapesChunk]         Type:    %d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1521
+#, c-format
+msgid "[ShapesChunk]         Flags:   %d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1522
+#, c-format
+msgid "[ShapesChunk]         %d color tables, %d colors per table"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1523
+#, c-format
+msgid "[ShapesChunk]         %d sequences"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1524
+#, c-format
+msgid "[ShapesChunk]         %d frames"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1525
+#, c-format
+msgid "[ShapesChunk]         %d bitmaps"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1533
+#, c-format
+msgid "[ShapesChunk] Loading colortable %d/%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1543
+#, fuzzy, c-format
+msgid "[ShapesChunk] Error loading color table %d... Dropped"
+msgstr "カラーテーブル読み込み時にエラーが発生しました。"
+
+#: ../Shapes/ShapesElements.cpp:1555
+msgid "[ShapesChunk] Invalid bitmap offset: this may not be a Marathon shapes file"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1561
+#, c-format
+msgid "[ShapesChunk] Loading bitmap %d/%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1571
+#, c-format
+msgid "[ShapesDocument] Error loading bitmap %d... Dropped"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1583
+msgid "[ShapesChunk] Invalid sequence offset: this may not be a Marathon shapes file"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1589
+#, c-format
+msgid "[ShapesChunk] Loading sequence %d/%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1599
+msgid "[ShapesDocument] Error loading sequence... Dropped"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1611
+msgid "[ShapesChunk] Invalid frame offset: this may not be a Marathon shapes file"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1617
+#, c-format
+msgid "[ShapesChunk] Loading frame %d/%d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1639
+#, c-format
+msgid "[ShapesDocument] Error loading frame %d... Dropped"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1662
+#, c-format
+msgid "[ShapesChunk] Unknown 'cldf' version %d in patch"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1696
+msgid "[ShapesChunk] Invliad 'ctab' index"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1718
+msgid "[ShapesChunk] Invalid 'hlsh' index"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1737
+msgid "[ShapesChunk] Invalid 'llsh' index"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:1760
+msgid "[ShapesChunk] Invalid 'bmap' index"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:2010
+#, c-format
+msgid "[ShapesCollection]     Status: %d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:2011
+#, c-format
+msgid "[ShapesCollection]     Flags:  %d"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:2017
+msgid "[ShapesCollection]     8-bit chunk present"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:2033
+msgid "[ShapesCollection] Error loading 8-bit chunk... Dropped"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:2042
+msgid "[ShapesCollection]     16/32-bit chunk present"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:2058
+msgid "[ShapesCollection] Error loading 16/32-bit chunk... Dropped"
+msgstr ""
+
+#: ../Shapes/ShapesElements.cpp:2083
+msgid "[ShapesCollection] Error loading patch chunk; invalid depth"
+msgstr ""
+
 #: ../Shapes/ShapesView.cpp:100
 msgid "ShapeFusion : Shapes : "
 msgstr "ShapeFusion:形態:"
@@ -3299,7 +3750,7 @@ msgstr ""
 
 #: ../Shapes/ShapesView.cpp:327
 msgid "Normal"
-msgstr ""
+msgstr "通常"
 
 #: ../Shapes/ShapesView.cpp:328
 msgid "Fade out to black"
@@ -3339,7 +3790,7 @@ msgstr ""
 
 #: ../Shapes/ShapesView.cpp:336
 msgid "Landscape"
-msgstr ""
+msgstr "背景"
 
 #: ../Shapes/ShapesView.cpp:337
 #, fuzzy
@@ -3683,7 +4134,7 @@ msgstr ""
 
 #: ../Shapes/ShapesView.cpp:1259
 msgid "RLE"
-msgstr ""
+msgstr "RLE形式"
 
 #: ../Shapes/ShapesView.cpp:1261
 #, c-format
@@ -3712,6 +4163,255 @@ msgstr ""
 msgid "Delete frame"
 msgstr "フレームを削除"
 
+#: ../Shapes/utilities.cpp:49
+#, c-format
+msgid "[utilities ShapesBitmapToImage] Pixel value %u with just %u colors/table. Aborting"
+msgstr ""
+
+#: ../Sounds/SoundsDocument.cpp:114
+msgid "[SoundsDocument] There was an error while loading, see log"
+msgstr ""
+
+#: ../Sounds/SoundsDocument.cpp:201
+#, c-format
+msgid "[SoundsDocument] Error loading : Incorrect version/tag, (%d/%x)"
+msgstr ""
+
+#: ../Sounds/SoundsDocument.cpp:206
+#, c-format
+msgid "[SoundsDocument] Error loading : Incorrect Sound/Source count (%d/%d)"
+msgstr ""
+
+#: ../Sounds/SoundsDocument.cpp:220
+#, c-format
+msgid "[SoundsDocument] Version:\t\t%d"
+msgstr ""
+
+#: ../Sounds/SoundsDocument.cpp:221
+#, c-format
+msgid "[SoundsDocument] Tag:\t\t\t%d"
+msgstr ""
+
+#: ../Sounds/SoundsDocument.cpp:222
+#, c-format
+msgid "[SoundsDocument] Source Count:\t%d"
+msgstr ""
+
+#: ../Sounds/SoundsDocument.cpp:223
+#, c-format
+msgid "[SoundsDocument] Sound Count:\t%d"
+msgstr ""
+
+#: ../Sounds/SoundsDocument.cpp:235
+#, c-format
+msgid "[SoundsDocument] Loading source %d, sound %d"
+msgstr ""
+
+#: ../Sounds/SoundsDocument.cpp:242
+msgid "[SoundsDocument] Error loading sound definition. Skipping..."
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:188
+#, c-format
+msgid "[AppleSoundHeader] Unsupported compression format '%.4s.'"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:209
+#, c-format
+msgid "[AppleSoundHeader] Unknown header type %.2x."
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:283
+msgid "[AppleSoundHeader] libsndfile could not open file."
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:320
+#: ../Sounds/SoundsElements.cpp:334
+msgid "[AppleSoundHeader] libsndfile write error."
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:330
+msgid "[AppleSoundHeader] libsndfile read error."
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:390
+msgid "[AppleSoundHeader] libsndfile read error"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:396
+msgid "[AppleSoundHeader] libsndfile write error"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:490
+#: ../Sounds/SoundsElements.cpp:497
+#, c-format
+msgid "Invalid chance %d"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:585
+#, c-format
+msgid "[SoundsDefinition] incorrect Behavior/Chance (%d/%d)"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:600
+#, c-format
+msgid "[SoundsDefinition] incorrect permutation count : %d"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:614
+#, c-format
+msgid "[SoundsDefinition] incorrect group offset / total length (%d/%d)"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:628
+#, c-format
+msgid "[SoundsDefinition] Sound Code:\t\t\t%d"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:629
+#, c-format
+msgid "[SoundsDefinition] Behavior Index:\t\t%d"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:630
+#, c-format
+msgid "[SoundsDefinition] Flags:\t\t\t\t%d"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:631
+#, c-format
+msgid "[SoundsDefinition] Chance:\t\t\t\t%d"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:632
+#, c-format
+msgid "[SoundsDefinition] Low Pitch:\t\t\t%f"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:633
+#, c-format
+msgid "[SoundsDefinition] High Pitch:\t\t\t%f"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:634
+#, c-format
+msgid "[SoundsDefinition] Permutations:\t\t%d"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:635
+#, c-format
+msgid "[SoundsDefinition] Permutations Played:\t%d"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:636
+#, c-format
+msgid "[SoundsDefinition] Group Offset:\t\t%d"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:637
+#, c-format
+msgid "[SoundsDefinition] Single Length:\t\t%d"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:638
+#, c-format
+msgid "[SoundsDefinition] Total Length:\t\t%d"
+msgstr ""
+
+#: ../Sounds/SoundsElements.cpp:639
+#, c-format
+msgid "[SoundsDefinition] Last Played:\t\t\t%d"
+msgstr ""
+
+#: ../Sounds/SoundsView.cpp:72
+#, fuzzy
+msgid "ShapeFusion : Sounds : "
+msgstr "ShapeFusion:形態:"
+
+#: ../Sounds/SoundsView.cpp:86
+#, fuzzy
+msgid "Soft"
+msgstr "ショット"
+
+#: ../Sounds/SoundsView.cpp:86
+#, fuzzy
+msgid "Loud"
+msgstr "サウンド"
+
+#: ../Sounds/SoundsView.cpp:92
+msgid "Sound classes: "
+msgstr ""
+
+#: ../Sounds/SoundsView.cpp:93
+msgid "Class ID: "
+msgstr ""
+
+#: ../Sounds/SoundsView.cpp:96
+msgid "Class number: "
+msgstr ""
+
+#: ../Sounds/SoundsView.cpp:101
+msgid "Cannot be restarted"
+msgstr ""
+
+#: ../Sounds/SoundsView.cpp:102
+msgid "Does not self-abort"
+msgstr ""
+
+#: ../Sounds/SoundsView.cpp:103
+msgid "Resists pitch changes"
+msgstr ""
+
+#: ../Sounds/SoundsView.cpp:104
+msgid "Can't change pitch"
+msgstr ""
+
+#: ../Sounds/SoundsView.cpp:105
+msgid "Can't be obstructed"
+msgstr ""
+
+#: ../Sounds/SoundsView.cpp:106
+msgid "Can't be media obstructed"
+msgstr ""
+
+#: ../Sounds/SoundsView.cpp:107
+msgid "Is ambient"
+msgstr ""
+
+#: ../Sounds/SoundsView.cpp:109
+msgid "Volume"
+msgstr "音量"
+
+#: ../Sounds/SoundsView.cpp:111
+#, fuzzy
+msgid "Chance: "
+msgstr "チャージ済み:"
+
+#: ../Sounds/SoundsView.cpp:114
+msgid "Low pitch: "
+msgstr ""
+
+#: ../Sounds/SoundsView.cpp:116
+msgid "High pitch: "
+msgstr ""
+
+#: ../Sounds/SoundsView.cpp:119
+msgid "8-bit sounds:"
+msgstr ""
+
+#: ../Sounds/SoundsView.cpp:122
+msgid "16-bit sounds: "
+msgstr ""
+
+#: ../Sounds/SoundsView.cpp:125
+msgid "Remap 8-bit"
+msgstr ""
+
+#: ../Sounds/SoundsView.cpp:209
+#, fuzzy
+msgid "sound"
+msgstr "サウンド"
+
 #: ../Sounds/SoundsView.cpp:222
 #, c-format
 msgid "Sound source different at %d"
@@ -3791,6 +4491,11 @@ msgid "Choose a file name :"
 msgstr "フィル名を選択:"
 
 #: ../Sounds/SoundsView.cpp:538
+#, fuzzy, c-format
+msgid "Sound %d-%d.wav"
+msgstr "サウンド%d"
+
+#: ../Sounds/SoundsView.cpp:538
 msgid "WAV files (*.wav)|*.wav|AIFF files (*.aif)|*.aif"
 msgstr "WAVファイル(*.wav)|*.wav|AIFFファイル(*.aif)|*.aif"