Some tweaks to output file name generation. This should preserve original file names containing multiple dot (.) characters right before the file extension.

This commit is contained in:
LoRd_MuldeR 2017-08-15 22:47:09 +02:00
parent ca13fbbe91
commit 7f73661161
16 changed files with 238 additions and 163 deletions

View File

@ -3066,57 +3066,62 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="443"/>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="452"/>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<source>The target output directory is NOT writable:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="518"/>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<source>Failed to generate non-existing target file name!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown File Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="530"/>
<source>Unknown Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="531"/>
<source>Unknown Artist</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<location filename="../../src/Thread_Process.cpp" line="532"/>
<source>Unknown Album</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<location filename="../../src/Thread_Process.cpp" line="534"/>
<source>Unknown Comment</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="472"/>
<source>Target output file already exists, going to skip this file:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="471"/>
<location filename="../../src/Thread_Process.cpp" line="473"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="478"/>
<location filename="../../src/Thread_Process.cpp" line="480"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="492"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation type="unfinished"></translation>
</message>

View File

@ -3059,37 +3059,42 @@
<translation>Die Quell-Audiodatei konnte nicht zum Lesen geöffnet werden:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="443"/>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>Das Zielverzeichnis existiert nicht und konnte nicht erstellt werden:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="452"/>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<source>The target output directory is NOT writable:</source>
<translation>In das Zielverzeichnis kann nicht geschrieben werden:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="518"/>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<source>Failed to generate non-existing target file name!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown File Name</source>
<translation>Unbekannter Dateiname</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="530"/>
<source>Unknown Title</source>
<translation>Unbekannter Titel</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="531"/>
<source>Unknown Artist</source>
<translation>Unbekannter Künstler</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<location filename="../../src/Thread_Process.cpp" line="532"/>
<source>Unknown Album</source>
<translation>Unbekanntes Album</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<location filename="../../src/Thread_Process.cpp" line="534"/>
<source>Unknown Comment</source>
<translation>Unbekannter Kommentar</translation>
</message>
@ -3110,22 +3115,22 @@
<translation>Übersprungen.</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="472"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>Zieldatei existiert bereits, die Datei wird übersprungen:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="471"/>
<location filename="../../src/Thread_Process.cpp" line="473"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>Wenn existierende Dateien nicht übersprungen werden sollen, ändern Sie bitte den Überschreiben-Modus!</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="478"/>
<location filename="../../src/Thread_Process.cpp" line="480"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>Zieldatei existiert bereits, die Datei wird gelöscht und überschrieben:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="492"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>Die existierende Datei konnte nicht gelöscht werden, ein anderer Dateiname wird gewählt!</translation>
</message>

View File

@ -3059,37 +3059,42 @@
<translation>No se puede abrir el archivo de entrada para su lectura:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="443"/>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>La carpeta de salida no existe y NO puede ser creada:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="452"/>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<source>The target output directory is NOT writable:</source>
<translation>NO se puede escribir en la carpeta de salida:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="518"/>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<source>Failed to generate non-existing target file name!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown File Name</source>
<translation>Nombre de archivo desconocido</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="530"/>
<source>Unknown Title</source>
<translation>Título desconocido</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="531"/>
<source>Unknown Artist</source>
<translation>Artista desconocido</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<location filename="../../src/Thread_Process.cpp" line="532"/>
<source>Unknown Album</source>
<translation>Álbum desconocido</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<location filename="../../src/Thread_Process.cpp" line="534"/>
<source>Unknown Comment</source>
<translation>Comentario desconocido</translation>
</message>
@ -3110,22 +3115,22 @@
<translation>Omitidos.</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="472"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>El archivo de destino ya existe, se omitirá este archivo:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="471"/>
<location filename="../../src/Thread_Process.cpp" line="473"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>¡Si no quiere sobreescribir los archivos existentes, cambie el modo sobreescritura por favor!</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="478"/>
<location filename="../../src/Thread_Process.cpp" line="480"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>El archivo de destino ya existe, se eliminará este archivo:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="492"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>¡Error al eliminar el archivo de destino existente, se guardará con otro nombre!</translation>
</message>

View File

