From 0eeaf21223a133ab58de1e4aa859474351cfd91a Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 31 Jan 2010 20:09:59 +0100 Subject: [PATCH] Removed extra carriage return causing dialog re-layouting after muxing --- po/de.po | 28 ++++++++++++++-------------- po/ja.po | 28 ++++++++++++++-------------- po/zh_CN.po | 32 ++++++++++++++++---------------- po/zh_TW.po | 32 ++++++++++++++++---------------- src/mmg/mux_dialog.cpp | 4 ++-- 5 files changed, 62 insertions(+), 62 deletions(-) diff --git a/po/de.po b/po/de.po index 55af511dd..4bd482fb5 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-02-18 23:52+0100\n" -"PO-Revision-Date: 2010-01-23 12:31+0100\n" +"PO-Revision-Date: 2010-01-31 20:01+0100\n" "Last-Translator: Moritz Bunkus \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -1775,7 +1775,7 @@ msgstr "Über allen anderen Fenstern" msgid "An ID corresponding to the codec." msgstr "Eine den Codec identifizierende ID." -#: src/extract/attachments.cpp:131 +#: src/extract/attachments.cpp:132 msgid "An attachment with the ID %1% was not found.\n" msgstr "Ein Dateianhang mit der ID %1% wurde nicht gefunden.\n" @@ -1898,7 +1898,7 @@ msgstr "Audio Ausgabeabtastrate" msgid "Audio sampling frequency" msgstr "Audio Abtastrate" -#: src/mmg/header_editor/track_type_page.cpp:45 +#: src/mmg/header_editor/track_type_page.cpp:46 #, c-format msgid "Audio track %u" msgstr "Audio-Track %u" @@ -4258,11 +4258,11 @@ msgstr "Normalerweise belässt mkvmerge Informationen über das Seitenverhältni msgid "Not a hex digit at position %1%" msgstr "An Position %1% befindet sich keine Hexadezimalziffer" -#: src/common/kax_analyzer.cpp:207 +#: src/common/kax_analyzer.cpp:208 msgid "Not a valid Matroska file (no EBML head found)" msgstr "Keine gültige Matroska-Datei (kein EBML-Kopf gefunden)" -#: src/common/kax_analyzer.cpp:217 +#: src/common/kax_analyzer.cpp:218 msgid "Not a valid Matroska file (no segment/level 0 element found)" msgstr "Keine gültige Matroska-Datei (kein Segment/Level-0-Element gefunden)" @@ -4528,7 +4528,7 @@ msgstr "Fortschritt: 100%\n" msgid "Progress: 100%%%1%" msgstr "Fortschritt: 100%%%1%" -#: src/common/kax_analyzer.cpp:1027 +#: src/common/kax_analyzer.cpp:1028 msgid "Progress: [%1%%2%] %3%%%" msgstr "Fortschritt: [%1%%2%] %3%%%" @@ -5288,7 +5288,7 @@ msgstr "Zeichenkette" msgid "Subtitle track %1% is missing some duration elements. Please check the resulting SSA/ASS file for entries that have the same start and end time.\n" msgstr "Dem Untertiteltrack %1% fehlen einige Elemente für die Framedauer. Bitte überprüfen Sie die extrahierte SSA/ASS-Datei auf Einträge, deren Start-Zeitstempel mit dem End-Zeitstempel übereinstimmt, und korrigieren Sie diese Einträge manuell.\n" -#: src/mmg/header_editor/track_type_page.cpp:51 +#: src/mmg/header_editor/track_type_page.cpp:52 #, c-format msgid "Subtitle track %u" msgstr "Untertiteltrack %u" @@ -5613,8 +5613,8 @@ msgstr "Im fünften Modus wird versucht, Kapitelinformationen und Tags zusammen msgid "The file '%1%' cannot be attached because it does not exist or cannot be read.\n" msgstr "Die Datei '%1%' kann nicht angehängt werden, weil sie entweder nicht existiert oder nicht gelesen werden kann.\n" -#: src/extract/attachments.cpp:118 src/extract/chapters.cpp:51 -#: src/extract/cuesheets.cpp:208 src/extract/tags.cpp:51 +#: src/extract/attachments.cpp:119 src/extract/chapters.cpp:52 +#: src/extract/cuesheets.cpp:209 src/extract/tags.cpp:52 msgid "The file '%1%' could not be opened for reading (%2%)." msgstr "Die Datei '%1%' konnte nicht zum Lesen geöffnet werden (%2%)." @@ -7049,7 +7049,7 @@ msgstr "Video Stereomodus" msgid "Video track" msgstr "Video-Track" -#: src/mmg/header_editor/track_type_page.cpp:48 +#: src/mmg/header_editor/track_type_page.cpp:49 #, c-format msgid "Video track %u" msgstr "Video-Track %u" @@ -7872,8 +7872,8 @@ msgstr "mkvmerge -o aus [globale Optionen] [Optionen1] [@Optionsdatei . #: src/mmg/mux_dialog.cpp:316 #, c-format -msgid "mkvmerge FAILED with a return code of %d. %s\n" -msgstr "mkvmerge schlug mit einem Rückgabewert von %d fehl. %s\n" +msgid "mkvmerge FAILED with a return code of %d. %s" +msgstr "mkvmerge schlug mit einem Rückgabewert von %d fehl. %s" #: src/mmg/tabs/global.cpp:476 src/mmg/tabs/global.cpp:490 #: src/mmg/tabs/global.cpp:494 src/mmg/tabs/global.cpp:498 @@ -7919,8 +7919,8 @@ msgstr "mkvmerge-Programmdatei" #: src/mmg/mux_dialog.cpp:318 #, c-format -msgid "mkvmerge finished with a return code of %d. %s\n" -msgstr "mkvmerge schloss den Prozess mit einem Rückgabewert von %d ab. %s\n" +msgid "mkvmerge finished with a return code of %d. %s" +msgstr "mkvmerge schloss den Prozess mit einem Rückgabewert von %d ab. %s" #: src/mmg/jobs.cpp:131 src/mmg/mux_dialog.cpp:273 msgid "mkvmerge has finished" diff --git a/po/ja.po b/po/ja.po index 5e454fd75..0a3f0459f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: ja\n" "Report-Msgid-Bugs-To: Hiroki Taniura \n" "POT-Creation-Date: 2009-02-27 00:38+0900\n" -"PO-Revision-Date: 2010-01-23 11:48+0900\n" +"PO-Revision-Date: 2010-01-31 20:02+0100\n" "Last-Translator: Katsuhiko Nishimra \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -1748,7 +1748,7 @@ msgstr "常に手前に表示" msgid "An ID corresponding to the codec." msgstr "コーデックに対応するIDです。" -#: src/extract/attachments.cpp:131 +#: src/extract/attachments.cpp:132 msgid "An attachment with the ID %1% was not found.\n" msgstr "ID %1%の添付ファイルが見つかりませんでした。\n" @@ -1868,7 +1868,7 @@ msgstr "オーディオの出力サンプリング周波数" msgid "Audio sampling frequency" msgstr "オーディオのサンプリング周波数" -#: src/mmg/header_editor/track_type_page.cpp:45 +#: src/mmg/header_editor/track_type_page.cpp:46 #, c-format msgid "Audio track %u" msgstr "オーディオトラック%u" @@ -4245,11 +4245,11 @@ msgstr "通常mkvmergeは、MPEG4ビデオビットストリームのアスペ msgid "Not a hex digit at position %1%" msgstr "%1%にあるのは16進数の数ではありません" -#: src/common/kax_analyzer.cpp:207 +#: src/common/kax_analyzer.cpp:208 msgid "Not a valid Matroska file (no EBML head found)" msgstr "正しいMatroskaファイルではありません（EBMLヘッドが見つかりませんでした）" -#: src/common/kax_analyzer.cpp:217 +#: src/common/kax_analyzer.cpp:218 msgid "Not a valid Matroska file (no segment/level 0 element found)" msgstr "正しいMatroskaファイルではありません（セグメント/レベル0の要素が見つかりませんでした）" @@ -4514,7 +4514,7 @@ msgstr "進行状況: 100%\n" msgid "Progress: 100%%%1%" msgstr "進行状況: 100%%%1%" -#: src/common/kax_analyzer.cpp:1027 +#: src/common/kax_analyzer.cpp:1028 msgid "Progress: [%1%%2%] %3%%%" msgstr "進行状況: [%1%%2%] %3%%%" @@ -5268,7 +5268,7 @@ msgstr "文字列" msgid "Subtitle track %1% is missing some duration elements. Please check the resulting SSA/ASS file for entries that have the same start and end time.\n" msgstr "字幕トラック%1%に失われている持続時間要素があります。同じ開始時間と終了時間がないか出力されるSSA/ASSファイルのエントリをチェックしてください。\n" -#: src/mmg/header_editor/track_type_page.cpp:51 +#: src/mmg/header_editor/track_type_page.cpp:52 #, c-format msgid "Subtitle track %u" msgstr "字幕トラック%u" @@ -5590,8 +5590,8 @@ msgstr "5番目のモードでは、チャプタ情報とタグを展開しCUE msgid "The file '%1%' cannot be attached because it does not exist or cannot be read.\n" msgstr "ファイルが存在していないか読み取れないため、ファイル'%1%'を添付することができません。\n" -#: src/extract/attachments.cpp:118 src/extract/chapters.cpp:51 -#: src/extract/cuesheets.cpp:208 src/extract/tags.cpp:51 +#: src/extract/attachments.cpp:119 src/extract/chapters.cpp:52 +#: src/extract/cuesheets.cpp:209 src/extract/tags.cpp:52 msgid "The file '%1%' could not be opened for reading (%2%)." msgstr "ファイル'%1%'を開いて読み込むことができませんでした（%2%）。" @@ -6986,7 +6986,7 @@ msgstr "ビデオステレオモード" msgid "Video track" msgstr "ビデオトラック" -#: src/mmg/header_editor/track_type_page.cpp:48 +#: src/mmg/header_editor/track_type_page.cpp:49 #, c-format msgid "Video track %u" msgstr "ビデオトラック%u" @@ -7809,8 +7809,8 @@ msgstr "mkvmerge -o 出力ファイル [グローバルオプション] [オプ #: src/mmg/mux_dialog.cpp:316 #, c-format -msgid "mkvmerge FAILED with a return code of %d. %s\n" -msgstr "mkvmergeはリターンコード%dで異常終了しました。%s\n" +msgid "mkvmerge FAILED with a return code of %d. %s" +msgstr "mkvmergeはリターンコード%dで異常終了しました。%s" #: src/mmg/tabs/global.cpp:476 src/mmg/tabs/global.cpp:490 #: src/mmg/tabs/global.cpp:494 src/mmg/tabs/global.cpp:498 @@ -7856,8 +7856,8 @@ msgstr "mkvmergeの実行ファイル" #: src/mmg/mux_dialog.cpp:318 #, c-format -msgid "mkvmerge finished with a return code of %d. %s\n" -msgstr "mkvmergeはリターンコード%dで終了しました。%s\n" +msgid "mkvmerge finished with a return code of %d. %s" +msgstr "mkvmergeはリターンコード%dで終了しました。%s" #: src/mmg/jobs.cpp:131 src/mmg/mux_dialog.cpp:273 msgid "mkvmerge has finished" diff --git a/po/zh_CN.po b/po/zh_CN.po index 8b1b35f69..a0644ad1e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: zh\n" "Report-Msgid-Bugs-To: Dean Lee \n" "POT-Creation-Date: 2009-02-18 23:52+0100\n" -"PO-Revision-Date: 2010-01-27 22:06+0800\n" +"PO-Revision-Date: 2010-01-31 20:02+0100\n" "Last-Translator: Dean Lee \n" "Language-Team: Chinese Simplified \n" "MIME-Version: 1.0\n" @@ -1779,7 +1779,7 @@ msgstr "总在最前" msgid "An ID corresponding to the codec." msgstr "对应编解码器的 ID。" -#: src/extract/attachments.cpp:131 +#: src/extract/attachments.cpp:132 msgid "An attachment with the ID %1% was not found.\n" msgstr "找不到 ID 为 %1% 的附件。\n" @@ -1906,7 +1906,7 @@ msgstr "音频输出采样率" msgid "Audio sampling frequency" msgstr "音频采样率" -#: src/mmg/header_editor/track_type_page.cpp:45 +#: src/mmg/header_editor/track_type_page.cpp:46 #, c-format msgid "Audio track %u" msgstr "音频轨 %u" @@ -4345,11 +4345,11 @@ msgstr "通常 mkvmerge 保留 MPEG4 视频位流中的宽高比信息并将信 msgid "Not a hex digit at position %1%" msgstr "非十六进制数位，于 %1%" -#: src/common/kax_analyzer.cpp:207 +#: src/common/kax_analyzer.cpp:208 msgid "Not a valid Matroska file (no EBML head found)" msgstr "不是有效的 Matroska 文件 (未发现 EBML 头)" -#: src/common/kax_analyzer.cpp:217 +#: src/common/kax_analyzer.cpp:218 msgid "Not a valid Matroska file (no segment/level 0 element found)" msgstr "不是有效的 Matroska 文件 (未发现有效的 剪辑/0 层级元素)" @@ -4623,7 +4623,7 @@ msgstr "进度: 100%\n" msgid "Progress: 100%%%1%" msgstr "进度: 100%%%1%" -#: src/common/kax_analyzer.cpp:1027 +#: src/common/kax_analyzer.cpp:1028 msgid "Progress: [%1%%2%] %3%%%" msgstr "进度: [%1%%2%] %3%%%" @@ -5398,7 +5398,7 @@ msgstr "字符串" msgid "Subtitle track %1% is missing some duration elements. Please check the resulting SSA/ASS file for entries that have the same start and end time.\n" msgstr "字幕轨 %1% 缺时长元素。请检查输出的 SSA/ASS 文件中有相同起始和终止时间的条目。\n" -#: src/mmg/header_editor/track_type_page.cpp:51 +#: src/mmg/header_editor/track_type_page.cpp:52 #, c-format msgid "Subtitle track %u" msgstr "字幕轨 %u" @@ -5723,10 +5723,10 @@ msgstr "第一个模式将尝试提取章节信息和标签并将其以 CUE 表 msgid "The file '%1%' cannot be attached because it does not exist or cannot be read.\n" msgstr "文件 '%1%' 无法附加，因为它不存在或不可读。\n" -#: src/extract/attachments.cpp:118 -#: src/extract/chapters.cpp:51 -#: src/extract/cuesheets.cpp:208 -#: src/extract/tags.cpp:51 +#: src/extract/attachments.cpp:119 +#: src/extract/chapters.cpp:52 +#: src/extract/cuesheets.cpp:209 +#: src/extract/tags.cpp:52 msgid "The file '%1%' could not be opened for reading (%2%)." msgstr "文件 '%1%' 无法打开以读取 (%2%)。" @@ -7208,7 +7208,7 @@ msgstr "视频立体模式" msgid "Video track" msgstr "视频轨" -#: src/mmg/header_editor/track_type_page.cpp:48 +#: src/mmg/header_editor/track_type_page.cpp:49 #, c-format msgid "Video track %u" msgstr "视频轨 %u" @@ -8060,8 +8060,8 @@ msgstr "mkvmerge -o out [全局选项] [选项1] [@optionsfile ...]\n" #: src/mmg/mux_dialog.cpp:316 #, c-format -msgid "mkvmerge FAILED with a return code of %d. %s\n" -msgstr "mkvmerge 执行 *失败* ，返回代码 %d。 %s\n" +msgid "mkvmerge FAILED with a return code of %d. %s" +msgstr "mkvmerge 执行 *失败* ，返回代码 %d。 %s" #: src/mmg/tabs/global.cpp:476 #: src/mmg/tabs/global.cpp:490 @@ -8115,8 +8115,8 @@ msgstr "mkvmerge 可执行程序" #: src/mmg/mux_dialog.cpp:318 #, c-format -msgid "mkvmerge finished with a return code of %d. %s\n" -msgstr "mkvmerge 执行完毕，返回代码 %d。%s\n" +msgid "mkvmerge finished with a return code of %d. %s" +msgstr "mkvmerge 执行完毕，返回代码 %d。%s" #: src/mmg/jobs.cpp:131 #: src/mmg/mux_dialog.cpp:273 diff --git a/po/zh_TW.po b/po/zh_TW.po index ed2021865..fda57712f 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: zh-TW\n" "Report-Msgid-Bugs-To: Dean Lee \n" "POT-Creation-Date: 2009-02-18 23:52+0100\n" -"PO-Revision-Date: 2010-01-20 21:02+0100\n" +"PO-Revision-Date: 2010-01-31 20:02+0100\n" "Last-Translator: Dong-Jun Wu \n" "Language-Team: Chinese Traditional \n" "MIME-Version: 1.0\n" @@ -1781,7 +1781,7 @@ msgstr "總在最前面" msgid "An ID corresponding to the codec." msgstr "對應編解碼器的 ID。" -#: src/extract/attachments.cpp:131 +#: src/extract/attachments.cpp:132 msgid "An attachment with the ID %1% was not found.\n" msgstr "找不到 ID 為 %1% 的附件。\n" @@ -1908,7 +1908,7 @@ msgstr "音訊輸出取樣頻率" msgid "Audio sampling frequency" msgstr "音訊取樣頻率" -#: src/mmg/header_editor/track_type_page.cpp:45 +#: src/mmg/header_editor/track_type_page.cpp:46 #, c-format msgid "Audio track %u" msgstr "音軌 %u" @@ -4348,11 +4348,11 @@ msgstr "通常 mkvmerge 保留 MPEG4 視訊位元流中的外觀比例資訊並 msgid "Not a hex digit at position %1%" msgstr "非十六進位數位，於 %1%" -#: src/common/kax_analyzer.cpp:207 +#: src/common/kax_analyzer.cpp:208 msgid "Not a valid Matroska file (no EBML head found)" msgstr "不是有效的 Matroska 檔 (未發現 EBML 表頭)" -#: src/common/kax_analyzer.cpp:217 +#: src/common/kax_analyzer.cpp:218 msgid "Not a valid Matroska file (no segment/level 0 element found)" msgstr "不是有效的 Matroska 檔 (未發現有效的 剪輯/0 層級元件)" @@ -4626,7 +4626,7 @@ msgstr "進度: 100%\n" msgid "Progress: 100%%%1%" msgstr "進度: 100%%%1%" -#: src/common/kax_analyzer.cpp:1027 +#: src/common/kax_analyzer.cpp:1028 msgid "Progress: [%1%%2%] %3%%%" msgstr "進度: [%1%%2%] %3%%%" @@ -5403,7 +5403,7 @@ msgstr "字串" msgid "Subtitle track %1% is missing some duration elements. Please check the resulting SSA/ASS file for entries that have the same start and end time.\n" msgstr "字幕軌 %1% 缺少持續時間元件。請檢查輸出的 SSA/ASS 檔中有相同起始和終止時間的項目。\n" -#: src/mmg/header_editor/track_type_page.cpp:51 +#: src/mmg/header_editor/track_type_page.cpp:52 #, c-format msgid "Subtitle track %u" msgstr "字幕軌 %u" @@ -5728,10 +5728,10 @@ msgstr "第五種模式可試著提取章節資訊和標籤並將這些匯出成 msgid "The file '%1%' cannot be attached because it does not exist or cannot be read.\n" msgstr "無法附加檔案「%1%」，因為它不存在或無法讀取。\n" -#: src/extract/attachments.cpp:118 -#: src/extract/chapters.cpp:51 -#: src/extract/cuesheets.cpp:208 -#: src/extract/tags.cpp:51 +#: src/extract/attachments.cpp:119 +#: src/extract/chapters.cpp:52 +#: src/extract/cuesheets.cpp:209 +#: src/extract/tags.cpp:52 msgid "The file '%1%' could not be opened for reading (%2%)." msgstr "檔案「%1%」無法開啟以讀取 (%2%)。" @@ -7213,7 +7213,7 @@ msgstr "視訊立體模式" msgid "Video track" msgstr "視訊軌" -#: src/mmg/header_editor/track_type_page.cpp:48 +#: src/mmg/header_editor/track_type_page.cpp:49 #, c-format msgid "Video track %u" msgstr "視訊軌 %u" @@ -8065,8 +8065,8 @@ msgstr "mkvmerge -o out [整體選項] [選項1] <檔案1> [@optionsfile ...]\n" #: src/mmg/mux_dialog.cpp:316 #, c-format -msgid "mkvmerge FAILED with a return code of %d. %s\n" -msgstr "mkvmerge 執行 *失敗* ，返回碼 %d。 %s\n" +msgid "mkvmerge FAILED with a return code of %d. %s" +msgstr "mkvmerge 執行 *失敗* ，返回碼 %d。 %s" #: src/mmg/tabs/global.cpp:476 #: src/mmg/tabs/global.cpp:490 @@ -8120,8 +8120,8 @@ msgstr "mkvmerge 可執行檔" #: src/mmg/mux_dialog.cpp:318 #, c-format -msgid "mkvmerge finished with a return code of %d. %s\n" -msgstr "mkvmerge 執行完畢，返回碼 %d。%s\n" +msgid "mkvmerge finished with a return code of %d. %s" +msgstr "mkvmerge 執行完畢，返回碼 %d。%s" #: src/mmg/jobs.cpp:131 #: src/mmg/mux_dialog.cpp:273 diff --git a/src/mmg/mux_dialog.cpp b/src/mmg/mux_dialog.cpp index f011663f5..b15cc3813 100644 --- a/src/mmg/mux_dialog.cpp +++ b/src/mmg/mux_dialog.cpp @@ -313,9 +313,9 @@ mux_process::OnTerminate(int terminated_pid, wxString format; if ((status != 0) && (status != 1)) - format = Z("mkvmerge FAILED with a return code of %d. %s\n"); + format = Z("mkvmerge FAILED with a return code of %d. %s"); else - format = Z("mkvmerge finished with a return code of %d. %s\n"); + format = Z("mkvmerge finished with a return code of %d. %s"); #if defined(SYS_WINDOWS) wxString status_1 = Z("There were warnings, or the process was terminated.");