pot/merge.

1 files changed, 57 insertions, 49 deletions

diff --git a/src/tools/po/ru_RU.po b/src/tools/po/ru_RU.po
index 51a4be520..bd05f8ee3 100644
--- a/src/tools/po/ru_RU.po
+++ b/src/tools/po/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 09:51+0100\n"
+"POT-Creation-Date: 2021-04-05 00:51+0200\n"
 "PO-Revision-Date: 2019-03-26 23:32+0200\n"
 "Last-Translator: Igor Voytovich <dcp@dualvfilms.com>\n"
 "Language-Team: Russian\n"
@@ -29,11 +29,11 @@ msgstr "%d KDM-ключи записаны в %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "&Добавить проект...\tCtrl-A"
 
-#: src/tools/dcpomatic_player.cc:507
+#: src/tools/dcpomatic_player.cc:517
 msgid "&Add OV..."
 msgstr "Добавить OV…"
 
-#: src/tools/dcpomatic_player.cc:513
+#: src/tools/dcpomatic_player.cc:523
 msgid "&Close"
 msgstr "&Закрыть"
 
@@ -42,25 +42,25 @@ msgid "&Close\tCtrl-W"
 msgstr "&Закрыть\tCtrl-W"
 
 #: src/tools/dcpomatic.cc:1395 src/tools/dcpomatic_batch.cc:93
-#: src/tools/dcpomatic_kdm.cc:266 src/tools/dcpomatic_player.cc:565
+#: src/tools/dcpomatic_kdm.cc:266 src/tools/dcpomatic_player.cc:575
 #: src/tools/dcpomatic_playlist.cc:547
 msgid "&Edit"
 msgstr "&Редактировать"
 
 #: src/tools/dcpomatic.cc:1331 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:244 src/tools/dcpomatic_player.cc:517
+#: src/tools/dcpomatic_kdm.cc:244 src/tools/dcpomatic_player.cc:527
 #: src/tools/dcpomatic_playlist.cc:528
 msgid "&Exit"
 msgstr "&Выход"
 
 #: src/tools/dcpomatic.cc:1394 src/tools/dcpomatic_batch.cc:91
-#: src/tools/dcpomatic_kdm.cc:264 src/tools/dcpomatic_player.cc:563
+#: src/tools/dcpomatic_kdm.cc:264 src/tools/dcpomatic_player.cc:573
 #: src/tools/dcpomatic_playlist.cc:545
 msgid "&File"
 msgstr "&Файл"
 
 #: src/tools/dcpomatic.cc:1399 src/tools/dcpomatic_batch.cc:96
-#: src/tools/dcpomatic_kdm.cc:268 src/tools/dcpomatic_player.cc:569
+#: src/tools/dcpomatic_kdm.cc:268 src/tools/dcpomatic_player.cc:579
 #: src/tools/dcpomatic_playlist.cc:549
 msgid "&Help"
 msgstr "&Помощь"
@@ -73,20 +73,20 @@ msgstr "&Задачи"
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Сделать DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_player.cc:506
+#: src/tools/dcpomatic.cc:1313 src/tools/dcpomatic_player.cc:516
 msgid "&Open...\tCtrl-O"
 msgstr "&Открыть...\tCtrl-O"
 
 #: src/tools/dcpomatic.cc:1343 src/tools/dcpomatic.cc:1346
 #: src/tools/dcpomatic_batch.cc:79 src/tools/dcpomatic_batch.cc:82
 #: src/tools/dcpomatic_kdm.cc:250 src/tools/dcpomatic_kdm.cc:253
-#: src/tools/dcpomatic_player.cc:523 src/tools/dcpomatic_player.cc:526
+#: src/tools/dcpomatic_player.cc:533 src/tools/dcpomatic_player.cc:536
 #: src/tools/dcpomatic_playlist.cc:535
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Настройки...\tCtrl-P"
 
 #: src/tools/dcpomatic.cc:1333 src/tools/dcpomatic_batch.cc:75
-#: src/tools/dcpomatic_kdm.cc:246 src/tools/dcpomatic_player.cc:519
+#: src/tools/dcpomatic_kdm.cc:246 src/tools/dcpomatic_player.cc:529
 #: src/tools/dcpomatic_playlist.cc:530
 msgid "&Quit"
 msgstr "&Выход"
@@ -100,11 +100,11 @@ msgid "&Send DCP to TMS"
 msgstr "&Отправить DCP на TMS (Theatre Management System)"
 
 #: src/tools/dcpomatic.cc:1398 src/tools/dcpomatic_batch.cc:95
-#: src/tools/dcpomatic_player.cc:568
+#: src/tools/dcpomatic_player.cc:578
 msgid "&Tools"
 msgstr "&Инструменты"
 
