Merge master.

[dcpomatic.git] / src / tools / po / es_ES.po

diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 30f568c987481381d0c44d322a3551d0ddf7e871..b64478334198f7dbd052c0a50ef96fad1416c86d 100644 (file)
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DVDOMATIC\n"
+"Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-05-09 09:51+0100\n"
 "PO-Revision-Date: 2013-03-23 21:08-0500\n"
@@ -85,6 +85,17 @@ msgstr "No se pudo cargar la película %s (%s)"
 msgid "Could not open film at %s (%s)"
 msgstr "No se pudo cargar la película en %s (%s)"
 
+<<<<<<< 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"