Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-08 19:21:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.bunkus.org/~/mkvtoolnix

Browse Source
This commit is contained in:
Moritz Bunkus 2010-06-18 17:56:36 +02:00
commit 7c5d6cbe66
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
po/ja.po
View File

@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: ja\n"
"Report-Msgid-Bugs-To: Hiroki Taniura <boiled.sugar@gmail.com>\n"
"POT-Creation-Date: 2009-02-27 00:38+0900\n"
"PO-Revision-Date: 2010-06-13 18:39+0900\n"
"PO-Revision-Date: 2010-06-18 22:36+0900\n"
"Last-Translator: Hiroki Taniura <boiled.sugar@gmail.com>\n"
"Language-Team: Japanese <boiled.sugar@gmail.com>\n"
"MIME-Version: 1.0\n"
@ -4427,9 +4427,8 @@ msgid "Overwrite existing file?"
msgstr "既存のファイルに上書きしますか？"
#: src/mmg/tabs/input.cpp:247
#, fuzzy
msgid "PGS/SUP subtitles"
msgstr "字幕"
msgstr "PGS/SUP字幕"
#: src/input/r_vobsub.cpp:523
msgid "PTS error: 0x%|1$02x| %|2$02x|%|3$02x| %|4$02x|%|5$02x|\n"
@ -6882,14 +6881,12 @@ msgid "Using the PCM output module.\n"
msgstr "PCM出力モジュールを使用しています。\n"
#: src/input/r_pgssup.cpp:72
#, fuzzy
msgid "Using the PGS output module.\n"
msgstr "DTS出力モジュールを使用しています。\n"
msgstr "PGS出力モジュールを使用しています。\n"
#: src/input/r_pgssup.cpp:59
#, fuzzy
msgid "Using the PGSSUP demultiplexer.\n"
msgstr "MPEG ESデマルチプレクサを使用しています。\n"
msgstr "PGSSUPデマルチプレクサを使用しています。\n"
#: src/input/r_qtmp4.cpp:124
msgid "Using the Quicktime/MP4 demultiplexer.\n"
@ -8092,7 +8089,7 @@ msgstr "未処理"
#: src/input/r_pgssup.cpp:55
#, fuzzy
msgid "pgssup_reader: Could not open the file."
msgstr "mpeg_es_reader：ファイルを開けませんでした。"
msgstr "pgssup_reader：ファイルを開けませんでした。"
#: src/info/mkvinfo.cpp:718
msgid "pixel crop bottom: %1%"

15
po/zh_CN.po
View File

@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: zh\n"
"Report-Msgid-Bugs-To: Dean Lee <xslidian@gmail.com>\n"
"POT-Creation-Date: 2009-02-18 23:52+0100\n"
"PO-Revision-Date: 2010-06-13 10:41+0800\n"
"PO-Revision-Date: 2010-06-18 19:10+0800\n"
"Last-Translator: Dean Lee <xslidian@lidian.info>\n"
"Language-Team: Chinese Simplified <xslidian@gmail.com>\n"
"MIME-Version: 1.0\n"
@ -4559,9 +4559,8 @@ msgid "Overwrite existing file?"
msgstr "覆写现有的文件?"
#: src/mmg/tabs/input.cpp:247
#, fuzzy
msgid "PGS/SUP subtitles"
msgstr "字幕"
msgstr "PGS/SUP 字幕"
#: src/input/r_vobsub.cpp:523
msgid "PTS error: 0x%|1$02x| %|2$02x|%|3$02x| %|4$02x|%|5$02x|\n"
@ -7115,14 +7114,12 @@ msgid "Using the PCM output module.\n"
msgstr "使用 PCM 输出模块。\n"
#: src/input/r_pgssup.cpp:72
#, fuzzy
msgid "Using the PGS output module.\n"
msgstr "使用 DTS 输出模块。\n"
msgstr "使用 PGS 输出模块。\n"
#: src/input/r_pgssup.cpp:59
#, fuzzy
msgid "Using the PGSSUP demultiplexer.\n"
msgstr "使用 MPEG ES 分离器。\n"
msgstr "使用 PGSSUP 分离器。\n"
#: src/input/r_qtmp4.cpp:124
msgid "Using the Quicktime/MP4 demultiplexer.\n"
@ -8395,9 +8392,8 @@ msgid "pending"
msgstr "挂起"
#: src/input/r_pgssup.cpp:55
#, fuzzy
msgid "pgssup_reader: Could not open the file."
msgstr "mpeg_es_reader: 无法打开文件。"
msgstr "pgssup_reader: 无法打开文件。"
#: src/info/mkvinfo.cpp:718
msgid "pixel crop bottom: %1%"
@ -8881,6 +8877,7 @@ msgstr "是"
#~ " -v, --verbose 提高“详细”程度。\n"
#~ " -h, --help 显示本帮助。\n"
#~ " -V, --version 显示版本信息。\n"
#, fuzzy
#~ msgid "Using the IVF output module.\n"
#~ msgstr "使用 FLAC 输出模块。\n"

8
src/mmg/tabs/input.cpp
View File

@ -323,7 +323,6 @@ tab_input::add_file(const wxString &file_name,
wxString name, command, video_track_name, opt_file_name;
wxArrayString output, errors;
std::vector<wxString> args, pair;
size_t pos;
int new_file_pos, result;
unsigned int i, k;
wxFile *opt_file;
@ -378,7 +377,8 @@ tab_input::add_file(const wxString &file_name,
if (3 == result) {
wxString container = Z("unknown");
if (output.Count() && (0 <= (pos = output[0].Find(wxT("container:")))))
int pos;
if (output.Count() && (wxNOT_FOUND != (pos = output[0].Find(wxT("container:")))))
container = output[0].Mid(pos + 11);
wxString info;
@ -433,6 +433,8 @@ tab_input::add_file(const wxString &file_name,
default_track_found_for['s'] = -1 != default_track_checked('s');
for (i = 0; i < output.Count(); i++) {
int pos;
if (output[i].Find(wxT("Track")) == 0) {
mmg_track_cptr track(new mmg_track_t);
@ -535,7 +537,7 @@ tab_input::add_file(const wxString &file_name,
cfg->Flush();
}
} else if ((pos = output[i].Find(wxT("container:"))) > 0) {
} else if ((pos = output[i].Find(wxT("container:"))) != wxNOT_FOUND) {
wxString container = output[i].Mid(pos + 11).BeforeFirst(wxT(' '));
wxString info = output[i].Mid(pos + 11).AfterFirst(wxT('[')).BeforeLast(wxT(']'));