-#: src/tools/dcpomatic.cc:1397 src/tools/dcpomatic_player.cc:567
+#: src/tools/dcpomatic.cc:1397 src/tools/dcpomatic_player.cc:577
 msgid "&View"
 msgstr "&Вид"
 
@@ -117,13 +117,13 @@ msgid "<b>Playlists</b>"
 msgstr ""
 
 #: src/tools/dcpomatic.cc:1390 src/tools/dcpomatic_batch.cc:89
-#: src/tools/dcpomatic_kdm.cc:260 src/tools/dcpomatic_player.cc:559
+#: src/tools/dcpomatic_kdm.cc:260 src/tools/dcpomatic_player.cc:569
 #: src/tools/dcpomatic_playlist.cc:542
 msgid "About"
 msgstr "О программе"
 
 #: src/tools/dcpomatic.cc:1388 src/tools/dcpomatic_kdm.cc:258
-#: src/tools/dcpomatic_player.cc:557 src/tools/dcpomatic_playlist.cc:540
+#: src/tools/dcpomatic_player.cc:567 src/tools/dcpomatic_playlist.cc:540
 msgid "About DCP-o-matic"
 msgstr "О программе DCP-o-matic"
 
@@ -131,7 +131,7 @@ msgstr "О программе DCP-o-matic"
 msgid "Add"
 msgstr "Добавить"
 
-#: src/tools/dcpomatic_player.cc:508
+#: src/tools/dcpomatic_player.cc:518
 #, fuzzy
 msgid "Add &KDM..."
 msgstr "Добавить KDM…"
@@ -153,7 +153,7 @@ msgid "Add..."
 msgstr "Добавить…"
 
 #: src/tools/dcpomatic.cc:1731 src/tools/dcpomatic_kdm.cc:704
-#: src/tools/dcpomatic_player.cc:1202 src/tools/dcpomatic_playlist.cc:652
+#: src/tools/dcpomatic_player.cc:1212 src/tools/dcpomatic_playlist.cc:652
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -172,7 +172,7 @@ msgstr ""
 "\n"
 
 #: src/tools/dcpomatic.cc:1750 src/tools/dcpomatic_kdm.cc:713
-#: src/tools/dcpomatic_player.cc:1211 src/tools/dcpomatic_playlist.cc:661
+#: src/tools/dcpomatic_player.cc:1221 src/tools/dcpomatic_playlist.cc:661
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -187,7 +187,7 @@ msgstr "В сервере кодирования DCP-o-matic произошла
 
 #: src/tools/dcpomatic.cc:964 src/tools/dcpomatic.cc:1755
 #: src/tools/dcpomatic_kdm.cc:403 src/tools/dcpomatic_kdm.cc:718
-#: src/tools/dcpomatic_kdm.cc:727 src/tools/dcpomatic_player.cc:1216
+#: src/tools/dcpomatic_kdm.cc:727 src/tools/dcpomatic_player.cc:1226
 #: src/tools/dcpomatic_playlist.cc:666 src/tools/dcpomatic_playlist.cc:675
 msgid "An unknown exception occurred."
 msgstr "Произошла неизвестная ошибка."
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Bad setting for %s."
 msgstr "Неправильная настройка для %s."
 
-#: src/tools/dcpomatic_player.cc:535 src/tools/dcpomatic_playlist.cc:271
+#: src/tools/dcpomatic_player.cc:545 src/tools/dcpomatic_playlist.cc:271
 msgid "CPL"
 msgstr "CPL"
 
@@ -213,7 +213,7 @@ msgstr "CPL"
 msgid "CPL's content is not encrypted."
 msgstr "Содержимое CPL-файла не зашифровано."
 
-#: src/tools/dcpomatic.cc:1380 src/tools/dcpomatic_player.cc:551
+#: src/tools/dcpomatic.cc:1380 src/tools/dcpomatic_player.cc:561
 msgid "Check for updates"
 msgstr "Проверить обновления"
 
@@ -226,7 +226,7 @@ msgstr "DCP-o-matic"
 msgid "Close without saving film"
 msgstr "Закрыть без сохранения проекта"
 
-#: src/tools/dcpomatic.cc:1373 src/tools/dcpomatic_player.cc:541
+#: src/tools/dcpomatic.cc:1373 src/tools/dcpomatic_player.cc:551
 msgid "Closed captions..."
 msgstr "Скрытые субтитры…"
 
@@ -254,11 +254,11 @@ msgstr "Не удалось найти пакетный конвертер."
 msgid "Could not find player."
 msgstr "Не удалось найти проигрыватель."
 
