Commit da63737d authored by Sergio Costas's avatar Sergio Costas

Merge branch 'showinmenu'

parents 58b737f4 ff89f386
## History of versions ##
* version 4.8.4 (2016-11-03)
* Allows to set if a movie is shown or not in the DVD menu from the main window
* version 4.8.3 (2016-10-16)
* Fixed the problem fixed bitrate problem with FFMpeg and AVConv (thanks to Juniorsnet)
......
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.18.3 -->
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<object class="GtkListStore" id="disc_size_list">
......@@ -38,6 +38,8 @@
<column type="gboolean"/>
<!-- column-name duration -->
<column type="gchararray"/>
<!-- column-name in_menu -->
<column type="gboolean"/>
</columns>
</object>
<object class="GtkWindow" id="wmain_window">
......@@ -265,6 +267,19 @@
</child>
</object>
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn3">
<property name="title" translatable="yes">In menu</property>
<child>
<object class="GtkCellRendererToggle" id="cellrenderertext4">
<signal name="toggled" handler="on_cellrenderertext4_toggled" swapped="no"/>
</object>
<attributes>
<attribute name="active">4</attribute>
</attributes>
</child>
</object>
</child>
</object>
</child>
</object>
......
......@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: DeVeDe 3.12\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-14 16:01+0100\n"
"PO-Revision-Date: 2016-03-14 16:01+0100\n"
"POT-Creation-Date: 2016-11-03 23:59+0100\n"
"PO-Revision-Date: 2016-11-03 23:59+0100\n"
"Last-Translator: Sergio Costas <rastersoft@gmail.com>\n"
"Language-Team: Español; Castellano <rastersoft@gmail.com>\n"
"Language: \n"
......@@ -49,7 +49,7 @@ msgstr "Convirtiendo %(X)s (pasada 1)"
msgid "Converting %(X)s"
msgstr "Convirtiendo %(X)s"
#: ../src/devedeng/avconv.py:362 ../src/devedeng/ffmpeg.py:355
#: ../src/devedeng/avconv.py:474 ../src/devedeng/ffmpeg.py:467
#, python-format
msgid "Creating menu %(X)d"
msgstr "Creando el menú %(X)d"
......@@ -195,43 +195,43 @@ msgstr "Mezclando menú %(X)d"
msgid "DevedeNG projects"
msgstr "Proyectos DevedeNG"
#: ../src/devedeng/project.py:204
#: ../src/devedeng/project.py:206
msgid "Abort the current DVD and exit?"
msgstr "¿Interrumpir el DVD y salir?"
#: ../src/devedeng/project.py:204
#: ../src/devedeng/project.py:206
msgid "Exit DeVeDe"
msgstr "Salir de DeVeDe"
#: ../src/devedeng/project.py:259
#: ../src/devedeng/project.py:270
msgid "The following files could not be added:"
msgstr "No se han podido añadir los siguientes ficheros:"
#: ../src/devedeng/project.py:259 ../src/devedeng/project.py:719
#: ../src/devedeng/project.py:270 ../src/devedeng/project.py:730
msgid "Error while adding files"
msgstr "Error al añadir ficheros"
#: ../src/devedeng/project.py:271
#: ../src/devedeng/project.py:282
#, python-format
msgid "The file <b>%(X)s</b> <i>(%(Y)s)</i> will be removed."
msgstr "El fichero <b>%(X)s</b> <i>(%(Y)s)</i> será borrado."
#: ../src/devedeng/project.py:271
#: ../src/devedeng/project.py:282
msgid "Delete file"
msgstr "Borrar archivo"
#: ../src/devedeng/project.py:474
#: ../src/devedeng/project.py:485
#, python-format
msgid "The limit for this format is %(l)d files, but your project has %(h)d."
msgstr ""
"El límite para este formato es de %(l)d ficheros, pero este proyecto tiene "
"%(h)d."
#: ../src/devedeng/project.py:474
#: ../src/devedeng/project.py:485
msgid "Too many files in the project"
msgstr "Demasiados ficheros en el proyecto"
#: ../src/devedeng/project.py:483
#: ../src/devedeng/project.py:494
#, python-format
msgid ""
"The selected folder already exists. To create the project, Devede must "
......@@ -250,27 +250,27 @@ msgstr ""
"\n"
" y todo su contenido <b>será borrado</b>. ¿Continuar?"
#: ../src/devedeng/project.py:483
#: ../src/devedeng/project.py:494
msgid "Delete folder"
msgstr "Borrar carpeta"
#: ../src/devedeng/project.py:618
#: ../src/devedeng/project.py:629
msgid "Close current project and start a fresh one?"
msgstr "¿Cerrar este proyecto y comenzar uno nuevo?"
#: ../src/devedeng/project.py:618
#: ../src/devedeng/project.py:629
msgid "New project"
msgstr "Nuevo proyecto"
#: ../src/devedeng/project.py:659
#: ../src/devedeng/project.py:670
msgid "The file already exists. Overwrite it?"
msgstr "El fichero ya existe. ¿Sobreescribirlo?"
#: ../src/devedeng/project.py:659
#: ../src/devedeng/project.py:670
msgid "The file already exists"
msgstr "El fichero ya existe"
#: ../src/devedeng/project.py:719
#: ../src/devedeng/project.py:730
msgid "The following files in the project could not be added again:"
msgstr "Los siguientes ficheros del proyecto no se pudieron añadir de nuevo:"
......@@ -433,7 +433,7 @@ msgstr "<b>Cambiar las propiedades de estos ficheros</b>"
msgid "PAL/SECAM"
msgstr "PAL/SECAM"
#: ../data/interface/wfile_properties.ui.h:16 ../data/interface/wmain.ui.h:15
#: ../data/interface/wfile_properties.ui.h:16 ../data/interface/wmain.ui.h:16
msgid "NTSC"
msgstr "NTSC"
......@@ -762,7 +762,7 @@ msgstr "Misc"
msgid "<b>Options</b>"
msgstr "<b>Opciones</b>"
#: ../data/interface/wfile_properties.ui.h:96 ../data/interface/wmain.ui.h:9
#: ../data/interface/wfile_properties.ui.h:96 ../data/interface/wmain.ui.h:10
msgid "Preview"
msgstr "Previsualizar"
......@@ -798,39 +798,43 @@ msgstr "Título"
msgid "Duration"
msgstr "Duración"
#: ../data/interface/wmain.ui.h:10
#: ../data/interface/wmain.ui.h:9
msgid "In menu"
msgstr "En el menú"
#: ../data/interface/wmain.ui.h:11
msgid "<b>Files</b>"
msgstr "<b>Archivos</b>"
#: ../data/interface/wmain.ui.h:11
#: ../data/interface/wmain.ui.h:12
msgid "Media size:"
msgstr "Tamaño del disco:"
#: ../data/interface/wmain.ui.h:12
#: ../data/interface/wmain.ui.h:13
msgid "Adjust disc usage"
msgstr "Ajustar el espacio ocupado en disco"
#: ../data/interface/wmain.ui.h:13
#: ../data/interface/wmain.ui.h:14
msgid "<b>Disc usage</b>"
msgstr "<b>Ocupación del disco</b>"
#: ../data/interface/wmain.ui.h:14
#: ../data/interface/wmain.ui.h:15
msgid "PAL"
msgstr "PAL"
#: ../data/interface/wmain.ui.h:16
#: ../data/interface/wmain.ui.h:17
msgid "<b>Default format</b>"
msgstr "<b>Formato por defecto</b>"
#: ../data/interface/wmain.ui.h:17
#: ../data/interface/wmain.ui.h:18
msgid "Create a menu with the titles"
msgstr "Crear un menú con los títulos"
#: ../data/interface/wmain.ui.h:18
#: ../data/interface/wmain.ui.h:19
msgid "Menu options"
msgstr "Opciones del menú"
#: ../data/interface/wmain.ui.h:19
#: ../data/interface/wmain.ui.h:20
msgid "<b>Menus</b>"
msgstr "<b>Menús</b>"
......
......@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: DeVeDe 3.16\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-14 16:01+0100\n"
"PO-Revision-Date: 2016-03-14 15:57+0100\n"
"POT-Creation-Date: 2016-11-03 23:59+0100\n"
"PO-Revision-Date: 2016-11-04 00:00+0100\n"
"Last-Translator: Sergio Costas <rastersoft@gmail.com>\n"
"Language-Team: Español; Castellano <rastersoft@gmail.com>\n"
"Language: gl\n"
......@@ -50,7 +50,7 @@ msgstr "Convertendo %(X)s (paso 1)"
msgid "Converting %(X)s"
msgstr "Convertendo %(X)s"
#: ../src/devedeng/avconv.py:362 ../src/devedeng/ffmpeg.py:355
#: ../src/devedeng/avconv.py:474 ../src/devedeng/ffmpeg.py:467
#, python-format
msgid "Creating menu %(X)d"
msgstr "Creando o menú %(X)d"
......@@ -184,9 +184,8 @@ msgid "Creating ISO image"
msgstr "Creando a imaxe ISO"
#: ../src/devedeng/help.py:17
#, fuzzy
msgid "Can't open the help files."
msgstr "Non se pode abrir o ficheiro."
msgstr "Non se pode abrir o ficheiro de axuda."
#: ../src/devedeng/mux_dvd_menu.py:34
#, python-format
......@@ -197,43 +196,43 @@ msgstr "Mesturando o menú %(X)d"
msgid "DevedeNG projects"
msgstr "Proxectos DevedeNG"
#: ../src/devedeng/project.py:204
#: ../src/devedeng/project.py:206
msgid "Abort the current DVD and exit?"
msgstr "Interromper o DVD e saír?"
#: ../src/devedeng/project.py:204
#: ../src/devedeng/project.py:206
msgid "Exit DeVeDe"
msgstr "Saír de DeVeDe"
#: ../src/devedeng/project.py:259
#: ../src/devedeng/project.py:270
msgid "The following files could not be added:"
msgstr "Non é posíbel engadir os seguintes ficheiros:"
#: ../src/devedeng/project.py:259 ../src/devedeng/project.py:719
#: ../src/devedeng/project.py:270 ../src/devedeng/project.py:730
msgid "Error while adding files"
msgstr "Produciuse un erro ao engadir ficheiros"
#: ../src/devedeng/project.py:271
#: ../src/devedeng/project.py:282
#, python-format
msgid "The file <b>%(X)s</b> <i>(%(Y)s)</i> will be removed."
msgstr "O ficheiro <b>%(X)s</b> <i>(%(Y)s)</i> vai seren retirado."
#: ../src/devedeng/project.py:271
#: ../src/devedeng/project.py:282
msgid "Delete file"
msgstr "Eliminar o ficheiro"
#: ../src/devedeng/project.py:474
#: ../src/devedeng/project.py:485
#, python-format
msgid "The limit for this format is %(l)d files, but your project has %(h)d."
msgstr ""
"O limite para este formato é de %(l)d ficheiros, mais o seu proxecto ten "
"%(h)d."
#: ../src/devedeng/project.py:474
#: ../src/devedeng/project.py:485
msgid "Too many files in the project"
msgstr "Hai ficheiros de máis no proxecto"
#: ../src/devedeng/project.py:483
#: ../src/devedeng/project.py:494
#, python-format
msgid ""
"The selected folder already exists. To create the project, Devede must "
......@@ -252,27 +251,27 @@ msgstr ""
"\n"
" e todo o seu contido <b>vai seren eliminado</b>. Quere continuar?"
#: ../src/devedeng/project.py:483
#: ../src/devedeng/project.py:494
msgid "Delete folder"
msgstr "Eliminar o cartafol"
#: ../src/devedeng/project.py:618
#: ../src/devedeng/project.py:629
msgid "Close current project and start a fresh one?"
msgstr "Pechar o proxecto actual e comezar un novo?"
#: ../src/devedeng/project.py:618
#: ../src/devedeng/project.py:629
msgid "New project"
msgstr "Novo proxecto"
#: ../src/devedeng/project.py:659
#: ../src/devedeng/project.py:670
msgid "The file already exists. Overwrite it?"
msgstr "Xa existe o ficheiro. Quere sobrescribilo?"
#: ../src/devedeng/project.py:659
#: ../src/devedeng/project.py:670
msgid "The file already exists"
msgstr "Xa existe o ficheiro"
#: ../src/devedeng/project.py:719
#: ../src/devedeng/project.py:730
msgid "The following files in the project could not be added again:"
msgstr "Non poderán volver engadirse ao proxecto os seguintes ficheiros:"
......@@ -434,7 +433,7 @@ msgstr "<b>Estabelecer as propiedades para estes ficheiros</b>"
msgid "PAL/SECAM"
msgstr "PAL/SECAM"
#: ../data/interface/wfile_properties.ui.h:16 ../data/interface/wmain.ui.h:15
#: ../data/interface/wfile_properties.ui.h:16 ../data/interface/wmain.ui.h:16
msgid "NTSC"
msgstr "NTSC"
......@@ -763,7 +762,7 @@ msgstr "Misc"
msgid "<b>Options</b>"
msgstr "<b>Opcións</b>"
#: ../data/interface/wfile_properties.ui.h:96 ../data/interface/wmain.ui.h:9
#: ../data/interface/wfile_properties.ui.h:96 ../data/interface/wmain.ui.h:10
msgid "Preview"
msgstr "Previsualizar"
......@@ -799,39 +798,43 @@ msgstr "Título"
msgid "Duration"
msgstr "Duración"
#: ../data/interface/wmain.ui.h:10
#: ../data/interface/wmain.ui.h:9
msgid "In menu"
msgstr "No menú"
#: ../data/interface/wmain.ui.h:11
msgid "<b>Files</b>"
msgstr "<b>Ficheiros</b>"
#: ../data/interface/wmain.ui.h:11
#: ../data/interface/wmain.ui.h:12
msgid "Media size:"
msgstr "Tamaño do disco:"
#: ../data/interface/wmain.ui.h:12
#: ../data/interface/wmain.ui.h:13
msgid "Adjust disc usage"
msgstr "Axustar o uso de disco"
#: ../data/interface/wmain.ui.h:13
#: ../data/interface/wmain.ui.h:14
msgid "<b>Disc usage</b>"
msgstr "<b>Ocupación do disco</b>"
#: ../data/interface/wmain.ui.h:14
#: ../data/interface/wmain.ui.h:15
msgid "PAL"
msgstr "PAL"
#: ../data/interface/wmain.ui.h:16
#: ../data/interface/wmain.ui.h:17
msgid "<b>Default format</b>"
msgstr "<b>Formato predeterminado</b>"
#: ../data/interface/wmain.ui.h:17
#: ../data/interface/wmain.ui.h:18
msgid "Create a menu with the titles"
msgstr "Crear un menú cos títulos"
#: ../data/interface/wmain.ui.h:18
#: ../data/interface/wmain.ui.h:19
msgid "Menu options"
msgstr "Opcións do menú"
#: ../data/interface/wmain.ui.h:19
#: ../data/interface/wmain.ui.h:20
msgid "<b>Menus</b>"
msgstr "<b>Menús</b>"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-03-14 16:01+0100\n"
"POT-Creation-Date: 2016-11-03 23:59+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -47,7 +47,7 @@ msgstr ""
msgid "Converting %(X)s"
msgstr ""
#: ../src/devedeng/avconv.py:362 ../src/devedeng/ffmpeg.py:355
#: ../src/devedeng/avconv.py:474 ../src/devedeng/ffmpeg.py:467
#, python-format
msgid "Creating menu %(X)d"
msgstr ""
......@@ -175,41 +175,41 @@ msgstr ""
msgid "DevedeNG projects"
msgstr ""
#: ../src/devedeng/project.py:204
#: ../src/devedeng/project.py:206
msgid "Abort the current DVD and exit?"
msgstr ""
#: ../src/devedeng/project.py:204
#: ../src/devedeng/project.py:206
msgid "Exit DeVeDe"
msgstr ""
#: ../src/devedeng/project.py:259
#: ../src/devedeng/project.py:270
msgid "The following files could not be added:"
msgstr ""
#: ../src/devedeng/project.py:259 ../src/devedeng/project.py:719
#: ../src/devedeng/project.py:270 ../src/devedeng/project.py:730
msgid "Error while adding files"
msgstr ""
#: ../src/devedeng/project.py:271
#: ../src/devedeng/project.py:282
#, python-format
msgid "The file <b>%(X)s</b> <i>(%(Y)s)</i> will be removed."
msgstr ""
#: ../src/devedeng/project.py:271
#: ../src/devedeng/project.py:282
msgid "Delete file"
msgstr ""
#: ../src/devedeng/project.py:474
#: ../src/devedeng/project.py:485
#, python-format
msgid "The limit for this format is %(l)d files, but your project has %(h)d."
msgstr ""
#: ../src/devedeng/project.py:474
#: ../src/devedeng/project.py:485
msgid "Too many files in the project"
msgstr ""
#: ../src/devedeng/project.py:483
#: ../src/devedeng/project.py:494
#, python-format
msgid ""
"The selected folder already exists. To create the project, Devede must "
......@@ -221,27 +221,27 @@ msgid ""
" and all its contents <b>will be deleted</b>. Continue?"
msgstr ""
#: ../src/devedeng/project.py:483
#: ../src/devedeng/project.py:494
msgid "Delete folder"
msgstr ""
#: ../src/devedeng/project.py:618
#: ../src/devedeng/project.py:629
msgid "Close current project and start a fresh one?"
msgstr ""
#: ../src/devedeng/project.py:618
#: ../src/devedeng/project.py:629
msgid "New project"
msgstr ""
#: ../src/devedeng/project.py:659
#: ../src/devedeng/project.py:670
msgid "The file already exists. Overwrite it?"
msgstr ""
#: ../src/devedeng/project.py:659
#: ../src/devedeng/project.py:670
msgid "The file already exists"
msgstr ""
#: ../src/devedeng/project.py:719
#: ../src/devedeng/project.py:730
msgid "The following files in the project could not be added again:"
msgstr ""
......@@ -400,7 +400,7 @@ msgstr ""
msgid "PAL/SECAM"
msgstr ""
#: ../data/interface/wfile_properties.ui.h:16 ../data/interface/wmain.ui.h:15
#: ../data/interface/wfile_properties.ui.h:16 ../data/interface/wmain.ui.h:16
msgid "NTSC"
msgstr ""
......@@ -725,7 +725,7 @@ msgstr ""
msgid "<b>Options</b>"
msgstr ""
#: ../data/interface/wfile_properties.ui.h:96 ../data/interface/wmain.ui.h:9
#: ../data/interface/wfile_properties.ui.h:96 ../data/interface/wmain.ui.h:10
msgid "Preview"
msgstr ""
......@@ -761,39 +761,43 @@ msgstr ""
msgid "Duration"
msgstr ""
#: ../data/interface/wmain.ui.h:10
msgid "<b>Files</b>"
#: ../data/interface/wmain.ui.h:9
msgid "In menu"
msgstr ""
#: ../data/interface/wmain.ui.h:11
msgid "Media size:"
msgid "<b>Files</b>"
msgstr ""
#: ../data/interface/wmain.ui.h:12
msgid "Adjust disc usage"
msgid "Media size:"
msgstr ""
#: ../data/interface/wmain.ui.h:13
msgid "<b>Disc usage</b>"
msgid "Adjust disc usage"
msgstr ""
#: ../data/interface/wmain.ui.h:14
msgid "<b>Disc usage</b>"
msgstr ""
#: ../data/interface/wmain.ui.h:15
msgid "PAL"
msgstr ""
#: ../data/interface/wmain.ui.h:16
#: ../data/interface/wmain.ui.h:17
msgid "<b>Default format</b>"
msgstr ""
#: ../data/interface/wmain.ui.h:17
#: ../data/interface/wmain.ui.h:18
msgid "Create a menu with the titles"
msgstr ""
#: ../data/interface/wmain.ui.h:18
#: ../data/interface/wmain.ui.h:19
msgid "Menu options"
msgstr ""
#: ../data/interface/wmain.ui.h:19
#: ../data/interface/wmain.ui.h:20
msgid "<b>Menus</b>"
msgstr ""
......
......@@ -64,7 +64,7 @@ except:
setup(
name='devedeng',
version='4.8.3',
version='4.8.4',
description='A video DVD creator',
long_description = "A program that allows to create video DVDs",
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment