Use pofilter to check i18n and fix some .po file glitches.

diff --git a/hacks/check_i18n b/hacks/check_i18n
index b07c0ad17ddf88ca6f3daaac7f8eb528b745509d..d0c7edee8e2a8e8255af9562dc5828f6ab396189 100644 (file)
--- a/hacks/check_i18n
+++ b/hacks/check_i18n
@@ -1,17 +1,15 @@
-#!/usr/bin/python3
+#!/bin/bash

 
 

-import os
+mkdir -p errors

 
 

-for (dirpath, dirs, files) in os.walk('.'):
-    for filename in files:
-        if filename.endswith('.po'):
-            with open(os.path.join(dirpath, filename), 'r') as f:
-                for l in f.readlines():
-                    # Pango markup with corrupted quotation marks
-                    if l.find('span') != -1 and (l.find('«') != -1 or l.find('“') != -1):
-                        print(os.path.join(dirpath, filename))
-                        print(l)
-                    # Badly-spaced placeholders
-                    if not l.find('%%') and (l.find('% 1') != -1 or l.find('% 2') != -1 or l.find('% s') != -1 or l.find('% d') != -1 or l.find('% f') != -1):
-                        print(os.path.join(dirpath, filename))
-                        print(l)
+pofilter -i src/lib/po -o errors/lib --nofuzzy \
+    -t escapes -t nplurals -t printf -t pythonbraceformat -t variables -t xmltags \
+    -t accelerators
+
+pofilter -i src/wx/po -o errors/wx --nofuzzy \
+    -t escapes -t nplurals -t printf -t pythonbraceformat -t variables -t xmltags \
+    -t accelerators
+
+pofilter -i src/tools/po -o errors/tools --nofuzzy \
+    -t escapes -t nplurals -t printf -t pythonbraceformat -t variables -t xmltags \
+    -t accelerators

diff --git a/src/lib/po/da_DK.po b/src/lib/po/da_DK.po
index 9e9dc143266772751450e363ce0189dda4b861a5..d86b952f5379b765cdec31895a84c226314a9c36 100644 (file)
--- a/src/lib/po/da_DK.po
+++ b/src/lib/po/da_DK.po
@@ -41,7 +41,7 @@ msgid ""
 "Display aspect ratio %.2f:1"
 msgstr ""
 "\n"
 "Display aspect ratio %.2f:1"
 msgstr ""
 "\n"

-"Skærmformat %2f:1"
+"Skærmformat %.2f:1"

 
 #: src/lib/video_content.cc:432
 msgid ""
 
 #: src/lib/video_content.cc:432
 msgid ""


@@ -1851,14 +1851,6 @@ msgstr "videobilleder"
 #~ msgid "4:3"
 #~ msgstr "4:3"
 
 #~ msgid "4:3"
 #~ msgstr "4:3"
 

-#~ msgid ""
-#~ "Your DCP frame rate (%1 fps) may cause problems in a few (mostly older) "
-#~ "projectors.  Use 24 or 48 frames per second to be on the safe side."
-#~ msgstr ""
-#~ "Billedhastigheden (%d bps) på din DCP kan give problemer i nogle få "
-#~ "(primært ældre) projektorer. Brug 24 eller 48 billeder i sekunder for at "
-#~ "være på den sikre side."
-

 #~ msgid "Finding length and subtitles"
 #~ msgstr "Finder længde og undertekster"
 
 #~ msgid "Finding length and subtitles"
 #~ msgstr "Finder længde og undertekster"
 


@@ -1877,9 +1869,6 @@ msgstr "videobilleder"
 #~ msgid "could not create file %1"
 #~ msgstr "kunne ikke danne filen %1"
 
 #~ msgid "could not create file %1"
 #~ msgstr "kunne ikke danne filen %1"
 

-#~ msgid "could not open file %1"
-#~ msgstr "kunne ikke åbne filen %"
-

 #~ msgid "Computing audio digest"
 #~ msgstr "Beregner lydresume"
 
 #~ msgid "Computing audio digest"
 #~ msgstr "Beregner lydresume"
 


@@ -1896,9 +1885,6 @@ msgstr "videobilleder"
 #~ msgid "Video"
 #~ msgstr "Video størrelse"
 
 #~ msgid "Video"
 #~ msgstr "Video størrelse"
 

-#~ msgid "could not open audio file for reading"
-#~ msgstr "lydfil kunne ikke indlæses"
-

 #~ msgid "Video length"
 #~ msgstr "Video længde"
 
 #~ msgid "Video length"
 #~ msgstr "Video længde"
 

diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 064c933913a4a740307874258ad77922b1136294..6727ed41ff66efda8790a15171e024bc5d1de68a 100644 (file)
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -1503,7 +1503,7 @@ msgstr ""
 "Das DCP ist auf eine Bildrate von %1 fps eingestellt. Diese Bildrate wird "
 "nicht von allen Projektionssystemen unterstützt!Wählen Sie Bildraten "
 "abweichend von 24fps oder 48fps(3D) nicht leichtfertig! Ändern Sie die "
 "Das DCP ist auf eine Bildrate von %1 fps eingestellt. Diese Bildrate wird "
 "nicht von allen Projektionssystemen unterstützt!Wählen Sie Bildraten "
 "abweichend von 24fps oder 48fps(3D) nicht leichtfertig! Ändern Sie die "

-"Bildrate gegebenenfalls in %2fps!"
+"Bildrate gegebenenfalls in %2 fps!"

 
 #: src/lib/hints.cc:165
 msgid ""
 
 #: src/lib/hints.cc:165
 msgid ""


@@ -1514,7 +1514,7 @@ msgstr ""
 "Das DCP ist auf eine Bildrate von %1 fps eingestellt. Diese Bildrate wird "
 "nicht von allen Projektionssystemen unterstützt!Wählen Sie Bildraten "
 "abweichend von 24fps oder 48fps(3D) nicht leichtfertig! Ändern Sie die "
 "Das DCP ist auf eine Bildrate von %1 fps eingestellt. Diese Bildrate wird "
 "nicht von allen Projektionssystemen unterstützt!Wählen Sie Bildraten "
 "abweichend von 24fps oder 48fps(3D) nicht leichtfertig! Ändern Sie die "

-"Bildrate gegebenenfalls in %2fps!"
+"Bildrate gegebenenfalls in %2 fps!"

 
 #: src/lib/hints.cc:175
 msgid ""
 
 #: src/lib/hints.cc:175
 msgid ""


@@ -1937,15 +1937,6 @@ msgstr "Video Bilder"
 #~ msgid "IMAX"
 #~ msgstr "IMAX"
 
 #~ msgid "IMAX"
 #~ msgstr "IMAX"
 

-#~ msgid ""
-#~ "Your DCP frame rate (%1 fps) may cause problems in a few (mostly older) "
-#~ "projectors.  Use 24 or 48 frames per second to be on the safe side."
-#~ msgstr ""
-#~ "Ihre gewählte DCP Bildrate (vermutlich resultierend aus Quell-Inhalten "
-#~ "mit dieser Bildrate im Projekt) kann auf älteren Projektionssystemen "
-#~ "Probleme verursachen. Sicherheitshalber sollten Sie 24fps (2D) oder 48fps "
-#~ "(3D) verwenden."
-

 #~ msgid "Finding length and subtitles"
 #~ msgstr "Länge und Untertitel werden ermittelt"
 
 #~ msgid "Finding length and subtitles"
 #~ msgstr "Länge und Untertitel werden ermittelt"
 

diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index d7443884e5872433ef9c242e8af1331898079d43..7f623af3c1a6609464d59c0df8d3d5704434e699 100644 (file)
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -1630,7 +1630,7 @@ msgstr "no se pudo abrir la sesión SSH"
 
 #: src/lib/exceptions.cc:49
 msgid "could not write to file %1 (%2)"
 
 #: src/lib/exceptions.cc:49
 msgid "could not write to file %1 (%2)"

-msgstr "no se pudo escribir en el fichero (%1)"
+msgstr "no se pudo escribir en el fichero %1 (%2)"

 
 #: src/lib/dcpomatic_socket.cc:65
 msgid "error during async_connect (%1)"
 
 #: src/lib/dcpomatic_socket.cc:65
 msgid "error during async_connect (%1)"


@@ -1914,9 +1914,6 @@ msgstr "fotogramas"
 #~ msgid "Video size"
 #~ msgstr "Tamaño del video"
 
 #~ msgid "Video size"
 #~ msgstr "Tamaño del video"
 

-#~ msgid "could not read from file"
-#~ msgstr "No se pudo leer del fichero %1 (%2)"
-

 #, fuzzy
 #~ msgid "NC"
 #~ msgstr "C"
 #, fuzzy
 #~ msgid "NC"
 #~ msgstr "C"


@@ -1933,9 +1930,6 @@ msgstr "fotogramas"
 #~ msgid "could not run sample-rate converter"
 #~ msgstr "no se pudo ejecutar el conversor de velocidad"
 
 #~ msgid "could not run sample-rate converter"
 #~ msgstr "no se pudo ejecutar el conversor de velocidad"
 

-#~ msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
-#~ msgstr "no se pudo ejecutar el conversor de velocidad"
-

 #~ msgid "1.375"
 #~ msgstr "1.375"
 
 #~ msgid "1.375"
 #~ msgstr "1.375"
 

diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 36baf18091c6ac473f3bc4b4ac9c8d6e94131bb0..3851efdf6b4f0ee706583177da17c17099001a7d 100644 (file)
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -1062,7 +1062,7 @@ msgstr "Preparato per la frequenza fotogrammi del video"
 
 #: src/lib/exceptions.cc:85
 msgid "Programming error at %1:%2 %3"
 
 #: src/lib/exceptions.cc:85
 msgid "Programming error at %1:%2 %3"

-msgstr "Errore di programmazione a %1:%2"
+msgstr "Errore di programmazione a %1:%2 %3"

 
 #: src/lib/dcp_content_type.cc:57
 msgid "Promo"
 
 #: src/lib/dcp_content_type.cc:57
 msgid "Promo"


