Merge branch '1.0' of ssh://git.carlh.net/home/carl/git/dcpomatic2 into 2.0

2 files changed, 22 insertions, 22 deletions

diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 20eccb11c..96f2cabb8 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-08-27 16:40+0100\n"
-"PO-Revision-Date: 2015-07-06 15:44+0100\n"
+"PO-Revision-Date: 2015-08-30 15:38-0400\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
 "Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.8.4\n"
 
 #: src/tools/dcpomatic.cc:334
 msgid "%1 already exists as a file, so you cannot use it for a new film."
@@ -90,12 +90,12 @@ msgid "Add Film..."
 msgstr "Añadir película..."
 
 #: src/tools/dcpomatic.cc:919
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An exception occurred: %s (%s).\n"
 "\n"
 msgstr ""
-"Ha ocurrido un error desconocido: %s (%s).\n"
+"Ha ocurrido una excepción: %s (%s).\n"
 "\n"
 
 #: src/tools/dcpomatic.cc:921
@@ -115,7 +115,7 @@ msgstr "Ha ocurrido un error desconocido."
 #: src/tools/dcpomatic.cc:430
 #, c-format
 msgid "Bad setting for %s (%s)"
-msgstr ""
+msgstr "Configuración errónea para %s (%s)"
 
 #: src/tools/dcpomatic.cc:457
 msgid "CPL's content is not encrypted."
@@ -132,7 +132,7 @@ msgstr "No se pudo cargar la película %s (%s)"
 #: src/tools/dcpomatic.cc:432
 #, c-format
 msgid "Could not make DCP: %s"
-msgstr ""
+msgstr "No se pudo crear el DCP: %s"
 
 #: src/tools/dcpomatic.cc:285 src/tools/dcpomatic_batch.cc:175
 #, c-format
@@ -141,7 +141,7 @@ msgstr "No se pudo cargar la película en %s (%s)"
 
 #: src/tools/dcpomatic.cc:517
 msgid "Could not show DCP"
-msgstr ""
+msgstr "No se pudo mostrar el DCP"
 
 #: src/tools/dcpomatic.cc:508
 msgid "Could not show DCP (could not run konqueror)"
@@ -171,9 +171,8 @@ msgid "Film changed"
 msgstr "Película cambiada"
 
 #: src/tools/dcpomatic.cc:705
-#, fuzzy
 msgid "Hints..."
-msgstr "Pistas...\tCtrl-H"
+msgstr "Pistas…"
 
 #: src/tools/dcpomatic.cc:699
 msgid "Make &KDMs...\tCtrl-K"
@@ -185,11 +184,11 @@ msgstr "Nuevo...\tCtrl-N"
 
 #: src/tools/dcpomatic.cc:717
 msgid "Report a problem..."
-msgstr ""
+msgstr "Comunicar un problema…"
 
 #: src/tools/dcpomatic.cc:709
 msgid "Restore default preferences"
-msgstr ""
+msgstr "Restaurar las preferencias por defecto"
 
 #: src/tools/dcpomatic.cc:701
 msgid "S&how DCP"
@@ -213,16 +212,17 @@ msgid "Select film to open"
 msgstr "Selecciona la película a abrir"
 
 #: src/tools/dcpomatic.cc:416
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
 "the disk that you are using only has %.1f Gb available.  You would need half "
 "as much space if the filesystem supported hard links, but it does not.  Do "
 "you want to continue anyway?"
 msgstr ""
-"El DCP de esta película usará aproximadamente %.1f Gb, y el disco "
-"seleccionado solo tiene %.1f Gb disponibles.  Quieres continuar de todas "
-"formas?"
+"El DCP y los ficheros intermedios para esta película necesitarán "
+"aproximadamente %.1f Gb, y el disco seleccionado solo tiene %.1f Gb "
+"disponibles. Necesitarías la mitad de espacio si el sistema de ficheros "
+"soportara enlaces duros, pero no es así. Quieres continuar de todas formas?"
 
 #: src/tools/dcpomatic.cc:414
 #, c-format
@@ -268,7 +268,7 @@ msgstr "Trabajos sin finalizar"
 
 #: src/tools/dcpomatic.cc:704
 msgid "Video waveform..."
-msgstr ""
+msgstr "Forma de de onda del vídeo…"
 
 #: src/tools/dcpomatic.cc:359 src/tools/dcpomatic_batch.cc:161
 msgid ""
diff --git a/src/tools/po/ru_RU.po b/src/tools/po/ru_RU.po
index 2b0047b59..ebc30cfa3 100644
--- a/src/tools/po/ru_RU.po
+++ b/src/tools/po/ru_RU.po
@@ -1,19 +1,19 @@
 # Igor V <iva_co@ukr.net>, 2015. #zanata
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-08-27 16:40+0100\n"
-"PO-Revision-Date: 2015-07-16 05:12-0400\n"
+"PO-Revision-Date: 2015-08-29 10:10+0200\n"
 "Last-Translator: Igor V <iva_co@ukr.net>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Zanata 3.6.2\n"
+"X-Generator: Poedit 1.7.5\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/tools/dcpomatic.cc:334
 msgid "%1 already exists as a file, so you cannot use it for a new film."
@@ -90,7 +90,7 @@ msgid "Add Film..."
 msgstr "Добавить проект..."
 
 #: src/tools/dcpomatic.cc:919
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An exception occurred: %s (%s).\n"
 "\n"
@@ -266,7 +266,7 @@ msgstr "Незавершенные задачи"
 
 #: src/tools/dcpomatic.cc:704
 msgid "Video waveform..."
-msgstr ""
+msgstr "График видео..."
 
 #: src/tools/dcpomatic.cc:359 src/tools/dcpomatic_batch.cc:161
 msgid ""