pot/merge.

1 files changed, 62 insertions, 62 deletions

diff --git a/src/tools/po/ru_RU.po b/src/tools/po/ru_RU.po
index 7694cdb03..cade4bb8a 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: 2019-03-18 17:30+0000\n"
+"POT-Creation-Date: 2019-03-24 00:53+0000\n"
 "PO-Revision-Date: 2018-08-20 18:49+0300\n"
 "Last-Translator: Igor Voytovich <dcp@dualvfilms.com>\n"
 "Language-Team: Russian\n"
@@ -41,82 +41,82 @@ msgstr "Добавить OV…"
 msgid "&Close"
 msgstr "&Закрыть"
 
-#: src/tools/dcpomatic.cc:1219
+#: src/tools/dcpomatic.cc:1221
 #, fuzzy
 msgid "&Close\tCtrl-W"
 msgstr "&Сохранить\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1281
+#: src/tools/dcpomatic.cc:1283
 msgid "&Content"
 msgstr "&Контент"
 
-#: src/tools/dcpomatic.cc:1280 src/tools/dcpomatic_batch.cc:91
+#: src/tools/dcpomatic.cc:1282 src/tools/dcpomatic_batch.cc:91
 #: src/tools/dcpomatic_kdm.cc:253 src/tools/dcpomatic_player.cc:509
 msgid "&Edit"
 msgstr "&Редактировать"
 
-#: src/tools/dcpomatic.cc:1226 src/tools/dcpomatic_batch.cc:71
+#: src/tools/dcpomatic.cc:1228 src/tools/dcpomatic_batch.cc:71
 #: src/tools/dcpomatic_kdm.cc:231 src/tools/dcpomatic_player.cc:461
 msgid "&Exit"
 msgstr "&Выход"
 
-#: src/tools/dcpomatic.cc:1279 src/tools/dcpomatic_batch.cc:89
+#: src/tools/dcpomatic.cc:1281 src/tools/dcpomatic_batch.cc:89
 #: src/tools/dcpomatic_kdm.cc:251 src/tools/dcpomatic_player.cc:507
 msgid "&File"
 msgstr "&Файл"
 
-#: src/tools/dcpomatic.cc:1285 src/tools/dcpomatic_batch.cc:94
+#: src/tools/dcpomatic.cc:1287 src/tools/dcpomatic_batch.cc:94
 #: src/tools/dcpomatic_kdm.cc:255 src/tools/dcpomatic_player.cc:513
 msgid "&Help"
 msgstr "&Помощь"
 
-#: src/tools/dcpomatic.cc:1282
+#: src/tools/dcpomatic.cc:1284
 msgid "&Jobs"
 msgstr "&Задачи"
 
-#: src/tools/dcpomatic.cc:1246
+#: src/tools/dcpomatic.cc:1248
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Сделать DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:1208 src/tools/dcpomatic_player.cc:450
+#: src/tools/dcpomatic.cc:1210 src/tools/dcpomatic_player.cc:450
 msgid "&Open...\tCtrl-O"
 msgstr "&Открыть...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:1236 src/tools/dcpomatic.cc:1238
+#: src/tools/dcpomatic.cc:1238 src/tools/dcpomatic.cc:1240
 #: src/tools/dcpomatic_batch.cc:77 src/tools/dcpomatic_batch.cc:80
 #: src/tools/dcpomatic_kdm.cc:237 src/tools/dcpomatic_kdm.cc:240
 #: src/tools/dcpomatic_player.cc:467 src/tools/dcpomatic_player.cc:470
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Настройки...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:1228 src/tools/dcpomatic_batch.cc:73
+#: src/tools/dcpomatic.cc:1230 src/tools/dcpomatic_batch.cc:73
 #: src/tools/dcpomatic_kdm.cc:233 src/tools/dcpomatic_player.cc:463
 msgid "&Quit"
 msgstr "&Выход"
 
-#: src/tools/dcpomatic.cc:1210
+#: src/tools/dcpomatic.cc:1212
 msgid "&Save\tCtrl-S"
 msgstr "&Сохранить\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1254
+#: src/tools/dcpomatic.cc:1256
 msgid "&Send DCP to TMS"
 msgstr "&Отправить DCP на TMS (Theatre Management System)"
 
-#: src/tools/dcpomatic.cc:1284 src/tools/dcpomatic_batch.cc:93
+#: src/tools/dcpomatic.cc:1286 src/tools/dcpomatic_batch.cc:93
 #: src/tools/dcpomatic_player.cc:512
 msgid "&Tools"
 msgstr "&Инструменты"
 