@@ -1644,7 +1644,7 @@ msgstr "Impossibile avviare la sessione SSH"
 
 #: src/lib/exceptions.cc:49
 msgid "could not write to file %1 (%2)"
 
 #: src/lib/exceptions.cc:49
 msgid "could not write to file %1 (%2)"

-msgstr "Impossibile scrivere il file (%1)"
+msgstr "Impossibile scrivere il file %1 (%2)"

 
 #: src/lib/dcpomatic_socket.cc:65
 msgid "error during async_connect (%1)"
 
 #: src/lib/dcpomatic_socket.cc:65
 msgid "error during async_connect (%1)"

diff --git a/src/lib/po/pl_PL.po b/src/lib/po/pl_PL.po
index ee12261da6b779d96ace94e592678de335bed841..88c447b667d4a5dc75d7188fc93622cd0eabd29b 100644 (file)
--- a/src/lib/po/pl_PL.po
+++ b/src/lib/po/pl_PL.po
@@ -1062,7 +1062,7 @@ msgstr "Przygotowany na liczbę kl/s"
 
 #: src/lib/exceptions.cc:85
 msgid "Programming error at %1:%2 %3"
 
 #: src/lib/exceptions.cc:85
 msgid "Programming error at %1:%2 %3"

-msgstr "Błąd programowania w lini %1:%2"
+msgstr "Błąd programowania w lini %1:%2 %3"

 
 #: src/lib/dcp_content_type.cc:57
 msgid "Promo"
 
 #: src/lib/dcp_content_type.cc:57
 msgid "Promo"

diff --git a/src/lib/po/pt_BR.po b/src/lib/po/pt_BR.po
index 576ab5f5e9d2ae869b0c20ca5bea9d84c5f26cb7..e2124189d117ceb03a91abda1305dbda435626ae 100644 (file)
--- a/src/lib/po/pt_BR.po
+++ b/src/lib/po/pt_BR.po
@@ -98,7 +98,7 @@ msgstr ""
 
 #: src/lib/atmos_mxf_content.cc:83
 msgid "%1 [Atmos]"
 
 #: src/lib/atmos_mxf_content.cc:83
 msgid "%1 [Atmos]"

-msgstr "[Dolby Atmos]"
+msgstr "%1 [Dolby Atmos]"

 
 #: src/lib/dcp_content.cc:268
 msgid "%1 [DCP]"
 
 #: src/lib/dcp_content.cc:268
 msgid "%1 [DCP]"


@@ -1079,7 +1079,7 @@ msgstr "Preparado para frame rate de vídeo"
 
 #: src/lib/exceptions.cc:85
 msgid "Programming error at %1:%2 %3"
 
 #: src/lib/exceptions.cc:85
 msgid "Programming error at %1:%2 %3"

-msgstr "Erro de programação em %1:%2"
+msgstr "Erro de programação em %1:%2 %3"

 
 #: src/lib/dcp_content_type.cc:57
 msgid "Promo"
 
 #: src/lib/dcp_content_type.cc:57
 msgid "Promo"

diff --git a/src/lib/po/pt_PT.po b/src/lib/po/pt_PT.po
index 844a20f742e9be3d42cd6c00f888ea7553fea4d5..d073c65b7e5a1eb1ce2787a965b9bd9d8fed9f00 100644 (file)
--- a/src/lib/po/pt_PT.po
+++ b/src/lib/po/pt_PT.po
@@ -699,7 +699,7 @@ msgstr "Cada fotograma do conteúdo será repetido %1 vezes no DCP.\n"
 
 #: src/lib/send_kdm_email_job.cc:61
 msgid "Email KDMs"
 
 #: src/lib/send_kdm_email_job.cc:61
 msgid "Email KDMs"

-msgstr "Enviar chaves KDM por email para %1"
+msgstr "Enviar chaves KDM por email"

 
 #: src/lib/send_kdm_email_job.cc:64
 msgid "Email KDMs for %1"
 
 #: src/lib/send_kdm_email_job.cc:64
 msgid "Email KDMs for %1"


@@ -711,7 +711,7 @@ msgstr ""
 
 #: src/lib/send_problem_report_job.cc:59
 msgid "Email problem report"
 
 #: src/lib/send_problem_report_job.cc:59
 msgid "Email problem report"

-msgstr "Enviar relatório de problemas para %1"
+msgstr "Enviar relatório de problemas"

 
 #: src/lib/send_problem_report_job.cc:62
 msgid "Email problem report for %1"
 
 #: src/lib/send_problem_report_job.cc:62
 msgid "Email problem report for %1"

diff --git a/src/lib/po/ru_RU.po b/src/lib/po/ru_RU.po
index 87e3920c15572c3ce06aaa43d936811943d4ea87..06064967b3816937855076242dc1b182d3913c68 100644 (file)
--- a/src/lib/po/ru_RU.po
+++ b/src/lib/po/ru_RU.po
@@ -238,11 +238,11 @@ msgstr "Идёт анализ аудио"
 
 #: src/lib/audio_content.cc:257
 msgid "Audio will be resampled from %1Hz to %2Hz"
 
 #: src/lib/audio_content.cc:257
 msgid "Audio will be resampled from %1Hz to %2Hz"

-msgstr "Аудио будет ресэмплировано с %1Гц на %2Гц"
+msgstr "Аудио будет ресэмплировано с %1 Гц на %2 Гц"

 
 #: src/lib/audio_content.cc:259
 msgid "Audio will be resampled to %1Hz"
 
 #: src/lib/audio_content.cc:259
 msgid "Audio will be resampled to %1Hz"

-msgstr "Аудио будет ресэмплировано на %1Гц"
+msgstr "Аудио будет ресэмплировано на %1 Гц"

 
 #: src/lib/audio_content.cc:248
 msgid "Audio will not be resampled"
 
 #: src/lib/audio_content.cc:248
 msgid "Audio will not be resampled"


@@ -1202,7 +1202,7 @@ msgstr "Размер"
 
 #: src/lib/audio_content.cc:252
 msgid "Some audio will be resampled to %1Hz"
 
 #: src/lib/audio_content.cc:252
 msgid "Some audio will be resampled to %1Hz"

-msgstr "Некоторое аудио будет ресемплировано на %1Гц"
+msgstr "Некоторое аудио будет ресемплировано на %1 Гц"

 
 #: src/lib/check_content_change_job.cc:86
 msgid ""
 
 #: src/lib/check_content_change_job.cc:86
 msgid ""

diff --git a/src/lib/po/sk_SK.po b/src/lib/po/sk_SK.po
index ca87e9e5af9879e127c5c254bb3217c1c8fc5adb..d4d97aeabcf3ef97c20cb1ea918caf05f752faaa 100644 (file)
--- a/src/lib/po/sk_SK.po
+++ b/src/lib/po/sk_SK.po
@@ -547,7 +547,7 @@ msgstr "Nemôžem otvoriť %1"
 
 #: src/lib/curl_uploader.cc:86 src/lib/scp_uploader.cc:101
 msgid "Could not open %1 to send"
 
 #: src/lib/curl_uploader.cc:86 src/lib/scp_uploader.cc:101
 msgid "Could not open %1 to send"

-msgstr "Nemôžem otvoriť 1% na poslanie"
+msgstr "Nemôžem otvoriť %1 na poslanie"

 
 #: src/lib/internet.cc:118 src/lib/internet.cc:123
 msgid "Could not open downloaded ZIP file"
 
 #: src/lib/internet.cc:118 src/lib/internet.cc:123
 msgid "Could not open downloaded ZIP file"

diff --git a/src/lib/po/uk_UA.po b/src/lib/po/uk_UA.po
index c2f0003c00b87e2e57db4212341e57a1b911f929..33cf00503651885c26a8694bf3a579c8d5746c05 100644 (file)
--- a/src/lib/po/uk_UA.po
+++ b/src/lib/po/uk_UA.po
@@ -240,11 +240,11 @@ msgstr "Аналіз аудіо"
 
 #: src/lib/audio_content.cc:257
 msgid "Audio will be resampled from %1Hz to %2Hz"
 
 #: src/lib/audio_content.cc:257
 msgid "Audio will be resampled from %1Hz to %2Hz"

-msgstr "Аудіо буде ресемпловано з %1Гц в %2Гц"
+msgstr "Аудіо буде ресемпловано з %1 Гц в %2 Гц"

 
 #: src/lib/audio_content.cc:259
 msgid "Audio will be resampled to %1Hz"
 
 #: src/lib/audio_content.cc:259
 msgid "Audio will be resampled to %1Hz"

-msgstr "Аудіо будет ресемпловано в %1Гц"
+msgstr "Аудіо будет ресемпловано в %1 Гц"

 
 #: src/lib/audio_content.cc:248
 msgid "Audio will not be resampled"
 
 #: src/lib/audio_content.cc:248
 msgid "Audio will not be resampled"


@@ -1198,7 +1198,7 @@ msgstr "Розмір"
 
 #: src/lib/audio_content.cc:252
 msgid "Some audio will be resampled to %1Hz"
 
 #: src/lib/audio_content.cc:252
 msgid "Some audio will be resampled to %1Hz"

-msgstr "Деяке аудіо будет ресемпловано в %1Гц"
+msgstr "Деяке аудіо будет ресемпловано в %1 Гц"

 
 #: src/lib/check_content_change_job.cc:86
 msgid ""
 
 #: src/lib/check_content_change_job.cc:86
 msgid ""

diff --git a/src/lib/po/zh_CN.po b/src/lib/po/zh_CN.po
index a736be285d30155035ebe8da3183bf3c60b134e4..7da57cf017a62a5ee576e3c11f12570c00a82db8 100644 (file)
--- a/src/lib/po/zh_CN.po
+++ b/src/lib/po/zh_CN.po
@@ -319,7 +319,7 @@ msgstr "不能包含斜杠"
 
 #: src/lib/exceptions.cc:61
 msgid "Cannot handle pixel format %1 during %2"
 
 #: src/lib/exceptions.cc:61
 msgid "Cannot handle pixel format %1 during %2"

-msgstr "在 %2不能处理图片格式 %1"
+msgstr "在 %2 不能处理图片格式 %1"

 
 #: src/lib/film.cc:1348
 msgid "Cannot make a KDM as this project is not encrypted."
 
 #: src/lib/film.cc:1348
 msgid "Cannot make a KDM as this project is not encrypted."