@ -3066,37 +3066,42 @@ Sélection automatique (par défaut)</translation>
<translation>Le fichier audio source n&apos;a pas pu être ouvert pour la lecture:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="443"/>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>Le répertoire de sortie cible n&apos;existe pas et ne peut PAS être créé:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="452"/>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<source>The target output directory is NOT writable:</source>
<translation>Le répertoire de sortie cible n&apos;est pas accessible en écriture:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="518"/>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<source>Failed to generate non-existing target file name!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown File Name</source>
<translation>Nom de fichier inconnu</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="530"/>
<source>Unknown Title</source>
<translation>Titre inconnu</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="531"/>
<source>Unknown Artist</source>
<translation>Artiste inconnu</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<location filename="../../src/Thread_Process.cpp" line="532"/>
<source>Unknown Album</source>
<translation>Album inconnu</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<location filename="../../src/Thread_Process.cpp" line="534"/>
<source>Unknown Comment</source>
<translation>Commentaire inconnu</translation>
</message>
@ -3118,22 +3123,22 @@ Sélection automatique (par défaut)</translation>
<translation>Ignoré.</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="472"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>Le fichier de sortie existe déjà, il sera ignoré :</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="471"/>
<location filename="../../src/Thread_Process.cpp" line="473"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>Si vous ne voulez pas ignorer les fichiers existants, veuillez changer le mode de remplacement !</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="478"/>
<location filename="../../src/Thread_Process.cpp" line="480"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>Le fichier de sortie existe déjà, il sera supprimé :</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="492"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>Impossible de supprimer le fichier cible existant, il sera enregistré sous un autre nom !</translation>
</message>

View File

@ -3066,57 +3066,62 @@
<translation>A forrás hangfájl nem nyitható meg olvasásra:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="443"/>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>A cél kimeneti könyvtár nem létezik, és NEM hozható létre:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="452"/>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<source>The target output directory is NOT writable:</source>
<translation>A cél kimeneti könyvtár NEM írható:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="518"/>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<source>Failed to generate non-existing target file name!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown File Name</source>
<translation>Ismeretlen fájlnév</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="530"/>
<source>Unknown Title</source>
<translation>Ismeretlen cím</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="531"/>
<source>Unknown Artist</source>
<translation>Ismeretlen előadó</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<location filename="../../src/Thread_Process.cpp" line="532"/>
<source>Unknown Album</source>
<translation>Ismeretlen album</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<location filename="../../src/Thread_Process.cpp" line="534"/>
<source>Unknown Comment</source>
<translation>Ismeretlen hozzászólás</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="472"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>A cél kimeneti fájl már létezik, ez a fájl ki lesz hagyva:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="471"/>
<location filename="../../src/Thread_Process.cpp" line="473"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>Ha nem szeretné a meglévő fájlokat kihagyni, kérjük, változtassa meg a felülírási módot!</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="478"/>
<location filename="../../src/Thread_Process.cpp" line="480"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>A cél kimeneti fájl már létezik, a meglévő fájl törlésre kerül:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="492"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>Nem sikerült törölni a meglévő cél fájlt. Az állomány másik fájlnéven lesz elmentve!</translation>
</message>

View File

@ -3125,38 +3125,43 @@
<translation>Il file audio sorgente non può essere aperto per la lettura:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="443"/>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>La cartella di destinazione assegnata non esiste e NON può essere creata:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="452"/>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<source>The target output directory is NOT writable:</source>
<translatorcomment>La directory di destinazione assegnata è di SOLA LETTURA:</translatorcomment>
<translation>La directory di destinazione assegnata NON è scrivibile:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="518"/>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<source>Failed to generate non-existing target file name!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown File Name</source>
<translation>Nome File Sconosciuto</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="530"/>
<source>Unknown Title</source>
<translation>Titolo Sconosciuto</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="531"/>
<source>Unknown Artist</source>
<translation>Artista Sconosciuto</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<location filename="../../src/Thread_Process.cpp" line="532"/>
<source>Unknown Album</source>
<translation>Album Sconosciuto</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<location filename="../../src/Thread_Process.cpp" line="534"/>
<source>Unknown Comment</source>
<translation>Commento Sconosciuto</translation>
</message>
@ -3177,22 +3182,22 @@
<translation>Saltato.</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="472"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>Il file di destinazione esiste già, questo file verrà saltato:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="471"/>
<location filename="../../src/Thread_Process.cpp" line="473"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>Se non vuoi saltare i file esistenti, cambia la modalità di sovrascrittura!</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="478"/>
<location filename="../../src/Thread_Process.cpp" line="480"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>Il file di destinazione esiste già, il file esistente verrà eliminato:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="492"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>Impossibile eliminare il file di destinazione esistente, il file verrà salvato con un altro nome!</translation>
</message>

