From 46c157092c318d54596271b538693fc0864afe71 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Mon, 29 Feb 2016 08:52:46 +0100 Subject: [PATCH 01/18] #1172 Text content is wrong after decompilation: double escape fixed --- .../decompiler/flash/xfl/XFLConverter.java | 39 +++++++++---------- .../src/com/jpexs/helpers/Helper.java | 4 +- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java index 43ce7001a..ff2e6a793 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java @@ -12,7 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public -* License along with this library. + * License along with this library. */ package com.jpexs.decompiler.flash.xfl; @@ -104,6 +104,7 @@ import com.jpexs.decompiler.flash.types.shaperecords.StyleChangeRecord; import com.jpexs.decompiler.flash.types.sound.MP3FRAME; import com.jpexs.decompiler.flash.types.sound.MP3SOUNDDATA; import com.jpexs.decompiler.flash.types.sound.SoundFormat; +import com.jpexs.helpers.Helper; import com.jpexs.helpers.Path; import com.jpexs.helpers.SerializableImage; import com.jpexs.helpers.utf8.Utf8Helper; @@ -217,8 +218,8 @@ public class XFLConverter { + "" - + "" - + ""); + + "" + + ""); } private static void convertLineStyle(HashMap characters, LINESTYLE2 ls, int shapeNum, StringBuilder ret) { @@ -1051,7 +1052,7 @@ public class XFLConverter { ret.append(""); ret.append(""); @@ -2004,7 +2005,7 @@ public class XFLConverter { if (hasAllRanges) { embedRanges = "9999"; } - ret2.append(""); + ret2.append(""); } } @@ -2190,7 +2191,7 @@ public class XFLConverter { if (ret2.length() > 0) { ret.append("" + "").append(ret2).append("" - + ""); + + ""); } } @@ -2402,7 +2403,7 @@ public class XFLConverter { ret.append(" fontRenderingMode=\"").append(fontRenderingMode).append("\""); } if (instanceName != null) { - ret.append(" instanceName=\"").append(xmlString(instanceName)).append("\""); + ret.append(" instanceName=\"").append(Helper.escapeHTML(instanceName)).append("\""); } ret.append(antiAlias); Map attrs = TextTag.getTextRecordsAttributes(textRecords, swf); @@ -2469,7 +2470,7 @@ public class XFLConverter { firstRun = false; if (font != null) { ret.append(""); - ret.append("").append(xmlString((newline ? "\r" : "") + rec.getText(font))).append(""); + ret.append("").append(Helper.escapeHTML((newline ? "\r" : "") + rec.getText(font))).append(""); ret.append(""); ret.append(""); - ret.append("").append(xmlString(txt)).append(""); + ret.append("").append(Helper.escapeHTML(txt)).append(""); int leftMargin = -1; int rightMargin = -1; int indent = -1; @@ -2844,7 +2845,7 @@ public class XFLConverter { publishSettings.append(" 0\n"); publishSettings.append(" 0\n"); publishSettings.append(" ").append(useNetwork ? 1 : 0).append("\n"); - publishSettings.append(" ").append(xmlString(characterClasses.containsKey(0) ? characterClasses.get(0) : "")).append("\n"); + publishSettings.append(" ").append(Helper.escapeHTML(characterClasses.containsKey(0) ? characterClasses.get(0) : "")).append("\n"); publishSettings.append(" 2\n"); publishSettings.append(" 4\n"); publishSettings.append(" 4096\n"); @@ -3171,10 +3172,6 @@ public class XFLConverter { return tparser.result; } - private static String xmlString(String s) { - return s.replace("<", "<").replace(">", ">").replace("\"", """).replace("&", "&").replace("\r\n", " ").replace("\r", " ").replace("\n", " "); - } - private static double twipToPixel(double tw) { return tw / SWF.unitDivisor; } @@ -3383,7 +3380,7 @@ public class XFLConverter { private void putText(String txt) { result += ""; - result += "" + xmlString(txt) + ""; + result += "" + Helper.escapeHTML(txt) + ""; result += ""; result += "", "\"", "'", "/"}; - String[] to = new String[]{"&", "<", ">", """, "'", "/"}; + String[] from = new String[]{"&", "<", ">", "\"", "'", "/", "\r\n", "\r", "\n"}; + String[] to = new String[]{"&", "<", ">", """, "'", "/", " ", " ", " "}; for (int i = 0; i < from.length; i++) { text = text.replace(from[i], to[i]); } From 0b786859c05fc5c2429aaf07cd7ed8dbde8c29c4 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Tue, 1 Mar 2016 10:25:50 +0100 Subject: [PATCH 02/18] #1174 Method/Getter/Setter Trait is in swedish after changing language to english_ fixed --- src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java b/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java index 696463454..7673d66e2 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/abc/DetailPanel.java @@ -52,11 +52,11 @@ public class DetailPanel extends JPanel implements TagEditorPanel { public SlotConstTraitDetailPanel slotConstTraitPanel; - public static final String METHOD_TRAIT_CARD = AppStrings.translate("abc.detail.methodtrait"); + public static final String METHOD_TRAIT_CARD = "abc.detail.methodtrait"; - public static final String UNSUPPORTED_TRAIT_CARD = AppStrings.translate("abc.detail.unsupported"); + public static final String UNSUPPORTED_TRAIT_CARD = "abc.detail.unsupported"; - public static final String SLOT_CONST_TRAIT_CARD = AppStrings.translate("abc.detail.slotconsttrait"); + public static final String SLOT_CONST_TRAIT_CARD = "abc.detail.slotconsttrait"; private final JPanel innerPanel; @@ -222,7 +222,7 @@ public class DetailPanel extends JPanel implements TagEditorPanel { } selectedCard = name; - selectedLabel.setText(selectedCard); + selectedLabel.setText(AppStrings.translate(name)); if (trait == null) { traitNameLabel.setText("-"); } else { From 311475954a65d53ff204b6cc34e21181c65f6fc8 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Wed, 2 Mar 2016 09:56:03 +0100 Subject: [PATCH 03/18] french translation updated --- .../AdvancedSettingsDialog_fr.properties | 121 ++++++++++++- .../gui/locales/DebugLogDialog_fr.properties | 2 +- .../gui/locales/ExportDialog_fr.properties | 24 ++- .../flash/gui/locales/MainFrame_fr.properties | 159 ++++++++++++++++++ .../locales/ReplaceTraceDialog_fr.properties | 2 +- 5 files changed, 302 insertions(+), 6 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties index f86639b24..de1cc1d7a 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties @@ -312,4 +312,123 @@ config.description.showTraitSavedMessage = Afficher un message d'avertissement l config.name.showTraitSavedMessage = Afficher un message lors de l'enregistrement de la caract\u00e9ristique config.name.updateProxyAddress = Adresse du Proxy http pour v\u00e9rifier les mises \u00e0 jour -config.description.updateProxyAddress = Adresse du Proxy http pour v\u00e9rifier les mises \u00e0 jour. Format : example.com:8080 +config.description.updateProxyAddress = Adresse du Proxy http pour v\u00e9rifier les mises \u00e0 jour. Format : exemple.com:8080 + +config.name.editorMode = Mode \u00c9diteur +config.description.editorMode = Rend \u00e9ditable les zone de texte automatiquement lorsque vous s\u00e9lectionnez un texte ou un script + +config.name.autoSaveTagModifications = Enregistrement auto des \u00e9tiquettes modifi\u00e9es +config.description.autoSaveTagModifications = Enregistre les changements lorsque vous s\u00e9lectionnez une autre \u00e9tiquette dans l'arborescence + +config.name.saveSessionOnExit = Save session on exit +config.description.saveSessionOnExit = Save the current session and reopens it after FFDec restart (works only with real files) + +config.name._showDebugMenu = Affiche le menu de d\u00e9boggage FFDec +config.description._showDebugMenu = Affiche le menu de d\u00e9boggage dans le ruban lorsque le d\u00e9compileur est en train de d\u00e9bogguer. + +config.name.allowOnlyOneInstance = Une seule instance FFDec (OS Windows uniquement) +config.description.allowOnlyOneInstance = FFDec peut d\u00e9marrer en une seule fois, tous les fichiers ouverts seront ajout\u00e9s dans une unique fen\u00eatre. Ne fonctionne que sous Windows uniquement. + +config.name.scriptExportSingleFile = Export des scripts dans un seul fichier +config.description.scriptExportSingleFile = Exportation des scripts dans un seul fichier au lieu de cr\u00e9er plusieurs fichiers + +config.name.setFFDecVersionInExportedFont = Indiquer la version de FFDec dans la police de caract\u00e8res export\u00e9es +config.description.setFFDecVersionInExportedFont = Lorsque cette option est decoch\u00e9es, FFDec n'ajoutera son num\u00e9ro de version dans la police de caract\u00e8res export\u00e9es. + +config.name.gui.skin = Personnalisation de l'interface utilisateur +config.description.gui.skin = Personnalisation de l'interface utilisateur + +config.name.lastSessionFiles = Fichiers de la derni\u008re session +config.description.lastSessionFiles = Contient les fichiers ouverts lors de la derni\u008re session + +config.name.lastSessionSelection = S\u009lection de la derni\u008re session +config.description.lastSessionSelection = Contient la s\u00e9lection lors de la derni\u008re session + +config.name.loopMedia = Rejouer les sons et les sprites +config.description.loopMedia = Rejoue automatiquement les sons et les sprites + +config.name.gui.timeLineSplitPane.dividerLocationPercent = (Internal) Timeline Splitter location +config.description.gui.timeLineSplitPane.dividerLocationPercent = + +config.name.cacheImages = Images en m\u000e9moire cache +config.description.cacheImages = Met en m\u00e9moire cache les images-objets d\u00e9cod\u00e9es + +config.name.swfSpecificConfigs = Configuration avanc\u00e9es SWF +config.description.swfSpecificConfigs = Contient les configurations avanc\u00e9es SWF + +config.name.exeExportMode = Mode export EXE +config.description.exeExportMode = Mode export EXE + +config.name.ignoreCLikePackages = Ignorer les paquets FlashCC / Alchemy ou similaires +config.description.ignoreCLikePackages = Les paquets FlashCC/Alchemy ne sont pas d\u00e9compilables correctement. Vous pouvez les d\u00e9sactiver pour gagner en vitesse de d\u00e9compilation avec les autres paquets. + +config.name.overwriteExistingFiles = \u00c9craser les fichiers existants +config.description.overwriteExistingFiles = \u00c9craser les fichiers existants lors de l'export. Ne fonctionne que pour les scripts AS2/3. + +config.name.smartNumberFormatting = Utiliser le formattage num\u00c9rique intelligent +config.description.smartNumberFormatting = Formattage num\u00c9riques sp\u00c9ciaux (par exemple : les couleurs et les temps) + +config.name.enableScriptInitializerDisplay = Affiche l'initialisateur de script +config.description.enableScriptInitializerDisplay = Active l'affichage et l'\u00c9ditiion de l'initialisateur de script. Ce param\u00c8tre ajoute une nouvelle ligne en \u00c9vidence dans chaque classe. + +config.name.autoOpenLoadedSWFs = Ouvre les SWF charg\u00c9s lors de l'ex\u00c9cution (Lecteur externe = Windows seulement) +config.description.autoOpenLoadedSWFs = Ouvre automatiquement tous les SWF charg\u00c9s par la classe de chargement AS3 en lisant les SWF jou\u00c9s dans le lecteur externe FFDec. Cette option ne fonctionne que sous Windows. + +config.name.lastSessionFileTitles = Les titres de la derni\u00c8re session +config.description.lastSessionFileTitles = Comprend les titres des fichiers ouverts lors de la derni\u00c8re session (par exemple depuis une URL, etc.) + +config.group.name.paths = Chemins +config.group.description.paths = Location des fichiers demand\u00c9s +config.group.tip.paths = Vous pouvez t\u00c9l\u00c9charger ces fichiers depuis le site web d'Adobe +config.group.link.paths = https://www.adobe.com/support/flashplayer/debug_downloads.html +config.group.linkText.paths = [visite] + +config.name.playerLocation = 1) Chemin du lecteur Flash +config.description.playerLocation = Location du lecteur autonome de fichier ex\u00c9cutable Flash. Used for Run action. + +config.name.playerDebugLocation = 2) Chemin du d\u00c9boggeur du lecteur Flash +config.description.playerDebugLocation = Location du d\u00c9boggueur autonome du lecteur Flash. Utilis\u00c9 \u00e0 des fins de d\u00e9bogguage. + +config.name.playerLibLocation = 3) Chemin du fichier PlayerGlobal (.swc) +config.description.playerLibLocation = Location de la librairie du lecteur Flash playerglobal.swc. Utilis\u00c9 principalement pour la d\u00c9compilation du code AS3. + +config.name.debugHalt = Stoppe l'ex\u00c9cution lorsque le d\u00c9bogguage d\u00c9marre +config.description.debugHalt = G\u00e9n\u00e8re une pause du SWF lorsque le d\u00c9bogguage commence. + +config.name.gui.avm2.splitPane.vars.dividerLocationPercent = (Interne) Location du menu de debug +config.description.gui.avm2.splitPane.vars.dividerLocationPercent = + +tip = Tip:\u0020 + +config.name.gui.action.splitPane.vars.dividerLocationPercent = (Interne) Location du menu de debug AS1/2 +config.description.gui.action.splitPane.vars.dividerLocationPercent = + +config.name.setMovieDelay = D\u00c9lais en millisecondes avant de changer le SWF dans le lecteur externe +config.description.setMovieDelay = Ce n'est pas recommand\u00c9 de mettre une valeur en dessous de 1000 ms + +config.name.warning.svgImport = Alerte lors d'un import SVG +config.description.warning.svgImport = + +config.name.shapeImport.useNonSmoothedFill = Utiliser un remplissage non liss\u00c9 lorsque forme est remplac\u00c9e par une image +config.description.shapeImport.useNonSmoothedFill = + +config.name.internalFlashViewer.execute.as12 = Utiliser le lecteur flash propre \u00e0 AS1/2 (Exp\u00c9rimental) +config.description.internalFlashViewer.execute.as12 = Tente d'ex\u00c9cuter le code ActionScript 1/2 dans le lecteur externe FFDec + +config.name.warning.hexViewNotUpToDate = Afficher une vue, pas en temps r\u00c9el, des alertes en hexad\u00c9cimal +config.description.warning.hexViewNotUpToDate = + +config.name.displayDupInstructions = Afficher les instructions \u00a7\u00a7dup +config.description.displayDupInstructions = Affiche les instructions \u00a7\u00a7dup dans le code. Sans eux, le code peut \u00eatre compil\u00c9 facilement mais pourrait entra\u00eener un effet de doublon. + +config.name.useRegExprLiteral = D\u00c9compiler litt\u00e9ralement RegExp en tant que /pattern/mod. +config.description.useRegExprLiteral = Utilise la syntaxe /pattern/mod lors de la d\u00c9compilations d'expressions r\u00c9guli\u00c8res. Les nouveaux RegExp("pat","mod") sont utilis\u00c9s diff\u00c9remment + +config.name.handleSkinPartsAutomatically = Manipuler automatiquement les m\u00c9tadonn\u00c9es [SkinPart] +config.description.handleSkinPartsAutomatically = D\u00c9compile et \u00c9dite directement les m\u00c9tadonn\u00c9es [SkinPart]. Lorsque cette option est d\u00c9sactiv\u00c9e, les attributs et la m\u00c9thode de lecture des _skinParts sont modifiables manuellement. + +config.name.simplifyExpressions = Simplier les expressions +config.description.simplifyExpressions = Evalue et simplifie les expressions pour rendre le code plus lisible + +config.name.resetLetterSpacingOnTextImport = R\u00c9nitialiser l'espace entre les lettres lors de l'import de texte +config.description.resetLetterSpacingOnTextImport = Adapte les caract\u00c8res de polices cyrilliques, parce qu'elles sont plus larges diff --git a/src/com/jpexs/decompiler/flash/gui/locales/DebugLogDialog_fr.properties b/src/com/jpexs/decompiler/flash/gui/locales/DebugLogDialog_fr.properties index 05af26e5e..ba3f5e4aa 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/DebugLogDialog_fr.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/DebugLogDialog_fr.properties @@ -16,4 +16,4 @@ dialog.title = Journal du d\u00e9boggueur button.clear = Effacer button.close = Fermer -msg.header = connection %clientid%: +msg.header = connexion %clientid%: diff --git a/src/com/jpexs/decompiler/flash/gui/locales/ExportDialog_fr.properties b/src/com/jpexs/decompiler/flash/gui/locales/ExportDialog_fr.properties index dc3c16e7f..8b0b9246d 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/ExportDialog_fr.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/ExportDialog_fr.properties @@ -16,7 +16,7 @@ shapes = Formes shapes.svg = SVG shapes.png = PNG shapes.bmp = BMP -shapes.canvas = HTML5 Canvas +shapes.canvas = Canevas HTML5 texts = Textes texts.plain = Texte brut @@ -43,6 +43,7 @@ scripts.as = ActionScript scripts.pcode = Assembleur scripts.pcode_hex = Assembleur hexad\u00e9cimal scripts.hex = Hexad\u00e9cimal +scripts.constants = Constantes binaryData = Donn\u00e8es binaires binaryData.raw = Raw @@ -55,17 +56,31 @@ button.cancel = Annuler morphshapes = Images anim\u00e8es morphshapes.gif = GIF morphshapes.svg = SVG -morphshapes.canvas = Toile HTML5 +morphshapes.canvas = Canevas HTML5 frames = Image frames.png = PNG frames.gif = GIF frames.avi = AVI frames.svg = SVG -frames.canvas = Canvas HTML5 +frames.canvas = Canevas HTML5 frames.pdf = PDF frames.bmp = BMP +sprites = Sprites +sprites.png = PNG +sprites.gif = GIF +sprites.avi = AVI +sprites.svg = SVG +sprites.canvas = Canevas HTML5 +sprites.pdf = PDF +sprites.bmp = BMP + +buttons = Buttons +buttons.png = PNG +buttons.svg = SVG +buttons.bmp = BMP + fonts = Polices de caract\u00e9res fonts.ttf = TTF fonts.woff = WOFF @@ -73,3 +88,6 @@ fonts.woff = WOFF zoom = Zoom zoom.percent = % zoom.invalid = Valeur de zoom invalide. + +symbolclass = Symbol-Class mapping +symbolclass.csv = CSV diff --git a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_fr.properties b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_fr.properties index 15219495d..05e09068d 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_fr.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/MainFrame_fr.properties @@ -514,6 +514,7 @@ button.snapshot.hint = Faire une capture d'\u00e9cran vers le presse-papier editorTruncateWarning = Texte tronqu\u00e9 d\u00e8s la position %chars% en mode debug. +#Font name which is presented in the SWF Font tag font.name.intag = Font name in tag: menu.debugger = Debugger @@ -554,3 +555,161 @@ contextmenu.exportSwfXml = Exportation du SWF en tant qu'XML contextmenu.importSwfXml = Importation SWF XML filter.xml = XML +#REM by LOLA -------------------------------------------------------------------------------------------------------------------------------------------------- +#after version 4.1.0 +contextmenu.undo = Revenir en arri\u00e8re + +text.align.left = Aligner \u00e0 gauche +text.align.right = Aligner \u00e0 Droite +text.align.center = Centrer +text.align.justify = Justifier + +text.undo = Annuler les changements + +menu.file.import.xml = Import SWF XML +menu.file.export.xml = Export SWF XML + +#after version 4.1.1 +text.align.translatex.decrease = D\u00e9cr\u00e9menter TranslateX +text.align.translatex.increase = Incr\u00e9menter TranslateX +selectPreviousTag = S\u00e9lectionner l'\u00e9tiquette pr\u00e9c\u00e9dente +selectNextTag = S\u00e9lectionner l'\u00e9tiquette suivante +button.ignoreAll = Ignorer tout +menu.file.import.symbolClass = Import Symbol-Class +text.toggleCase = Toggle case + +#after version 5.0.2 +preview.loop = Loop +menu.file.import.script = Importer script +contextmenu.copyTagWithDependencies = Copier l'\u00e9tiquette avec ses d\u00e9pendances vers +button.replaceWithTag = Remplacer par un autre caract\u00e8re +button.resolveConstants = R\u00e9soudre les constantes + +#after version 5.1.0 +button.viewConstants = Voir les constantes +work.exported = Export\u00e9 +button.replaceAlphaChannel = Remplacer le canal alpha ... + +tagInfo.header.name = Nom +tagInfo.header.value = Valeur +tagInfo.tagType = Type d'\u00e9tiquette +tagInfo.characterId = Caract\u00e8re No +tagInfo.offset = Offset +tagInfo.length = Longueur +tagInfo.bounds = Limites +tagInfo.width = Largeur +tagInfo.height = Hauteur +tagInfo.neededCharacters = Caract\u00e8res n\u00e9cessaires + +button.viewhexpcode = Voir les instructions en hexad\u00e9cimal +taginfo.header = Information basique de l'\u00e9tiquette + +tagInfo.dependentCharacters = Caract\u00e8res d\u00e9pendants + +#after version 5.3.0 +header.uncompressed = D\u00e9compress\u00e9 +header.warning.unsupportedGfxCompression = GFX ne supporte que les contenus d\u00e9compress\u00e9s ou des Zlibb compress\u00e9s. +header.warning.minimumZlibVersion = La compression Zlib requiert la version 6 de SWF ou plus. +header.warning.minimumLzmaVersion = La compression LZMA requiert la version 13 de SWF ou plus. + +tagInfo.codecName = Nom du codec +tagInfo.exportFormat = Format d'export +tagInfo.samplingRate = Taux d'\u00e9chantillonage +tagInfo.stereo = St\u00e9r\u00e9o +tagInfo.sampleCount = Nombre d'\u00e9chantillons + +filter.dmg = Fichiers ex\u00e9cutables Mac (*.dmg) +filter.linuxExe = Fichiers ex\u00e9cutables Linux + +import.script.result = %count% scripts import\u00e9s. +import.script.as12warning = L'import de scripts ne fonctionne qu'avec les scripts AS1/2. + +error.constantPoolTooBig = Le bloc de constantes est trop grand. index=%index%, size=%size% +error.image.alpha.invalid = Les donn\u00e9es du canal alpha est invalide. + +#after version 6.0.2 +contextmenu.saveUncompressedToFile = Enregistrer dans un fichier d\u00e9compress\u00e9 +abc.traitslist.scriptinitializer = Initialisateur de script +menu.settings.autoOpenLoadedSWFs = Ouvrir les SWF charg\u00e9s lors de la lecture + +#after version 6.1.1 +menu.file.start = D\u00e9marrer +menu.file.start.run = Run +menu.file.start.stop = Stop +menu.file.start.debug = Debug +menu.debugging = Deboguage +menu.debugging.debug = Debug +menu.debugging.debug.stop = Stop +menu.debugging.debug.pause = Pause +menu.debugging.debug.stepOver = Step over +menu.debugging.debug.stepInto = Step into +menu.debugging.debug.stepOut = Step out +menu.debugging.debug.continue = Continuer +menu.debugging.debug.stack = Empiler ... +menu.debugging.debug.watch = Nouvelle horloge ... + +message.playerpath.notset = Le lecteur Flash est introuvable. Veuillez indiquer son chemin dans Param\u00e8tres avanc\u00e9s / Chemins (1). +message.playerpath.debug.notset = Le d\u00e9bogueur Flash est introuvouvable. Veuillez indiquer son chemin dans Param\u00e8tres avanc\u00e9s / Chemins (2). +message.playerpath.lib.notset = La librairie PlayerGlobal (.SWC) est introuvable. Veuillez indiquer son chemin dans Param\u00e8tres avanc\u00e9s / Chemins (2). + +debugpanel.header = D\u00e9boguage + +variables.header.registers = Registres +variables.header.locals = Locaux +variables.header.arguments = Arguments +variables.header.scopeChain = Scope chain +variables.column.name = Nom +variables.column.type = Type +variables.column.value = Valeur + +callStack.header = Appel de pile +callStack.header.file = Fichier +callStack.header.line = Ligne + +stack.header = Pile +stack.header.item = Item + +constantpool.header = Constant pool +constantpool.header.id = Id +constantpool.header.value = Valeur + +work.running = Ex\u00e9cution +work.debugging = D\u00e9boguage +work.debugging.instrumenting = Pr\u00e9paration du SWF pour un d\u00e9boguage +work.breakat = Arr\u00eat \u00e0\u0020 +work.halted = Le d\u00e9boguage \u00e0 commenc\u00e9, l'ex\u00e9cution est arr\u00eat\u00e9. Ajoutez des points d'arr\u00eat et cliquez sur Continuer (F5) pour reprendre l'ex\u00e9cution. + +debuglog.header = Journal +debuglog.button.clear = Vide le journal + +#after 7.0.1 +work.debugging.wait = Patientez pendant la connexion du d\u00e9boggueur Flash + +error.debug.listen = Impossible d'\u00e9couter le port %port%. Il est possible qu'il soit utilis\u00e9 par un autre d\u00e9boggueur Flash. + +debug.break.reason.unknown = (Inconnu) +debug.break.reason.breakpoint = (Point d'arr\u00eat) +debug.break.reason.watch = (Surveiller) +debug.break.reason.fault = (Erreur) +debug.break.reason.stopRequest = (Stop request) +debug.break.reason.step = (Pas) +debug.break.reason.halt = (Arr\u00eat) +debug.break.reason.scriptLoaded = (Script charg\u00e9) + +menu.file.start.debugpcode = D\u00e9boguage assembleur + +#after 7.1.2 +button.replaceNoFill = Remplacer - Mettre \u00e0 jour les limites... +message.warning.svgImportExperimental = Toutes les fonctionnalit\u00e9s SVG ne sont pas forc\u00e9ment support\u00e9es. V\u00e9rifiez le journal apr\u00e8s l'import. + +message.imported.swf = Le fichier SWF utilise des propri\u00e9t\u00e9s du fichier import\u00e9 :\n%url%\nSouhaitez-vous charger les propri\u00e9t\u00e9s \u00e0 partir de cette URL ? +message.imported.swf.manually = Imposible de charger le SWF import\u00e9\n%url%\nLe fichier ou l'URL n'existe pas.\nVoulez-vous s\u00e9lectionner un fichier local ? + +message.warning.hexViewNotUpToDate = La vue hexad\u00e9cimale n'est pas \u00e0 jour. Veuillez enregistrer et recharger le fichier pour mettre \u00e0 jour la vue. +message.font.replace.updateTexts = Plusieurs caract\u00e8res ont \u00e9t\u00e9 remplac\u00e9s. Mettre \u00e0 jour les textes existants ? + +menu.settings.simplifyExpressions = Simplification d'expressions + +#after 8.0.1 +menu.recentFiles.empty = La liste des fichiers r\u00e9cents est vide +message.warning.outOfMemeory32BitJre = M\u00e9moire insuffisante. Vous utilisez une version 32 bits de Java sur un syst\u00e8me 64 bits. Veuillez utiliser Java 64 bits. diff --git a/src/com/jpexs/decompiler/flash/gui/locales/ReplaceTraceDialog_fr.properties b/src/com/jpexs/decompiler/flash/gui/locales/ReplaceTraceDialog_fr.properties index 8fd6015b9..cc66cf67d 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/ReplaceTraceDialog_fr.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/ReplaceTraceDialog_fr.properties @@ -17,4 +17,4 @@ dialog.title = Remplacer les appels de fonction Trace function.debugAlert = debugAlert - Alerte du navigateur web Javascript function.debugConsole = debugConsole - Navigateur Web javascript console.log -function.debugSocket = debugSocket - socket de connection vers le d\u00e9compileur +function.debugSocket = debugSocket - socket de connexion vers le d\u00e9compileur From 1bc6e3076c153860c102eb62d43ae3e8372cae4b Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Wed, 2 Mar 2016 09:58:46 +0100 Subject: [PATCH 04/18] french translation updated 2 --- .../flash/locales/AppResources_fr.properties | 2 + nsis_locales/French.nsh | 110 +++++++++--------- 2 files changed, 57 insertions(+), 55 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/AppResources_fr.properties b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/AppResources_fr.properties index a486dbf4d..eb6209405 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/AppResources_fr.properties +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/locales/AppResources_fr.properties @@ -19,6 +19,8 @@ decompilationError.timeout.description = Non d\u00e9compil\u00e9 car le d\u00e9l decompilationError.obfuscated = Le code est probablement obsfusqu\u00e9 decompilationError.errorType = Type d'erreur decompilationError.error.description = Non d\u00e9compil\u00e9 car il y a des erreurs +decompilationError.actionCount = Nb d'actions : +decompilationError.instructionCount = Nb d'instructions : decompilation.skipped = D\u00e9compilation abandonn\u00e9 decompilation.unsupported = Non support\u00e9 par le d\u00e9compileur diff --git a/nsis_locales/French.nsh b/nsis_locales/French.nsh index 0e0897b8c..cafaf435f 100644 --- a/nsis_locales/French.nsh +++ b/nsis_locales/French.nsh @@ -1,61 +1,61 @@ !define LANG "FRENCH" ; Must be the lang name define by NSIS -!insertmacro LANG_STRING STRING_SWC_NOTFOUND "PlayerGlobal.SWC was not found on Adobe webpages. Maybe your firewall is blocking access or you have some proxy enabled. You can set the path to the SWC file later in advanced settings." -!insertmacro LANG_STRING STRING_SAVED_TO "saved to" -!insertmacro LANG_STRING STRING_EXISTS_SKIP_DOWNLOAD "already exists, skipping download" -!insertmacro LANG_STRING STRING_STARTING_DOWNLOAD "Starting download" -!insertmacro LANG_STRING STRING_DESKTOP_SHORTCUT "Desktop Shortcut" -!insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Add to context menu" -!insertmacro LANG_STRING STRING_SECTION_APP "Application GUI and Libraries" -!insertmacro LANG_STRING STRING_SECTION_SWC "Download FlashPlayer library from Adobe site - useful for ActionScript direct editation and other features" -!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in windows explorer." -!insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Creates shortcut link on desktop" -!insertmacro LANG_STRING STRING_UNINST_USER "Remove user configuration" -!insertmacro LANG_STRING STRING_HELP_US "Help us" -!insertmacro LANG_STRING STRING_HELP_US_FREE "This whole decompiler is Free and OpenSource. If you want to support us, you can tell other people about our decompiler. Use link to our pages, share a word." -!insertmacro LANG_STRING STRING_HELP_US_DONATE "If you wish to express your appreciation for the time and resources the author has spent developing, we also do accept and appreciate monetary donations." -!insertmacro LANG_STRING STRING_HELP_US_MORE "Click here for more info:" -!insertmacro LANG_STRING STRING_HELP_US_DOYOU "Do you know you can help us?" -!insertmacro LANG_STRING STRING_HELP_US_BUTTON "Help us!" -!insertmacro LANG_STRING STRING_SWC "Download PlayerGlobal.swc" +!insertmacro LANG_STRING STRING_SWC_NOTFOUND "La biblioth\u00e8que PlayerGlobal.SWC est introuvable sur le site web d'Adobe. Il est possible que votre parefeu bloque l'acc\u00e8s ou utilisez un proxy. Vous pouvez indiquer le chemin du fichier SWF plus tard dans les param\u00e8tres avanc\u00e9es.." +!insertmacro LANG_STRING STRING_SAVED_TO "enregistr\u00e9 sous" +!insertmacro LANG_STRING STRING_EXISTS_SKIP_DOWNLOAD "d\u00e9jà existant, je passe le t\u00e9l\u00e9chargement" +!insertmacro LANG_STRING STRING_STARTING_DOWNLOAD "D\u00e9marrage du t\u00e9l\u00e9chargement" +!insertmacro LANG_STRING STRING_DESKTOP_SHORTCUT "Raccourci Bureau" +!insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Ajout au menu contextuel" +!insertmacro LANG_STRING STRING_SECTION_APP "Application GUI et librairies" +!insertmacro LANG_STRING STRING_SECTION_SWC "T\u00e9l\u00e9chargement de la libriarie FlashPlayer à partir du site web d'Adobe - Toutes les fonctionnalit\u00e9s d'\u00e9dition et modification de codes ActionScript sont op\u00e9rationnelles" +!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Ajout de FFDec au menu contextuel des fichiers SWF et GFX dans l'explorateur Windows." +!insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Cr\u00e9ation d'un raccourci vers le Bureau" +!insertmacro LANG_STRING STRING_UNINST_USER "Suppression de la configuration de l'utilisateur" +!insertmacro LANG_STRING STRING_HELP_US "Aidez-nous" +!insertmacro LANG_STRING STRING_HELP_US_FREE "Ce d\u00e9compileur est compl\u00e8tement gratuit et le code source est disponible. Si vous souhaitez nous aider, vous pouvez parler de ce logiciel autour de vous. Mettez un lien vers notre page web, partagez au monde " +!insertmacro LANG_STRING STRING_HELP_US_DONATE "Si vous souhaitez exprimer votre gratitude pour le temps et les ressources que l'auteur a pass\u00e9 en d\u00e9veloppement, nous acceptons et appr\u00e9cions aussi les dons en num\u00e9raires." +!insertmacro LANG_STRING STRING_HELP_US_MORE "Cliquez ici pour plus d'informations :" +!insertmacro LANG_STRING STRING_HELP_US_DOYOU "Souhaitez-vous savoir comment nous aider ?" +!insertmacro LANG_STRING STRING_HELP_US_BUTTON "Aidez-nous !" +!insertmacro LANG_STRING STRING_SWC "T\u00e9l\u00e9chargement du PlayerGlobal.swc" !insertmacro LANG_STRING STRING_SWC_CHECK "Checking Adobe site for newest PlayerGlobal.swc file" ;Flash ActiveX: -!insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Flash Player ActiveX control required" -!insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "This application requires Flash ActiveX control" -!insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "This application requires installation of the Flash ActiveX control. This will be downloaded and installed as part of the installation." -!insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Flash ActiveX already installed" -!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash Active X is missing." -!insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "About to download Flash from " -!insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Download result = " -!insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Cannot download Flash ActiveX. You can download it later manually or use our own flash viewer." -!insertmacro LANG_STRING STRING_FLASH_AX_LAUNCHSETUP "Launching Flash setup" -!insertmacro LANG_STRING STRING_FLASH_AX_INTERRUPTED "The Flash setup has been abnormally interrupted - return code" -!insertmacro LANG_STRING STRING_FLASH_AX_SETUPOUTCOME "Checking the Flash Setup's outcome" -!insertmacro LANG_STRING STRING_FLASH_AX_UNABLEFINDAFTER "Unable to find Flash ActiveX, even though the Flash setup was successful" -!insertmacro LANG_STRING STRING_FLASH_AX_UNABLEINSTALL "Unable to install Flash ActiveX. You can download it later manually or use our own flash viewer." -!insertmacro LANG_STRING STRING_FLASH_AX_SETUPFINISHED "Flash Setup finished" -!insertmacro LANG_STRING STRING_FLASH_AX_DETECTING "Detecting Flash ActiveX" +!insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Le contr\u00f4le ActiveX Flash Player est n\u00e9cessaire" +!insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "Cette application n\u00e9cessite le contr\u00f4le ActiveX Flash ActiveX" +!insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "Cette application n\u00e9cessite l'installation du contr\u00f4le ActiveX Flash. Il sera t\u00e9l\u00e9charg\u00e9 et install\u00e9 en m\u00eame temps par l'installateur." +!insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Le contr\u00f4le Flash ActiveX est d\u00e9jà install\u00e9" +!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "R\u00e9sultat : Le contr\u00f4le Flash Active X est manquant." +!insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "\u00c0 propos du t\u00e9l\u00e9chargement de Flash à partir de " +!insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "R\u00e9sultat du t\u00e9l\u00e9chargement = " +!insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Impossible de t\u00e9l\u00e9charger le contr\u00f4le ActiveX Flash. Vous pourrez le t\u00e9l\u00e9charger plus tard manuellement en utilisant notre lecteur flash." +!insertmacro LANG_STRING STRING_FLASH_AX_LAUNCHSETUP "Lancement du setup Flash" +!insertmacro LANG_STRING STRING_FLASH_AX_INTERRUPTED "Le setup Flash a \u00e9t\u00e9 interrompu anormalement - code de retour d'erreur " +!insertmacro LANG_STRING STRING_FLASH_AX_SETUPOUTCOME "V\u00e9rification du r\u00e9sultat de l'installation de Flash" +!insertmacro LANG_STRING STRING_FLASH_AX_UNABLEFINDAFTER "Impossible de trouver le contr\u00f4le ActiveX Flash, alors qu'il a \u00e9t\u00e9 install\u00e9 avec succ\u00e8s" +!insertmacro LANG_STRING STRING_FLASH_AX_UNABLEINSTALL "Impossible d'installer le contr\u00f4le ActiveX Flash. VOus pourrez le t\u00e9l\u00e9charger plus tard manuellement en utilisant notre lecteur flash." +!insertmacro LANG_STRING STRING_FLASH_AX_SETUPFINISHED "Le setup Flash est termin\u00e9" +!insertmacro LANG_STRING STRING_FLASH_AX_DETECTING "D\u00e9tection du contr\u00f4le ActiveX Flash" ;JRE: -!insertmacro LANG_STRING STRING_JRE_REQUIRED_TITLE "JRE Installation Required" -!insertmacro LANG_STRING STRING_JRE_REQUIRED "This application requires Java ${JRE_VERSION} or higher" -!insertmacro LANG_STRING STRING_JRE_REQUIRED_INFO "This application requires installation of the Java Runtime Environment. This will be downloaded and installed as part of the installation." -!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED_TITLE "JRE Update Required" -!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED "This application requires Java ${JRE_VERSION} or higher" -!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED_INFO "This application requires a more recent version of the Java Runtime Environment. This will be downloaded and installed as part of the installation." -!insertmacro LANG_STRING STRING_JRE_DETECTVERSION "Detecting JRE Version" -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE "JRE Version detection complete - result = " -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE_OLD "Old JRE found" -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE_NO "No JRE Found" -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_1 "Comparing version " -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_2 " to " -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_3 " results in " -!insertmacro LANG_STRING STRING_JRE_WILLDOWNLOAD "About to download JRE from " -!insertmacro LANG_STRING STRING_JRE_DOWNRESULT "Download result = " -!insertmacro LANG_STRING STRING_JRE_CANNOTDOWNLOAD "Cannot download Java. You can download it later manually." -!insertmacro LANG_STRING STRING_JRE_LAUNCHSETUP "Launching JRE setup" -!insertmacro LANG_STRING STRING_JRE_SETUPFINISHED "JRE Setup finished" -!insertmacro LANG_STRING STRING_JRE_INTERRUPTED "The JRE setup has been abnormally interrupted - return code " -!insertmacro LANG_STRING STRING_JRE_SETUPOUTCOME "Checking the JRE Setup's outcome" -!insertmacro LANG_STRING STRING_JRE_UNABLEFINDAFTER "Unable to find JRE with version above ${JRE_VERSION}, even though the JRE setup was successful" -!insertmacro LANG_STRING STRING_JRE_UNABLEINSTALL "Unable to install Java. You can install it later manually." +!insertmacro LANG_STRING STRING_JRE_REQUIRED_TITLE "L'installation de JRE est n\u00e9cessaire" +!insertmacro LANG_STRING STRING_JRE_REQUIRED "Cette application n\u00e9cessite Java ${JRE_VERSION} ou plus" +!insertmacro LANG_STRING STRING_JRE_REQUIRED_INFO "Cette application n\u00e9cessite l'installation du Java Runtime Environment. Il sera t\u00e9l\u00e9charg\u00e9 et install\u00e9 en m\u00eame temps par l'installateur." +!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED_TITLE "Une mise à jour de JRE est n\u00e9cessaire" +!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED "Cette application n\u00e9cessite Java ${JRE_VERSION} ou plus" +!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED_INFO "Cette application n\u00e9cessite une version plus r\u00e9cente du Java Runtime Environment. Il sera t\u00e9l\u00e9charg\u00e9 et install\u00e9 en m\u00eame temps par l'installateur." +!insertmacro LANG_STRING STRING_JRE_DETECTVERSION "D\u00e9tection de la version de JRE" +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE "La d\u00e9tection de la version de JRE est termin\u00e9 - r\u00e9sultat = " +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE_OLD "Une ancienne version de JRE a \u00e9t\u00e9 trouv\u00e9" +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE_NO "JRE non trouv\u00e9" +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_1 "Comparaison des versions " +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_2 " vers " +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_3 " r\u00e9sultats en " +!insertmacro LANG_STRING STRING_JRE_WILLDOWNLOAD "\u00c0 propos du t\u00e9l\u00e9chargement de JRE à partir de " +!insertmacro LANG_STRING STRING_JRE_DOWNRESULT "R\u00e9sultat du t\u00e9l\u00e9chargement = " +!insertmacro LANG_STRING STRING_JRE_CANNOTDOWNLOAD "Impossible de t\u00e9l\u00e9charger Java. Vous You pourrez le t\u00e9l\u00e9charger manuellement par la suite." +!insertmacro LANG_STRING STRING_JRE_LAUNCHSETUP "Lancement du setup JRE" +!insertmacro LANG_STRING STRING_JRE_SETUPFINISHED "Le setup JRE est termin\u00e9" +!insertmacro LANG_STRING STRING_JRE_INTERRUPTED "Le setup JRE a \u00e9t\u00e9 interrompu anormalement - code de retour de l'erreur " +!insertmacro LANG_STRING STRING_JRE_SETUPOUTCOME "V\u00e9rification du r\u00e9sultat de l'installation de JRE" +!insertmacro LANG_STRING STRING_JRE_UNABLEFINDAFTER "Impossible de trouver JRE avec une version sup\u00e9rieure à ${JRE_VERSION}, alors que le setup JRE a \u00e9t\u00e9 install\u00e9 avec succ\u00e8s" +!insertmacro LANG_STRING STRING_JRE_UNABLEINSTALL "Impossible d'installer Java. Vous pourrez le t\u00e9l\u00e9charger manuellement par la suite." From fbb32451e6802419bcb82bc81a60c728f1d2ee84 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Wed, 2 Mar 2016 10:12:30 +0100 Subject: [PATCH 05/18] build test... --- src/com/jpexs/decompiler/flash/gui/ImagePanel.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java index 495e15a76..af8466999 100644 --- a/src/com/jpexs/decompiler/flash/gui/ImagePanel.java +++ b/src/com/jpexs/decompiler/flash/gui/ImagePanel.java @@ -370,9 +370,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay { if (Configuration._debugMode.get()) { g2d.drawString("frameLoss:" + df.format(frameLoss) + "%", 20, 20); } - } - } @Override @@ -1196,11 +1194,17 @@ public final class ImagePanel extends JPanel implements MediaDisplay { } private long startRun = 0L; + private long startDrop = 0L; + private int skippedFrames = 0; + private float fpsShouldBe = 0; + private float fpsIs = 0; + private Timer fpsTimer; + private int startFrame = 0; private synchronized void setFpsIs(float val) { @@ -1234,6 +1238,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay { public final Timer thisTimer = timer; public final boolean isSingleFrame = singleFrame; + private long lastRun = 0L; @Override @@ -1264,7 +1269,7 @@ public final class ImagePanel extends JPanel implements MediaDisplay { int frameCount = timelined.getTimeline().getFrameCount(); //How many ticks (= times where frame should be displayed in framerate) are there from hitting play button int ticksFromStart = (int) Math.floor((frameTimeMsIs - startRun) / (double) getMsPerFrame()) + 1; - //Add ticks to first frame when hitting play button, ignoring total framecount => this value can be larger than number of frames in timeline + //Add ticks to first frame when hitting play button, ignoring total framecount => this value can be larger than number of frames in timeline int frameOverMaxShouldBeNow = startFrame + ticksFromStart; //Apply maximum frames repating, this is actual frame which should be drawed now int frameShouldBeNow = frameOverMaxShouldBeNow % frameCount; From 42bf264d9c1ef42fa321df2bde22927391b7a9ba Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Wed, 2 Mar 2016 10:35:10 +0100 Subject: [PATCH 06/18] nsh fixes --- nsis_locales/Catalan.nsh | 4 +- nsis_locales/Czech.nsh | 3 +- nsis_locales/Dutch.nsh | 4 +- nsis_locales/English.nsh | 4 -- nsis_locales/French.nsh | 86 +++++++++++++++++------------------ nsis_locales/German.nsh | 5 +- nsis_locales/Hungarian.nsh | 1 + nsis_locales/Polish.nsh | 6 +-- nsis_locales/Portuguese.nsh | 5 +- nsis_locales/PortugueseBR.nsh | 5 +- nsis_locales/Russian.nsh | 5 +- nsis_locales/SimpChinese.nsh | 5 +- nsis_locales/Spanish.nsh | 4 +- nsis_locales/Swedish.nsh | 4 +- nsis_locales/Ukrainian.nsh | 4 +- 15 files changed, 73 insertions(+), 72 deletions(-) diff --git a/nsis_locales/Catalan.nsh b/nsis_locales/Catalan.nsh index 109596f02..020822179 100644 --- a/nsis_locales/Catalan.nsh +++ b/nsis_locales/Catalan.nsh @@ -7,7 +7,7 @@ !insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Add to context menu" !insertmacro LANG_STRING STRING_SECTION_APP "Application GUI and Libraries" !insertmacro LANG_STRING STRING_SECTION_SWC "Download FlashPlayer library from Adobe site - useful for ActionScript direct editation and other features" -!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in windows explorer." +!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in Windows Explorer." !insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Creates shortcut link on desktop" !insertmacro LANG_STRING STRING_UNINST_USER "Remove user configuration" !insertmacro LANG_STRING STRING_HELP_US "Help us" @@ -24,7 +24,7 @@ !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "This application requires Flash ActiveX control" !insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "This application requires installation of the Flash ActiveX control. This will be downloaded and installed as part of the installation." !insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Flash ActiveX already installed" -!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash Active X is missing." +!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash ActiveX is missing." !insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "About to download Flash from " !insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Download result = " !insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Cannot download Flash ActiveX. You can download it later manually or use our own flash viewer." diff --git a/nsis_locales/Czech.nsh b/nsis_locales/Czech.nsh index b12aba9cc..4fce24ef8 100644 --- a/nsis_locales/Czech.nsh +++ b/nsis_locales/Czech.nsh @@ -19,13 +19,12 @@ !insertmacro LANG_STRING STRING_SWC "Stáhnout PlayerGlobal.swc" !insertmacro LANG_STRING STRING_SWC_CHECK "Kontroluji stránky Adobe pro nejnovÄ›jší soubor PlayerGlobal.swc" - ;Flash ActiveX: !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Vyžadován ovládací prvek Flash Player ActiveX" !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "Tato aplikace vyžaduje ovládací prvek Flash ActiveX" !insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "Tato aplikace vyžaduje instalaci ovládacího prvku Flash ActiveX. Ten bude stažen a nainstalován jako souÄást instalace." !insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Ovládací prvek Flash ActiveX je již nainstalován" -!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Výsledek: Flash Active X chybí." +!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Výsledek: Flash ActiveX chybí." !insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "Následuje stažení Flashe z " !insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Výsledek stažení = " !insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Nelze stáhnout Flash ActiveX. Můžete ho stáhnout pozdÄ›ji ruÄnÄ› nebo použít náš vlastní zobrazovaÄ flashe." diff --git a/nsis_locales/Dutch.nsh b/nsis_locales/Dutch.nsh index b3c7e38f2..b44865a43 100644 --- a/nsis_locales/Dutch.nsh +++ b/nsis_locales/Dutch.nsh @@ -7,7 +7,7 @@ !insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Add to context menu" !insertmacro LANG_STRING STRING_SECTION_APP "Application GUI and Libraries" !insertmacro LANG_STRING STRING_SECTION_SWC "Download FlashPlayer library from Adobe site - useful for ActionScript direct editation and other features" -!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in windows explorer." +!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in Windows Explorer." !insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Creates shortcut link on desktop" !insertmacro LANG_STRING STRING_UNINST_USER "Remove user configuration" !insertmacro LANG_STRING STRING_HELP_US "Help us" @@ -24,7 +24,7 @@ !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "This application requires Flash ActiveX control" !insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "This application requires installation of the Flash ActiveX control. This will be downloaded and installed as part of the installation." !insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Flash ActiveX already installed" -!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash Active X is missing." +!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash ActiveX is missing." !insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "About to download Flash from " !insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Download result = " !insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Cannot download Flash ActiveX. You can download it later manually or use our own flash viewer." diff --git a/nsis_locales/English.nsh b/nsis_locales/English.nsh index 63bf2ccbc..46ceaee8a 100644 --- a/nsis_locales/English.nsh +++ b/nsis_locales/English.nsh @@ -61,7 +61,3 @@ !insertmacro LANG_STRING STRING_JRE_UNABLEINSTALL "Unable to install Java. You can install it later manually." ;!insertmacro LANG_STRING STRING_ "" - - - - diff --git a/nsis_locales/French.nsh b/nsis_locales/French.nsh index cafaf435f..1f80391d5 100644 --- a/nsis_locales/French.nsh +++ b/nsis_locales/French.nsh @@ -1,61 +1,61 @@ !define LANG "FRENCH" ; Must be the lang name define by NSIS -!insertmacro LANG_STRING STRING_SWC_NOTFOUND "La biblioth\u00e8que PlayerGlobal.SWC est introuvable sur le site web d'Adobe. Il est possible que votre parefeu bloque l'acc\u00e8s ou utilisez un proxy. Vous pouvez indiquer le chemin du fichier SWF plus tard dans les param\u00e8tres avanc\u00e9es.." -!insertmacro LANG_STRING STRING_SAVED_TO "enregistr\u00e9 sous" -!insertmacro LANG_STRING STRING_EXISTS_SKIP_DOWNLOAD "d\u00e9jà existant, je passe le t\u00e9l\u00e9chargement" -!insertmacro LANG_STRING STRING_STARTING_DOWNLOAD "D\u00e9marrage du t\u00e9l\u00e9chargement" +!insertmacro LANG_STRING STRING_SWC_NOTFOUND "La bibliothèque PlayerGlobal.SWC est introuvable sur le site web d'Adobe. Il est possible que votre parefeu bloque l'accès ou utilisez un proxy. Vous pouvez indiquer le chemin du fichier SWF plus tard dans les paramètres avancées.." +!insertmacro LANG_STRING STRING_SAVED_TO "enregistré sous" +!insertmacro LANG_STRING STRING_EXISTS_SKIP_DOWNLOAD "déjà existant, je passe le téléchargement" +!insertmacro LANG_STRING STRING_STARTING_DOWNLOAD "Démarrage du téléchargement" !insertmacro LANG_STRING STRING_DESKTOP_SHORTCUT "Raccourci Bureau" !insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Ajout au menu contextuel" !insertmacro LANG_STRING STRING_SECTION_APP "Application GUI et librairies" -!insertmacro LANG_STRING STRING_SECTION_SWC "T\u00e9l\u00e9chargement de la libriarie FlashPlayer à partir du site web d'Adobe - Toutes les fonctionnalit\u00e9s d'\u00e9dition et modification de codes ActionScript sont op\u00e9rationnelles" +!insertmacro LANG_STRING STRING_SECTION_SWC "Téléchargement de la libriarie FlashPlayer à partir du site web d'Adobe - Toutes les fonctionnalités d'édition et modification de codes ActionScript sont opérationnelles" !insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Ajout de FFDec au menu contextuel des fichiers SWF et GFX dans l'explorateur Windows." -!insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Cr\u00e9ation d'un raccourci vers le Bureau" +!insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Création d'un raccourci vers le Bureau" !insertmacro LANG_STRING STRING_UNINST_USER "Suppression de la configuration de l'utilisateur" !insertmacro LANG_STRING STRING_HELP_US "Aidez-nous" -!insertmacro LANG_STRING STRING_HELP_US_FREE "Ce d\u00e9compileur est compl\u00e8tement gratuit et le code source est disponible. Si vous souhaitez nous aider, vous pouvez parler de ce logiciel autour de vous. Mettez un lien vers notre page web, partagez au monde " -!insertmacro LANG_STRING STRING_HELP_US_DONATE "Si vous souhaitez exprimer votre gratitude pour le temps et les ressources que l'auteur a pass\u00e9 en d\u00e9veloppement, nous acceptons et appr\u00e9cions aussi les dons en num\u00e9raires." +!insertmacro LANG_STRING STRING_HELP_US_FREE "Ce décompileur est complètement gratuit et le code source est disponible. Si vous souhaitez nous aider, vous pouvez parler de ce logiciel autour de vous. Mettez un lien vers notre page web, partagez au monde " +!insertmacro LANG_STRING STRING_HELP_US_DONATE "Si vous souhaitez exprimer votre gratitude pour le temps et les ressources que l'auteur a passé en développement, nous acceptons et apprécions aussi les dons en numéraires." !insertmacro LANG_STRING STRING_HELP_US_MORE "Cliquez ici pour plus d'informations :" !insertmacro LANG_STRING STRING_HELP_US_DOYOU "Souhaitez-vous savoir comment nous aider ?" !insertmacro LANG_STRING STRING_HELP_US_BUTTON "Aidez-nous !" -!insertmacro LANG_STRING STRING_SWC "T\u00e9l\u00e9chargement du PlayerGlobal.swc" +!insertmacro LANG_STRING STRING_SWC "Téléchargement du PlayerGlobal.swc" !insertmacro LANG_STRING STRING_SWC_CHECK "Checking Adobe site for newest PlayerGlobal.swc file" + ;Flash ActiveX: -!insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Le contr\u00f4le ActiveX Flash Player est n\u00e9cessaire" -!insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "Cette application n\u00e9cessite le contr\u00f4le ActiveX Flash ActiveX" -!insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "Cette application n\u00e9cessite l'installation du contr\u00f4le ActiveX Flash. Il sera t\u00e9l\u00e9charg\u00e9 et install\u00e9 en m\u00eame temps par l'installateur." -!insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Le contr\u00f4le Flash ActiveX est d\u00e9jà install\u00e9" -!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "R\u00e9sultat : Le contr\u00f4le Flash Active X est manquant." -!insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "\u00c0 propos du t\u00e9l\u00e9chargement de Flash à partir de " -!insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "R\u00e9sultat du t\u00e9l\u00e9chargement = " -!insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Impossible de t\u00e9l\u00e9charger le contr\u00f4le ActiveX Flash. Vous pourrez le t\u00e9l\u00e9charger plus tard manuellement en utilisant notre lecteur flash." +!insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Le contrôle ActiveX Flash Player est nécessaire" +!insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "Cette application nécessite le contrôle ActiveX Flash ActiveX" +!insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "Cette application nécessite l'installation du contrôle ActiveX Flash. Il sera téléchargé et installé en même temps par l'installateur." +!insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Le contrôle Flash ActiveX est déjà installé" +!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Résultat : Le contrôle Flash ActiveX est manquant." +!insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "À propos du téléchargement de Flash à partir de " +!insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Résultat du téléchargement = " +!insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Impossible de télécharger le contrôle ActiveX Flash. Vous pourrez le télécharger plus tard manuellement en utilisant notre lecteur flash." !insertmacro LANG_STRING STRING_FLASH_AX_LAUNCHSETUP "Lancement du setup Flash" -!insertmacro LANG_STRING STRING_FLASH_AX_INTERRUPTED "Le setup Flash a \u00e9t\u00e9 interrompu anormalement - code de retour d'erreur " -!insertmacro LANG_STRING STRING_FLASH_AX_SETUPOUTCOME "V\u00e9rification du r\u00e9sultat de l'installation de Flash" -!insertmacro LANG_STRING STRING_FLASH_AX_UNABLEFINDAFTER "Impossible de trouver le contr\u00f4le ActiveX Flash, alors qu'il a \u00e9t\u00e9 install\u00e9 avec succ\u00e8s" -!insertmacro LANG_STRING STRING_FLASH_AX_UNABLEINSTALL "Impossible d'installer le contr\u00f4le ActiveX Flash. VOus pourrez le t\u00e9l\u00e9charger plus tard manuellement en utilisant notre lecteur flash." -!insertmacro LANG_STRING STRING_FLASH_AX_SETUPFINISHED "Le setup Flash est termin\u00e9" -!insertmacro LANG_STRING STRING_FLASH_AX_DETECTING "D\u00e9tection du contr\u00f4le ActiveX Flash" +!insertmacro LANG_STRING STRING_FLASH_AX_INTERRUPTED "Le setup Flash a été interrompu anormalement - code de retour d'erreur " +!insertmacro LANG_STRING STRING_FLASH_AX_SETUPOUTCOME "Vérification du résultat de l'installation de Flash" +!insertmacro LANG_STRING STRING_FLASH_AX_UNABLEFINDAFTER "Impossible de trouver le contrôle ActiveX Flash, alors qu'il a été installé avec succès" +!insertmacro LANG_STRING STRING_FLASH_AX_UNABLEINSTALL "Impossible d'installer le contrôle ActiveX Flash. VOus pourrez le télécharger plus tard manuellement en utilisant notre lecteur flash." +!insertmacro LANG_STRING STRING_FLASH_AX_SETUPFINISHED "Le setup Flash est terminé" +!insertmacro LANG_STRING STRING_FLASH_AX_DETECTING "Détection du contrôle ActiveX Flash" ;JRE: -!insertmacro LANG_STRING STRING_JRE_REQUIRED_TITLE "L'installation de JRE est n\u00e9cessaire" -!insertmacro LANG_STRING STRING_JRE_REQUIRED "Cette application n\u00e9cessite Java ${JRE_VERSION} ou plus" -!insertmacro LANG_STRING STRING_JRE_REQUIRED_INFO "Cette application n\u00e9cessite l'installation du Java Runtime Environment. Il sera t\u00e9l\u00e9charg\u00e9 et install\u00e9 en m\u00eame temps par l'installateur." -!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED_TITLE "Une mise à jour de JRE est n\u00e9cessaire" -!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED "Cette application n\u00e9cessite Java ${JRE_VERSION} ou plus" -!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED_INFO "Cette application n\u00e9cessite une version plus r\u00e9cente du Java Runtime Environment. Il sera t\u00e9l\u00e9charg\u00e9 et install\u00e9 en m\u00eame temps par l'installateur." -!insertmacro LANG_STRING STRING_JRE_DETECTVERSION "D\u00e9tection de la version de JRE" -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE "La d\u00e9tection de la version de JRE est termin\u00e9 - r\u00e9sultat = " -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE_OLD "Une ancienne version de JRE a \u00e9t\u00e9 trouv\u00e9" -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE_NO "JRE non trouv\u00e9" +!insertmacro LANG_STRING STRING_JRE_REQUIRED_TITLE "L'installation de JRE est nécessaire" +!insertmacro LANG_STRING STRING_JRE_REQUIRED "Cette application nécessite Java ${JRE_VERSION} ou plus" +!insertmacro LANG_STRING STRING_JRE_REQUIRED_INFO "Cette application nécessite l'installation du Java Runtime Environment. Il sera téléchargé et installé en même temps par l'installateur." +!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED_TITLE "Une mise à jour de JRE est nécessaire" +!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED "Cette application nécessite Java ${JRE_VERSION} ou plus" +!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED_INFO "Cette application nécessite une version plus récente du Java Runtime Environment. Il sera téléchargé et installé en même temps par l'installateur." +!insertmacro LANG_STRING STRING_JRE_DETECTVERSION "Détection de la version de JRE" +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE "La détection de la version de JRE est terminé - résultat = " +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE_OLD "Une ancienne version de JRE a été trouvé" +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE_NO "JRE non trouvé" !insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_1 "Comparaison des versions " !insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_2 " vers " -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_3 " r\u00e9sultats en " -!insertmacro LANG_STRING STRING_JRE_WILLDOWNLOAD "\u00c0 propos du t\u00e9l\u00e9chargement de JRE à partir de " -!insertmacro LANG_STRING STRING_JRE_DOWNRESULT "R\u00e9sultat du t\u00e9l\u00e9chargement = " -!insertmacro LANG_STRING STRING_JRE_CANNOTDOWNLOAD "Impossible de t\u00e9l\u00e9charger Java. Vous You pourrez le t\u00e9l\u00e9charger manuellement par la suite." +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_3 " résultats en " +!insertmacro LANG_STRING STRING_JRE_WILLDOWNLOAD "À propos du téléchargement de JRE à partir de " +!insertmacro LANG_STRING STRING_JRE_DOWNRESULT "Résultat du téléchargement = " +!insertmacro LANG_STRING STRING_JRE_CANNOTDOWNLOAD "Impossible de télécharger Java. Vous You pourrez le télécharger manuellement par la suite." !insertmacro LANG_STRING STRING_JRE_LAUNCHSETUP "Lancement du setup JRE" -!insertmacro LANG_STRING STRING_JRE_SETUPFINISHED "Le setup JRE est termin\u00e9" -!insertmacro LANG_STRING STRING_JRE_INTERRUPTED "Le setup JRE a \u00e9t\u00e9 interrompu anormalement - code de retour de l'erreur " -!insertmacro LANG_STRING STRING_JRE_SETUPOUTCOME "V\u00e9rification du r\u00e9sultat de l'installation de JRE" -!insertmacro LANG_STRING STRING_JRE_UNABLEFINDAFTER "Impossible de trouver JRE avec une version sup\u00e9rieure à ${JRE_VERSION}, alors que le setup JRE a \u00e9t\u00e9 install\u00e9 avec succ\u00e8s" -!insertmacro LANG_STRING STRING_JRE_UNABLEINSTALL "Impossible d'installer Java. Vous pourrez le t\u00e9l\u00e9charger manuellement par la suite." - +!insertmacro LANG_STRING STRING_JRE_SETUPFINISHED "Le setup JRE est terminé" +!insertmacro LANG_STRING STRING_JRE_INTERRUPTED "Le setup JRE a été interrompu anormalement - code de retour de l'erreur " +!insertmacro LANG_STRING STRING_JRE_SETUPOUTCOME "Vérification du résultat de l'installation de JRE" +!insertmacro LANG_STRING STRING_JRE_UNABLEFINDAFTER "Impossible de trouver JRE avec une version supérieure à ${JRE_VERSION}, alors que le setup JRE a été installé avec succès" +!insertmacro LANG_STRING STRING_JRE_UNABLEINSTALL "Impossible d'installer Java. Vous pourrez le télécharger manuellement par la suite." diff --git a/nsis_locales/German.nsh b/nsis_locales/German.nsh index 00fcbf4ae..b57d3d62a 100644 --- a/nsis_locales/German.nsh +++ b/nsis_locales/German.nsh @@ -7,7 +7,7 @@ !insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Add to context menu" !insertmacro LANG_STRING STRING_SECTION_APP "Application GUI and Libraries" !insertmacro LANG_STRING STRING_SECTION_SWC "Download FlashPlayer library from Adobe site - useful for ActionScript direct editation and other features" -!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in windows explorer." +!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in Windows Explorer." !insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Creates shortcut link on desktop" !insertmacro LANG_STRING STRING_UNINST_USER "Remove user configuration" !insertmacro LANG_STRING STRING_HELP_US "Help us" @@ -18,12 +18,13 @@ !insertmacro LANG_STRING STRING_HELP_US_BUTTON "Help us!" !insertmacro LANG_STRING STRING_SWC "Download PlayerGlobal.swc" !insertmacro LANG_STRING STRING_SWC_CHECK "Checking Adobe site for newest PlayerGlobal.swc file" + ;Flash ActiveX: !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Flash Player ActiveX control required" !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "This application requires Flash ActiveX control" !insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "This application requires installation of the Flash ActiveX control. This will be downloaded and installed as part of the installation." !insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Flash ActiveX already installed" -!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash Active X is missing." +!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash ActiveX is missing." !insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "About to download Flash from " !insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Download result = " !insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Cannot download Flash ActiveX. You can download it later manually or use our own flash viewer." diff --git a/nsis_locales/Hungarian.nsh b/nsis_locales/Hungarian.nsh index c0f30e7b8..f8ab8d8be 100644 --- a/nsis_locales/Hungarian.nsh +++ b/nsis_locales/Hungarian.nsh @@ -18,6 +18,7 @@ !insertmacro LANG_STRING STRING_HELP_US_BUTTON "Segítsen nekünk!" !insertmacro LANG_STRING STRING_SWC "PlayerGlobal.swc letöltése" !insertmacro LANG_STRING STRING_SWC_CHECK "Adobe oldal vizsgálata a legújabb PlayerGlobal.swc fájlhoz" + ;Flash ActiveX: !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Flash Player ActiveX vezérlÅ‘ szükséges" !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "Ezen az alkalmazásnak szüksége van a Flash ActiveX vezérlÅ‘hez" diff --git a/nsis_locales/Polish.nsh b/nsis_locales/Polish.nsh index e78d4f4ef..bdcfb2736 100644 --- a/nsis_locales/Polish.nsh +++ b/nsis_locales/Polish.nsh @@ -7,7 +7,7 @@ !insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Add to context menu" !insertmacro LANG_STRING STRING_SECTION_APP "Application GUI and Libraries" !insertmacro LANG_STRING STRING_SECTION_SWC "Download FlashPlayer library from Adobe site - useful for ActionScript direct editation and other features" -!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in windows explorer." +!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in Windows Explorer." !insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Creates shortcut link on desktop" !insertmacro LANG_STRING STRING_UNINST_USER "Remove user configuration" !insertmacro LANG_STRING STRING_HELP_US "Help us" @@ -18,12 +18,13 @@ !insertmacro LANG_STRING STRING_HELP_US_BUTTON "Help us!" !insertmacro LANG_STRING STRING_SWC "Download PlayerGlobal.swc" !insertmacro LANG_STRING STRING_SWC_CHECK "Checking Adobe site for newest PlayerGlobal.swc file" + ;Flash ActiveX: !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Flash Player ActiveX control required" !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "This application requires Flash ActiveX control" !insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "This application requires installation of the Flash ActiveX control. This will be downloaded and installed as part of the installation." !insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Flash ActiveX already installed" -!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash Active X is missing." +!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash ActiveX is missing." !insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "About to download Flash from " !insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Download result = " !insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Cannot download Flash ActiveX. You can download it later manually or use our own flash viewer." @@ -59,4 +60,3 @@ !insertmacro LANG_STRING STRING_JRE_UNABLEFINDAFTER "Unable to find JRE with version above ${JRE_VERSION}, even though the JRE setup was successful" !insertmacro LANG_STRING STRING_JRE_UNABLEINSTALL "Unable to install Java. You can install it later manually." - diff --git a/nsis_locales/Portuguese.nsh b/nsis_locales/Portuguese.nsh index e1e65eb98..ba3b688e9 100644 --- a/nsis_locales/Portuguese.nsh +++ b/nsis_locales/Portuguese.nsh @@ -7,7 +7,7 @@ !insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Add to context menu" !insertmacro LANG_STRING STRING_SECTION_APP "Application GUI and Libraries" !insertmacro LANG_STRING STRING_SECTION_SWC "Download FlashPlayer library from Adobe site - useful for ActionScript direct editation and other features" -!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in windows explorer." +!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in Windows Explorer." !insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Creates shortcut link on desktop" !insertmacro LANG_STRING STRING_UNINST_USER "Remove user configuration" !insertmacro LANG_STRING STRING_HELP_US "Help us" @@ -18,12 +18,13 @@ !insertmacro LANG_STRING STRING_HELP_US_BUTTON "Help us!" !insertmacro LANG_STRING STRING_SWC "Download PlayerGlobal.swc" !insertmacro LANG_STRING STRING_SWC_CHECK "Checking Adobe site for newest PlayerGlobal.swc file" + ;Flash ActiveX: !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Flash Player ActiveX control required" !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "This application requires Flash ActiveX control" !insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "This application requires installation of the Flash ActiveX control. This will be downloaded and installed as part of the installation." !insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Flash ActiveX already installed" -!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash Active X is missing." +!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash ActiveX is missing." !insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "About to download Flash from " !insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Download result = " !insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Cannot download Flash ActiveX. You can download it later manually or use our own flash viewer." diff --git a/nsis_locales/PortugueseBR.nsh b/nsis_locales/PortugueseBR.nsh index 196074c69..ddb50da1d 100644 --- a/nsis_locales/PortugueseBR.nsh +++ b/nsis_locales/PortugueseBR.nsh @@ -7,7 +7,7 @@ !insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Add to context menu" !insertmacro LANG_STRING STRING_SECTION_APP "Application GUI and Libraries" !insertmacro LANG_STRING STRING_SECTION_SWC "Download FlashPlayer library from Adobe site - useful for ActionScript direct editation and other features" -!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in windows explorer." +!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in Windows Explorer." !insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Creates shortcut link on desktop" !insertmacro LANG_STRING STRING_UNINST_USER "Remove user configuration" !insertmacro LANG_STRING STRING_HELP_US "Help us" @@ -18,12 +18,13 @@ !insertmacro LANG_STRING STRING_HELP_US_BUTTON "Help us!" !insertmacro LANG_STRING STRING_SWC "Download PlayerGlobal.swc" !insertmacro LANG_STRING STRING_SWC_CHECK "Checking Adobe site for newest PlayerGlobal.swc file" + ;Flash ActiveX: !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Flash Player ActiveX control required" !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "This application requires Flash ActiveX control" !insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "This application requires installation of the Flash ActiveX control. This will be downloaded and installed as part of the installation." !insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Flash ActiveX already installed" -!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash Active X is missing." +!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash ActiveX is missing." !insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "About to download Flash from " !insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Download result = " !insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Cannot download Flash ActiveX. You can download it later manually or use our own flash viewer." diff --git a/nsis_locales/Russian.nsh b/nsis_locales/Russian.nsh index 55d65fb52..218d0d444 100644 --- a/nsis_locales/Russian.nsh +++ b/nsis_locales/Russian.nsh @@ -7,7 +7,7 @@ !insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Add to context menu" !insertmacro LANG_STRING STRING_SECTION_APP "Application GUI and Libraries" !insertmacro LANG_STRING STRING_SECTION_SWC "Download FlashPlayer library from Adobe site - useful for ActionScript direct editation and other features" -!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in windows explorer." +!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in Windows Explorer." !insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Creates shortcut link on desktop" !insertmacro LANG_STRING STRING_UNINST_USER "Remove user configuration" !insertmacro LANG_STRING STRING_HELP_US "Help us" @@ -18,12 +18,13 @@ !insertmacro LANG_STRING STRING_HELP_US_BUTTON "Help us!" !insertmacro LANG_STRING STRING_SWC "Download PlayerGlobal.swc" !insertmacro LANG_STRING STRING_SWC_CHECK "Checking Adobe site for newest PlayerGlobal.swc file" + ;Flash ActiveX: !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Flash Player ActiveX control required" !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "This application requires Flash ActiveX control" !insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "This application requires installation of the Flash ActiveX control. This will be downloaded and installed as part of the installation." !insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Flash ActiveX already installed" -!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash Active X is missing." +!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash ActiveX is missing." !insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "About to download Flash from " !insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Download result = " !insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Cannot download Flash ActiveX. You can download it later manually or use our own flash viewer." diff --git a/nsis_locales/SimpChinese.nsh b/nsis_locales/SimpChinese.nsh index 5d426a3b1..98f494c84 100644 --- a/nsis_locales/SimpChinese.nsh +++ b/nsis_locales/SimpChinese.nsh @@ -7,7 +7,7 @@ !insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Add to context menu" !insertmacro LANG_STRING STRING_SECTION_APP "Application GUI and Libraries" !insertmacro LANG_STRING STRING_SECTION_SWC "Download FlashPlayer library from Adobe site - useful for ActionScript direct editation and other features" -!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in windows explorer." +!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in Windows Explorer." !insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Creates shortcut link on desktop" !insertmacro LANG_STRING STRING_UNINST_USER "Remove user configuration" !insertmacro LANG_STRING STRING_HELP_US "Help us" @@ -18,12 +18,13 @@ !insertmacro LANG_STRING STRING_HELP_US_BUTTON "Help us!" !insertmacro LANG_STRING STRING_SWC "Download PlayerGlobal.swc" !insertmacro LANG_STRING STRING_SWC_CHECK "Checking Adobe site for newest PlayerGlobal.swc file" + ;Flash ActiveX: !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Flash Player ActiveX control required" !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "This application requires Flash ActiveX control" !insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "This application requires installation of the Flash ActiveX control. This will be downloaded and installed as part of the installation." !insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Flash ActiveX already installed" -!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash Active X is missing." +!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash ActiveX is missing." !insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "About to download Flash from " !insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Download result = " !insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Cannot download Flash ActiveX. You can download it later manually or use our own flash viewer." diff --git a/nsis_locales/Spanish.nsh b/nsis_locales/Spanish.nsh index b8d80910b..a381062cf 100644 --- a/nsis_locales/Spanish.nsh +++ b/nsis_locales/Spanish.nsh @@ -7,7 +7,7 @@ !insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Add to context menu" !insertmacro LANG_STRING STRING_SECTION_APP "Application GUI and Libraries" !insertmacro LANG_STRING STRING_SECTION_SWC "Download FlashPlayer library from Adobe site - useful for ActionScript direct editation and other features" -!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in windows explorer." +!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in Windows Explorer." !insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Creates shortcut link on desktop" !insertmacro LANG_STRING STRING_UNINST_USER "Remove user configuration" !insertmacro LANG_STRING STRING_HELP_US "Help us" @@ -24,7 +24,7 @@ !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "This application requires Flash ActiveX control" !insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "This application requires installation of the Flash ActiveX control. This will be downloaded and installed as part of the installation." !insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Flash ActiveX already installed" -!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash Active X is missing." +!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash ActiveX is missing." !insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "About to download Flash from " !insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Download result = " !insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Cannot download Flash ActiveX. You can download it later manually or use our own flash viewer." diff --git a/nsis_locales/Swedish.nsh b/nsis_locales/Swedish.nsh index c52ae4e8c..a8d8989a8 100644 --- a/nsis_locales/Swedish.nsh +++ b/nsis_locales/Swedish.nsh @@ -7,7 +7,7 @@ !insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Add to context menu" !insertmacro LANG_STRING STRING_SECTION_APP "Application GUI and Libraries" !insertmacro LANG_STRING STRING_SECTION_SWC "Download FlashPlayer library from Adobe site - useful for ActionScript direct editation and other features" -!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in windows explorer." +!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in Windows Explorer." !insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Creates shortcut link on desktop" !insertmacro LANG_STRING STRING_UNINST_USER "Remove user configuration" !insertmacro LANG_STRING STRING_HELP_US "Help us" @@ -24,7 +24,7 @@ !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "This application requires Flash ActiveX control" !insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "This application requires installation of the Flash ActiveX control. This will be downloaded and installed as part of the installation." !insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Flash ActiveX already installed" -!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash Active X is missing." +!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash ActiveX is missing." !insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "About to download Flash from " !insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Download result = " !insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Cannot download Flash ActiveX. You can download it later manually or use our own flash viewer." diff --git a/nsis_locales/Ukrainian.nsh b/nsis_locales/Ukrainian.nsh index 05e091019..0dd20a542 100644 --- a/nsis_locales/Ukrainian.nsh +++ b/nsis_locales/Ukrainian.nsh @@ -7,7 +7,7 @@ !insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Add to context menu" !insertmacro LANG_STRING STRING_SECTION_APP "Application GUI and Libraries" !insertmacro LANG_STRING STRING_SECTION_SWC "Download FlashPlayer library from Adobe site - useful for ActionScript direct editation and other features" -!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in windows explorer." +!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in Windows Explorer." !insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Creates shortcut link on desktop" !insertmacro LANG_STRING STRING_UNINST_USER "Remove user configuration" !insertmacro LANG_STRING STRING_HELP_US "Help us" @@ -24,7 +24,7 @@ !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "This application requires Flash ActiveX control" !insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "This application requires installation of the Flash ActiveX control. This will be downloaded and installed as part of the installation." !insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Flash ActiveX already installed" -!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash Active X is missing." +!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash ActiveX is missing." !insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "About to download Flash from " !insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Download result = " !insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Cannot download Flash ActiveX. You can download it later manually or use our own flash viewer." From d74f1519b979601a0dba52ead9c191db0edd9def Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Wed, 2 Mar 2016 10:48:44 +0100 Subject: [PATCH 07/18] revert french.nsh --- nsis_locales/French.nsh | 110 ++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/nsis_locales/French.nsh b/nsis_locales/French.nsh index 1f80391d5..e352ddca1 100644 --- a/nsis_locales/French.nsh +++ b/nsis_locales/French.nsh @@ -1,61 +1,61 @@ !define LANG "FRENCH" ; Must be the lang name define by NSIS -!insertmacro LANG_STRING STRING_SWC_NOTFOUND "La bibliothèque PlayerGlobal.SWC est introuvable sur le site web d'Adobe. Il est possible que votre parefeu bloque l'accès ou utilisez un proxy. Vous pouvez indiquer le chemin du fichier SWF plus tard dans les paramètres avancées.." -!insertmacro LANG_STRING STRING_SAVED_TO "enregistré sous" -!insertmacro LANG_STRING STRING_EXISTS_SKIP_DOWNLOAD "déjà existant, je passe le téléchargement" -!insertmacro LANG_STRING STRING_STARTING_DOWNLOAD "Démarrage du téléchargement" -!insertmacro LANG_STRING STRING_DESKTOP_SHORTCUT "Raccourci Bureau" -!insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Ajout au menu contextuel" -!insertmacro LANG_STRING STRING_SECTION_APP "Application GUI et librairies" -!insertmacro LANG_STRING STRING_SECTION_SWC "Téléchargement de la libriarie FlashPlayer à partir du site web d'Adobe - Toutes les fonctionnalités d'édition et modification de codes ActionScript sont opérationnelles" -!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Ajout de FFDec au menu contextuel des fichiers SWF et GFX dans l'explorateur Windows." -!insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Création d'un raccourci vers le Bureau" -!insertmacro LANG_STRING STRING_UNINST_USER "Suppression de la configuration de l'utilisateur" -!insertmacro LANG_STRING STRING_HELP_US "Aidez-nous" -!insertmacro LANG_STRING STRING_HELP_US_FREE "Ce décompileur est complètement gratuit et le code source est disponible. Si vous souhaitez nous aider, vous pouvez parler de ce logiciel autour de vous. Mettez un lien vers notre page web, partagez au monde " -!insertmacro LANG_STRING STRING_HELP_US_DONATE "Si vous souhaitez exprimer votre gratitude pour le temps et les ressources que l'auteur a passé en développement, nous acceptons et apprécions aussi les dons en numéraires." -!insertmacro LANG_STRING STRING_HELP_US_MORE "Cliquez ici pour plus d'informations :" -!insertmacro LANG_STRING STRING_HELP_US_DOYOU "Souhaitez-vous savoir comment nous aider ?" -!insertmacro LANG_STRING STRING_HELP_US_BUTTON "Aidez-nous !" -!insertmacro LANG_STRING STRING_SWC "Téléchargement du PlayerGlobal.swc" +!insertmacro LANG_STRING STRING_SWC_NOTFOUND "PlayerGlobal.SWC was not found on Adobe webpages. Maybe your firewall is blocking access or you have some proxy enabled. You can set the path to the SWC file later in advanced settings." +!insertmacro LANG_STRING STRING_SAVED_TO "saved to" +!insertmacro LANG_STRING STRING_EXISTS_SKIP_DOWNLOAD "already exists, skipping download" +!insertmacro LANG_STRING STRING_STARTING_DOWNLOAD "Starting download" +!insertmacro LANG_STRING STRING_DESKTOP_SHORTCUT "Desktop Shortcut" +!insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Add to context menu" +!insertmacro LANG_STRING STRING_SECTION_APP "Application GUI and Libraries" +!insertmacro LANG_STRING STRING_SECTION_SWC "Download FlashPlayer library from Adobe site - useful for ActionScript direct editation and other features" +!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in Windows Explorer." +!insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Creates shortcut link on desktop" +!insertmacro LANG_STRING STRING_UNINST_USER "Remove user configuration" +!insertmacro LANG_STRING STRING_HELP_US "Help us" +!insertmacro LANG_STRING STRING_HELP_US_FREE "This whole decompiler is Free and OpenSource. If you want to support us, you can tell other people about our decompiler. Use link to our pages, share a word." +!insertmacro LANG_STRING STRING_HELP_US_DONATE "If you wish to express your appreciation for the time and resources the author has spent developing, we also do accept and appreciate monetary donations." +!insertmacro LANG_STRING STRING_HELP_US_MORE "Click here for more info:" +!insertmacro LANG_STRING STRING_HELP_US_DOYOU "Do you know you can help us?" +!insertmacro LANG_STRING STRING_HELP_US_BUTTON "Help us!" +!insertmacro LANG_STRING STRING_SWC "Download PlayerGlobal.swc" !insertmacro LANG_STRING STRING_SWC_CHECK "Checking Adobe site for newest PlayerGlobal.swc file" ;Flash ActiveX: -!insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Le contrôle ActiveX Flash Player est nécessaire" -!insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "Cette application nécessite le contrôle ActiveX Flash ActiveX" -!insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "Cette application nécessite l'installation du contrôle ActiveX Flash. Il sera téléchargé et installé en même temps par l'installateur." -!insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Le contrôle Flash ActiveX est déjà installé" -!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Résultat : Le contrôle Flash ActiveX est manquant." -!insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "À propos du téléchargement de Flash à partir de " -!insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Résultat du téléchargement = " -!insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Impossible de télécharger le contrôle ActiveX Flash. Vous pourrez le télécharger plus tard manuellement en utilisant notre lecteur flash." -!insertmacro LANG_STRING STRING_FLASH_AX_LAUNCHSETUP "Lancement du setup Flash" -!insertmacro LANG_STRING STRING_FLASH_AX_INTERRUPTED "Le setup Flash a été interrompu anormalement - code de retour d'erreur " -!insertmacro LANG_STRING STRING_FLASH_AX_SETUPOUTCOME "Vérification du résultat de l'installation de Flash" -!insertmacro LANG_STRING STRING_FLASH_AX_UNABLEFINDAFTER "Impossible de trouver le contrôle ActiveX Flash, alors qu'il a été installé avec succès" -!insertmacro LANG_STRING STRING_FLASH_AX_UNABLEINSTALL "Impossible d'installer le contrôle ActiveX Flash. VOus pourrez le télécharger plus tard manuellement en utilisant notre lecteur flash." -!insertmacro LANG_STRING STRING_FLASH_AX_SETUPFINISHED "Le setup Flash est terminé" -!insertmacro LANG_STRING STRING_FLASH_AX_DETECTING "Détection du contrôle ActiveX Flash" +!insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Flash Player ActiveX control required" +!insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "This application requires Flash ActiveX control" +!insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "This application requires installation of the Flash ActiveX control. This will be downloaded and installed as part of the installation." +!insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Flash ActiveX already installed" +!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash ActiveX is missing." +!insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "About to download Flash from " +!insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Download result = " +!insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Cannot download Flash ActiveX. You can download it later manually or use our own flash viewer." +!insertmacro LANG_STRING STRING_FLASH_AX_LAUNCHSETUP "Launching Flash setup" +!insertmacro LANG_STRING STRING_FLASH_AX_INTERRUPTED "The Flash setup has been abnormally interrupted - return code" +!insertmacro LANG_STRING STRING_FLASH_AX_SETUPOUTCOME "Checking the Flash Setup's outcome" +!insertmacro LANG_STRING STRING_FLASH_AX_UNABLEFINDAFTER "Unable to find Flash ActiveX, even though the Flash setup was successful" +!insertmacro LANG_STRING STRING_FLASH_AX_UNABLEINSTALL "Unable to install Flash ActiveX. You can download it later manually or use our own flash viewer." +!insertmacro LANG_STRING STRING_FLASH_AX_SETUPFINISHED "Flash Setup finished" +!insertmacro LANG_STRING STRING_FLASH_AX_DETECTING "Detecting Flash ActiveX" ;JRE: -!insertmacro LANG_STRING STRING_JRE_REQUIRED_TITLE "L'installation de JRE est nécessaire" -!insertmacro LANG_STRING STRING_JRE_REQUIRED "Cette application nécessite Java ${JRE_VERSION} ou plus" -!insertmacro LANG_STRING STRING_JRE_REQUIRED_INFO "Cette application nécessite l'installation du Java Runtime Environment. Il sera téléchargé et installé en même temps par l'installateur." -!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED_TITLE "Une mise à jour de JRE est nécessaire" -!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED "Cette application nécessite Java ${JRE_VERSION} ou plus" -!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED_INFO "Cette application nécessite une version plus récente du Java Runtime Environment. Il sera téléchargé et installé en même temps par l'installateur." -!insertmacro LANG_STRING STRING_JRE_DETECTVERSION "Détection de la version de JRE" -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE "La détection de la version de JRE est terminé - résultat = " -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE_OLD "Une ancienne version de JRE a été trouvé" -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE_NO "JRE non trouvé" -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_1 "Comparaison des versions " -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_2 " vers " -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_3 " résultats en " -!insertmacro LANG_STRING STRING_JRE_WILLDOWNLOAD "À propos du téléchargement de JRE à partir de " -!insertmacro LANG_STRING STRING_JRE_DOWNRESULT "Résultat du téléchargement = " -!insertmacro LANG_STRING STRING_JRE_CANNOTDOWNLOAD "Impossible de télécharger Java. Vous You pourrez le télécharger manuellement par la suite." -!insertmacro LANG_STRING STRING_JRE_LAUNCHSETUP "Lancement du setup JRE" -!insertmacro LANG_STRING STRING_JRE_SETUPFINISHED "Le setup JRE est terminé" -!insertmacro LANG_STRING STRING_JRE_INTERRUPTED "Le setup JRE a été interrompu anormalement - code de retour de l'erreur " -!insertmacro LANG_STRING STRING_JRE_SETUPOUTCOME "Vérification du résultat de l'installation de JRE" -!insertmacro LANG_STRING STRING_JRE_UNABLEFINDAFTER "Impossible de trouver JRE avec une version supérieure à ${JRE_VERSION}, alors que le setup JRE a été installé avec succès" -!insertmacro LANG_STRING STRING_JRE_UNABLEINSTALL "Impossible d'installer Java. Vous pourrez le télécharger manuellement par la suite." +!insertmacro LANG_STRING STRING_JRE_REQUIRED_TITLE "JRE Installation Required" +!insertmacro LANG_STRING STRING_JRE_REQUIRED "This application requires Java ${JRE_VERSION} or higher" +!insertmacro LANG_STRING STRING_JRE_REQUIRED_INFO "This application requires installation of the Java Runtime Environment. This will be downloaded and installed as part of the installation." +!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED_TITLE "JRE Update Required" +!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED "This application requires Java ${JRE_VERSION} or higher" +!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED_INFO "This application requires a more recent version of the Java Runtime Environment. This will be downloaded and installed as part of the installation." +!insertmacro LANG_STRING STRING_JRE_DETECTVERSION "Detecting JRE Version" +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE "JRE Version detection complete - result = " +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE_OLD "Old JRE found" +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE_NO "No JRE Found" +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_1 "Comparing version " +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_2 " to " +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_3 " results in " +!insertmacro LANG_STRING STRING_JRE_WILLDOWNLOAD "About to download JRE from " +!insertmacro LANG_STRING STRING_JRE_DOWNRESULT "Download result = " +!insertmacro LANG_STRING STRING_JRE_CANNOTDOWNLOAD "Cannot download Java. You can download it later manually." +!insertmacro LANG_STRING STRING_JRE_LAUNCHSETUP "Launching JRE setup" +!insertmacro LANG_STRING STRING_JRE_SETUPFINISHED "JRE Setup finished" +!insertmacro LANG_STRING STRING_JRE_INTERRUPTED "The JRE setup has been abnormally interrupted - return code " +!insertmacro LANG_STRING STRING_JRE_SETUPOUTCOME "Checking the JRE Setup's outcome" +!insertmacro LANG_STRING STRING_JRE_UNABLEFINDAFTER "Unable to find JRE with version above ${JRE_VERSION}, even though the JRE setup was successful" +!insertmacro LANG_STRING STRING_JRE_UNABLEINSTALL "Unable to install Java. You can install it later manually." From a51c88a45c878b3dff1039de0550e2da83d58150 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Wed, 2 Mar 2016 10:51:55 +0100 Subject: [PATCH 08/18] french.nsh again, utf-8 --- nsis_locales/French.nsh | 110 ++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/nsis_locales/French.nsh b/nsis_locales/French.nsh index e352ddca1..da29b304c 100644 --- a/nsis_locales/French.nsh +++ b/nsis_locales/French.nsh @@ -1,61 +1,61 @@ !define LANG "FRENCH" ; Must be the lang name define by NSIS -!insertmacro LANG_STRING STRING_SWC_NOTFOUND "PlayerGlobal.SWC was not found on Adobe webpages. Maybe your firewall is blocking access or you have some proxy enabled. You can set the path to the SWC file later in advanced settings." -!insertmacro LANG_STRING STRING_SAVED_TO "saved to" -!insertmacro LANG_STRING STRING_EXISTS_SKIP_DOWNLOAD "already exists, skipping download" -!insertmacro LANG_STRING STRING_STARTING_DOWNLOAD "Starting download" -!insertmacro LANG_STRING STRING_DESKTOP_SHORTCUT "Desktop Shortcut" -!insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Add to context menu" -!insertmacro LANG_STRING STRING_SECTION_APP "Application GUI and Libraries" -!insertmacro LANG_STRING STRING_SECTION_SWC "Download FlashPlayer library from Adobe site - useful for ActionScript direct editation and other features" -!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Adds FFDec to context menu of SWF and GFX files in Windows Explorer." -!insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Creates shortcut link on desktop" -!insertmacro LANG_STRING STRING_UNINST_USER "Remove user configuration" -!insertmacro LANG_STRING STRING_HELP_US "Help us" -!insertmacro LANG_STRING STRING_HELP_US_FREE "This whole decompiler is Free and OpenSource. If you want to support us, you can tell other people about our decompiler. Use link to our pages, share a word." -!insertmacro LANG_STRING STRING_HELP_US_DONATE "If you wish to express your appreciation for the time and resources the author has spent developing, we also do accept and appreciate monetary donations." -!insertmacro LANG_STRING STRING_HELP_US_MORE "Click here for more info:" -!insertmacro LANG_STRING STRING_HELP_US_DOYOU "Do you know you can help us?" -!insertmacro LANG_STRING STRING_HELP_US_BUTTON "Help us!" -!insertmacro LANG_STRING STRING_SWC "Download PlayerGlobal.swc" +!insertmacro LANG_STRING STRING_SWC_NOTFOUND "La bibliothèque PlayerGlobal.SWC est introuvable sur le site web d'Adobe. Il est possible que votre parefeu bloque l'accès ou utilisez un proxy. Vous pouvez indiquer le chemin du fichier SWF plus tard dans les paramètres avancées.." +!insertmacro LANG_STRING STRING_SAVED_TO "enregistré sous" +!insertmacro LANG_STRING STRING_EXISTS_SKIP_DOWNLOAD "déjà existant, je passe le téléchargement" +!insertmacro LANG_STRING STRING_STARTING_DOWNLOAD "Démarrage du téléchargement" +!insertmacro LANG_STRING STRING_DESKTOP_SHORTCUT "Raccourci Bureau" +!insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Ajout au menu contextuel" +!insertmacro LANG_STRING STRING_SECTION_APP "Application GUI et librairies" +!insertmacro LANG_STRING STRING_SECTION_SWC "Téléchargement de la libriarie FlashPlayer à partir du site web d'Adobe - Toutes les fonctionnalités d'édition et modification de codes ActionScript sont opérationnelles" +!insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Ajout de FFDec au menu contextuel des fichiers SWF et GFX dans l'explorateur Windows." +!insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Création d'un raccourci vers le Bureau" +!insertmacro LANG_STRING STRING_UNINST_USER "Suppression de la configuration de l'utilisateur" +!insertmacro LANG_STRING STRING_HELP_US "Aidez-nous" +!insertmacro LANG_STRING STRING_HELP_US_FREE "Ce décompileur est complètement gratuit et le code source est disponible. Si vous souhaitez nous aider, vous pouvez parler de ce logiciel autour de vous. Mettez un lien vers notre page web, partagez au monde " +!insertmacro LANG_STRING STRING_HELP_US_DONATE "Si vous souhaitez exprimer votre gratitude pour le temps et les ressources que l'auteur a passé en développement, nous acceptons et apprécions aussi les dons en numéraires." +!insertmacro LANG_STRING STRING_HELP_US_MORE "Cliquez ici pour plus d'informations :" +!insertmacro LANG_STRING STRING_HELP_US_DOYOU "Souhaitez-vous savoir comment nous aider ?" +!insertmacro LANG_STRING STRING_HELP_US_BUTTON "Aidez-nous !" +!insertmacro LANG_STRING STRING_SWC "Téléchargement du PlayerGlobal.swc" !insertmacro LANG_STRING STRING_SWC_CHECK "Checking Adobe site for newest PlayerGlobal.swc file" ;Flash ActiveX: -!insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Flash Player ActiveX control required" -!insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "This application requires Flash ActiveX control" -!insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "This application requires installation of the Flash ActiveX control. This will be downloaded and installed as part of the installation." -!insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Flash ActiveX already installed" -!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Result: Flash ActiveX is missing." -!insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "About to download Flash from " -!insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Download result = " -!insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Cannot download Flash ActiveX. You can download it later manually or use our own flash viewer." -!insertmacro LANG_STRING STRING_FLASH_AX_LAUNCHSETUP "Launching Flash setup" -!insertmacro LANG_STRING STRING_FLASH_AX_INTERRUPTED "The Flash setup has been abnormally interrupted - return code" -!insertmacro LANG_STRING STRING_FLASH_AX_SETUPOUTCOME "Checking the Flash Setup's outcome" -!insertmacro LANG_STRING STRING_FLASH_AX_UNABLEFINDAFTER "Unable to find Flash ActiveX, even though the Flash setup was successful" -!insertmacro LANG_STRING STRING_FLASH_AX_UNABLEINSTALL "Unable to install Flash ActiveX. You can download it later manually or use our own flash viewer." -!insertmacro LANG_STRING STRING_FLASH_AX_SETUPFINISHED "Flash Setup finished" -!insertmacro LANG_STRING STRING_FLASH_AX_DETECTING "Detecting Flash ActiveX" +!insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Le contrôle ActiveX Flash Player est nécessaire" +!insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED "Cette application nécessite le contrôle ActiveX Flash ActiveX" +!insertmacro LANG_STRING STRING_FLASH_AX_WILLINSTALL "Cette application nécessite l'installation du contrôle ActiveX Flash. Il sera téléchargé et installé en même temps par l'installateur." +!insertmacro LANG_STRING STRING_FLASH_AX_ALREADYINSTALLED "Le contrôle Flash ActiveX est déjà installé" +!insertmacro LANG_STRING STRING_FLASH_AX_MISSING "Résultat : Le contrôle Flash ActiveX est manquant." +!insertmacro LANG_STRING STRING_FLASH_AX_WILLDOWNLOAD "À propos du téléchargement de Flash à partir de " +!insertmacro LANG_STRING STRING_FLASH_AX_DOWNRESULT "Résultat du téléchargement = " +!insertmacro LANG_STRING STRING_FLASH_AX_CANNOTDOWNLOAD "Impossible de télécharger le contrôle ActiveX Flash. Vous pourrez le télécharger plus tard manuellement en utilisant notre lecteur flash." +!insertmacro LANG_STRING STRING_FLASH_AX_LAUNCHSETUP "Lancement du setup Flash" +!insertmacro LANG_STRING STRING_FLASH_AX_INTERRUPTED "Le setup Flash a été interrompu anormalement - code de retour d'erreur " +!insertmacro LANG_STRING STRING_FLASH_AX_SETUPOUTCOME "Vérification du résultat de l'installation de Flash" +!insertmacro LANG_STRING STRING_FLASH_AX_UNABLEFINDAFTER "Impossible de trouver le contrôle ActiveX Flash, alors qu'il a été installé avec succès" +!insertmacro LANG_STRING STRING_FLASH_AX_UNABLEINSTALL "Impossible d'installer le contrôle ActiveX Flash. VOus pourrez le télécharger plus tard manuellement en utilisant notre lecteur flash." +!insertmacro LANG_STRING STRING_FLASH_AX_SETUPFINISHED "Le setup Flash est terminé" +!insertmacro LANG_STRING STRING_FLASH_AX_DETECTING "Détection du contrôle ActiveX Flash" ;JRE: -!insertmacro LANG_STRING STRING_JRE_REQUIRED_TITLE "JRE Installation Required" -!insertmacro LANG_STRING STRING_JRE_REQUIRED "This application requires Java ${JRE_VERSION} or higher" -!insertmacro LANG_STRING STRING_JRE_REQUIRED_INFO "This application requires installation of the Java Runtime Environment. This will be downloaded and installed as part of the installation." -!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED_TITLE "JRE Update Required" -!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED "This application requires Java ${JRE_VERSION} or higher" -!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED_INFO "This application requires a more recent version of the Java Runtime Environment. This will be downloaded and installed as part of the installation." -!insertmacro LANG_STRING STRING_JRE_DETECTVERSION "Detecting JRE Version" -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE "JRE Version detection complete - result = " -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE_OLD "Old JRE found" -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE_NO "No JRE Found" -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_1 "Comparing version " -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_2 " to " -!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_3 " results in " -!insertmacro LANG_STRING STRING_JRE_WILLDOWNLOAD "About to download JRE from " -!insertmacro LANG_STRING STRING_JRE_DOWNRESULT "Download result = " -!insertmacro LANG_STRING STRING_JRE_CANNOTDOWNLOAD "Cannot download Java. You can download it later manually." -!insertmacro LANG_STRING STRING_JRE_LAUNCHSETUP "Launching JRE setup" -!insertmacro LANG_STRING STRING_JRE_SETUPFINISHED "JRE Setup finished" -!insertmacro LANG_STRING STRING_JRE_INTERRUPTED "The JRE setup has been abnormally interrupted - return code " -!insertmacro LANG_STRING STRING_JRE_SETUPOUTCOME "Checking the JRE Setup's outcome" -!insertmacro LANG_STRING STRING_JRE_UNABLEFINDAFTER "Unable to find JRE with version above ${JRE_VERSION}, even though the JRE setup was successful" -!insertmacro LANG_STRING STRING_JRE_UNABLEINSTALL "Unable to install Java. You can install it later manually." +!insertmacro LANG_STRING STRING_JRE_REQUIRED_TITLE "L'installation de JRE est nécessaire" +!insertmacro LANG_STRING STRING_JRE_REQUIRED "Cette application nécessite Java ${JRE_VERSION} ou plus" +!insertmacro LANG_STRING STRING_JRE_REQUIRED_INFO "Cette application nécessite l'installation du Java Runtime Environment. Il sera téléchargé et installé en même temps par l'installateur." +!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED_TITLE "Une mise à jour de JRE est nécessaire" +!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED "Cette application nécessite Java ${JRE_VERSION} ou plus" +!insertmacro LANG_STRING STRING_JRE_UPDATEREQUIRED_INFO "Cette application nécessite une version plus récente du Java Runtime Environment. Il sera téléchargé et installé en même temps par l'installateur." +!insertmacro LANG_STRING STRING_JRE_DETECTVERSION "Détection de la version de JRE" +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE "La détection de la version de JRE est terminé - résultat = " +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE_OLD "Une ancienne version de JRE a été trouvé" +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPLETE_NO "JRE non trouvé" +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_1 "Comparaison des versions " +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_2 " vers " +!insertmacro LANG_STRING STRING_JRE_DETECTCOMPARE_3 " résultats en " +!insertmacro LANG_STRING STRING_JRE_WILLDOWNLOAD "À propos du téléchargement de JRE à partir de " +!insertmacro LANG_STRING STRING_JRE_DOWNRESULT "Résultat du téléchargement = " +!insertmacro LANG_STRING STRING_JRE_CANNOTDOWNLOAD "Impossible de télécharger Java. Vous You pourrez le télécharger manuellement par la suite." +!insertmacro LANG_STRING STRING_JRE_LAUNCHSETUP "Lancement du setup JRE" +!insertmacro LANG_STRING STRING_JRE_SETUPFINISHED "Le setup JRE est terminé" +!insertmacro LANG_STRING STRING_JRE_INTERRUPTED "Le setup JRE a été interrompu anormalement - code de retour de l'erreur " +!insertmacro LANG_STRING STRING_JRE_SETUPOUTCOME "Vérification du résultat de l'installation de JRE" +!insertmacro LANG_STRING STRING_JRE_UNABLEFINDAFTER "Impossible de trouver JRE avec une version supérieure à ${JRE_VERSION}, alors que le setup JRE a été installé avec succès" +!insertmacro LANG_STRING STRING_JRE_UNABLEINSTALL "Impossible d'installer Java. Vous pourrez le télécharger manuellement par la suite." From 155888d9302336a834345164c54b615831ce548e Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Wed, 2 Mar 2016 11:26:43 +0100 Subject: [PATCH 09/18] advanced settings fr fixed --- .../gui/locales/AdvancedSettingsDialog_fr.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties index de1cc1d7a..580a4beb5 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties @@ -338,11 +338,11 @@ config.description.setFFDecVersionInExportedFont = Lorsque cette option est deco config.name.gui.skin = Personnalisation de l'interface utilisateur config.description.gui.skin = Personnalisation de l'interface utilisateur -config.name.lastSessionFiles = Fichiers de la derni\u008re session -config.description.lastSessionFiles = Contient les fichiers ouverts lors de la derni\u008re session +config.name.lastSessionFiles = Fichiers de la derni\u00e8re session +config.description.lastSessionFiles = Contient les fichiers ouverts lors de la derni\u00e8re session -config.name.lastSessionSelection = S\u009lection de la derni\u008re session -config.description.lastSessionSelection = Contient la s\u00e9lection lors de la derni\u008re session +config.name.lastSessionSelection = S\u00e9lection de la derni\u00e8re session +config.description.lastSessionSelection = Contient la s\u00e9lection lors de la derni\u00e8re session config.name.loopMedia = Rejouer les sons et les sprites config.description.loopMedia = Rejoue automatiquement les sons et les sprites @@ -350,7 +350,7 @@ config.description.loopMedia = Rejoue automatiquement les sons et les sprites config.name.gui.timeLineSplitPane.dividerLocationPercent = (Internal) Timeline Splitter location config.description.gui.timeLineSplitPane.dividerLocationPercent = -config.name.cacheImages = Images en m\u000e9moire cache +config.name.cacheImages = Images en m\u00e9moire cache config.description.cacheImages = Met en m\u00e9moire cache les images-objets d\u00e9cod\u00e9es config.name.swfSpecificConfigs = Configuration avanc\u00e9es SWF From 495b705172f9cfa6d35664bdc70ed33b6195b6c2 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Wed, 2 Mar 2016 11:31:14 +0100 Subject: [PATCH 10/18] french transation improved --- nsis_locales/French.nsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nsis_locales/French.nsh b/nsis_locales/French.nsh index da29b304c..e000bac1a 100644 --- a/nsis_locales/French.nsh +++ b/nsis_locales/French.nsh @@ -6,7 +6,7 @@ !insertmacro LANG_STRING STRING_DESKTOP_SHORTCUT "Raccourci Bureau" !insertmacro LANG_STRING STRING_ADD_CONTEXT_MENU "Ajout au menu contextuel" !insertmacro LANG_STRING STRING_SECTION_APP "Application GUI et librairies" -!insertmacro LANG_STRING STRING_SECTION_SWC "Téléchargement de la libriarie FlashPlayer à partir du site web d'Adobe - Toutes les fonctionnalités d'édition et modification de codes ActionScript sont opérationnelles" +!insertmacro LANG_STRING STRING_SECTION_SWC "Téléchargement de la librairie FlashPlayer depuis le site web d'Adobe - Toutes les fonctionnalités d'édition et de modification du code ActionScript seront disponibles" !insertmacro LANG_STRING STRING_SECTION_CONTEXT_MENU "Ajout de FFDec au menu contextuel des fichiers SWF et GFX dans l'explorateur Windows." !insertmacro LANG_STRING STRING_SECTION_SHORTCUT "Création d'un raccourci vers le Bureau" !insertmacro LANG_STRING STRING_UNINST_USER "Suppression de la configuration de l'utilisateur" From f54294933e3b15e08ee5643d6ad3a8af9576376e Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Wed, 2 Mar 2016 12:32:31 +0100 Subject: [PATCH 11/18] french transation improved --- nsis_locales/French.nsh | 2 +- .../AdvancedSettingsDialog_fr.properties | 72 +++++++++---------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/nsis_locales/French.nsh b/nsis_locales/French.nsh index e000bac1a..7257ed5a2 100644 --- a/nsis_locales/French.nsh +++ b/nsis_locales/French.nsh @@ -17,7 +17,7 @@ !insertmacro LANG_STRING STRING_HELP_US_DOYOU "Souhaitez-vous savoir comment nous aider ?" !insertmacro LANG_STRING STRING_HELP_US_BUTTON "Aidez-nous !" !insertmacro LANG_STRING STRING_SWC "Téléchargement du PlayerGlobal.swc" -!insertmacro LANG_STRING STRING_SWC_CHECK "Checking Adobe site for newest PlayerGlobal.swc file" +!insertmacro LANG_STRING STRING_SWC_CHECK "Vérification d'une version plus récente de PlayerGlobal.swc" ;Flash ActiveX: !insertmacro LANG_STRING STRING_FLASH_AX_REQUIRED_TITLE "Le contrôle ActiveX Flash Player est nécessaire" diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties index 580a4beb5..2de551dcc 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties @@ -38,8 +38,8 @@ config.group.description.limit = Limites de la d\u00e9compilation du code crypt\ config.group.name.ui = Interface config.group.description.ui = Configuration de l'interface utilisateur -config.group.name.debug = Deboggage -config.group.description.debug = Param\u00e8tres de d\u00e9boggage +config.group.name.debug = D\u00e9boguage +config.group.description.debug = Param\u00e8tres de d\u00e9boguage config.group.name.display = Affichage config.group.description.display = Affichage des objets Flash, etc. @@ -260,7 +260,7 @@ config.description.textExportExportFontFace = Embarquer le style de police de ca config.name.lzmaFastBytes = LZMA fast bytes (valeurs permises : 5-255) config.description.lzmaFastBytes = Param\u00e8tre vitesse des octets de l'encodeur LZMA -config.name.pluginPath = Plugin Path +config.name.pluginPath = Chemin du Plugin config.description.pluginPath = - config.name.showMethodBodyId = Afficher l'identifiant dans le corps de texte @@ -314,14 +314,14 @@ config.name.showTraitSavedMessage = Afficher un message lors de l'enregistrement config.name.updateProxyAddress = Adresse du Proxy http pour v\u00e9rifier les mises \u00e0 jour config.description.updateProxyAddress = Adresse du Proxy http pour v\u00e9rifier les mises \u00e0 jour. Format : exemple.com:8080 -config.name.editorMode = Mode \u00c9diteur -config.description.editorMode = Rend \u00e9ditable les zone de texte automatiquement lorsque vous s\u00e9lectionnez un texte ou un script +config.name.editorMode = Mode \u00e9diteur +config.description.editorMode = Rend \u00e9ditable les zones de texte automatiquement lorsque vous s\u00e9lectionnez un texte ou un script config.name.autoSaveTagModifications = Enregistrement auto des \u00e9tiquettes modifi\u00e9es config.description.autoSaveTagModifications = Enregistre les changements lorsque vous s\u00e9lectionnez une autre \u00e9tiquette dans l'arborescence -config.name.saveSessionOnExit = Save session on exit -config.description.saveSessionOnExit = Save the current session and reopens it after FFDec restart (works only with real files) +config.name.saveSessionOnExit = Enregistrer la session en quittant +config.description.saveSessionOnExit = Enregistre la session courante et la r\u00e9tablira au red\u00e9marrage de FFDec (ne fonctionne qu'avec des fichiers physiquement pr\u00e9sents sur disque) config.name._showDebugMenu = Affiche le menu de d\u00e9boggage FFDec config.description._showDebugMenu = Affiche le menu de d\u00e9boggage dans le ruban lorsque le d\u00e9compileur est en train de d\u00e9bogguer. @@ -365,37 +365,37 @@ config.description.ignoreCLikePackages = Les paquets FlashCC/Alchemy ne sont pas config.name.overwriteExistingFiles = \u00c9craser les fichiers existants config.description.overwriteExistingFiles = \u00c9craser les fichiers existants lors de l'export. Ne fonctionne que pour les scripts AS2/3. -config.name.smartNumberFormatting = Utiliser le formattage num\u00c9rique intelligent -config.description.smartNumberFormatting = Formattage num\u00c9riques sp\u00c9ciaux (par exemple : les couleurs et les temps) +config.name.smartNumberFormatting = Utiliser le formattage num\u00e9rique intelligent +config.description.smartNumberFormatting = Formattage num\u00e9riques sp\u00e9ciaux (par exemple : les couleurs et les temps) config.name.enableScriptInitializerDisplay = Affiche l'initialisateur de script -config.description.enableScriptInitializerDisplay = Active l'affichage et l'\u00c9ditiion de l'initialisateur de script. Ce param\u00c8tre ajoute une nouvelle ligne en \u00c9vidence dans chaque classe. +config.description.enableScriptInitializerDisplay = Active l'affichage et l'\u00e9ditiion de l'initialisateur de script. Ce param\u00e8tre ajoute une nouvelle ligne en \u00e9vidence dans chaque classe. -config.name.autoOpenLoadedSWFs = Ouvre les SWF charg\u00c9s lors de l'ex\u00c9cution (Lecteur externe = Windows seulement) -config.description.autoOpenLoadedSWFs = Ouvre automatiquement tous les SWF charg\u00c9s par la classe de chargement AS3 en lisant les SWF jou\u00c9s dans le lecteur externe FFDec. Cette option ne fonctionne que sous Windows. +config.name.autoOpenLoadedSWFs = Ouvre les SWF charg\u00e9s lors de l'ex\u00e9cution (Lecteur externe = Windows seulement) +config.description.autoOpenLoadedSWFs = Ouvre automatiquement tous les SWF charg\u00e9s par la classe de chargement AS3 en lisant les SWF jou\u00e9s dans le lecteur externe FFDec. Cette option ne fonctionne que sous Windows. config.name.lastSessionFileTitles = Les titres de la derni\u00c8re session config.description.lastSessionFileTitles = Comprend les titres des fichiers ouverts lors de la derni\u00c8re session (par exemple depuis une URL, etc.) config.group.name.paths = Chemins -config.group.description.paths = Location des fichiers demand\u00c9s -config.group.tip.paths = Vous pouvez t\u00c9l\u00c9charger ces fichiers depuis le site web d'Adobe +config.group.description.paths = Location des fichiers demand\u00e9s +config.group.tip.paths = Vous pouvez t\u00e9l\u00e9charger ces fichiers depuis le site web d'Adobe config.group.link.paths = https://www.adobe.com/support/flashplayer/debug_downloads.html -config.group.linkText.paths = [visite] +config.group.linkText.paths = [visiter] config.name.playerLocation = 1) Chemin du lecteur Flash -config.description.playerLocation = Location du lecteur autonome de fichier ex\u00c9cutable Flash. Used for Run action. +config.description.playerLocation = Location du lecteur autonome de fichier ex\u00e9cutable Flash. Used for Run action. -config.name.playerDebugLocation = 2) Chemin du d\u00c9boggeur du lecteur Flash -config.description.playerDebugLocation = Location du d\u00c9boggueur autonome du lecteur Flash. Utilis\u00c9 \u00e0 des fins de d\u00e9bogguage. +config.name.playerDebugLocation = 2) Chemin du d\u00e9boggeur du lecteur Flash +config.description.playerDebugLocation = Location du d\u00e9boggueur autonome du lecteur Flash. Utilis\u00e9 \u00e0 des fins de d\u00e9bogguage. config.name.playerLibLocation = 3) Chemin du fichier PlayerGlobal (.swc) -config.description.playerLibLocation = Location de la librairie du lecteur Flash playerglobal.swc. Utilis\u00c9 principalement pour la d\u00c9compilation du code AS3. +config.description.playerLibLocation = Location de la librairie du lecteur Flash playerglobal.swc. Utilis\u00e9 principalement pour la d\u00e9compilation du code AS3. -config.name.debugHalt = Stoppe l'ex\u00c9cution lorsque le d\u00c9bogguage d\u00c9marre -config.description.debugHalt = G\u00e9n\u00e8re une pause du SWF lorsque le d\u00c9bogguage commence. +config.name.debugHalt = Stoppe l'ex\u00e9cution lorsque le d\u00e9bogguage d\u00e9marre +config.description.debugHalt = G\u00e9n\u00e8re une pause du SWF lorsque le d\u00e9bogguage commence. -config.name.gui.avm2.splitPane.vars.dividerLocationPercent = (Interne) Location du menu de debug +config.name.gui.avm2.splitPane.vars.dividerLocationPercent = (Interne) Localisation du menu de debug config.description.gui.avm2.splitPane.vars.dividerLocationPercent = tip = Tip:\u0020 @@ -403,32 +403,32 @@ tip = Tip:\u0020 config.name.gui.action.splitPane.vars.dividerLocationPercent = (Interne) Location du menu de debug AS1/2 config.description.gui.action.splitPane.vars.dividerLocationPercent = -config.name.setMovieDelay = D\u00c9lais en millisecondes avant de changer le SWF dans le lecteur externe -config.description.setMovieDelay = Ce n'est pas recommand\u00c9 de mettre une valeur en dessous de 1000 ms +config.name.setMovieDelay = D\u00e9lais en millisecondes avant de changer le SWF dans le lecteur externe +config.description.setMovieDelay = Ce n'est pas recommand\u00e9 de mettre une valeur en dessous de 1000 ms config.name.warning.svgImport = Alerte lors d'un import SVG config.description.warning.svgImport = -config.name.shapeImport.useNonSmoothedFill = Utiliser un remplissage non liss\u00c9 lorsque forme est remplac\u00c9e par une image +config.name.shapeImport.useNonSmoothedFill = Utiliser un remplissage non liss\u00e9 lorsque forme est remplac\u00e9e par une image config.description.shapeImport.useNonSmoothedFill = -config.name.internalFlashViewer.execute.as12 = Utiliser le lecteur flash propre \u00e0 AS1/2 (Exp\u00c9rimental) -config.description.internalFlashViewer.execute.as12 = Tente d'ex\u00c9cuter le code ActionScript 1/2 dans le lecteur externe FFDec +config.name.internalFlashViewer.execute.as12 = Utiliser le lecteur flash propre \u00e0 AS1/2 (Exp\u00e9rimental) +config.description.internalFlashViewer.execute.as12 = Tente d'ex\u00e9cuter le code ActionScript 1/2 dans le lecteur externe FFDec -config.name.warning.hexViewNotUpToDate = Afficher une vue, pas en temps r\u00c9el, des alertes en hexad\u00c9cimal +config.name.warning.hexViewNotUpToDate = Afficher une vue, pas en temps r\u00e9el, des alertes en hexad\u00e9cimal config.description.warning.hexViewNotUpToDate = config.name.displayDupInstructions = Afficher les instructions \u00a7\u00a7dup -config.description.displayDupInstructions = Affiche les instructions \u00a7\u00a7dup dans le code. Sans eux, le code peut \u00eatre compil\u00c9 facilement mais pourrait entra\u00eener un effet de doublon. +config.description.displayDupInstructions = Affiche les instructions \u00a7\u00a7dup dans le code. Sans eux, le code peut \u00eatre compil\u00e9 facilement mais pourrait entra\u00eener un effet de doublon. -config.name.useRegExprLiteral = D\u00c9compiler litt\u00e9ralement RegExp en tant que /pattern/mod. -config.description.useRegExprLiteral = Utilise la syntaxe /pattern/mod lors de la d\u00c9compilations d'expressions r\u00c9guli\u00c8res. Les nouveaux RegExp("pat","mod") sont utilis\u00c9s diff\u00c9remment +config.name.useRegExprLiteral = D\u00e9compiler litt\u00e9ralement RegExp en tant que /pattern/mod. +config.description.useRegExprLiteral = Utilise la syntaxe /pattern/mod lors de la d\u00e9compilations d'expressions r\u00e9guli\u00c8res. Les nouveaux RegExp("pat","mod") sont utilis\u00e9s diff\u00e9remment -config.name.handleSkinPartsAutomatically = Manipuler automatiquement les m\u00c9tadonn\u00c9es [SkinPart] -config.description.handleSkinPartsAutomatically = D\u00c9compile et \u00c9dite directement les m\u00c9tadonn\u00c9es [SkinPart]. Lorsque cette option est d\u00c9sactiv\u00c9e, les attributs et la m\u00c9thode de lecture des _skinParts sont modifiables manuellement. +config.name.handleSkinPartsAutomatically = Manipuler automatiquement les m\u00e9tadonn\u00e9es [SkinPart] +config.description.handleSkinPartsAutomatically = D\u00e9compile et \u00e9dite directement les m\u00e9tadonn\u00e9es [SkinPart]. Lorsque cette option est d\u00e9sactiv\u00e9e, les attributs et la m\u00e9thode de lecture des _skinParts sont modifiables manuellement. config.name.simplifyExpressions = Simplier les expressions -config.description.simplifyExpressions = Evalue et simplifie les expressions pour rendre le code plus lisible +config.description.simplifyExpressions = \uooc9value et simplifie les expressions pour rendre le code plus lisible -config.name.resetLetterSpacingOnTextImport = R\u00c9nitialiser l'espace entre les lettres lors de l'import de texte -config.description.resetLetterSpacingOnTextImport = Adapte les caract\u00c8res de polices cyrilliques, parce qu'elles sont plus larges +config.name.resetLetterSpacingOnTextImport = R\u00e9nitialiser l'espace entre les lettres lors de l'import de texte +config.description.resetLetterSpacingOnTextImport = Adapte les caract\u00e9res de polices cyrilliques, parce qu'elles sont plus larges From 974ed8cdad93bc57fa98ecbf4a948b31ce161c61 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Wed, 2 Mar 2016 12:35:34 +0100 Subject: [PATCH 12/18] french transation fix --- .../flash/gui/locales/AdvancedSettingsDialog_ca.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_ca.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_ca.properties index 857ce2473..dd6b40e39 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_ca.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_ca.properties @@ -312,7 +312,7 @@ config.name.showTraitSavedMessage = Torna a mostrar el missatge de tret desat config.description.showTraitSavedMessage = Torna a mostrar el missatge de tret desat config.name.updateProxyAddress = Adre\u00e7a de la Proxy http per a la comprovaci\u00f3 d'actualitzacions -config.description.updateProxyAddress = Adre\u00e7a de la Proxy http per a la comprovaci\u00f3 d'actualitzacions. Format: exemple.com:8080 +config.description.updateProxyAddress = Adre\u00e7a de la Proxy http per a la comprovaci\u00f3 d'actualitzacions. Format: example.com:8080 config.name.editorMode = Mode de l'Editor config.description.editorMode = Fes editables les \u00e0rees de text autom\u00e0ticament quan se seleccioni un node Text o Script From 71a33350fe796aeafd669b9e7a40086ce3444333 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Wed, 2 Mar 2016 12:41:58 +0100 Subject: [PATCH 13/18] french transation fix --- .../flash/gui/locales/AdvancedSettingsDialog_fr.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties index 2de551dcc..8ae927592 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties @@ -428,7 +428,7 @@ config.name.handleSkinPartsAutomatically = Manipuler automatiquement les m\u00e9 config.description.handleSkinPartsAutomatically = D\u00e9compile et \u00e9dite directement les m\u00e9tadonn\u00e9es [SkinPart]. Lorsque cette option est d\u00e9sactiv\u00e9e, les attributs et la m\u00e9thode de lecture des _skinParts sont modifiables manuellement. config.name.simplifyExpressions = Simplier les expressions -config.description.simplifyExpressions = \uooc9value et simplifie les expressions pour rendre le code plus lisible +config.description.simplifyExpressions = \u00c9value et simplifie les expressions pour rendre le code plus lisible config.name.resetLetterSpacingOnTextImport = R\u00e9nitialiser l'espace entre les lettres lors de l'import de texte config.description.resetLetterSpacingOnTextImport = Adapte les caract\u00e9res de polices cyrilliques, parce qu'elles sont plus larges From dd66588894b91efb21ddd6cc415d81bbbe829ccd Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Wed, 2 Mar 2016 12:59:49 +0100 Subject: [PATCH 14/18] french transation fix --- .../flash/gui/locales/AdvancedSettingsDialog_fr.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties index 8ae927592..eddc1c79d 100644 --- a/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties +++ b/src/com/jpexs/decompiler/flash/gui/locales/AdvancedSettingsDialog_fr.properties @@ -427,7 +427,7 @@ config.description.useRegExprLiteral = Utilise la syntaxe /pattern/mod lors de l config.name.handleSkinPartsAutomatically = Manipuler automatiquement les m\u00e9tadonn\u00e9es [SkinPart] config.description.handleSkinPartsAutomatically = D\u00e9compile et \u00e9dite directement les m\u00e9tadonn\u00e9es [SkinPart]. Lorsque cette option est d\u00e9sactiv\u00e9e, les attributs et la m\u00e9thode de lecture des _skinParts sont modifiables manuellement. -config.name.simplifyExpressions = Simplier les expressions +config.name.simplifyExpressions = Simplifier les expressions config.description.simplifyExpressions = \u00c9value et simplifie les expressions pour rendre le code plus lisible config.name.resetLetterSpacingOnTextImport = R\u00e9nitialiser l'espace entre les lettres lors de l'import de texte From d1bb94a645cae20fd5bb427056d131a274b6ace9 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Thu, 3 Mar 2016 15:43:00 +0100 Subject: [PATCH 15/18] #1171 export stroke scale to fla --- .../decompiler/flash/xfl/XFLConverter.java | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java index ff2e6a793..308da8705 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java @@ -211,8 +211,25 @@ public class XFLConverter { } } + private static String getScaleMode(LINESTYLE lineStyle) { + if (lineStyle instanceof LINESTYLE2) { + LINESTYLE2 ls2 = (LINESTYLE2) lineStyle; + if (ls2.noHScaleFlag && ls2.noVScaleFlag) { + return "none"; + } else if (ls2.noHScaleFlag) { + return "vertical"; + } else if (ls2.noHScaleFlag) { + return "horizontal"; + } else { + return "normal"; + } + } + + return "normal"; + } + private static void convertLineStyle(LINESTYLE ls, int shapeNum, StringBuilder ret) { - ret.append("" + "" + ""); ret.append(""); From f0d43d42a3ff0793d49a534f34b362d5bb3cb01d Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Thu, 3 Mar 2016 15:47:04 +0100 Subject: [PATCH 16/18] #1171 export stroke scale to fla fix:) --- .../src/com/jpexs/decompiler/flash/xfl/XFLConverter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java index 308da8705..092d3806d 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java @@ -218,7 +218,7 @@ public class XFLConverter { return "none"; } else if (ls2.noHScaleFlag) { return "vertical"; - } else if (ls2.noHScaleFlag) { + } else if (ls2.noVScaleFlag) { return "horizontal"; } else { return "normal"; @@ -229,7 +229,7 @@ public class XFLConverter { } private static void convertLineStyle(LINESTYLE ls, int shapeNum, StringBuilder ret) { - ret.append("" + "" + ""); ret.append(""); From c6826da2b600bef0090bfa955f5fa2c528aae397 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Fri, 4 Mar 2016 10:50:38 +0100 Subject: [PATCH 17/18] AS2 deobfuscation fixes --- .../com/jpexs/decompiler/flash/action/swf4/ActionCall.java | 4 ++++ .../decompiler/flash/action/swf5/ActionCallMethod.java | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionCall.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionCall.java index c2cd3f3eb..08c750ae3 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionCall.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionCall.java @@ -50,6 +50,10 @@ public class ActionCall extends Action { @Override public boolean execute(LocalDataArea lda) { + if (lda.stack.size() == 0) { + return false; + } + lda.stage.callFrame(EcmaScript.toInt32(lda.stack.pop())); return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionCallMethod.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionCallMethod.java index 1b28b261f..edef5ce7d 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionCallMethod.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionCallMethod.java @@ -52,7 +52,12 @@ public class ActionCallMethod extends Action { return false; } String methodName = lda.popAsString(); - ActionScriptObject obj = (ActionScriptObject) lda.pop(); + Object obj0 = lda.pop(); + if (!(obj0 instanceof ActionScriptObject)) { + return false; + } + + ActionScriptObject obj = (ActionScriptObject) obj0; int numArgs = (int) (double) lda.popAsNumber(); if (lda.stack.size() < numArgs) { return false; From 4a73edc4c298c454bb1bda8fc5b626af95a5ce00 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Fri, 4 Mar 2016 13:14:06 +0100 Subject: [PATCH 18/18] AS2 deobfuscation: some more EmptyStack problem fixed --- .../decompiler/flash/action/swf3/ActionNextFrame.java | 1 + .../decompiler/flash/action/swf3/ActionPrevFrame.java | 1 + .../decompiler/flash/action/swf3/ActionSetTarget.java | 1 + .../decompiler/flash/action/swf4/ActionAsciiToChar.java | 2 +- .../jpexs/decompiler/flash/action/swf4/ActionCall.java | 2 +- .../decompiler/flash/action/swf4/ActionCharToAscii.java | 2 +- .../decompiler/flash/action/swf4/ActionCloneSprite.java | 1 + .../jpexs/decompiler/flash/action/swf4/ActionEndDrag.java | 1 + .../decompiler/flash/action/swf4/ActionGetProperty.java | 1 + .../jpexs/decompiler/flash/action/swf4/ActionGetURL2.java | 1 + .../decompiler/flash/action/swf4/ActionGetVariable.java | 2 +- .../decompiler/flash/action/swf4/ActionGotoFrame2.java | 3 ++- .../com/jpexs/decompiler/flash/action/swf4/ActionIf.java | 2 +- .../decompiler/flash/action/swf4/ActionMBAsciiToChar.java | 2 +- .../decompiler/flash/action/swf4/ActionMBCharToAscii.java | 2 +- .../flash/action/swf4/ActionMBStringLength.java | 2 +- .../com/jpexs/decompiler/flash/action/swf4/ActionNot.java | 2 +- .../com/jpexs/decompiler/flash/action/swf4/ActionPop.java | 1 + .../decompiler/flash/action/swf4/ActionRandomNumber.java | 3 ++- .../decompiler/flash/action/swf4/ActionRemoveSprite.java | 1 + .../decompiler/flash/action/swf4/ActionSetProperty.java | 1 + .../decompiler/flash/action/swf4/ActionSetTarget2.java | 1 + .../decompiler/flash/action/swf4/ActionStartDrag.java | 1 + .../decompiler/flash/action/swf4/ActionStringLength.java | 2 +- .../decompiler/flash/action/swf4/ActionToInteger.java | 2 +- .../jpexs/decompiler/flash/action/swf4/ActionTrace.java | 1 + .../decompiler/flash/action/swf5/ActionCallFunction.java | 3 ++- .../decompiler/flash/action/swf5/ActionCallMethod.java | 2 ++ .../decompiler/flash/action/swf5/ActionDecrement.java | 2 +- .../jpexs/decompiler/flash/action/swf5/ActionDelete2.java | 5 +++++ .../decompiler/flash/action/swf5/ActionEnumerate.java | 1 + .../decompiler/flash/action/swf5/ActionGetMember.java | 2 ++ .../decompiler/flash/action/swf5/ActionIncrement.java | 2 +- .../decompiler/flash/action/swf5/ActionInitArray.java | 3 +++ .../decompiler/flash/action/swf5/ActionInitObject.java | 3 +++ .../decompiler/flash/action/swf5/ActionNewMethod.java | 3 +++ .../decompiler/flash/action/swf5/ActionNewObject.java | 8 +++++--- .../decompiler/flash/action/swf5/ActionPushDuplicate.java | 2 +- .../jpexs/decompiler/flash/action/swf5/ActionReturn.java | 2 +- .../decompiler/flash/action/swf5/ActionSetMember.java | 2 ++ .../decompiler/flash/action/swf5/ActionTargetPath.java | 2 ++ .../decompiler/flash/action/swf5/ActionToNumber.java | 2 +- .../decompiler/flash/action/swf5/ActionToString.java | 2 +- .../jpexs/decompiler/flash/action/swf5/ActionTypeOf.java | 2 +- .../jpexs/decompiler/flash/action/swf5/ActionWith.java | 1 + .../decompiler/flash/action/swf6/ActionEnumerate2.java | 2 ++ .../decompiler/flash/action/swf6/ActionInstanceOf.java | 1 + .../jpexs/decompiler/flash/action/swf7/ActionCastOp.java | 2 ++ .../jpexs/decompiler/flash/action/swf7/ActionExtends.java | 1 + .../decompiler/flash/action/swf7/ActionImplementsOp.java | 3 +++ 50 files changed, 75 insertions(+), 24 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionNextFrame.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionNextFrame.java index 39a791332..f5e895da7 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionNextFrame.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionNextFrame.java @@ -49,6 +49,7 @@ public class ActionNextFrame extends Action { if (f < ((DisplayObject) lda.target).getTotalFrames()) { ((DisplayObject) lda.target).gotoFrame(f + 1); } + return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionPrevFrame.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionPrevFrame.java index 73c5d088c..28f606ecd 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionPrevFrame.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionPrevFrame.java @@ -49,6 +49,7 @@ public class ActionPrevFrame extends Action { if (f > 1) { ((DisplayObject) lda.target).gotoFrame(f - 1); } + return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionSetTarget.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionSetTarget.java index a040f962a..6538f50c3 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionSetTarget.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf3/ActionSetTarget.java @@ -53,6 +53,7 @@ public class ActionSetTarget extends Action { lda.target = lda.stage; return true; } + lda.target = lda.stage.getMember(targetName); return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionAsciiToChar.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionAsciiToChar.java index 5aa48898b..7c8ecd65e 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionAsciiToChar.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionAsciiToChar.java @@ -45,7 +45,7 @@ public class ActionAsciiToChar extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionCall.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionCall.java index 08c750ae3..4a23c7a67 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionCall.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionCall.java @@ -50,7 +50,7 @@ public class ActionCall extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionCharToAscii.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionCharToAscii.java index e9a0ccdcd..39f2c2913 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionCharToAscii.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionCharToAscii.java @@ -45,7 +45,7 @@ public class ActionCharToAscii extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionCloneSprite.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionCloneSprite.java index a95623114..e6cdfcdce 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionCloneSprite.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionCloneSprite.java @@ -50,6 +50,7 @@ public class ActionCloneSprite extends Action { if (lda.stack.size() < 3) { return false; } + int depth = EcmaScript.toInt32(lda.stack.pop()); String source = EcmaScript.toString(lda.stack.pop()); String target = EcmaScript.toString(lda.stack.pop()); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionEndDrag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionEndDrag.java index 98ecab4e0..536131bfb 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionEndDrag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionEndDrag.java @@ -48,6 +48,7 @@ public class ActionEndDrag extends Action { if (lda.target instanceof DisplayObject) { ((DisplayObject) lda.target).stopDrag(); } + return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGetProperty.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGetProperty.java index ea5ee5cae..425b9cc60 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGetProperty.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGetProperty.java @@ -52,6 +52,7 @@ public class ActionGetProperty extends Action { if (lda.stack.size() < 2) { return false; } + int index = EcmaScript.toInt32(lda.stack.pop()); String target = EcmaScript.toString(lda.stack.pop()); Object movieClip = lda.stage.getMember(target); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java index 5b740ce2d..67e7bc024 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGetURL2.java @@ -116,6 +116,7 @@ public class ActionGetURL2 extends Action { if (lda.stack.size() < 2) { return false; } + String target = EcmaScript.toString(lda.stack.pop()); String urlString = EcmaScript.toString(lda.stack.pop()); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java index 2972db488..4aa95c874 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGetVariable.java @@ -51,7 +51,7 @@ public class ActionGetVariable extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java index b51eeb26a..a5167ef6b 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionGotoFrame2.java @@ -109,9 +109,10 @@ public class ActionGotoFrame2 extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() < 1) { + if (lda.stack.isEmpty()) { return false; } + String frame = EcmaScript.toString(lda.stack.pop()); String target = "/"; if (frame.contains(":")) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java index e95769584..72aa993c9 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java @@ -110,7 +110,7 @@ public class ActionIf extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionMBAsciiToChar.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionMBAsciiToChar.java index 8aedd2cb9..cd3f511c1 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionMBAsciiToChar.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionMBAsciiToChar.java @@ -45,7 +45,7 @@ public class ActionMBAsciiToChar extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionMBCharToAscii.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionMBCharToAscii.java index 3c473f7c5..6f8d23679 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionMBCharToAscii.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionMBCharToAscii.java @@ -45,7 +45,7 @@ public class ActionMBCharToAscii extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionMBStringLength.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionMBStringLength.java index 60bda3611..2941b82cc 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionMBStringLength.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionMBStringLength.java @@ -45,7 +45,7 @@ public class ActionMBStringLength extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionNot.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionNot.java index 8d9ed0bdf..126a55cdc 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionNot.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionNot.java @@ -45,7 +45,7 @@ public class ActionNot extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionPop.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionPop.java index 51af6d475..8af92f17a 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionPop.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionPop.java @@ -42,6 +42,7 @@ public class ActionPop extends Action { if (lda.stack.isEmpty()) { return false; } + lda.stack.pop(); return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionRandomNumber.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionRandomNumber.java index 1c81e46f4..8057c5359 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionRandomNumber.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionRandomNumber.java @@ -45,9 +45,10 @@ public class ActionRandomNumber extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() < 1) { + if (lda.stack.isEmpty()) { return false; } + lda.stack.push(RandomNumberActionItem.getResult(lda.pop())); return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionRemoveSprite.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionRemoveSprite.java index 5f4a09ad9..125febd47 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionRemoveSprite.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionRemoveSprite.java @@ -49,6 +49,7 @@ public class ActionRemoveSprite extends Action { if (lda.stack.isEmpty()) { return false; } + String target = EcmaScript.toString(lda.stack.pop()); lda.stage.removeMember(target); return true; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionSetProperty.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionSetProperty.java index 318e9a974..9d9dec258 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionSetProperty.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionSetProperty.java @@ -59,6 +59,7 @@ public class ActionSetProperty extends Action { if (lda.stack.size() < 3) { return false; } + Object value = lda.pop(); int index = (int) (double) lda.popAsNumber(); String target = lda.popAsString(); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionSetTarget2.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionSetTarget2.java index 01fe53a7d..56f3b8716 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionSetTarget2.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionSetTarget2.java @@ -48,6 +48,7 @@ public class ActionSetTarget2 extends Action { if (lda.stack.isEmpty()) { return false; } + String target = lda.popAsString(); lda.target = lda.stage.getMember(target); return true; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionStartDrag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionStartDrag.java index 5f696f75e..7511cbece 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionStartDrag.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionStartDrag.java @@ -50,6 +50,7 @@ public class ActionStartDrag extends Action { if (lda.target instanceof DisplayObject) { ((DisplayObject) lda.target).startDrag(); } + return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionStringLength.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionStringLength.java index 39d4c9e36..dbaec7c7e 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionStringLength.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionStringLength.java @@ -45,7 +45,7 @@ public class ActionStringLength extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionToInteger.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionToInteger.java index 9bab2af69..59a3b453b 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionToInteger.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionToInteger.java @@ -45,7 +45,7 @@ public class ActionToInteger extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionTrace.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionTrace.java index c254e4958..8eea965e6 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionTrace.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionTrace.java @@ -48,6 +48,7 @@ public class ActionTrace extends Action { if (lda.stack.isEmpty()) { return false; } + lda.stage.trace(lda.pop()); return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java index e0a2313d7..e99348720 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionCallFunction.java @@ -49,19 +49,20 @@ public class ActionCallFunction extends Action { @Override public boolean execute(LocalDataArea lda) { - String functionName = lda.popAsString(); int numArgs = (int) (double) lda.popAsNumber(); List args = new ArrayList<>(); for (int i = 0; i < numArgs; i++) { args.add(lda.pop()); } + for (ActionScriptFunction f : lda.functions) { if (functionName.equals(f.getFunctionName())) { lda.stack.push(lda.stage.callFunction(f.getFunctionOffset(), f.getFunctionLength(), args, f.getFuncRegNames(), Undefined.INSTANCE /*?*/)); return true; } } + return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionCallMethod.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionCallMethod.java index edef5ce7d..70f317b77 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionCallMethod.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionCallMethod.java @@ -51,6 +51,7 @@ public class ActionCallMethod extends Action { if (lda.stack.size() < 3) { return false; } + String methodName = lda.popAsString(); Object obj0 = lda.pop(); if (!(obj0 instanceof ActionScriptObject)) { @@ -62,6 +63,7 @@ public class ActionCallMethod extends Action { if (lda.stack.size() < numArgs) { return false; } + List args = new ArrayList<>(); for (int i = 0; i < numArgs; i++) { args.add(lda.pop()); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionDecrement.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionDecrement.java index a4f990cb7..07b69e527 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionDecrement.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionDecrement.java @@ -45,7 +45,7 @@ public class ActionDecrement extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete2.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete2.java index c1b1faa1e..2b3fb3b17 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete2.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionDelete2.java @@ -47,11 +47,16 @@ public class ActionDelete2 extends Action { @Override public boolean execute(LocalDataArea lda) { + if (lda.stack.isEmpty()) { + return false; + } + String memberName = lda.popAsString(); Object o = lda.target; //should be current scope if (o instanceof ActionScriptObject) { ((ActionScriptObject) o).setMember(memberName, Undefined.INSTANCE); } + return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionEnumerate.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionEnumerate.java index 1185ff5a8..b1b53d846 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionEnumerate.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionEnumerate.java @@ -50,6 +50,7 @@ public class ActionEnumerate extends Action { if (lda.stack.isEmpty()) { return false; } + String objectName = lda.popAsString(); lda.stack.push(Null.INSTANCE); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionGetMember.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionGetMember.java index a58124c21..8afc8470e 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionGetMember.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionGetMember.java @@ -50,6 +50,7 @@ public class ActionGetMember extends Action { if (lda.stack.size() < 2) { return false; } + String membername = lda.popAsString(); Object obj = lda.pop(); if (obj instanceof ActionScriptObject) { @@ -57,6 +58,7 @@ public class ActionGetMember extends Action { } else { lda.stack.push(Undefined.INSTANCE); } + return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionIncrement.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionIncrement.java index 276f238d4..dff7a7f18 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionIncrement.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionIncrement.java @@ -45,7 +45,7 @@ public class ActionIncrement extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionInitArray.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionInitArray.java index 909f22b08..33bf882df 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionInitArray.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionInitArray.java @@ -45,14 +45,17 @@ public class ActionInitArray extends Action { if (lda.stack.isEmpty()) { return false; } + int num = (int) (double) lda.popAsNumber(); if (lda.stack.size() < num) { return false; } + ActionScriptArray arr = new ActionScriptArray(); for (int i = 0; i < num; i++) { arr.setValueAtIndex(i, lda.stack.pop()); } + lda.stack.push(arr); return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionInitObject.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionInitObject.java index 268916cca..c991ac8ca 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionInitObject.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionInitObject.java @@ -50,16 +50,19 @@ public class ActionInitObject extends Action { if (lda.stack.isEmpty()) { return false; } + int num = (int) (double) (Double) lda.popAsNumber(); if (lda.stack.size() < 2 * num) { return false; } + ActionScriptObject obj = new ActionScriptObject(); for (int i = 0; i < num; i++) { Object val = lda.pop(); String name = lda.popAsString(); obj.setMember(name, val); } + lda.stack.push(obj); return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionNewMethod.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionNewMethod.java index bac787fae..2859a77ff 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionNewMethod.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionNewMethod.java @@ -51,16 +51,19 @@ public class ActionNewMethod extends Action { if (lda.stack.size() < 3) { return false; } + String methodName = lda.popAsString(); ActionScriptObject obj = (ActionScriptObject) lda.pop(); int numArgs = (int) (double) lda.popAsNumber(); if (lda.stack.size() < numArgs) { return false; } + List args = new ArrayList<>(); for (int i = 0; i < numArgs; i++) { args.add(lda.pop()); } + ActionScriptObject nobj = new ActionScriptObject(); ActionScriptFunction f = (ActionScriptFunction) obj.getMember(methodName); lda.stage.callFunction(f.getFunctionOffset(), f.getFunctionLength(), args, f.getFuncRegNames(), nobj); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionNewObject.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionNewObject.java index 0fd5b777d..3663e6c3a 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionNewObject.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionNewObject.java @@ -18,7 +18,6 @@ package com.jpexs.decompiler.flash.action.swf5; import com.jpexs.decompiler.flash.BaseLocalData; import com.jpexs.decompiler.flash.action.Action; -import com.jpexs.decompiler.flash.action.ActionScriptFunction; import com.jpexs.decompiler.flash.action.ActionScriptObject; import com.jpexs.decompiler.flash.action.LocalDataArea; import com.jpexs.decompiler.flash.action.model.NewObjectActionItem; @@ -51,19 +50,22 @@ public class ActionNewObject extends Action { if (lda.stack.size() < 2) { return false; } + String objectName = lda.popAsString(); int numArgs = (int) (double) (Double) lda.popAsNumber(); if (lda.stack.size() < numArgs) { return false; } + List args = new ArrayList<>(); for (int i = 0; i < numArgs; i++) { args.add(lda.stack.pop()); } + ActionScriptObject obj = new ActionScriptObject(); - //TODO:check type + //TODO:check type /*ActionScriptFunction constructor = (ActionScriptFunction) lda.stage.getMember(objectName); - lda.stage.callFunction(constructor.getFunctionOffset(), constructor.getFunctionLength(), args, constructor.getFuncRegNames(), obj); + lda.stage.callFunction(constructor.getFunctionOffset(), constructor.getFunctionLength(), args, constructor.getFuncRegNames(), obj); */ lda.stack.push(obj); return true; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionPushDuplicate.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionPushDuplicate.java index a966786b6..ba02a1ee4 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionPushDuplicate.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionPushDuplicate.java @@ -46,7 +46,7 @@ public class ActionPushDuplicate extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionReturn.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionReturn.java index 31d7e70ee..ce9aeb0a3 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionReturn.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionReturn.java @@ -45,7 +45,7 @@ public class ActionReturn extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { //lda.returnValue = Undefined.INSTANCE; return false; } else { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionSetMember.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionSetMember.java index 65b6cbaf7..011c8cb05 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionSetMember.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionSetMember.java @@ -58,12 +58,14 @@ public class ActionSetMember extends Action { if (lda.stack.size() < 3) { return false; } + Object value = lda.pop(); String memberName = lda.popAsString(); Object obj = lda.pop(); if (obj instanceof ActionScriptObject) { ((ActionScriptObject) obj).setMember(memberName, value); } + return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionTargetPath.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionTargetPath.java index 077e7f7cd..0bc2fb707 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionTargetPath.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionTargetPath.java @@ -49,6 +49,7 @@ public class ActionTargetPath extends Action { if (lda.stack.isEmpty()) { return false; } + Object obj = lda.pop(); String path = lda.stage.getMemberPath(obj); @@ -57,6 +58,7 @@ public class ActionTargetPath extends Action { } else { lda.stack.push(path); } + return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionToNumber.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionToNumber.java index 946598ae8..b794b5d69 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionToNumber.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionToNumber.java @@ -45,7 +45,7 @@ public class ActionToNumber extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionToString.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionToString.java index ced47875e..969e99c9c 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionToString.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionToString.java @@ -45,7 +45,7 @@ public class ActionToString extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionTypeOf.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionTypeOf.java index 406087adc..bdfd1724d 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionTypeOf.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionTypeOf.java @@ -45,7 +45,7 @@ public class ActionTypeOf extends Action { @Override public boolean execute(LocalDataArea lda) { - if (lda.stack.size() == 0) { + if (lda.stack.isEmpty()) { return false; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java index 85976d82a..90034cdc3 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java @@ -59,6 +59,7 @@ public class ActionWith extends Action implements GraphSourceItemContainer { if (lda.stack.isEmpty()) { return false; } + ActionScriptObject obj = (ActionScriptObject) lda.pop(); ActionScriptWith w = new ActionScriptWith(obj, fileOffset, codeSize); lda.withs.add(w); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf6/ActionEnumerate2.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf6/ActionEnumerate2.java index 667f1ff36..060d1678d 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf6/ActionEnumerate2.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf6/ActionEnumerate2.java @@ -61,6 +61,7 @@ public class ActionEnumerate2 extends Action { if (lda.stack.isEmpty()) { return false; } + Object o = lda.pop(); lda.stack.push(Null.INSTANCE); @@ -70,6 +71,7 @@ public class ActionEnumerate2 extends Action { lda.stack.push(m); } } + return true; } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf6/ActionInstanceOf.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf6/ActionInstanceOf.java index 1d62cda1e..eb1bd9112 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf6/ActionInstanceOf.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf6/ActionInstanceOf.java @@ -72,6 +72,7 @@ public class ActionInstanceOf extends Action { if (lda.stack.size() < 2) { return false; } + Object type = lda.stack.pop(); Object obj = lda.stack.pop(); if (getInstanceOfResult(obj, type)) { diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionCastOp.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionCastOp.java index 4227b2133..79140eb61 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionCastOp.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionCastOp.java @@ -51,6 +51,7 @@ public class ActionCastOp extends Action { if (lda.stack.size() < 2) { return false; } + ActionScriptObject obj = (ActionScriptObject) lda.pop(); ActionScriptObject constr = (ActionScriptObject) lda.pop(); if (ActionInstanceOf.getInstanceOfResult(obj, constr)) { @@ -58,6 +59,7 @@ public class ActionCastOp extends Action { } else { lda.stack.push(Null.INSTANCE); } + return true; } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionExtends.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionExtends.java index 78ddb57ff..ecdc5aacb 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionExtends.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionExtends.java @@ -49,6 +49,7 @@ public class ActionExtends extends Action { if (lda.stack.size() < 2) { return false; } + //TODO: check if its really ActionScriptObject ? ActionScriptObject superClass = (ActionScriptObject) lda.pop(); ActionScriptObject subClass = (ActionScriptObject) lda.pop(); diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionImplementsOp.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionImplementsOp.java index c23a56fee..ffa907710 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionImplementsOp.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf7/ActionImplementsOp.java @@ -50,6 +50,7 @@ public class ActionImplementsOp extends Action { if (lda.stack.size() < 2) { return false; } + //TODO: check if its really scriptobject? ActionScriptObject obj = (ActionScriptObject) lda.pop(); int num = (int) (double) lda.popAsNumber(); @@ -57,9 +58,11 @@ public class ActionImplementsOp extends Action { if (lda.stack.size() < num) { return false; } + for (int i = 0; i < num; i++) { interfaces.add(lda.stack.pop()); } + obj.setImplementsObjs(interfaces); return true; }