@@ -614,7 +614,7 @@ msgstr "将使用隔帧打包DCP.\n"
 msgid ""
 "DCP-o-matic could not open the file %1 (%2).  Perhaps it does not exist or "
 "is in an unexpected format."
 msgid ""
 "DCP-o-matic could not open the file %1 (%2).  Perhaps it does not exist or "
 "is in an unexpected format."

-msgstr "无法打开文件%1。文件不存在或格式无法识别。"
+msgstr "无法打开文件%1 (%2)。文件不存在或格式无法识别。"

 
 #: src/lib/film.cc:1270
 msgid ""
 
 #: src/lib/film.cc:1270
 msgid ""


@@ -677,7 +677,7 @@ msgstr "该DCP中将每一帧复制为两帧。\n"
 
 #: src/lib/frame_rate_change.cc:108
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 
 #: src/lib/frame_rate_change.cc:108
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"

-msgstr "每个内容帧将在DCP中重复％1次。\n"
+msgstr "每个内容帧将在DCP中重复%1次。\n"

 
 #: src/lib/send_kdm_email_job.cc:61
 msgid "Email KDMs"
 
 #: src/lib/send_kdm_email_job.cc:61
 msgid "Email KDMs"


@@ -1252,19 +1252,19 @@ msgstr "磁盘空间不足，清理磁盘空间以继续."
 
 #: src/lib/playlist.cc:223
 msgid "The file %1 has been moved %2 milliseconds earlier."
 
 #: src/lib/playlist.cc:223
 msgid "The file %1 has been moved %2 milliseconds earlier."

-msgstr "文件 1% 被向前移动了 2% 毫秒."
+msgstr "文件 %1 被向前移动了 %2 毫秒."

 
 #: src/lib/playlist.cc:218
 msgid "The file %1 has been moved %2 milliseconds later."
 
 #: src/lib/playlist.cc:218
 msgid "The file %1 has been moved %2 milliseconds later."

-msgstr "文件 1% 被向后移动了 2% 毫秒."
+msgstr "文件 %1 被向后移动了 %2 毫秒."

 
 #: src/lib/playlist.cc:243
 msgid "The file %1 has been trimmed by %2 milliseconds less."
 
 #: src/lib/playlist.cc:243
 msgid "The file %1 has been trimmed by %2 milliseconds less."

-msgstr "文件 1% 被缩短了 2% 毫秒."
+msgstr "文件 %1 被缩短了 %2 毫秒."

 
 #: src/lib/playlist.cc:238
 msgid "The file %1 has been trimmed by %2 milliseconds more."
 
 #: src/lib/playlist.cc:238
 msgid "The file %1 has been trimmed by %2 milliseconds more."

-msgstr "文件 1% 被延长了 2% 毫秒."
+msgstr "文件 %1 被延长了 %2 毫秒."

 
 #: src/lib/hints.cc:206
 msgid ""
 
 #: src/lib/hints.cc:206
 msgid ""


@@ -1565,11 +1565,11 @@ msgstr "无法移动的音频文件 (%1)"
 
 #: src/lib/exceptions.cc:33
 msgid "could not open file %1 for reading (%2)"
 
 #: src/lib/exceptions.cc:33
 msgid "could not open file %1 for reading (%2)"

-msgstr "读取 %1文件失败"
+msgstr "读取 %1文件失败(%2)"

 
 #: src/lib/exceptions.cc:33
 msgid "could not open file %1 for writing (%2)"
 
 #: src/lib/exceptions.cc:33
 msgid "could not open file %1 for writing (%2)"

-msgstr "写入 %1文件失败"
+msgstr "写入 %1文件失败(%2)"

 
 #: src/lib/exceptions.cc:43
 msgid "could not read from file %1 (%2)"
 
 #: src/lib/exceptions.cc:43
 msgid "could not read from file %1 (%2)"


@@ -1585,7 +1585,7 @@ msgstr "无法启动SSH"
 
 #: src/lib/exceptions.cc:49
 msgid "could not write to file %1 (%2)"
 
 #: src/lib/exceptions.cc:49
 msgid "could not write to file %1 (%2)"

-msgstr "不能写入文件 (%1)"
+msgstr "不能写入文件 %1 (%2)"

 
 #: src/lib/dcpomatic_socket.cc:65
 msgid "error during async_connect (%1)"
 
 #: src/lib/dcpomatic_socket.cc:65
 msgid "error during async_connect (%1)"


@@ -1771,17 +1771,6 @@ msgstr "视频帧"
 #~ msgid "it overlaps other subtitle content; remove the other content."
 #~ msgstr "字幕文件重复，请删除重复项."
 
 #~ msgid "it overlaps other subtitle content; remove the other content."
 #~ msgstr "字幕文件重复，请删除重复项."
 