View File

@ -3050,37 +3050,42 @@
<translation type="unfinished"> :</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="443"/>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation type="unfinished"> , :</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="452"/>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<source>The target output directory is NOT writable:</source>
<translation type="unfinished"> :</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="518"/>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<source>Failed to generate non-existing target file name!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown File Name</source>
<translation type="unfinished"> </translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="530"/>
<source>Unknown Title</source>
<translation type="unfinished"> </translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="531"/>
<source>Unknown Artist</source>
<translation type="unfinished"> </translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<location filename="../../src/Thread_Process.cpp" line="532"/>
<source>Unknown Album</source>
<translation type="unfinished"> </translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<location filename="../../src/Thread_Process.cpp" line="534"/>
<source>Unknown Comment</source>
<translation type="unfinished"> </translation>
</message>
@ -3101,22 +3106,22 @@
<translation type="unfinished">.</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="472"/>
<source>Target output file already exists, going to skip this file:</source>
<translation type="unfinished"> . :</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="471"/>
<location filename="../../src/Thread_Process.cpp" line="473"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation type="unfinished"> , !</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="478"/>
<location filename="../../src/Thread_Process.cpp" line="480"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation type="unfinished"> . :</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="492"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation type="unfinished"> . !</translation>
</message>

View File

@ -3083,57 +3083,62 @@
<translation type="unfinished">Źródłowy plik dźwiękowy nie mógł zostać otworzony:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="443"/>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation type="unfinished">Lokalizacja docelowa nie istnieje lu NIE mogła zostać utworzona:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="452"/>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<source>The target output directory is NOT writable:</source>
<translation type="unfinished">Nie można zapisać do lokalizacji docelowej:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="518"/>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<source>Failed to generate non-existing target file name!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown File Name</source>
<translation type="unfinished">Nieznana nazwa pliku</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="530"/>
<source>Unknown Title</source>
<translation type="unfinished">Nieznany Tytuł</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="531"/>
<source>Unknown Artist</source>
<translation type="unfinished">Nieznany Artysta</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<location filename="../../src/Thread_Process.cpp" line="532"/>
<source>Unknown Album</source>
<translation type="unfinished">Nieznany Album</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<location filename="../../src/Thread_Process.cpp" line="534"/>
<source>Unknown Comment</source>
<translation type="unfinished">Nieznany Komentarz</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="472"/>
<source>Target output file already exists, going to skip this file:</source>
<translation type="unfinished">Plik wynikowy już istnieje, zostanie pominięty plik:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="471"/>
<location filename="../../src/Thread_Process.cpp" line="473"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation type="unfinished">Jeśli nie chcesz aby istniejące pliki były pomijane, zmień tryb nadpisywania!</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="478"/>
<location filename="../../src/Thread_Process.cpp" line="480"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation type="unfinished">Plik wynikowy już istnieje, zostanie usunięty plik:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="492"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation type="unfinished">Usuwanie istniejącego pliku zakończone niepowodzeniem, nowy plik zostanie zapisany pod inną nazwą!</translation>
</message>

View File

@ -3074,37 +3074,42 @@
<translation>Исходный аудио файл не может быть открыт:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="443"/>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>Папка для выходных файлов не существует и не может быть создана:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="452"/>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<source>The target output directory is NOT writable:</source>
<translation>Папка для выходных файлов недоступна для записи:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="518"/>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<source>Failed to generate non-existing target file name!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown File Name</source>
<translation>Неизвестное имя файла</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="530"/>
<source>Unknown Title</source>
<translation>Неизвестное Название</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="531"/>
<source>Unknown Artist</source>
<translation>Неизвестный Артист</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<location filename="../../src/Thread_Process.cpp" line="532"/>
<source>Unknown Album</source>
<translation>Неизвестный Альбом</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<location filename="../../src/Thread_Process.cpp" line="534"/>
<source>Unknown Comment</source>
<translation>Неизвестный Комментарий</translation>
</message>
@ -3125,22 +3130,22 @@
<translation>Пропущен.</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="472"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>Файл уже существует, будет пропущен:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="471"/>
<location filename="../../src/Thread_Process.cpp" line="473"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>Если Вы не хотите пропускать уже существующие файлы, пожалуйста, измените режим перезаписи!</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="478"/>
<location filename="../../src/Thread_Process.cpp" line="480"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>Файл уже существует, будет удалён:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="492"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>Ошибка удаления существующего файла, будет сохранение с другим именем!</translation>
</message>