-#: src/tools/dcpomatic.cc:1283 src/tools/dcpomatic_player.cc:511
+#: src/tools/dcpomatic.cc:1285 src/tools/dcpomatic_player.cc:511
 msgid "&View"
 msgstr "&Вид"
 
-#: src/tools/dcpomatic.cc:1275 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic.cc:1277 src/tools/dcpomatic_batch.cc:87
 #: src/tools/dcpomatic_kdm.cc:247 src/tools/dcpomatic_player.cc:503
 msgid "About"
 msgstr "О программе"
 
-#: src/tools/dcpomatic.cc:1273 src/tools/dcpomatic_kdm.cc:245
+#: src/tools/dcpomatic.cc:1275 src/tools/dcpomatic_kdm.cc:245
 #: src/tools/dcpomatic_player.cc:501
 msgid "About DCP-o-matic"
 msgstr "О программе DCP-o-matic"
@@ -143,7 +143,7 @@ msgstr "Добавить папку…"
 msgid "Add..."
 msgstr "Добавить…"
 
-#: src/tools/dcpomatic.cc:1589 src/tools/dcpomatic_kdm.cc:639
+#: src/tools/dcpomatic.cc:1591 src/tools/dcpomatic_kdm.cc:639
 #: src/tools/dcpomatic_player.cc:1093 src/tools/dcpomatic_playlist.cc:408
 #, c-format
 msgid ""
@@ -153,7 +153,7 @@ msgstr ""
 "Произошла ошибка: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1598 src/tools/dcpomatic_kdm.cc:648
+#: src/tools/dcpomatic.cc:1600 src/tools/dcpomatic_kdm.cc:648
 #: src/tools/dcpomatic_player.cc:1102 src/tools/dcpomatic_playlist.cc:417
 #, c-format
 msgid ""
@@ -167,7 +167,7 @@ msgstr ""
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "В сервере кодирования DCP-o-matic произошла неизвестная ошибка."
 
-#: src/tools/dcpomatic.cc:883 src/tools/dcpomatic.cc:1603
+#: src/tools/dcpomatic.cc:883 src/tools/dcpomatic.cc:1605
 #: src/tools/dcpomatic_kdm.cc:371 src/tools/dcpomatic_kdm.cc:653
 #: src/tools/dcpomatic_kdm.cc:662 src/tools/dcpomatic_player.cc:1107
 #: src/tools/dcpomatic_playlist.cc:422 src/tools/dcpomatic_playlist.cc:431
@@ -195,7 +195,7 @@ msgstr "CPL"
 msgid "CPL's content is not encrypted."
 msgstr "Содержимое CPL-файла не зашифровано."
 
-#: src/tools/dcpomatic.cc:1266 src/tools/dcpomatic_player.cc:497
+#: src/tools/dcpomatic.cc:1268 src/tools/dcpomatic_player.cc:497
 msgid "Check for updates"
 msgstr "Проверить обновления"
 
@@ -203,11 +203,11 @@ msgstr "Проверить обновления"
 msgid "Close without saving film"
 msgstr "Закрыть без сохранения проекта"
 
-#: src/tools/dcpomatic.cc:1259 src/tools/dcpomatic_player.cc:487
+#: src/tools/dcpomatic.cc:1261 src/tools/dcpomatic_player.cc:487
 msgid "Closed captions..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1232
+#: src/tools/dcpomatic.cc:1234
 msgid "Copy settings\tCtrl-C"
 msgstr "Копировать настройки\tCtrl-C"
 
@@ -249,7 +249,7 @@ msgstr ""
 msgid "Could not load film %1"
 msgstr "Не удалось загрузить проект %1"
 
-#: src/tools/dcpomatic.cc:1514
+#: src/tools/dcpomatic.cc:1516
 msgid "Could not load film %1 (%2)"
 msgstr "Не удалось загрузить проект %1 (%2)"
 
@@ -295,7 +295,7 @@ msgstr "Не удалось открыть каталог DCP"
 msgid "Could not show DCP."
 msgstr "Не удалось открыть каталог DCP."
 
-#: src/tools/dcpomatic.cc:1298 src/tools/dcpomatic_batch.cc:322
+#: src/tools/dcpomatic.cc:1300 src/tools/dcpomatic_batch.cc:322
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
@@ -303,7 +303,7 @@ msgstr ""
 "Не удалось записать в файл базы кинотеатров - %s. Ваши изменения не были "
 "сохранены."
 