-#~ msgid ""
-#~ "The DCP %1 was being referred to by this film.  This not now possible "
-#~ "because the reel sizes in the film no longer agree with those in the "
-#~ "imported DCP.\n"
-#~ "\n"
-#~ "Setting the 'Reel type' to 'split by video content' will probably help.\n"
-#~ "\n"
-#~ "After doing that you would need to re-tick the appropriate 'refer to "
-#~ "existing DCP' checkboxes."
-#~ msgstr "DCP中的电影内容太大，请使用 【 分卷模式 】后再试一次。"
-

 #~ msgid "Could not find pixel format for video."
 #~ msgstr "找不到视频格式"
 
 #~ msgid "Could not find pixel format for video."
 #~ msgstr "找不到视频格式"
 


@@ -1859,9 +1848,6 @@ msgstr "视频帧"
 #~ msgid "Video size"
 #~ msgstr "视频大小"
 
 #~ msgid "Video size"
 #~ msgstr "视频大小"
 

-#~ msgid "could not read from file"
-#~ msgstr "无法从文件中读取 %1 (%2)"
-

 #~ msgid "KDM delivery"
 #~ msgstr "Envío de KDM"
 
 #~ msgid "KDM delivery"
 #~ msgstr "Envío de KDM"
 


@@ -1874,9 +1860,6 @@ msgstr "视频帧"
 #~ msgid "could not run sample-rate converter"
 #~ msgstr "no se pudo ejecutar el conversor de velocidad"
 
 #~ msgid "could not run sample-rate converter"
 #~ msgstr "no se pudo ejecutar el conversor de velocidad"
 

-#~ msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
-#~ msgstr "no se pudo ejecutar el conversor de velocidad"
-

 #~ msgid "1.375"
 #~ msgstr "1.375"
 
 #~ msgid "1.375"
 #~ msgstr "1.375"
 

diff --git a/src/tools/po/da_DK.po b/src/tools/po/da_DK.po
index df134bfef16a47826d4eca3989c0417cc6b6f89a..0a2a8986c4f8bbeedd9a120392c00b7248b99adb 100644 (file)
--- a/src/tools/po/da_DK.po
+++ b/src/tools/po/da_DK.po
@@ -639,8 +639,8 @@ msgid ""
 "as much space if the filesystem supported hard links, but it does not.  Do "
 "you want to continue anyway?"
 msgstr ""
 "as much space if the filesystem supported hard links, but it does not.  Do "
 "you want to continue anyway?"
 msgstr ""

-"DCPen og midlertidige filer til denne film kommer til at fylde ca. %1f Gb og "
-"disken du bruger har kun %1f Gb tilgængeligt. Du ville kun skulle bruge "
+"DCPen og midlertidige filer til denne film kommer til at fylde ca. %.1f Gb og "
+"disken du bruger har kun %.1f Gb tilgængeligt. Du ville kun skulle bruge "

 "halvt så megen plads hvis filsystemet understøttede hårde links, men det gør "
 "det ikke. Ønsker du alligevel at fortsætte?"
 
 "halvt så megen plads hvis filsystemet understøttede hårde links, men det gør "
 "det ikke. Ønsker du alligevel at fortsætte?"
 

diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index 5d4e48ba6f7ce3dede6caa73032fad945dce7f34..40b8324523d827d080d722adb263ee8129d79348 100644 (file)
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -316,7 +316,7 @@ msgstr ""
 #: src/tools/dcpomatic_player.cc:833
 msgid "Could not write to config file.  Your changes have not been saved."
 msgstr ""
 #: src/tools/dcpomatic_player.cc:833
 msgid "Could not write to config file.  Your changes have not been saved."
 msgstr ""

-"Konnte nicht in die Konfigurationsdatei schreiben (%s). Ihre Änderungen "
+"Konnte nicht in die Konfigurationsdatei schreiben. Ihre Änderungen "

 "wurden nicht gespeichert."
 
 #: src/tools/dcpomatic_kdm.cc:174
 "wurden nicht gespeichert."
 
 #: src/tools/dcpomatic_kdm.cc:174

diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 08cae8ac726368cf309e946980f5418181eaee43..47932f63c24e59f26357b1480b253b39289378ca 100644 (file)
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -253,7 +253,7 @@ msgstr "No se pudo cargar la película %1"
 
 #: src/tools/dcpomatic.cc:1532
 msgid "Could not load film %1 (%2)"
 
 #: src/tools/dcpomatic.cc:1532
 msgid "Could not load film %1 (%2)"

-msgstr "No se pudo cargar la película %s (%s)"
+msgstr "No se pudo cargar la película %1 (%2)"

 
 #: src/tools/dcpomatic.cc:760
 msgid "Could not make DCP."
 
 #: src/tools/dcpomatic.cc:760
 msgid "Could not make DCP."

diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index f9242f2d5730a6f574ca58ba1ea41511aef322b6..0596a850e9f6aedff1b3704cb59ebadbb6c3983c 100644 (file)
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -29,7 +29,7 @@ msgstr "%d KDMs créées dans %s"
 
 #: src/tools/dcpomatic_batch.cc:69
 msgid "&Add Film...\tCtrl-A"
 
 #: src/tools/dcpomatic_batch.cc:69
 msgid "&Add Film...\tCtrl-A"