-#: src/tools/dcpomatic_player.cc:678 src/tools/dcpomatic_player.cc:1141
+#: src/tools/dcpomatic_player.cc:688 src/tools/dcpomatic_player.cc:1151
 msgid "Could not load DCP %1."
 msgstr "Не удалось загрузить %1."
 
-#: src/tools/dcpomatic_player.cc:496
+#: src/tools/dcpomatic_player.cc:506
 #, fuzzy, c-format
 msgid ""
 "Could not load DCP.\n"
@@ -266,11 +266,12 @@ msgid ""
 "%s."
 msgstr "Не удалось загрузить %1."
 
-#: src/tools/dcpomatic_player.cc:660
+#: src/tools/dcpomatic_player.cc:670
 msgid "Could not load KDM."
 msgstr "Не удалось загрузить KDM."
 
-#: src/tools/dcpomatic_player.cc:365 src/tools/dcpomatic_player.cc:367
+#: src/tools/dcpomatic_player.cc:368 src/tools/dcpomatic_player.cc:375
+#: src/tools/dcpomatic_player.cc:377
 #, c-format
 msgid "Could not load a DCP from %s"
 msgstr "Не удалось загрузить DCP из %s"
@@ -349,7 +350,7 @@ msgstr ""
 "сохранены."
 
 #: src/tools/dcpomatic.cc:1424 src/tools/dcpomatic_batch.cc:336
-#: src/tools/dcpomatic_player.cc:899 src/tools/dcpomatic_playlist.cc:561
+#: src/tools/dcpomatic_player.cc:909 src/tools/dcpomatic_playlist.cc:561
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
@@ -357,7 +358,7 @@ msgstr ""
 "Не удалось записать в файл кионфгигурации - %s. Ваши изменения не были "
 "сохранены."
 
-#: src/tools/dcpomatic_player.cc:907
+#: src/tools/dcpomatic_player.cc:917
 msgid "Could not write to config file.  Your changes have not been saved."
 msgstr ""
 "Не удалось записать в файл кинфгигурации.  Ваши изменения не были сохранены."
@@ -383,13 +384,13 @@ msgstr "DCP-o-matic Сервер Кодирования"
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic Создатель KDM-ключей"
 
-#: src/tools/dcpomatic_player.cc:140 src/tools/dcpomatic_player.cc:359
-#: src/tools/dcpomatic_player.cc:625 src/tools/dcpomatic_player.cc:811
-#: src/tools/dcpomatic_player.cc:1089
+#: src/tools/dcpomatic_player.cc:140 src/tools/dcpomatic_player.cc:360
+#: src/tools/dcpomatic_player.cc:635 src/tools/dcpomatic_player.cc:821
+#: src/tools/dcpomatic_player.cc:1099
 msgid "DCP-o-matic Player"
 msgstr "DCP-o-matic Плеер"
 
-#: src/tools/dcpomatic_player.cc:1164
+#: src/tools/dcpomatic_player.cc:1174
 msgid "DCP-o-matic Player could not start."
 msgstr "Не удалось запустить DCP-o-matic Плеер."
 
@@ -405,15 +406,15 @@ msgstr "Не удалось запустить DCP-o-matic"
 msgid "DKDM"
 msgstr "DKDM (Distribution KDM)"
 
-#: src/tools/dcpomatic_player.cc:544
+#: src/tools/dcpomatic_player.cc:554
 msgid "Decode at full resolution"
 msgstr "Декодировать в полном разрешении"
 
-#: src/tools/dcpomatic_player.cc:545
+#: src/tools/dcpomatic_player.cc:555
 msgid "Decode at half resolution"
 msgstr "Декодировать с разрешением в половину"
 
-#: src/tools/dcpomatic_player.cc:546
+#: src/tools/dcpomatic_player.cc:556
 msgid "Decode at quarter resolution"
 msgstr "Декодировать с разрешением в четверть"
 
@@ -442,7 +443,7 @@ msgstr "Не дублировать"
 msgid "Down"
 msgstr "Вниз"
 
-#: src/tools/dcpomatic_player.cc:538
+#: src/tools/dcpomatic_player.cc:548
 msgid "Dual screen\tShift+F11"
 msgstr "Двойной экран\tShift+F11"
 
@@ -500,7 +501,7 @@ msgstr "Проект изменен"
 msgid "Frames per second"
 msgstr "Кадров в секунду"
 
-#: src/tools/dcpomatic_player.cc:537
+#: src/tools/dcpomatic_player.cc:547
 msgid "Full screen\tF11"
 msgstr "Весь экран\tF11"
 
@@ -524,7 +525,7 @@ msgstr "KDM|Тайминг"
 msgid "Length"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:359 src/tools/dcpomatic_player.cc:625
+#: src/tools/dcpomatic_player.cc:360 src/tools/dcpomatic_player.cc:635
 msgid "Loading content"
 msgstr "Загрузка контента"
 
