#
msgid ""
msgstr ""
-"Project-Id-Version: DVDOMATIC\n"
+"Project-Id-Version: DCPOMATIC\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 21:21+0100\n"
+"POT-Creation-Date: 2013-05-09 09:51+0100\n"
"PO-Revision-Date: 2013-03-23 21:08-0500\n"
"Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
"Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.5\n"
-#: src/tools/dvdomatic.cc:177
+#: src/tools/dvdomatic.cc:178
msgid "&Analyse audio"
msgstr "&Analizar audio"
-#: src/tools/dvdomatic.cc:183
+#: src/tools/dvdomatic.cc:184
msgid "&Edit"
msgstr "&Editar"
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dvdomatic.cc:183
msgid "&File"
msgstr "&Archivo"
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dvdomatic.cc:186
msgid "&Help"
msgstr "&Ayuda"
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dvdomatic.cc:185
msgid "&Jobs"
msgstr "&Tareas"
-#: src/tools/dvdomatic.cc:173
+#: src/tools/dvdomatic.cc:174
msgid "&Make DCP"
msgstr "&Crear DCP"
-#: src/tools/dvdomatic.cc:161
+#: src/tools/dvdomatic.cc:162
msgid "&Open..."
msgstr "&Abrir..."
-#: src/tools/dvdomatic.cc:170
+#: src/tools/dvdomatic.cc:171
msgid "&Preferences..."
msgstr "&Preferencias..."
-#: src/tools/dvdomatic.cc:165
+#: src/tools/dvdomatic.cc:166
msgid "&Properties..."
msgstr "&Propiedades..."
-#: src/tools/dvdomatic.cc:167
+#: src/tools/dvdomatic.cc:168
msgid "&Quit"
msgstr "&Salir"
-#: src/tools/dvdomatic.cc:163
+#: src/tools/dvdomatic.cc:164
msgid "&Save"
msgstr "&Guardar"
-#: src/tools/dvdomatic.cc:174
+#: src/tools/dvdomatic.cc:175
msgid "&Send DCP to TMS"
msgstr "&Enviar DCP al TMS"
-#: src/tools/dvdomatic.cc:409
+#: src/tools/dvdomatic.cc:426
msgid ""
"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
msgstr ""
"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-#: src/tools/dvdomatic.cc:180
+#: src/tools/dvdomatic.cc:181
msgid "About"
msgstr "Acerca de"
-#: src/tools/dvdomatic.cc:517
+#: src/tools/dvdomatic.cc:502
#, fuzzy
msgid "Could not load film %1 (%2)"
msgstr "No se pudo cargar la película %s (%s)"
-#: src/tools/dvdomatic.cc:331
+#: src/tools/dvdomatic.cc:348
#, c-format
msgid "Could not open film at %s (%s)"
msgstr "No se pudo cargar la película en %s (%s)"
-#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:402
-#: src/tools/dvdomatic.cc:521
+<<<<<<< HEAD
+#: src/tools/dcpomatic.cc:287 src/tools/dcpomatic.cc:410
+#: src/tools/dcpomatic.cc:531
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
+
+#: src/tools/dcpomatic.cc:75
+msgid "Film changed"
+msgstr "Película cambiada"
+
+#: src/tools/dcpomatic.cc:416
+#: src/tools/dvdomatic.cc:288 src/tools/dvdomatic.cc:419
+#: src/tools/dvdomatic.cc:506
msgid "DVD-o-matic"
msgstr "DVD-o-matic"
-#: src/tools/dvdomatic.cc:75
+#: src/tools/dvdomatic.cc:76
msgid "Film changed"
msgstr "Película cambiada"
-#: src/tools/dvdomatic.cc:408
+#: src/tools/dvdomatic.cc:425
msgid "Free, open-source DCP generation from almost anything."
msgstr ""
"Generación de DCP a partir de casi cualquier fuente, libre y de código "
"abierto."
-#: src/tools/dvdomatic.cc:160
+#: src/tools/dvdomatic.cc:161
msgid "New..."
msgstr "Nuevo..."
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dvdomatic.cc:176
msgid "S&how DCP"
msgstr "&Mostrar DCP"
-#: src/tools/dvdomatic.cc:74
-msgid "Save changes to film \"%1\" before closing?"
+#: src/tools/dvdomatic.cc:75
+#, c-format
+msgid "Save changes to film \"%s\" before closing?"
msgstr ""
-#: src/tools/dvdomatic.cc:319
+#: src/tools/dvdomatic.cc:328
msgid "Select film to open"
msgstr "Selecciona la película a abrir"
-#: src/tools/dvdomatic.cc:303
+#: src/tools/dvdomatic.cc:307
+msgid ""
+"The directory %1 already exists and is not empty. Are you sure you want to "
+"use it?"
+msgstr ""
+
+#: src/tools/dvdomatic.cc:333
+msgid ""
+"You did not select a folder. Make sure that you select a folder before "
+"clicking Open."
+msgstr ""
+
#, fuzzy
-msgid "The directory %1 already exists."
-msgstr "La carpeta %s ya existe."
+#~ msgid "The directory %1 already exists."
+#~ msgstr "La carpeta %s ya existe."