-msgstr "& Ajouter Film ... Ctrl-A"
+msgstr "&Ajouter Film ... Ctrl-A"

 
 #: src/tools/dcpomatic_player.cc:455
 msgid "&Add KDM..."
 
 #: src/tools/dcpomatic_player.cc:455
 msgid "&Add KDM..."


@@ -665,7 +665,7 @@ msgid ""
 "want to add this film to the queue anyway?"
 msgstr ""
 "Le DCP de ce film et les autres déjà présent en file d'attente occuperont "
 "want to add this film to the queue anyway?"
 msgstr ""
 "Le DCP de ce film et les autres déjà présent en file d'attente occuperont "

-"environ %1.f GB. Le disque que vous utilisez ne dispose que de %.1f Go "
+"environ %.1f GB. Le disque que vous utilisez ne dispose que de %.1f Go "

 "disponible(s). Souhaitez-vous continuer à ajouter ce film à la file "
 "d'attente quand même?"
 
 "disponible(s). Souhaitez-vous continuer à ajouter ce film à la file "
 "d'attente quand même?"
 

diff --git a/src/tools/po/ru_RU.po b/src/tools/po/ru_RU.po
index 0d5a0e90527eb6a1a20006b9884faee5e8603e26..8e4f59d5c2cb5119423994fc04ea96bf4f089da4 100644 (file)
--- a/src/tools/po/ru_RU.po
+++ b/src/tools/po/ru_RU.po
@@ -310,7 +310,7 @@ msgstr ""
 #: src/tools/dcpomatic_player.cc:833
 msgid "Could not write to config file.  Your changes have not been saved."
 msgstr ""
 #: src/tools/dcpomatic_player.cc:833
 msgid "Could not write to config file.  Your changes have not been saved."
 msgstr ""

-"Не удалось записать в файл кинфгигурации - %s.  Ваши изменения не были "
+"Не удалось записать в файл кинфгигурации.  Ваши изменения не были "

 "сохранены."
 
 #: src/tools/dcpomatic_kdm.cc:174
 "сохранены."
 
 #: src/tools/dcpomatic_kdm.cc:174

diff --git a/src/tools/po/zh_CN.po b/src/tools/po/zh_CN.po
index d41a3368dc6110e546dc8f753ec7ed15b6dfdcef..de483b442a8e9d793163e7d5d60ad272f69de6c8 100644 (file)
--- a/src/tools/po/zh_CN.po
+++ b/src/tools/po/zh_CN.po
@@ -230,7 +230,7 @@ msgstr "无法找到播放器."
 
 #: src/tools/dcpomatic_player.cc:621 src/tools/dcpomatic_player.cc:1047
 msgid "Could not load DCP %1."
 
 #: src/tools/dcpomatic_player.cc:621 src/tools/dcpomatic_player.cc:1047
 msgid "Could not load DCP %1."

-msgstr "无法载入DCP %s。"
+msgstr "无法载入DCP %1。"

 
 #: src/tools/dcpomatic_player.cc:603
 msgid "Could not load KDM."
 
 #: src/tools/dcpomatic_player.cc:603
 msgid "Could not load KDM."


@@ -243,11 +243,11 @@ msgstr "无法从 %s 载入DCP"
 
 #: src/tools/dcpomatic_batch.cc:447
 msgid "Could not load film %1"
 
 #: src/tools/dcpomatic_batch.cc:447
 msgid "Could not load film %1"

-msgstr "无法载入工程 %s (%s)"
+msgstr "无法载入工程 %1"

 
 #: src/tools/dcpomatic.cc:1532
 msgid "Could not load film %1 (%2)"
 
 #: src/tools/dcpomatic.cc:1532
 msgid "Could not load film %1 (%2)"

-msgstr "无法加载工程 %s (%s)"
+msgstr "无法加载工程 %1 (%2)"

 
 #: src/tools/dcpomatic.cc:760
 msgid "Could not make DCP."
 
 #: src/tools/dcpomatic.cc:760
 msgid "Could not make DCP."

diff --git a/src/wx/po/cs_CZ.po b/src/wx/po/cs_CZ.po
index 98912b35c9e663782450fb9278e0da7cb6976d38..027264575d04d88e9eb4c23885d5c4ab3c313d5b 100644 (file)
--- a/src/wx/po/cs_CZ.po
+++ b/src/wx/po/cs_CZ.po
@@ -696,7 +696,7 @@ msgstr "Tvůrce"
 #: src/wx/audio_dialog.cc:436
 #, c-format
 msgid "Cursor: %.1fdB at %s"
 #: src/wx/audio_dialog.cc:436
 #, c-format
 msgid "Cursor: %.1fdB at %s"

-msgstr "Kurzor: %1fdb v %s"
+msgstr "Kurzor: %.1fdb v %s"

 
 #: src/wx/audio_dialog.cc:430
 msgid "Cursor: none"
 
 #: src/wx/audio_dialog.cc:430
 msgid "Cursor: none"

diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 9a65ed877bb37694ffdca87314bbac28e743215c..5148f238bc0cf2b4d4b8654a3eb1128f8eac3337 100644 (file)
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -2375,7 +2375,7 @@ msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""