-#: src/tools/dcpomatic.cc:1310 src/tools/dcpomatic_batch.cc:334
+#: src/tools/dcpomatic.cc:1312 src/tools/dcpomatic_batch.cc:334
 #: src/tools/dcpomatic_player.cc:822
 #, c-format
 msgid ""
@@ -328,8 +328,8 @@ msgstr "Создать KDM-ключи"
 msgid "DCP"
 msgstr "CPL"
 
-#: src/tools/dcpomatic.cc:484 src/tools/dcpomatic.cc:1455
-#: src/tools/dcpomatic.cc:1493
+#: src/tools/dcpomatic.cc:484 src/tools/dcpomatic.cc:1457
+#: src/tools/dcpomatic.cc:1495
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -410,7 +410,7 @@ msgstr ""
 msgid "Duplicate Film"
 msgstr "Дублировать проект"
 
-#: src/tools/dcpomatic.cc:1214
+#: src/tools/dcpomatic.cc:1216
 msgid "Duplicate and open..."
 msgstr "Дублировать и открыть…"
 
@@ -418,7 +418,7 @@ msgstr "Дублировать и открыть…"
 msgid "Duplicate without saving film"
 msgstr "Дублировать без сохранения проекта"
 
-#: src/tools/dcpomatic.cc:1213
+#: src/tools/dcpomatic.cc:1215
 msgid "Duplicate..."
 msgstr "Дублировать..."
 
@@ -426,7 +426,7 @@ msgstr "Дублировать..."
 msgid "E-cinema"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1264 src/tools/dcpomatic_batch.cc:84
+#: src/tools/dcpomatic.cc:1266 src/tools/dcpomatic_batch.cc:84
 msgid "Encoding servers..."
 msgstr "Сервера кодирования..."
 
@@ -434,7 +434,7 @@ msgstr "Сервера кодирования..."
 msgid "Encrypted"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1252
+#: src/tools/dcpomatic.cc:1254
 msgid "Export...\tCtrl-E"
 msgstr "Экспортировать...\tCtrl-E"
 
@@ -461,7 +461,7 @@ msgstr "Кадров в секунду"
 msgid "Full screen\tF11"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1263
+#: src/tools/dcpomatic.cc:1265
 msgid "Hints..."
 msgstr "Подсказки..."
 
@@ -479,26 +479,22 @@ msgstr ""
 msgid "Loading content"
 msgstr "Загрузка DCP"
 
-#: src/tools/dcpomatic.cc:1249
+#: src/tools/dcpomatic.cc:1251
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "Сгенерировать &KDM...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:1247
+#: src/tools/dcpomatic.cc:1249
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "Сделать DCP в пакетном конвертере"
 
-#: src/tools/dcpomatic.cc:1250
+#: src/tools/dcpomatic.cc:1252
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "Сгенерировать DKDM для DCP-o-matic..."
 
-#: src/tools/dcpomatic.cc:1265
+#: src/tools/dcpomatic.cc:1267
 msgid "Manage templates..."
 msgstr "Управление шаблонами..."
 
-#: src/tools/dcpomatic_playlist.cc:180
-msgid "N"
-msgstr ""
-
 #: src/tools/dcpomatic_playlist.cc:101
 msgid "Name"
 msgstr ""
@@ -507,11 +503,11 @@ msgstr ""
 msgid "New Film"
 msgstr "Новый проект"
 
-#: src/tools/dcpomatic.cc:1207
+#: src/tools/dcpomatic.cc:1209
 msgid "New...\tCtrl-N"
 msgstr "Новый...\tCtrl-N"
 
-#: src/tools/dcpomatic.cc:1256
+#: src/tools/dcpomatic.cc:1258
 msgid "Open DCP in &player"
 msgstr "Открыть в &проигрывателе"
 
@@ -519,7 +515,7 @@ msgstr "Открыть в &проигрывателе"
 msgid "Output"
 msgstr "Вывод"
 
-#: src/tools/dcpomatic.cc:1233
+#: src/tools/dcpomatic.cc:1235
 msgid "Paste settings...\tCtrl-V"
 msgstr "Вставить настройки…\tCtrl-P"
 
@@ -527,16 +523,24 @@ msgstr "Вставить настройки…\tCtrl-P"
 msgid "Pause"
 msgstr ""
 
