pot/merge.

1 files changed, 88 insertions, 67 deletions

diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 73e6dc741..9fa4afafa 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-10 09:55+0000\n"
+"POT-Creation-Date: 2018-01-13 01:41+0000\n"
 "PO-Revision-Date: 2017-08-25 23:17-0400\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -31,17 +31,17 @@ msgstr "%d KDMs guardadas en %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Añadir película...\tCtrl-A"
 
-#: src/tools/dcpomatic_player.cc:176
+#: src/tools/dcpomatic_player.cc:179
 #, fuzzy
 msgid "&Add KDM..."
 msgstr "Añadir película..."
 
-#: src/tools/dcpomatic_player.cc:175
+#: src/tools/dcpomatic_player.cc:178
 #, fuzzy
 msgid "&Add OV..."
 msgstr "Añadir película..."
 
-#: src/tools/dcpomatic_player.cc:178
+#: src/tools/dcpomatic_player.cc:181
 msgid "&Close"
 msgstr ""
 
@@ -50,22 +50,22 @@ msgid "&Content"
 msgstr "&Contenido"
 
 #: src/tools/dcpomatic.cc:1096 src/tools/dcpomatic_batch.cc:85
-#: src/tools/dcpomatic_kdm.cc:251 src/tools/dcpomatic_player.cc:213
+#: src/tools/dcpomatic_kdm.cc:251 src/tools/dcpomatic_player.cc:216
 msgid "&Edit"
 msgstr "&Editar"
 
 #: src/tools/dcpomatic.cc:1047 src/tools/dcpomatic_batch.cc:65
-#: src/tools/dcpomatic_kdm.cc:229 src/tools/dcpomatic_player.cc:182
+#: src/tools/dcpomatic_kdm.cc:229 src/tools/dcpomatic_player.cc:185
 msgid "&Exit"
 msgstr "&Salir"
 
 #: src/tools/dcpomatic.cc:1095 src/tools/dcpomatic_batch.cc:83
-#: src/tools/dcpomatic_kdm.cc:249 src/tools/dcpomatic_player.cc:211
+#: src/tools/dcpomatic_kdm.cc:249 src/tools/dcpomatic_player.cc:214
 msgid "&File"
 msgstr "&Archivo"
 
 #: src/tools/dcpomatic.cc:1100 src/tools/dcpomatic_batch.cc:88
-#: src/tools/dcpomatic_kdm.cc:253 src/tools/dcpomatic_player.cc:217
+#: src/tools/dcpomatic_kdm.cc:253 src/tools/dcpomatic_player.cc:220
 msgid "&Help"
 msgstr "&Ayuda"
 
@@ -77,19 +77,19 @@ msgstr "&Tareas"
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Crear DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_player.cc:174
+#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_player.cc:177
 msgid "&Open...\tCtrl-O"
 msgstr "&Abrir...\tCtrl-O"
 
 #: src/tools/dcpomatic.cc:1057 src/tools/dcpomatic.cc:1059
 #: src/tools/dcpomatic_batch.cc:71 src/tools/dcpomatic_batch.cc:74
 #: src/tools/dcpomatic_kdm.cc:235 src/tools/dcpomatic_kdm.cc:238
-#: src/tools/dcpomatic_player.cc:188 src/tools/dcpomatic_player.cc:191
+#: src/tools/dcpomatic_player.cc:191 src/tools/dcpomatic_player.cc:194
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Preferencias...\tCtrl-P"
 
 #: src/tools/dcpomatic.cc:1049 src/tools/dcpomatic_batch.cc:67
-#: src/tools/dcpomatic_kdm.cc:231 src/tools/dcpomatic_player.cc:184
+#: src/tools/dcpomatic_kdm.cc:231 src/tools/dcpomatic_player.cc:187
 msgid "&Quit"
 msgstr "&Salir"
 
@@ -102,21 +102,21 @@ msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP al TMS"
 
 #: src/tools/dcpomatic.cc:1099 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_player.cc:216
+#: src/tools/dcpomatic_player.cc:219
 msgid "&Tools"
 msgstr "&Herramientas"
 
-#: src/tools/dcpomatic_player.cc:215
+#: src/tools/dcpomatic_player.cc:218
 msgid "&View"
 msgstr ""
 
 #: src/tools/dcpomatic.cc:1091 src/tools/dcpomatic_batch.cc:81