-"Le répertoire %s existe déjà et n'est pas vide. Etes- vous certain de "
+"Le répertoire %1 existe déjà et n'est pas vide. Etes- vous certain de "

 "vouloir l'utiliser?"
 
 #: src/wx/config_move_dialog.cc:35
 "vouloir l'utiliser?"
 
 #: src/wx/config_move_dialog.cc:35

diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 9f1fead581680889e925a2d60b5b28986763a87c..fe203a97c49aa8c4a0ec27273db03af5e0425d6a 100644 (file)
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -668,7 +668,7 @@ msgstr "Impossibile leggere il file del certificato (%s)"
 #: src/wx/download_certificate_panel.cc:60 src/wx/screen_dialog.cc:201
 #: src/wx/screen_dialog.cc:206
 msgid "Could not read certificate file."
 #: src/wx/download_certificate_panel.cc:60 src/wx/screen_dialog.cc:201
 #: src/wx/screen_dialog.cc:206
 msgid "Could not read certificate file."

-msgstr "Impossibile leggere il file del certificato (%s)"
+msgstr "Impossibile leggere il file del certificato."

 
 #: src/wx/config_dialog.cc:741
 #, c-format
 
 #: src/wx/config_dialog.cc:741
 #, c-format

diff --git a/src/wx/po/pl_PL.po b/src/wx/po/pl_PL.po
index 0086c8ad886b72eaddfd01d29f10960128e92567..a4fdd94c511de12a0d25293ef56fd47e943e5bb3 100644 (file)
--- a/src/wx/po/pl_PL.po
+++ b/src/wx/po/pl_PL.po
@@ -1468,7 +1468,7 @@ msgstr "Dziennik"
 #: src/wx/audio_dialog.cc:411
 #, c-format
 msgid "Loudness range %.2f LU"
 #: src/wx/audio_dialog.cc:411
 #, c-format
 msgid "Loudness range %.2f LU"

-msgstr "Zakres głośności %2f LU"
+msgstr "Zakres głośności %.2f LU"

 
 #: src/wx/batch_job_view.cc:48
 msgid "Lower priority"
 
 #: src/wx/batch_job_view.cc:48
 msgid "Lower priority"

diff --git a/src/wx/po/ru_RU.po b/src/wx/po/ru_RU.po
index d0dc058518cf80d334805a3dc5a23ff879fc7bd4..7c67bab9e2aee122166c9f2728f63330ef4bba9c 100644 (file)
--- a/src/wx/po/ru_RU.po
+++ b/src/wx/po/ru_RU.po
@@ -2367,7 +2367,7 @@ msgstr ""
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"

-msgstr "Папка %s уже существует и не пуста. Вы точно хотите использовать её?"
+msgstr "Папка %1 уже существует и не пуста. Вы точно хотите использовать её?"

 
 #: src/wx/config_move_dialog.cc:35
 #, c-format
 
 #: src/wx/config_move_dialog.cc:35
 #, c-format

diff --git a/src/wx/po/uk_UA.po b/src/wx/po/uk_UA.po
index c5068f6aafc0e9098d126c8f398ed4efce782662..de45164c50e46fe95780f050344c8d17129e274c 100644 (file)
--- a/src/wx/po/uk_UA.po
+++ b/src/wx/po/uk_UA.po
@@ -2390,7 +2390,7 @@ msgstr ""
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"

-msgstr "Папка %s вже існує и не є пустою. Ви точно хочете використовувати її?"
+msgstr "Папка %1 вже існує и не є пустою. Ви точно хочете використовувати її?"

 
 #: src/wx/config_move_dialog.cc:35
 #, c-format
 
 #: src/wx/config_move_dialog.cc:35
 #, c-format

diff --git a/src/wx/po/zh_CN.po b/src/wx/po/zh_CN.po
index 2fde6233bf7a2e443cf6d14ea25cb03cc42c75c5..b2a8ef6d522b44b65970f448be75e53f89f9a4aa 100644 (file)
--- a/src/wx/po/zh_CN.po
+++ b/src/wx/po/zh_CN.po
@@ -681,7 +681,7 @@ msgstr "无法读取Key文件，因为文件过长 (%s)"
 #: src/wx/film_viewer.cc:669
 msgid ""
 "Could not set up audio output.  There will be no audio during the preview."
 #: src/wx/film_viewer.cc:669
 msgid ""
 "Could not set up audio output.  There will be no audio during the preview."

-msgstr "不能设置音频输出 (%s)。因此预览时将没有音频输出."
+msgstr "不能设置音频输出。因此预览时将没有音频输出."

 
 #: src/wx/full_config_dialog.cc:1309
 msgid "Cover Sheet"
 
 #: src/wx/full_config_dialog.cc:1309
 msgid "Cover Sheet"


@@ -2345,7 +2345,7 @@ msgstr "文件不匹配，请删除不规范的文件或添加正确的文件."
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"

-msgstr "已存在文件 %s 并不为空，是否覆盖？"
+msgstr "已存在文件 %1 并不为空，是否覆盖？"

 
 #: src/wx/config_move_dialog.cc:35
 #, c-format
 
 #: src/wx/config_move_dialog.cc:35
 #, c-format