View File

@ -3076,57 +3076,62 @@
<translation>Källfilen kan inte öppnas för läsning:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="443"/>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>Målmappen finns inte och kan inte skapas:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="452"/>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<source>The target output directory is NOT writable:</source>
<translation>Målmappen är INTE skrivbar:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="518"/>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<source>Failed to generate non-existing target file name!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown File Name</source>
<translation>Okänt filnamn</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="530"/>
<source>Unknown Title</source>
<translation>Okänd titel</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="531"/>
<source>Unknown Artist</source>
<translation>Okänd artist</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<location filename="../../src/Thread_Process.cpp" line="532"/>
<source>Unknown Album</source>
<translation>Okänt album</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<location filename="../../src/Thread_Process.cpp" line="534"/>
<source>Unknown Comment</source>
<translation>Okänd kommentar</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="472"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>Målfilen finns redan! Den här filen hoppas över:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="471"/>
<location filename="../../src/Thread_Process.cpp" line="473"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>Om du inte vill att befintliga filer hoppas över, måste du ändra överskrivningsläge!</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="478"/>
<location filename="../../src/Thread_Process.cpp" line="480"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>Målfilen finns redan! Befintlig fil kommer att tas bort:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="492"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>Kunde inte ta bort befintlig målfil. Sparar med annat filnamn!</translation>
</message>

View File

@ -3050,37 +3050,42 @@
<translation>:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="443"/>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>,:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="452"/>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<source>The target output directory is NOT writable:</source>
<translation>:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="518"/>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<source>Failed to generate non-existing target file name!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown File Name</source>
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="530"/>
<source>Unknown Title</source>
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="531"/>
<source>Unknown Artist</source>
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<location filename="../../src/Thread_Process.cpp" line="532"/>
<source>Unknown Album</source>
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<location filename="../../src/Thread_Process.cpp" line="534"/>
<source>Unknown Comment</source>
<translation></translation>
</message>
@ -3101,22 +3106,22 @@
<translation>.</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="472"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>, : </translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="471"/>
<location filename="../../src/Thread_Process.cpp" line="473"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>, !</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="478"/>
<location filename="../../src/Thread_Process.cpp" line="480"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>, : </translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="492"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>, !</translation>
</message>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.1" language="uk_UA" sourcelanguage="en">
<TS version="2.0" language="uk_UA" sourcelanguage="en">
<context>
<name>AboutDialog</name>
<message>
@ -3067,37 +3067,42 @@
<translation>Неможливо відкрити для читання вхідний файл аудіо:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="443"/>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>Вихідної теки не існує і її неможливо створити:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="452"/>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<source>The target output directory is NOT writable:</source>
<translation>До вихідної теки неможливо проводити запис:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="518"/>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<source>Failed to generate non-existing target file name!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown File Name</source>
<translation>Невідома назва файла</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="530"/>
<source>Unknown Title</source>
<translation>Невідомий заголовок</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="531"/>
<source>Unknown Artist</source>
<translation>Невідомий виконавець</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<location filename="../../src/Thread_Process.cpp" line="532"/>
<source>Unknown Album</source>
<translation>Невідомий альбом</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<location filename="../../src/Thread_Process.cpp" line="534"/>
<source>Unknown Comment</source>
<translation>Невідомий коментар</translation>
</message>
@ -3118,22 +3123,22 @@
<translation>Пропущено.</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="472"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>Вихідний цільовий файл вже існує, спроба пропустити цей файл:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="471"/>
<location filename="../../src/Thread_Process.cpp" line="473"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>Якщо ви не хочете, щоб існуючі файли були пропущені, будь ласка, змініть режим перезапису!</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="478"/>
<location filename="../../src/Thread_Process.cpp" line="480"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>Вихідний цільовий файл вже існує, спроба видалити існуючий файл:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="492"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>Неможливо видалити існуючий файл, збереження буде проведено до файла з іншою назвою!</translation>
</message>

View File

