png_jpg => png_gif_jpg, because an swf can contain gif, too, and ffdec already expoted them as gif when png_jpg was selected

This commit is contained in:
2015-05-15 20:14:18 +02:00
parent 6cf53543d1
commit 8fa0698d59
21 changed files with 488 additions and 470 deletions
@@ -202,7 +202,7 @@ public class CommandLineArgumentParser {
out.println(" frame:canvas - HTML5 Canvas format for Frames");
out.println(" frame:pdf - PDF format for Frames");
out.println(" frame:bmp - BMP format for Frames");
out.println(" image:png_jpeg - PNG/JPEG format for Images");
out.println(" image:png_gif_jpeg - PNG/GIF/JPEG format for Images");
out.println(" image:png - PNG format for Images");
out.println(" image:jpeg - JPEG format for Images");
out.println(" image:bmp - BMP format for Images");
@@ -1,84 +1,84 @@
# Copyright (C) 2010-2015 JPEXS
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
shapes = Shapes
shapes.svg = SVG
shapes.png = PNG
shapes.bmp = BMP
shapes.canvas = HTML5 Canvas
texts = Texts
texts.plain = Plain text
texts.formatted = Formatted text
texts.svg = SVG
images = Images
images.png_jpeg = PNG/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
movies = Movies
movies.flv = FLV (No audio)
sounds = Sounds
sounds.mp3_wav_flv = MP3/WAV/FLV
sounds.flv = FLV (Audio only)
sounds.mp3_wav = MP3/WAV
sounds.wav = WAV
scripts = Scripts
scripts.as = ActionScript
scripts.pcode = P-code
scripts.pcode_hex = P-code with Hex
scripts.hex = Hex
scripts.constants = Constants
binaryData = Binary data
binaryData.raw = Raw
dialog.title = Export...
button.ok = OK
button.cancel = Cancel
morphshapes = Morphshapes
morphshapes.gif = GIF
morphshapes.svg = SVG
morphshapes.canvas = HTML5 Canvas
frames = Frames
frames.png = PNG
frames.gif = GIF
frames.avi = AVI
frames.svg = SVG
frames.canvas = HTML5 Canvas
frames.pdf = PDF
frames.bmp = BMP
buttons = Buttons
buttons.png = PNG
buttons.svg = SVG
buttons.bmp = BMP
fonts = Fonts
fonts.ttf = TTF
fonts.woff = WOFF
zoom = Zoom
zoom.percent = %
zoom.invalid = Invalid zoom value.
symbolclass = Symbol-Class mapping
symbolclass.csv = CSV
# Copyright (C) 2010-2015 JPEXS
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
shapes = Shapes
shapes.svg = SVG
shapes.png = PNG
shapes.bmp = BMP
shapes.canvas = HTML5 Canvas
texts = Texts
texts.plain = Plain text
texts.formatted = Formatted text
texts.svg = SVG
images = Images
images.png_gif_jpeg = PNG/GIF/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
movies = Movies
movies.flv = FLV (No audio)
sounds = Sounds
sounds.mp3_wav_flv = MP3/WAV/FLV
sounds.flv = FLV (Audio only)
sounds.mp3_wav = MP3/WAV
sounds.wav = WAV
scripts = Scripts
scripts.as = ActionScript
scripts.pcode = P-code
scripts.pcode_hex = P-code with Hex
scripts.hex = Hex
scripts.constants = Constants
binaryData = Binary data
binaryData.raw = Raw
dialog.title = Export...
button.ok = OK
button.cancel = Cancel
morphshapes = Morphshapes
morphshapes.gif = GIF
morphshapes.svg = SVG
morphshapes.canvas = HTML5 Canvas
frames = Frames
frames.png = PNG
frames.gif = GIF
frames.avi = AVI
frames.svg = SVG
frames.canvas = HTML5 Canvas
frames.pdf = PDF
frames.bmp = BMP
buttons = Buttons
buttons.png = PNG
buttons.svg = SVG
buttons.bmp = BMP
fonts = Fonts
fonts.ttf = TTF
fonts.woff = WOFF
zoom = Zoom
zoom.percent = %
zoom.invalid = Invalid zoom value.
symbolclass = Symbol-Class mapping
symbolclass.csv = CSV
@@ -24,7 +24,7 @@ texts.formatted = Text formatat
texts.svg = SVG
images = Imatges
images.png_jpeg = PNG/JPEG
images.png_gif_jpeg = PNG/GIF/JPEG
images.png = PNG
images.jpeg = JPEG
@@ -1,78 +1,78 @@
# Copyright (C) 2010-2015 JPEXS
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
shapes = Tvary
shapes.svg = SVG
shapes.png = PNG
shapes.bmp = BMP
shapes.canvas = HTML5 Canvas
texts = Texty
texts.plain = \u010cist\u00fd Text
texts.formatted = Form\u00e1tovan\u00fd text
texts.svg = SVG
images = Obr\u00e1zky
images.png_jpeg = PNG/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
movies = Videa
movies.flv = FLV (bez zvuku)
sounds = Zvuky
sounds.mp3_wav_flv = MP3/WAV/FLV
sounds.flv = FLV (pouze zvuk)
sounds.mp3_wav = MP3/WAV
sounds.wav = WAV
scripts = Skripty
scripts.as = ActionScript
scripts.pcode = P-k\u00f3d
scripts.pcode_hex = P-k\u00f3d s hex
scripts.hex = Hex
binaryData = Bin\u00e1rn\u00ed data
binaryData.raw = Raw
dialog.title = Exportovat...
button.ok = OK
button.cancel = Storno
morphshapes = Morphshapes
morphshapes.gif = GIF
morphshapes.svg = SVG
morphshapes.canvas = HTML5 Canvas
frames = Sn\u00edmky
frames.png = PNG
frames.gif = GIF
frames.avi = AVI
frames.svg = SVG
frames.canvas = HTML5 Canvas
frames.pdf = PDF
frames.bmp = BMP
fonts = P\u00edsma
fonts.ttf = TTF
fonts.woff = WOFF
zoom = P\u0159ibl\u00ed\u017een\u00ed
zoom.percent = %
zoom.invalid = Neplatn\u00e1 hodnota velikost.
symbolclass = Mapov\u00e1n\u00ed symbol\u016f na t\u0159\u00eddy
# Copyright (C) 2010-2015 JPEXS
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
shapes = Tvary
shapes.svg = SVG
shapes.png = PNG
shapes.bmp = BMP
shapes.canvas = HTML5 Canvas
texts = Texty
texts.plain = \u010cist\u00fd Text
texts.formatted = Form\u00e1tovan\u00fd text
texts.svg = SVG
images = Obr\u00e1zky
images.png_gif_jpeg = PNG/GIF/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
movies = Videa
movies.flv = FLV (bez zvuku)
sounds = Zvuky
sounds.mp3_wav_flv = MP3/WAV/FLV
sounds.flv = FLV (pouze zvuk)
sounds.mp3_wav = MP3/WAV
sounds.wav = WAV
scripts = Skripty
scripts.as = ActionScript
scripts.pcode = P-k\u00f3d
scripts.pcode_hex = P-k\u00f3d s hex
scripts.hex = Hex
binaryData = Bin\u00e1rn\u00ed data
binaryData.raw = Raw
dialog.title = Exportovat...
button.ok = OK
button.cancel = Storno
morphshapes = Morphshapes
morphshapes.gif = GIF
morphshapes.svg = SVG
morphshapes.canvas = HTML5 Canvas
frames = Sn\u00edmky
frames.png = PNG
frames.gif = GIF
frames.avi = AVI
frames.svg = SVG
frames.canvas = HTML5 Canvas
frames.pdf = PDF
frames.bmp = BMP
fonts = P\u00edsma
fonts.ttf = TTF
fonts.woff = WOFF
zoom = P\u0159ibl\u00ed\u017een\u00ed
zoom.percent = %
zoom.invalid = Neplatn\u00e1 hodnota velikost.
symbolclass = Mapov\u00e1n\u00ed symbol\u016f na t\u0159\u00eddy
symbolclass.csv = CSV
@@ -22,7 +22,7 @@ texts.plain = Klartext
texts.formatted = Formatierter Text
images = Bilder
images.png_jpeg = PNG/JPEG
images.png_gif_jpeg = PNG/GIF/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
@@ -22,7 +22,7 @@ texts.plain = Texto plano
texts.formatted = Texto formateado
images = Im\u00e1genes
images.png_jpeg = PNG/JPEG
images.png_gif_jpeg = PNG/GIF/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
@@ -24,7 +24,7 @@ texts.formatted = Texte format\u00e9
texts.svg = SVG
images = Images
images.png_jpeg = PNG/JPEG
images.png_gif_jpeg = PNG/GIF/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
@@ -1,84 +1,84 @@
# Copyright (C) 2010-2015 JPEXS
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
shapes = Alakzatok
shapes.svg = SVG
shapes.png = PNG
shapes.bmp = BMP
shapes.canvas = HTML5 V\u00e1szon
texts = Sz\u00f6vegek
texts.plain = Egyszer\u0171 sz\u00f6veg
texts.formatted = Form\u00e1zott sz\u00f6veg
texts.svg = SVG
images = K\u00e9pek
images.png_jpeg = PNG/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
movies = Mozg\u00f3k\u00e9pek
movies.flv = FLV (Hang n\u00e9lk\u00fcl)
sounds = Hangok
sounds.mp3_wav_flv = MP3/WAV/FLV
sounds.flv = FLV (Csak hang)
sounds.mp3_wav = MP3/WAV
sounds.wav = WAV
scripts = Szkriptek
scripts.as = ActionScript
scripts.pcode = P-code
scripts.pcode_hex = P-code \u00e9s Hexa
scripts.hex = Hexa
scripts.constants = Konstansok
binaryData = Binary data
binaryData.raw = Nyers
dialog.title = Export\u00e1l\u00e1s...
button.ok = OK
button.cancel = M\u00e9gse
morphshapes = Morph alakzatok
morphshapes.gif = GIF
morphshapes.svg = SVG
morphshapes.canvas = HTML5 V\u00e1szon
frames = Keretek
frames.png = PNG
frames.gif = GIF
frames.avi = AVI
frames.svg = SVG
frames.canvas = HTML5 V\u00e1szon
frames.pdf = PDF
frames.bmp = BMP
buttons = Gombok
buttons.png = PNG
buttons.svg = SVG
buttons.bmp = BMP
fonts = Bet\u0171t\u00edpusok
fonts.ttf = TTF
fonts.woff = WOFF
zoom = Nagy\u00edt\u00e1s
zoom.percent = %
zoom.invalid = \u00c9rv\u00e9nytelen nagy\u00edt\u00e1si \u00e9rt\u00e9k.
symbolclass = Szimb\u00f3lum oszt\u00e1ly
symbolclass.csv = CSV
# Copyright (C) 2010-2015 JPEXS
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
shapes = Alakzatok
shapes.svg = SVG
shapes.png = PNG
shapes.bmp = BMP
shapes.canvas = HTML5 V\u00e1szon
texts = Sz\u00f6vegek
texts.plain = Egyszer\u0171 sz\u00f6veg
texts.formatted = Form\u00e1zott sz\u00f6veg
texts.svg = SVG
images = K\u00e9pek
images.png_gif_jpeg = PNG/GIF/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
movies = Mozg\u00f3k\u00e9pek
movies.flv = FLV (Hang n\u00e9lk\u00fcl)
sounds = Hangok
sounds.mp3_wav_flv = MP3/WAV/FLV
sounds.flv = FLV (Csak hang)
sounds.mp3_wav = MP3/WAV
sounds.wav = WAV
scripts = Szkriptek
scripts.as = ActionScript
scripts.pcode = P-code
scripts.pcode_hex = P-code \u00e9s Hexa
scripts.hex = Hexa
scripts.constants = Konstansok
binaryData = Binary data
binaryData.raw = Nyers
dialog.title = Export\u00e1l\u00e1s...
button.ok = OK
button.cancel = M\u00e9gse
morphshapes = Morph alakzatok
morphshapes.gif = GIF
morphshapes.svg = SVG
morphshapes.canvas = HTML5 V\u00e1szon
frames = Keretek
frames.png = PNG
frames.gif = GIF
frames.avi = AVI
frames.svg = SVG
frames.canvas = HTML5 V\u00e1szon
frames.pdf = PDF
frames.bmp = BMP
buttons = Gombok
buttons.png = PNG
buttons.svg = SVG
buttons.bmp = BMP
fonts = Bet\u0171t\u00edpusok
fonts.ttf = TTF
fonts.woff = WOFF
zoom = Nagy\u00edt\u00e1s
zoom.percent = %
zoom.invalid = \u00c9rv\u00e9nytelen nagy\u00edt\u00e1si \u00e9rt\u00e9k.
symbolclass = Szimb\u00f3lum oszt\u00e1ly
symbolclass.csv = CSV
@@ -22,7 +22,7 @@ texts.plain = Platte tekst
texts.formatted = Geformatteerde tekst
images = Images
images.png_jpeg = PNG/JPEG
images.png_gif_jpeg = PNG/GIF/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
@@ -24,7 +24,7 @@ texts.formatted = Sformatowany tekst
texts.svg = SVG
images = Obrazy
images.png_jpeg = PNG/JPEG
images.png_gif_jpeg = PNG/GIF/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
@@ -22,7 +22,7 @@ texts.plain = Texto simples
texts.formatted = Texto Formatador
images = Imagens
images.png_jpeg = PNG/JPEG
images.png_gif_jpeg = PNG/GIF/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
@@ -22,7 +22,7 @@ texts.plain = Texto simples
texts.formatted = Texto Formatador
images = Imagens
images.png_jpeg = PNG/JPEG
images.png_gif_jpeg = PNG/GIF/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
@@ -24,7 +24,7 @@ texts.formatted = \u0424\u043e\u0440\u043c\u0430\u0442\u0438\u0440\u043e\u0432\u
texts.svg = SVG
images = \u0418\u0437\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u044f
images.png_jpeg = PNG/JPEG
images.png_gif_jpeg = PNG/GIF/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
@@ -1,78 +1,78 @@
# Copyright (C) 2010-2015 JPEXS
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
shapes = Former
shapes.svg = SVG
shapes.png = PNG
shapes.bmp = BMP
shapes.canvas = HTML5 Canvas
texts = Texter
texts.plain = Oformaterad text
texts.formatted = Formaterad text
texts.svg = SVG
images = Bilder
images.png_jpeg = PNG/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
movies = Filmer
movies.flv = FLV (Inget Ljud)
sounds = Ljud
sounds.mp3_wav_flv = MP3/WAV/FLV
sounds.flv = FLV (Bara ljud)
sounds.mp3_wav = MP3/WAV
sounds.wav = WAV
scripts = Scripts
scripts.as = AS
scripts.pcode = P-code
scripts.pcode_hex = P-code med Hex
scripts.hex = Hex
binaryData = Bin\u00e4r data
binaryData.raw = Raw
dialog.title = Exportera...
button.ok = Godk\u00e4nn
button.cancel = Avbryt
morphshapes = Morphshapes
morphshapes.gif = GIF
morphshapes.svg = SVG
morphshapes.canvas = HTML5 Canvas
frames = Frames
frames.png = PNG
frames.gif = GIF
frames.avi = AVI
frames.svg = SVG
frames.canvas = HTML5 Canvas
frames.pdf = PDF
frames.bmp = BMP
fonts = Typnitt
fonts.ttf = TTF
fonts.woff = WOFF
zoom = Zoom
zoom.percent = %
zoom.invalid = Ogiltigt zoomv\u00e4rde.
symbolclass = Symbol Klass
symbolclass.csv = CSV
# Copyright (C) 2010-2015 JPEXS
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
shapes = Former
shapes.svg = SVG
shapes.png = PNG
shapes.bmp = BMP
shapes.canvas = HTML5 Canvas
texts = Texter
texts.plain = Oformaterad text
texts.formatted = Formaterad text
texts.svg = SVG
images = Bilder
images.png_gif_jpeg = PNG/GIF/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
movies = Filmer
movies.flv = FLV (Inget Ljud)
sounds = Ljud
sounds.mp3_wav_flv = MP3/WAV/FLV
sounds.flv = FLV (Bara ljud)
sounds.mp3_wav = MP3/WAV
sounds.wav = WAV
scripts = Scripts
scripts.as = AS
scripts.pcode = P-code
scripts.pcode_hex = P-code med Hex
scripts.hex = Hex
binaryData = Bin\u00e4r data
binaryData.raw = Raw
dialog.title = Exportera...
button.ok = Godk\u00e4nn
button.cancel = Avbryt
morphshapes = Morphshapes
morphshapes.gif = GIF
morphshapes.svg = SVG
morphshapes.canvas = HTML5 Canvas
frames = Frames
frames.png = PNG
frames.gif = GIF
frames.avi = AVI
frames.svg = SVG
frames.canvas = HTML5 Canvas
frames.pdf = PDF
frames.bmp = BMP
fonts = Typnitt
fonts.ttf = TTF
fonts.woff = WOFF
zoom = Zoom
zoom.percent = %
zoom.invalid = Ogiltigt zoomv\u00e4rde.
symbolclass = Symbol Klass
symbolclass.csv = CSV
@@ -22,7 +22,7 @@ texts.plain = \u0417\u0432\u0438\u0447\u0430\u0439\u043d\u0438\u0439 \u0442\u043
texts.formatted = \u0424\u043e\u0440\u043c\u0430\u0442\u043e\u0432\u0430\u043d\u0438\u0439 \u0442\u0435\u043a\u0441\u0442
images = \u0417\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u043d\u044f
images.png_jpeg = PNG/JPEG
images.png_gif_jpeg = PNG/GIF/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP
@@ -22,7 +22,7 @@ texts.plain = \u7eaf\u6587\u672c
texts.formatted = \u683c\u5f0f\u5316\u7684\u6587\u672c
images = \u56fe\u7247
images.png_jpeg = PNG/JPEG
images.png_gif_jpeg = PNG/GIF/JPEG
images.png = PNG
images.jpeg = JPEG
images.bmp = BMP