-#: src/tools/dcpomatic_kdm.cc:245 src/tools/dcpomatic_player.cc:207
+#: src/tools/dcpomatic_kdm.cc:245 src/tools/dcpomatic_player.cc:210
 msgid "About"
 msgstr "Acerca de"
 
 #: src/tools/dcpomatic.cc:1089 src/tools/dcpomatic_kdm.cc:243
-#: src/tools/dcpomatic_player.cc:205
+#: src/tools/dcpomatic_player.cc:208
 msgid "About DCP-o-matic"
 msgstr "Acerca de DVD-o-matic"
 
@@ -132,8 +132,8 @@ msgstr "Añadir carpeta..."
 msgid "Add..."
 msgstr "Añadir..."
 
-#: src/tools/dcpomatic.cc:1360 src/tools/dcpomatic_kdm.cc:619
-#: src/tools/dcpomatic_player.cc:512
+#: src/tools/dcpomatic.cc:1360 src/tools/dcpomatic_kdm.cc:617
+#: src/tools/dcpomatic_player.cc:526
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -142,8 +142,8 @@ msgstr ""
 "Ha ocurrido una excepción: %s (%s).\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1369 src/tools/dcpomatic_kdm.cc:628
-#: src/tools/dcpomatic_player.cc:521
+#: src/tools/dcpomatic.cc:1369 src/tools/dcpomatic_kdm.cc:626
+#: src/tools/dcpomatic_player.cc:535
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -157,8 +157,8 @@ msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "Un error desconocido ha ocurrido en el servidor de DCP-o-matic."
 
 #: src/tools/dcpomatic.cc:740 src/tools/dcpomatic.cc:1374
-#: src/tools/dcpomatic_kdm.cc:361 src/tools/dcpomatic_kdm.cc:633
-#: src/tools/dcpomatic_kdm.cc:642 src/tools/dcpomatic_player.cc:526
+#: src/tools/dcpomatic_kdm.cc:361 src/tools/dcpomatic_kdm.cc:631
+#: src/tools/dcpomatic_kdm.cc:640 src/tools/dcpomatic_player.cc:540
 msgid "An unknown exception occurred."
 msgstr "Ha ocurrido un error desconocido."
 
@@ -171,15 +171,15 @@ msgstr ""
 "no se puede deshacer."
 
 #: src/tools/dcpomatic.cc:630
-#, c-format
-msgid "Bad setting for %s (%s)"
+#, fuzzy, c-format
+msgid "Bad setting for %s."
 msgstr "Configuración errónea para %s (%s)"
 
 #: src/tools/dcpomatic.cc:736 src/tools/dcpomatic_kdm.cc:357
 msgid "CPL's content is not encrypted."
 msgstr "El contenido del CPL no está encriptado."
 
-#: src/tools/dcpomatic.cc:1083 src/tools/dcpomatic_player.cc:201
+#: src/tools/dcpomatic.cc:1083 src/tools/dcpomatic_player.cc:204
 msgid "Check for updates"
 msgstr "Buscar actualizaciones"
 
@@ -191,7 +191,7 @@ msgstr "Cerrar sin guardar la película"
 msgid "Copy settings\tCtrl-C"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:435
+#: src/tools/dcpomatic_kdm.cc:433
 msgid ""
 "Could not decrypt the DKDM.  Perhaps it was not created with the correct "
 "certificate."
@@ -201,54 +201,65 @@ msgstr ""
 msgid "Could not find batch converter."
 msgstr "No se puedo encontrar el convertidor por lotes."
 
-#: src/tools/dcpomatic_player.cc:471
-msgid "Could not load DCP %1 (%2)"
-msgstr ""
+#: src/tools/dcpomatic_player.cc:485
+#, fuzzy
+msgid "Could not load DCP %1."
+msgstr "No se pudo crear el DCP: %s"
 
-#: src/tools/dcpomatic_player.cc:288
-#, c-format
-msgid "Could not load KDM (%s)"
-msgstr ""
+#: src/tools/dcpomatic_player.cc:294
+#, fuzzy
+msgid "Could not load KDM."
+msgstr "No se pudo mostrar el DCP"
 