+#: src/tools/dcpomatic_playlist.cc:180
+msgid "Question|N"
+msgstr ""
+
+#: src/tools/dcpomatic_playlist.cc:180
+msgid "Question|Y"
+msgstr ""
+
 #: src/tools/dcpomatic_kdm.cc:160 src/tools/dcpomatic_playlist.cc:133
 msgid "Remove"
 msgstr "Убрать"
 
-#: src/tools/dcpomatic.cc:1277 src/tools/dcpomatic_kdm.cc:249
+#: src/tools/dcpomatic.cc:1279 src/tools/dcpomatic_kdm.cc:249
 #: src/tools/dcpomatic_player.cc:505
 msgid "Report a problem..."
 msgstr "Сообщить об ошибке..."
 
-#: src/tools/dcpomatic.cc:687 src/tools/dcpomatic.cc:1269
+#: src/tools/dcpomatic.cc:687 src/tools/dcpomatic.cc:1271
 msgid "Restore default preferences"
 msgstr "Сбросить настройки по умолчанию"
 
@@ -544,11 +548,11 @@ msgstr "Сбросить настройки по умолчанию"
 msgid "Resume"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1255
+#: src/tools/dcpomatic.cc:1257
 msgid "S&how DCP"
 msgstr "Открыть папку DCP"
 
-#: src/tools/dcpomatic.cc:1212
+#: src/tools/dcpomatic.cc:1214
 msgid "Save as &template..."
 msgstr "Сохранить как &шаблон..."
 
@@ -574,11 +578,11 @@ msgstr "Сохранить проект и дублировать"
 msgid "Save playlist"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1243
+#: src/tools/dcpomatic.cc:1245
 msgid "Scale to fit &height"
 msgstr "Масштабировать по высоте"
 
-#: src/tools/dcpomatic.cc:1242
+#: src/tools/dcpomatic.cc:1244
 msgid "Scale to fit &width"
 msgstr "Масштабировать по ширине"
 
@@ -615,7 +619,7 @@ msgstr "Выберите DKDM-файл"
 msgid "Send KDM emails"
 msgstr "Отправить KDM-ключи по email"
 
-#: src/tools/dcpomatic.cc:1267
+#: src/tools/dcpomatic.cc:1269
 msgid "Send translations..."
 msgstr ""
 
@@ -657,7 +661,7 @@ msgstr ""
 "DCP-пакет проекта займёт порядка %.1f ГБ, но на целевом диске у вас доступно "
 "только %.1f ГБ. Продолжить в любом случае?"
 
-#: src/tools/dcpomatic.cc:1372 src/tools/dcpomatic_player.cc:804
+#: src/tools/dcpomatic.cc:1374 src/tools/dcpomatic_player.cc:804
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "DCP-o-matic не удалось связаться с сервером загрузки."
 
@@ -675,7 +679,7 @@ msgstr ""
 msgid "The KDM does not allow playback of this content at this time."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1636 src/tools/dcpomatic_batch.cc:477
+#: src/tools/dcpomatic.cc:1638 src/tools/dcpomatic_batch.cc:477
 #: src/tools/dcpomatic_kdm.cc:672 src/tools/dcpomatic_server.cc:350
 #: src/tools/dcpomatic_player.cc:1131
 msgid ""
@@ -693,11 +697,11 @@ msgstr ""
 msgid "The required display devices are not connected correctly."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1374 src/tools/dcpomatic_player.cc:806
+#: src/tools/dcpomatic.cc:1376 src/tools/dcpomatic_player.cc:806
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Нет новых версий DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:1062 src/tools/dcpomatic_batch.cc:230
+#: src/tools/dcpomatic.cc:1064 src/tools/dcpomatic_batch.cc:230
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Есть незавершенные задачи! Вы точно хотите выйти?"
 
@@ -719,7 +723,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:1063 src/tools/dcpomatic_batch.cc:231
+#: src/tools/dcpomatic.cc:1065 src/tools/dcpomatic_batch.cc:231
 msgid "Unfinished jobs"
 msgstr "Незавершенные задачи"
 
@@ -735,14 +739,10 @@ msgstr "Проверить DCP"
 msgid "Verifying DCP"
 msgstr "Проверка DCP"
 
-#: src/tools/dcpomatic.cc:1260
+#: src/tools/dcpomatic.cc:1262
 msgid "Video waveform..."
 msgstr "График видео..."
 
-#: src/tools/dcpomatic_playlist.cc:180
-msgid "Y"
-msgstr ""
-
 #: src/tools/dcpomatic.cc:859
 #, c-format
 msgid ""