diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-21 22:25:09 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-21 22:25:09 +0100 |
| commit | 02e4022f540915f8a38f9ab9576ac896fe39a1ab (patch) | |
| tree | 2301065f001f992c0c02f61fe2d2a321a0d5f7ce /src/tools | |
| parent | 237a0052c60af768f4d62b00321932918b7ba4d9 (diff) | |
Vaguely working new layout.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/po/es_ES.po | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po index b64478334..bceb9ffff 100644 --- a/src/tools/po/es_ES.po +++ b/src/tools/po/es_ES.po @@ -85,7 +85,6 @@ 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" @@ -101,10 +100,6 @@ msgstr "Película cambiada" msgid "DVD-o-matic" msgstr "DVD-o-matic" -#: src/tools/dvdomatic.cc:76 -msgid "Film changed" -msgstr "Película cambiada" - #: src/tools/dvdomatic.cc:425 msgid "Free, open-source DCP generation from almost anything." msgstr "" |