-#: src/tools/dcpomatic.cc:1288 src/tools/dcpomatic_batch.cc:342
+#: src/tools/dcpomatic_batch.cc:341
+#, fuzzy
+msgid "Could not load film %1"
+msgstr "No se pudo cargar la película %s (%s)"
+
+#: src/tools/dcpomatic.cc:1288
 msgid "Could not load film %1 (%2)"
 msgstr "No se pudo cargar la película %s (%s)"
 
 #: src/tools/dcpomatic.cc:632
-#, c-format
-msgid "Could not make DCP: %s."
+#, fuzzy
+msgid "Could not make DCP."
 msgstr "No se pudo crear el DCP: %s"
 
 #: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:140
-#, c-format
-msgid "Could not open film at %s (%s)"
+#, fuzzy, c-format
+msgid "Could not open film at %s"
 msgstr "No se pudo cargar la película en %s (%s)"
 
-#: src/tools/dcpomatic_kdm.cc:427
-#, c-format
+#: src/tools/dcpomatic_kdm.cc:426
+#, fuzzy
 msgid ""
 "Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
-"at all.\n"
-"\n"
-"%s"
+"at all."
 msgstr ""
 "No se pudo leer el archivo como un KDM.  Tal vez está mal formateado, o no "
 "es un KDM en absoluto.\n"
 "\n"
 "%s"
 
-#: src/tools/dcpomatic.cc:819
-msgid "Could not show DCP"
-msgstr "No se pudo mostrar el DCP"
-
 #: src/tools/dcpomatic.cc:810
-msgid "Could not show DCP (could not run konqueror)"
+#, fuzzy
+msgid "Could not run konqueror"
 msgstr "No se pudo mostrar el DCP (no se pudo ejecutar konqueror)"
 
 #: src/tools/dcpomatic.cc:803
-msgid "Could not show DCP (could not run nautilus)"
+#, fuzzy
+msgid "Could not run nautilus"
 msgstr "No se pudo mostrar el DCP (no se pudo ejecutar nautilos)"
 
+#: src/tools/dcpomatic.cc:810 src/tools/dcpomatic.cc:819
+msgid "Could not show DCP"
+msgstr "No se pudo mostrar el DCP"
+
+#: src/tools/dcpomatic.cc:803
+#, fuzzy
+msgid "Could not show DCP."
+msgstr "No se pudo mostrar el DCP"
+
 #: src/tools/dcpomatic.cc:1113
 #, c-format
 msgid ""
@@ -257,7 +268,7 @@ msgstr ""
 "No se pudo escribir en el fichero de cines en %s.  Los cambios no se han "
 "salvado."
 
-#: src/tools/dcpomatic.cc:1125 src/tools/dcpomatic_player.cc:378
+#: src/tools/dcpomatic.cc:1125 src/tools/dcpomatic_player.cc:384
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
@@ -282,29 +293,39 @@ msgstr "Convertidor por lotes DCP-o-matic"
 msgid "DCP-o-matic Encode Server"
 msgstr "Servidor de codificación DCP-o-matic"
 
-#: src/tools/dcpomatic_kdm.cc:555 src/tools/dcpomatic_kdm.cc:591
+#: src/tools/dcpomatic_kdm.cc:553 src/tools/dcpomatic_kdm.cc:589
 msgid "DCP-o-matic KDM Creator"
 msgstr "Generador de KDM DCP-o-matic"
 
-#: src/tools/dcpomatic_player.cc:78 src/tools/dcpomatic_player.cc:143
-#: src/tools/dcpomatic_player.cc:421
+#: src/tools/dcpomatic_player.cc:78 src/tools/dcpomatic_player.cc:144
+#: src/tools/dcpomatic_player.cc:435
 #, fuzzy
 msgid "DCP-o-matic Player"
 msgstr "DCP-o-matic"
 
+#: src/tools/dcpomatic_player.cc:499
+#, fuzzy
+msgid "DCP-o-matic Player could not start."
+msgstr "Imposible conectar con el servidor de descarga de DCP-o-matic."
+
+#: src/tools/dcpomatic_kdm.cc:604
+#, fuzzy
+msgid "DCP-o-matic could not start"
+msgstr "DCP-o-matic"
+
 #: src/tools/dcpomatic_kdm.cc:145
 msgid "DKDM"
 msgstr "DKDM"
 