@@ -619,7 +620,7 @@ msgid "Remove"
 msgstr "Убрать"
 
 #: src/tools/dcpomatic.cc:1392 src/tools/dcpomatic_kdm.cc:262
-#: src/tools/dcpomatic_player.cc:561
+#: src/tools/dcpomatic_player.cc:571
 msgid "Report a problem..."
 msgstr "Сообщить об ошибке..."
 
@@ -672,11 +673,11 @@ msgstr "Сохранить проект и дублировать"
 msgid "Screens"
 msgstr "Экраны"
 
-#: src/tools/dcpomatic_player.cc:579
+#: src/tools/dcpomatic_player.cc:589
 msgid "Select DCP to open"
 msgstr "Выберите DCP для открытия"
 
-#: src/tools/dcpomatic_player.cc:604
+#: src/tools/dcpomatic_player.cc:614
 msgid "Select DCP to open as OV"
 msgstr "Выберите DCP для открытия как OV"
 
@@ -689,7 +690,7 @@ msgstr "Выберите DKDM-файл"
 msgid "Select DKDM file"
 msgstr "Выберите DKDM-файл"
 
-#: src/tools/dcpomatic_player.cc:646
+#: src/tools/dcpomatic_player.cc:656
 msgid "Select KDM"
 msgstr "Выберите KDM-файл"
 
@@ -709,11 +710,11 @@ msgstr "Отправить KDM-ключи по email"
 msgid "Send translations..."
 msgstr "Отправить перевод…"
 
-#: src/tools/dcpomatic_player.cc:543
+#: src/tools/dcpomatic_player.cc:553
 msgid "Set decode resolution to match display"
 msgstr "Установить разрешение декодирования в соответствии экраном"
 
-#: src/tools/dcpomatic.cc:1382 src/tools/dcpomatic_player.cc:553
+#: src/tools/dcpomatic.cc:1382 src/tools/dcpomatic_player.cc:563
 msgid "System information..."
 msgstr ""
 
@@ -739,7 +740,7 @@ msgstr ""
 "DCP-пакет проекта займёт порядка %.1f ГБ, но на целевом диске у вас доступно "
 "только %.1f ГБ.  Продолжить в любом случае?"
 
-#: src/tools/dcpomatic.cc:1486 src/tools/dcpomatic_player.cc:881
+#: src/tools/dcpomatic.cc:1486 src/tools/dcpomatic_player.cc:891
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "DCP-o-matic не удалось связаться с сервером загрузки."
 
@@ -789,7 +790,7 @@ msgstr ""
 
 #: src/tools/dcpomatic.cc:1797 src/tools/dcpomatic_batch.cc:481
 #: src/tools/dcpomatic_kdm.cc:737 src/tools/dcpomatic_server.cc:353
-#: src/tools/dcpomatic_player.cc:1240
+#: src/tools/dcpomatic_player.cc:1250
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
@@ -797,7 +798,7 @@ msgstr ""
 "Ошибка загрузки существующей конфигурации. Будут использованы значения по-"
 "умолчанию. Это может занять немного времени."
 
-#: src/tools/dcpomatic.cc:1488 src/tools/dcpomatic_player.cc:883
+#: src/tools/dcpomatic.cc:1488 src/tools/dcpomatic_player.cc:893
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Нет новых версий DCP-o-matic."
 
@@ -814,7 +815,14 @@ msgstr ""
 "загрузиться в новой версии. Пожалуйста, внимательно проверьте настройки "
 "проекта."
 
-#: src/tools/dcpomatic_player.cc:552
+#: src/tools/dcpomatic_player.cc:370
+msgid ""
+"This looks like a DCP-o-matic project folder, which cannot be loaded into "
+"the player.  Choose the DCP directory inside the DCP-o-matic project folder "
+"if that's what you want to play."
+msgstr ""
+
+#: src/tools/dcpomatic_player.cc:562
 #, fuzzy
 msgid "Timing..."
 msgstr "KDM|Тайминг"
@@ -836,7 +844,7 @@ msgstr "Незавершенные задачи"
 msgid "Up"
 msgstr "Вверх"
 
-#: src/tools/dcpomatic_player.cc:549
+#: src/tools/dcpomatic_player.cc:559
 #, fuzzy
 msgid "Verify DCP..."
 msgstr "Проверить DCP"
@@ -896,7 +904,7 @@ msgid ""
 msgstr ""
 
 #: src/tools/dcpomatic.cc:586 src/tools/dcpomatic_batch.cc:299
-#: src/tools/dcpomatic_player.cc:585 src/tools/dcpomatic_player.cc:613
+#: src/tools/dcpomatic_player.cc:595 src/tools/dcpomatic_player.cc:623
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."