@ -3050,37 +3050,42 @@
<translation>:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="443"/>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="452"/>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<source>The target output directory is NOT writable:</source>
<translation>:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="518"/>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<source>Failed to generate non-existing target file name!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown File Name</source>
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="530"/>
<source>Unknown Title</source>
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="531"/>
<source>Unknown Artist</source>
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<location filename="../../src/Thread_Process.cpp" line="532"/>
<source>Unknown Album</source>
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<location filename="../../src/Thread_Process.cpp" line="534"/>
<source>Unknown Comment</source>
<translation></translation>
</message>
@ -3101,22 +3106,22 @@
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="472"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>, : </translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="471"/>
<location filename="../../src/Thread_Process.cpp" line="473"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>, !</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="478"/>
<location filename="../../src/Thread_Process.cpp" line="480"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>, : </translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="492"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>, !</translation>
</message>

Binary file not shown.

View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 6
#define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 2
#define VER_LAMEXP_BUILD 2005
#define VER_LAMEXP_BUILD 2006
#define VER_LAMEXP_CONFG 2002
///////////////////////////////////////////////////////////////////////////////

View File

@ -415,7 +415,6 @@ int ProcessThread::generateOutFileName(QString &outFileName)
readTest.close();
}
const QString baseName = sourceFile.completeBaseName();
QDir targetDir(MUtils::clean_file_path(m_outputDirectory.isEmpty() ? sourceFile.canonicalPath() : m_outputDirectory, false));
//Prepend relative source file path?
@ -457,12 +456,15 @@ int ProcessThread::generateOutFileName(QString &outFileName)
writeTest.remove();
}
//Apply rename pattern
const QString fileName = MUtils::clean_file_name(applyRegularExpression(applyRenamePattern(baseName, m_audioFile.metaInfo())), true);
//File extension
const QString fileExt = m_renameFileExt.isEmpty() ? QString::fromUtf8(m_encoder->toEncoderInfo()->extension()) : m_renameFileExt;
//Generate file name
const QString fileName = MUtils::clean_file_name(QString("%1.%2").arg(applyRegularExpression(applyRenamePattern(sourceFile.completeBaseName(), m_audioFile.metaInfo())), fileExt), true);
qWarning("fileName: \"%s\"", MUTILS_UTF8(fileName));
//Generate full output path
const QString fileExt = m_renameFileExt.isEmpty() ? QString::fromUtf8(m_encoder->toEncoderInfo()->extension()) : m_renameFileExt;
outFileName = QString("%1/%2.%3").arg(targetDir.canonicalPath(), fileName, fileExt);
outFileName = QString("%1/%2").arg(targetDir.canonicalPath(), fileName);
//Skip file, if target file exists (optional!)
if((m_overwriteMode == OverwriteMode_SkipExisting) && QFileInfo(outFileName).exists())
@ -476,39 +478,47 @@ int ProcessThread::generateOutFileName(QString &outFileName)
if((m_overwriteMode == OverwriteMode_Overwrite) && QFileInfo(outFileName).exists() && QFileInfo(outFileName).isFile())
{
handleMessage(QString("%1\n%2\n").arg(tr("Target output file already exists, going to delete existing file:"), QDir::toNativeSeparators(outFileName)));
bool removed = false;
if(sourceFile.canonicalFilePath().compare(QFileInfo(outFileName).absoluteFilePath(), Qt::CaseInsensitive) != 0)
{
for(int i = 0; i < 16; i++)
{
if(QFile::remove(outFileName))
{
removed = true;
break;
}
MUtils::OS::sleep_ms(1);
}
}
if(QFileInfo(outFileName).exists())
if(!removed)
{
handleMessage(QString("%1\n").arg(tr("Failed to delete existing target file, will save to another file name!")));
}
}
int n = 1;
//Generate final name
while(QFileInfo(outFileName).exists() && (n < (INT_MAX/2)))
for (int n = 2; n <= 99999; ++n)
{
outFileName = QString("%1/%2 (%3).%4").arg(targetDir.canonicalPath(), fileName, QString::number(++n), fileExt);
//Check file existence
QFileInfo outFileInfo(outFileName);
if (outFileInfo.exists())
{
outFileName = QString("%1/%2 (%3).%4").arg(outFileInfo.canonicalPath(), outFileInfo.completeBaseName(), QString::number(n), outFileInfo.suffix());
continue;
}
//Create placeholder
QFile placeholder(outFileName);
if(placeholder.open(QIODevice::WriteOnly))
if (placeholder.open(QIODevice::WriteOnly))
{
placeholder.close();
return 1;
}
}
return 1;
handleMessage(QString("%1\n").arg(tr("Failed to generate non-existing target file name!")));
return 0;
}
QString ProcessThread::applyRenamePattern(const QString &baseName, const AudioFileModel_MetaInfo &metaInfo)