-#: src/tools/dcpomatic_player.cc:196
+#: src/tools/dcpomatic_player.cc:199
 msgid "Decode at full resolution"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:197
+#: src/tools/dcpomatic_player.cc:200
 msgid "Decode at half resolution"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:198
+#: src/tools/dcpomatic_player.cc:201
 msgid "Decode at quarter resolution"
 msgstr ""
 
@@ -369,7 +390,7 @@ msgstr "Pistas…"
 msgid "KDM|Timing"
 msgstr "Tiempo"
 
-#: src/tools/dcpomatic_player.cc:143
+#: src/tools/dcpomatic_player.cc:144
 msgid "Loading DCP"
 msgstr ""
 
@@ -411,7 +432,7 @@ msgid "Remove"
 msgstr "Quitar"
 
 #: src/tools/dcpomatic.cc:1093 src/tools/dcpomatic_kdm.cc:247
-#: src/tools/dcpomatic_player.cc:209
+#: src/tools/dcpomatic_player.cc:212
 msgid "Report a problem..."
 msgstr "Comunicar un problema…"
 
@@ -457,12 +478,12 @@ msgstr "Redimensionar ajustando &anchura"
 msgid "Screens"
 msgstr "Pantallas"
 
-#: src/tools/dcpomatic_player.cc:227
+#: src/tools/dcpomatic_player.cc:230
 #, fuzzy
 msgid "Select DCP to open"
 msgstr "Selecciona la película a abrir"
 
-#: src/tools/dcpomatic_player.cc:252
+#: src/tools/dcpomatic_player.cc:255
 #, fuzzy
 msgid "Select DCP to open as OV"
 msgstr "Selecciona la película a abrir"
@@ -471,7 +492,7 @@ msgstr "Selecciona la película a abrir"
 msgid "Select DKDM file"
 msgstr "Selecciona el fichero DKDM"
 
-#: src/tools/dcpomatic_player.cc:280
+#: src/tools/dcpomatic_player.cc:284
 #, fuzzy
 msgid "Select KDM"
 msgstr "Selecciona el fichero DKDM"
@@ -484,7 +505,7 @@ msgstr "Selecciona la película a abrir"
 msgid "Send KDM emails"
 msgstr "Enviar los KDM por email"
 
-#: src/tools/dcpomatic_player.cc:195
+#: src/tools/dcpomatic_player.cc:198
 msgid "Set decode resolution to match display"
 msgstr ""
 
@@ -511,13 +532,13 @@ msgstr ""
 "seleccionado solo tiene %.1f Gb disponibles.  Quieres continuar de todas "
 "formas?"
 
-#: src/tools/dcpomatic.cc:1183 src/tools/dcpomatic_player.cc:361
+#: src/tools/dcpomatic.cc:1183 src/tools/dcpomatic_player.cc:367
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Imposible conectar con el servidor de descarga de DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:1407 src/tools/dcpomatic_batch.cc:376
-#: src/tools/dcpomatic_kdm.cc:652 src/tools/dcpomatic_server.cc:333
-#: src/tools/dcpomatic_player.cc:550
+#: src/tools/dcpomatic.cc:1407 src/tools/dcpomatic_batch.cc:373
+#: src/tools/dcpomatic_kdm.cc:650 src/tools/dcpomatic_server.cc:333
+#: src/tools/dcpomatic_player.cc:564
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
@@ -525,7 +546,7 @@ msgstr ""
 "La configuración existente no pudo cargarse. Los valores por defecto serán "
 "utilizados. Debería ser rápido."
 
-#: src/tools/dcpomatic.cc:1185 src/tools/dcpomatic_player.cc:363
+#: src/tools/dcpomatic.cc:1185 src/tools/dcpomatic_player.cc:369
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "No hay disponibles nuevas versiones de DCP-o-matic."
 
@@ -588,7 +609,7 @@ msgstr ""
 "SEGURIDAD</span> si quiere hacer KDMs para esta película."
 
 #: src/tools/dcpomatic.cc:446 src/tools/dcpomatic_batch.cc:226
-#: src/tools/dcpomatic_player.cc:233 src/tools/dcpomatic_player.cc:261
+#: src/tools/dcpomatic_player.cc:236 src/tools/dcpomatic_player.cc:264
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."