mirror of
https://gitlab.com/mbunkus/mkvtoolnix.git
synced 2025-02-26 08:22:31 +00:00
Merge branch 'master' of file:///home/mosu/prog/video/mkvtoolnix
Conflicts: ChangeLog
This commit is contained in:
Moritz Bunkus
commit
dc21d6e158
@ -2,6 +2,9 @@
|
||||
|
||||
* mmg: bug fix: Tooltips were not word-wrapped on Windows.
|
||||
|
||||
* mkvinfo: enhancement: Added the "EBML maximum size length"
|
||||
element to the list of known elements. Fix for bug 464.
|
||||
|
||||
2010-01-20 Moritz Bunkus <moritz@bunkus.org>
|
||||
|
||||
* mmg: new feature: Added a control for mkvmerge's "--cropping"
|
||||
|
||||
28
po/de.po
28
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-20 22:27+0100\n"
|
||||
"PO-Revision-Date: 2010-01-22 08:55+0100\n"
|
||||
"Last-Translator: Moritz Bunkus <moritz@bunkus.org>\n"
|
||||
"Language-Team: German <moritz@bunkus.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
@ -2021,7 +2021,7 @@ msgid "Category is not NUL terminated"
|
||||
msgstr "Die Kategoriezeichenkette wird nicht mit einem NUL-Zeichen abgeschlossen."
|
||||
|
||||
#: src/extract/timecodes_v2.cpp:360 src/extract/tracks.cpp:541
|
||||
#: src/info/mkvinfo.cpp:1917
|
||||
#: src/info/mkvinfo.cpp:1920
|
||||
msgid "Caught exception"
|
||||
msgstr "Eine Ausnahme wurde abgefangen."
|
||||
|
||||
@ -2240,7 +2240,7 @@ msgid "Close the current file without saving"
|
||||
msgstr "Die aktuelle Datei schließen, ohne zu speichern"
|
||||
|
||||
#: src/extract/timecodes_v2.cpp:262 src/extract/tracks.cpp:417
|
||||
#: src/info/mkvinfo.cpp:1857
|
||||
#: src/info/mkvinfo.cpp:1860
|
||||
msgid "Cluster"
|
||||
msgstr "Cluster"
|
||||
|
||||
@ -2752,15 +2752,15 @@ msgstr "Keinen Meta-Index schreiben."
|
||||
msgid "Do not write those header elements whose values are the same as their default values according to the Matroska specs."
|
||||
msgstr "Diejenigen Kopfelemente, die laut Matroska-Spezifikationen dem Standardwert für das Element entsprechen, nicht in die Zieldatei schreiben."
|
||||
|
||||
#: src/info/mkvinfo.cpp:1773
|
||||
#: src/info/mkvinfo.cpp:1776
|
||||
msgid "Doc type read version: %1%"
|
||||
msgstr "Dokumententyp Leseversion: %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1770
|
||||
#: src/info/mkvinfo.cpp:1773
|
||||
msgid "Doc type version: %1%"
|
||||
msgstr "Dokumententyp Version: %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1767
|
||||
#: src/info/mkvinfo.cpp:1770
|
||||
msgid "Doc type: %1%"
|
||||
msgstr "Dokumententyp: %1%"
|
||||
|
||||
@ -2796,6 +2796,10 @@ msgstr "EBML-Kopf"
|
||||
msgid "EBML maximum ID length: %1%"
|
||||
msgstr "Maximale EBML-ID-Länge: %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1767
|
||||
msgid "EBML maximum size length: %1%"
|
||||
msgstr "Maximale Länge des EBML-Längenattributes: %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1761
|
||||
msgid "EBML read version: %1%"
|
||||
msgstr "EBML Leseversion: %1%"
|
||||
@ -2939,7 +2943,7 @@ msgstr "Fehler: "
|
||||
msgid "Error: %1% parser failed for '%2%', line %3%, column %4%: %5%\n"
|
||||
msgstr "Fehler:: Der %1%-Parser schlug in '%2%', Zeile %3%, Spalte %4% fehl: %5%\n"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1796
|
||||
#: src/info/mkvinfo.cpp:1799
|
||||
msgid "Error: Couldn't open input file %1% (%2%).\n"
|
||||
msgstr "Fehler: Die Quelldatei %1% konnte nicht geöffnet werden (%2%).\n"
|
||||
|
||||
@ -4120,7 +4124,7 @@ msgstr "Nächster Dateiname"
|
||||
msgid "Next filename: %1%"
|
||||
msgstr "Nächster Dateiname: %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1836
|
||||
#: src/info/mkvinfo.cpp:1839
|
||||
msgid "Next level 0 element is not a segment but %1%"
|
||||
msgstr "Das nachfolgende Level-0-Element ist kein Segment sondern %1%"
|
||||
|
||||
@ -4144,7 +4148,7 @@ msgstr "In '--%2% %3%' wurde kein %1% angegeben.\n"
|
||||
msgid "No AC3 header found in first frame; track will be skipped.\n"
|
||||
msgstr "Im ersten Frame wurde kein AC3-Kopf gefunden. Der Track wird ausgelassen.\n"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1810
|
||||
#: src/info/mkvinfo.cpp:1813
|
||||
msgid "No EBML head found."
|
||||
msgstr "Es wurde kein EBML-Kopf gefunden."
|
||||
|
||||
@ -4218,7 +4222,7 @@ msgid "No output file name specified, will use attachment name.\n"
|
||||
msgstr "Es wurde kein Ausgabedateiname angegeben. Der Dateianhangsname wird statt dessen verwendet.\n"
|
||||
|
||||
#: src/extract/timecodes_v2.cpp:197 src/extract/tracks.cpp:343
|
||||
#: src/info/mkvinfo.cpp:1824
|
||||
#: src/info/mkvinfo.cpp:1827
|
||||
msgid "No segment/level 0 element found."
|
||||
msgstr "Es wurde kein Segment/Level-0-Element gefunden."
|
||||
|
||||
@ -4907,11 +4911,11 @@ msgstr "Segment-Tracks"
|
||||
msgid "Segment unique ID"
|
||||
msgstr "Eindeutige Segment-ID"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1832
|
||||
#: src/info/mkvinfo.cpp:1835
|
||||
msgid "Segment, size %1%"
|
||||
msgstr "Segment, Größe %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1830
|
||||
#: src/info/mkvinfo.cpp:1833
|
||||
msgid "Segment, size unknown"
|
||||
msgstr "Segment, unbekannte Größe"
|
||||
|
||||
|
||||
27
po/zh_CN.po
27
po/zh_CN.po
@ -2037,7 +2037,7 @@ msgstr "类别未以 NUL 收尾"
|
||||
|
||||
#: src/extract/timecodes_v2.cpp:360
|
||||
#: src/extract/tracks.cpp:541
|
||||
#: src/info/mkvinfo.cpp:1917
|
||||
#: src/info/mkvinfo.cpp:1920
|
||||
msgid "Caught exception"
|
||||
msgstr "发生异常"
|
||||
|
||||
@ -2267,7 +2267,7 @@ msgstr "在不保存的情况下关闭当前文件"
|
||||
|
||||
#: src/extract/timecodes_v2.cpp:262
|
||||
#: src/extract/tracks.cpp:417
|
||||
#: src/info/mkvinfo.cpp:1857
|
||||
#: src/info/mkvinfo.cpp:1860
|
||||
msgid "Cluster"
|
||||
msgstr "簇"
|
||||
|
||||
@ -2792,15 +2792,15 @@ msgstr "不要写入任何元定位元素。"
|
||||
msgid "Do not write those header elements whose values are the same as their default values according to the Matroska specs."
|
||||
msgstr "不要写入值与 Matroska 规范中的默认值相同的头元素。"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1773
|
||||
#: src/info/mkvinfo.cpp:1776
|
||||
msgid "Doc type read version: %1%"
|
||||
msgstr "文档类型读取版本: %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1770
|
||||
#: src/info/mkvinfo.cpp:1773
|
||||
msgid "Doc type version: %1%"
|
||||
msgstr "文档类型版本: %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1767
|
||||
#: src/info/mkvinfo.cpp:1770
|
||||
msgid "Doc type: %1%"
|
||||
msgstr "文档类型: %1%"
|
||||
|
||||
@ -2836,6 +2836,11 @@ msgstr "EBML 头"
|
||||
msgid "EBML maximum ID length: %1%"
|
||||
msgstr "EBML 最大 ID 长: %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1767
|
||||
#, fuzzy
|
||||
msgid "EBML maximum size length: %1%"
|
||||
msgstr "EBML 最大 ID 长: %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1761
|
||||
msgid "EBML read version: %1%"
|
||||
msgstr "EBML 读取版本: %1%"
|
||||
@ -2985,7 +2990,7 @@ msgstr "出错: "
|
||||
msgid "Error: %1% parser failed for '%2%', line %3%, column %4%: %5%\n"
|
||||
msgstr "出错: %1% 解析器失败，对于 '%2%', 行 %3%, 列 %4%: %5%\n"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1796
|
||||
#: src/info/mkvinfo.cpp:1799
|
||||
msgid "Error: Couldn't open input file %1% (%2%).\n"
|
||||
msgstr "出错: 无法打开输入文件 %1% (%2%)。\n"
|
||||
|
||||
@ -4201,7 +4206,7 @@ msgstr "下一文件名"
|
||||
msgid "Next filename: %1%"
|
||||
msgstr "下一文件名: %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1836
|
||||
#: src/info/mkvinfo.cpp:1839
|
||||
msgid "Next level 0 element is not a segment but %1%"
|
||||
msgstr "下一个 0 层级元素不是剪辑而是 %1%"
|
||||
|
||||
@ -4226,7 +4231,7 @@ msgstr "未指定 %1%，在 '--%2% %3%'。\n"
|
||||
msgid "No AC3 header found in first frame; track will be skipped.\n"
|
||||
msgstr "首帧未发现 AC3 头; 此轨将被跳过。\n"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1810
|
||||
#: src/info/mkvinfo.cpp:1813
|
||||
msgid "No EBML head found."
|
||||
msgstr "未找到 EBML 头。"
|
||||
|
||||
@ -4302,7 +4307,7 @@ msgstr "未指定输出文件名，将使用附件名。\n"
|
||||
|
||||
#: src/extract/timecodes_v2.cpp:197
|
||||
#: src/extract/tracks.cpp:343
|
||||
#: src/info/mkvinfo.cpp:1824
|
||||
#: src/info/mkvinfo.cpp:1827
|
||||
msgid "No segment/level 0 element found."
|
||||
msgstr "未发现剪辑/0 层级元素。"
|
||||
|
||||
@ -5016,11 +5021,11 @@ msgstr "剪辑轨道"
|
||||
msgid "Segment unique ID"
|
||||
msgstr "剪辑唯一 ID"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1832
|
||||
#: src/info/mkvinfo.cpp:1835
|
||||
msgid "Segment, size %1%"
|
||||
msgstr "剪辑, 尺寸 %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1830
|
||||
#: src/info/mkvinfo.cpp:1833
|
||||
msgid "Segment, size unknown"
|
||||
msgstr "剪辑, 尺寸未知"
|
||||
|
||||
|
||||
27
po/zh_TW.po
27
po/zh_TW.po
@ -2039,7 +2039,7 @@ msgstr "類別未以 NUL 結尾"
|
||||
|
||||
#: src/extract/timecodes_v2.cpp:360
|
||||
#: src/extract/tracks.cpp:541
|
||||
#: src/info/mkvinfo.cpp:1917
|
||||
#: src/info/mkvinfo.cpp:1920
|
||||
msgid "Caught exception"
|
||||
msgstr "發生異常"
|
||||
|
||||
@ -2269,7 +2269,7 @@ msgstr "在不儲存的情況下關閉目前檔案"
|
||||
|
||||
#: src/extract/timecodes_v2.cpp:262
|
||||
#: src/extract/tracks.cpp:417
|
||||
#: src/info/mkvinfo.cpp:1857
|
||||
#: src/info/mkvinfo.cpp:1860
|
||||
msgid "Cluster"
|
||||
msgstr "叢集"
|
||||
|
||||
@ -2794,15 +2794,15 @@ msgstr "不要寫入任何變換定位元件。"
|
||||
msgid "Do not write those header elements whose values are the same as their default values according to the Matroska specs."
|
||||
msgstr "不要寫入值與 Matroska 規範中的預設值相同的表頭元件。"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1773
|
||||
#: src/info/mkvinfo.cpp:1776
|
||||
msgid "Doc type read version: %1%"
|
||||
msgstr "文件檔類型讀取版本: %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1770
|
||||
#: src/info/mkvinfo.cpp:1773
|
||||
msgid "Doc type version: %1%"
|
||||
msgstr "文件檔類型版本: %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1767
|
||||
#: src/info/mkvinfo.cpp:1770
|
||||
msgid "Doc type: %1%"
|
||||
msgstr "文件檔類型: %1%"
|
||||
|
||||
@ -2838,6 +2838,11 @@ msgstr "EBML 表頭"
|
||||
msgid "EBML maximum ID length: %1%"
|
||||
msgstr "EBML 最大 ID 長: %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1767
|
||||
#, fuzzy
|
||||
msgid "EBML maximum size length: %1%"
|
||||
msgstr "EBML 最大 ID 長: %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1761
|
||||
msgid "EBML read version: %1%"
|
||||
msgstr "EBML 讀取版本: %1%"
|
||||
@ -2987,7 +2992,7 @@ msgstr "發生錯誤: "
|
||||
msgid "Error: %1% parser failed for '%2%', line %3%, column %4%: %5%\n"
|
||||
msgstr "發生錯誤: %1% 解析器失敗，對於「%2%」, 第 %3% 行, 第 %4% 列: %5%\n"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1796
|
||||
#: src/info/mkvinfo.cpp:1799
|
||||
msgid "Error: Couldn't open input file %1% (%2%).\n"
|
||||
msgstr "發生錯誤: 無法開啟輸入檔 %1% (%2%)。\n"
|
||||
|
||||
@ -4203,7 +4208,7 @@ msgstr "下一個檔名"
|
||||
msgid "Next filename: %1%"
|
||||
msgstr "下一個檔名: %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1836
|
||||
#: src/info/mkvinfo.cpp:1839
|
||||
msgid "Next level 0 element is not a segment but %1%"
|
||||
msgstr "下一個 0 層級元件不是剪輯而是 %1%"
|
||||
|
||||
@ -4228,7 +4233,7 @@ msgstr "未指定 %1%，在「--%2% %3%」。\n"
|
||||
msgid "No AC3 header found in first frame; track will be skipped.\n"
|
||||
msgstr "第一個畫格未發現 AC3 表頭; 此軌將被跳過。\n"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1810
|
||||
#: src/info/mkvinfo.cpp:1813
|
||||
msgid "No EBML head found."
|
||||
msgstr "未找到 EBML 表頭。"
|
||||
|
||||
@ -4304,7 +4309,7 @@ msgstr "未指定輸出檔名，將使用附件名。\n"
|
||||
|
||||
#: src/extract/timecodes_v2.cpp:197
|
||||
#: src/extract/tracks.cpp:343
|
||||
#: src/info/mkvinfo.cpp:1824
|
||||
#: src/info/mkvinfo.cpp:1827
|
||||
msgid "No segment/level 0 element found."
|
||||
msgstr "未發現剪輯/0 層級元件。"
|
||||
|
||||
@ -5018,11 +5023,11 @@ msgstr "剪輯軌道"
|
||||
msgid "Segment unique ID"
|
||||
msgstr "剪輯唯一 ID"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1832
|
||||
#: src/info/mkvinfo.cpp:1835
|
||||
msgid "Segment, size %1%"
|
||||
msgstr "剪輯, 大小 %1%"
|
||||
|
||||
#: src/info/mkvinfo.cpp:1830
|
||||
#: src/info/mkvinfo.cpp:1833
|
||||
msgid "Segment, size unknown"
|
||||
msgstr "剪輯, 未知大小"
|
||||
|
||||
|
||||
@ -1763,6 +1763,9 @@ handle_ebml_head(EbmlElement *l0,
|
||||
else if (is_id(e, EMaxIdLength))
|
||||
show_element(e, 1, boost::format(Y("EBML maximum ID length: %1%")) % uint64(*static_cast<EbmlUInteger *>(e)));
|
||||
|
||||
else if (is_id(e, EMaxSizeLength))
|
||||
show_element(e, 1, boost::format(Y("EBML maximum size length: %1%")) % uint64(*static_cast<EbmlUInteger *>(e)));
|
||||
|
||||
else if (is_id(e, EDocType))
|
||||
show_element(e, 1, boost::format(Y("Doc type: %1%")) % std::string(*static_cast<EbmlString *>(e)));
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user