From 5d55321326f21348a968c47281b9025e54e316fe Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Thu, 27 Jun 2013 20:16:17 +0200 Subject: [PATCH] Bump version number, add release message, set release code name --- ChangeLog | 2 + README | 2 +- README.Windows.txt | 2 +- configure.in | 2 +- contrib/fedora-core.spec | 2 +- contrib/opensuse-12.spec | 2 +- debian-upstream/changelog | 6 +++ doc/man/ja/mkvextract.1 | 6 +-- doc/man/ja/mkvinfo.1 | 6 +-- doc/man/ja/mkvmerge.1 | 6 +-- doc/man/ja/mkvpropedit.1 | 6 +-- doc/man/ja/mmg.1 | 6 +-- doc/man/mkvextract.1 | 65 ++++-------------------- doc/man/mkvextract.xml | 4 +- doc/man/mkvinfo.1 | 14 ++---- doc/man/mkvinfo.xml | 4 +- doc/man/mkvmerge.1 | 73 ++++++--------------------- doc/man/mkvmerge.xml | 4 +- doc/man/mkvpropedit.1 | 20 +++----- doc/man/mkvpropedit.xml | 4 +- doc/man/mkvtoolnix-gui.xml | 4 +- doc/man/mmg.1 | 11 ++--- doc/man/mmg.xml | 4 +- doc/man/nl/mkvextract.1 | 64 ++++-------------------- doc/man/nl/mkvinfo.1 | 14 ++---- doc/man/nl/mkvmerge.1 | 70 ++++++-------------------- doc/man/nl/mkvpropedit.1 | 14 ++---- doc/man/nl/mmg.1 | 11 ++--- doc/man/po4a/po/ja.po | 4 +- doc/man/po4a/po/nl.po | 4 +- doc/man/po4a/po/uk.po | 4 +- doc/man/po4a/po/zh_CN.po | 4 +- doc/man/uk/mkvextract.1 | 62 +++++------------------ doc/man/uk/mkvinfo.1 | 14 ++---- doc/man/uk/mkvmerge.1 | 73 ++++++--------------------- doc/man/uk/mkvpropedit.1 | 23 +++------ doc/man/uk/mmg.1 | 11 ++--- doc/man/zh_CN/mkvextract.1 | 65 ++++-------------------- doc/man/zh_CN/mkvinfo.1 | 15 ++---- doc/man/zh_CN/mkvmerge.1 | 85 +++++++------------------------- doc/man/zh_CN/mkvpropedit.1 | 18 ++----- doc/man/zh_CN/mmg.1 | 11 ++--- installer/mkvtoolnix-unicode.nsi | 2 +- src/common/version.cpp | 2 +- src/extract/resources.rc | 8 +-- src/info/resources.rc | 8 +-- src/merge/resources.rc | 8 +-- src/mkvtoolnix-gui/resources.rc | 8 +-- src/mmg/resources.rc | 8 +-- src/propedit/resources.rc | 8 +-- 50 files changed, 232 insertions(+), 641 deletions(-) diff --git a/ChangeLog b/ChangeLog index c22e6ad5d..3a9fe648c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2013-06-27 Moritz Bunkus + * Released v6.3.0. + * mkvmerge: bug fix: When appending unframed AVC/h.264 tracks and setting the default duration the second and all following source parts will use the same default duration as set for the first diff --git a/README b/README index 01d68dbbc..b865018a2 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -MKVToolNix 6.2.0 +MKVToolNix 6.3.0 ================ Table of contents diff --git a/README.Windows.txt b/README.Windows.txt index 60299fd96..fce5ee7dc 100644 --- a/README.Windows.txt +++ b/README.Windows.txt @@ -1,4 +1,4 @@ -Building MKVToolNix 6.2.0 on Windows +Building MKVToolNix 6.3.0 on Windows ==================================== There is currently only one supported way to build MKVToolNix for diff --git a/configure.in b/configure.in index 112fe759e..c24414688 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ AC_PREREQ(2.50) AC_CONFIG_HEADERS(config.h:config.h.in) PACKAGE="mkvtoolnix" -VERSION="6.2.0" +VERSION="6.3.0" AC_SUBST(PACKAGE) AC_SUBST(VERSION) diff --git a/contrib/fedora-core.spec b/contrib/fedora-core.spec index 00f7e5b88..d655f0f40 100644 --- a/contrib/fedora-core.spec +++ b/contrib/fedora-core.spec @@ -2,7 +2,7 @@ Summary: mkvtoolnix Name: mkvtoolnix -Version: 6.2.0 +Version: 6.3.0 Release: 1 License: GPL Group: Multimedia diff --git a/contrib/opensuse-12.spec b/contrib/opensuse-12.spec index 5b9d7a4b7..0111a5860 100644 --- a/contrib/opensuse-12.spec +++ b/contrib/opensuse-12.spec @@ -7,7 +7,7 @@ BuildRequires: flac flac-devel gcc-c++ gtk2 gtk2-devel libogg0 libogg-devel libs Name: mkvtoolnix URL: http://www.bunkus.org/videotools/mkvtoolnix/ -Version: 6.2.0 +Version: 6.3.0 Release: 1 Summary: tools to create, alter and inspect Matroska files License: GPL diff --git a/debian-upstream/changelog b/debian-upstream/changelog index 508620557..b502ff061 100644 --- a/debian-upstream/changelog +++ b/debian-upstream/changelog @@ -1,3 +1,9 @@ +mkvtoolnix (6.3.0) raring; urgency=low + + * New version. + + -- Moritz Bunkus Thu, 27 Jun 2013 20:15:22 +0200 + mkvtoolnix (6.2.0) raring; urgency=low * New version. diff --git a/doc/man/ja/mkvextract.1 b/doc/man/ja/mkvextract.1 index d0ee75548..31ec2b3c7 100644 --- a/doc/man/ja/mkvextract.1 +++ b/doc/man/ja/mkvextract.1 @@ -2,12 +2,12 @@ .\" Title: mkvextract .\" Author: Bunkus Moritz[FAMILY Given] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-04-27 +.\" Date: 2013-06-27 .\" Manual: -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Japanese .\" -.TH "MKVEXTRACT" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "" +.TH "MKVEXTRACT" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/ja/mkvinfo.1 b/doc/man/ja/mkvinfo.1 index 18fff627e..c0d641517 100644 --- a/doc/man/ja/mkvinfo.1 +++ b/doc/man/ja/mkvinfo.1 @@ -2,12 +2,12 @@ .\" Title: mkvinfo .\" Author: Bunkus Moritz[FAMILY Given] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-04-27 +.\" Date: 2013-06-27 .\" Manual: -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Japanese .\" -.TH "MKVINFO" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "" +.TH "MKVINFO" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/ja/mkvmerge.1 b/doc/man/ja/mkvmerge.1 index 47491f319..a90af843d 100644 --- a/doc/man/ja/mkvmerge.1 +++ b/doc/man/ja/mkvmerge.1 @@ -2,12 +2,12 @@ .\" Title: mkvmerge .\" Author: Bunkus Moritz[FAMILY Given] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-04-27 +.\" Date: 2013-06-27 .\" Manual: -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Japanese .\" -.TH "MKVMERGE" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "" +.TH "MKVMERGE" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/ja/mkvpropedit.1 b/doc/man/ja/mkvpropedit.1 index 9d812f318..0fb76b8aa 100644 --- a/doc/man/ja/mkvpropedit.1 +++ b/doc/man/ja/mkvpropedit.1 @@ -2,12 +2,12 @@ .\" Title: mkvpropedit .\" Author: Bunkus Moritz[FAMILY Given] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-04-27 +.\" Date: 2013-06-27 .\" Manual: -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Japanese .\" -.TH "MKVPROPEDIT" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "" +.TH "MKVPROPEDIT" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/ja/mmg.1 b/doc/man/ja/mmg.1 index d1e46605a..534c54080 100644 --- a/doc/man/ja/mmg.1 +++ b/doc/man/ja/mmg.1 @@ -2,12 +2,12 @@ .\" Title: mmg .\" Author: Bunkus Moritz[FAMILY Given] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-04-27 +.\" Date: 2013-06-27 .\" Manual: -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Japanese .\" -.TH "MMG" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "" +.TH "MMG" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/mkvextract.1 b/doc/man/mkvextract.1 index 5815f0487..4d93376a1 100644 --- a/doc/man/mkvextract.1 +++ b/doc/man/mkvextract.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mkvextract .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: User Commands -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: English .\" -.TH "MKVEXTRACT" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "User Commands" +.TH "MKVEXTRACT" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -165,12 +165,7 @@ source\&.mkv .SS "Track extraction mode" .PP Syntax: -\fBmkvextract\fR -\fBtracks\fR -\fIsource\-filename\fR -[\fIoptions\fR] -\fITID1:dest\-filename1\fR -[\fITID2:dest\-filename2\fR \&.\&.\&.] +\fBmkvextract\fR\fBtracks\fR\fIsource\-filename\fR[\fIoptions\fR]\fITID1:dest\-filename1\fR[\fITID2:dest\-filename2\fR \&.\&.\&.] .PP The following command line options are available for each track in the \*(Aqtracks\*(Aq extraction mode\&. They have to appear in front of the track specification (see below) they should be applied to\&. .PP @@ -241,10 +236,7 @@ $ mkvextract tracks input\&.mkv 1:output\-two\-tracks\&.rm 2:output\-two\-tracks .SS "Tags extraction mode" .PP Syntax: -\fBmkvextract\fR -\fBtags\fR -\fIsource\-filename\fR -[\fIoptions\fR] +\fBmkvextract\fR\fBtags\fR\fIsource\-filename\fR[\fIoptions\fR] .PP The extracted tags are written to the console unless the output is redirected (see the section about output redirection @@ -252,12 +244,7 @@ for details)\&. .SS "Attachments extraction mode" .PP Syntax: -\fBmkvextract\fR -\fBattachments\fR -\fIsource\-filename\fR -[\fIoptions\fR] -\fIAID1:outname1\fR -[\fIAID2:outname2\fR \&.\&.\&.] +\fBmkvextract\fR\fBattachments\fR\fIsource\-filename\fR[\fIoptions\fR]\fIAID1:outname1\fR[\fIAID2:outname2\fR \&.\&.\&.] .PP \fIAID\fR:\fIoutname\fR .RS 4 @@ -277,10 +264,7 @@ option\&. .SS "Chapters extraction mode" .PP Syntax: -\fBmkvextract\fR -\fBchapters\fR -\fIsource\-filename\fR -[\fIoptions\fR] +\fBmkvextract\fR\fBchapters\fR\fIsource\-filename\fR[\fIoptions\fR] .PP \fB\-s\fR, \fB\-\-simple\fR .RS 4 @@ -297,10 +281,7 @@ for details)\&. .SS "Cue sheet extraction mode" .PP Syntax: -\fBmkvextract\fR -\fBcuesheet\fR -\fIsource\-filename\fR -[\fIoptions\fR] +\fBmkvextract\fR\fBcuesheet\fR\fIsource\-filename\fR[\fIoptions\fR] .PP The extracted cue sheet is written to the console unless the output is redirected (see the section about output redirection @@ -308,12 +289,7 @@ for details)\&. .SS "Timecode extraction mode" .PP Syntax: -\fBmkvextract\fR -\fBtimecodes_v2\fR -\fIsource\-filename\fR -[\fIoptions\fR] -\fITID1:dest\-filename1\fR -[\fITID2:dest\-filename2\fR \&.\&.\&.] +\fBmkvextract\fR\fBtimecodes_v2\fR\fIsource\-filename\fR[\fIoptions\fR]\fITID1:dest\-filename1\fR[\fITID2:dest\-filename2\fR \&.\&.\&.] .PP The extracted timecodes are written to the console unless the output is redirected (see the section about output redirection @@ -362,7 +338,6 @@ $ mkvextract tags source\&.mkv > tags\&.xml .RE .\} .PP - \fBmkvextract\fR(1)\*(Aqs own redirection is invoked with the \fB\-\-redirect\-output\fR option\&. Example: @@ -402,7 +377,6 @@ The decision about the output format is based on the track type, not on the exte .PP V_MPEG4/ISO/AVC .RS 4 - H\&.264 / AVC @@ -428,7 +402,6 @@ files\&. .PP V_REAL/* .RS 4 - RealVideo(TM) tracks are written to RealMedia(TM) @@ -437,7 +410,6 @@ files\&. .PP V_THEORA .RS 4 - Theora(TM) streams will be written within an Ogg(TM) @@ -446,7 +418,6 @@ container .PP V_VP8 .RS 4 - VP8 tracks are written to IVF @@ -500,7 +471,6 @@ file\&. .PP A_REAL/* .RS 4 - RealAudio(TM) tracks are written to RealMedia(TM) @@ -509,7 +479,6 @@ files\&. .PP A_TTA1 .RS 4 - TrueAudio(TM) tracks are written to TTA @@ -522,7 +491,6 @@ CRC\&. .PP A_ALAC .RS 4 - ALAC tracks are written to CAF @@ -531,7 +499,6 @@ files\&. .PP A_FLAC .RS 4 - FLAC tracks are written to raw FLAC @@ -540,7 +507,6 @@ files\&. .PP A_WAVPACK4 .RS 4 - WavPack(TM) tracks are written to WV @@ -556,7 +522,6 @@ files\&. .PP S_TEXT/SSA, S_TEXT/ASS .RS 4 - SSA and ASS @@ -567,7 +532,6 @@ files respectively\&. .PP S_KATE .RS 4 - Kate(TM) streams will be written within an Ogg(TM) @@ -576,7 +540,6 @@ container\&. .PP S_VOBSUB .RS 4 - VobSub(TM) subtitles will be written as SUB @@ -587,7 +550,6 @@ files\&. .PP S_TEXT/USF .RS 4 - USF text subtitles will be written as USF @@ -596,7 +558,6 @@ files\&. .PP S_HDMV/PGS .RS 4 - PGS subtitles will be written as SUP @@ -635,7 +596,6 @@ Timecodes are first sorted and then output as a timecode v2 format compliant fil .RE .SH "EXIT CODES" .PP - \fBmkvextract\fR(1) exits with one of three exit codes: .sp @@ -647,7 +607,6 @@ exits with one of three exit codes: .sp -1 .IP \(bu 2.3 .\} - \fB0\fR \-\- This exit codes means that extraction has completed successfully\&. .RE @@ -660,7 +619,6 @@ exits with one of three exit codes: .sp -1 .IP \(bu 2.3 .\} - \fB1\fR \-\- In this case \fBmkvextract\fR(1) @@ -675,7 +633,6 @@ has output at least one warning, but extraction did continue\&. A warning is pre .sp -1 .IP \(bu 2.3 .\} - \fB2\fR \-\- This exit code is used after an error occurred\&. \fBmkvextract\fR(1) @@ -688,7 +645,6 @@ There are a few places in which special characters in text must or should be esc The rules are: \*(Aq \*(Aq (a space) becomes \*(Aq\es\*(Aq, \*(Aq"\*(Aq (double quotes) becomes \*(Aq\e2\*(Aq, \*(Aq:\*(Aq becomes \*(Aq\ec\*(Aq, \*(Aq#\*(Aq becomes \*(Aq\eh\*(Aq and \*(Aq\e\*(Aq (a single backslash) itself becomes \*(Aq\e\e\*(Aq\&. .SH "ENVIRONMENT VARIABLES" .PP - \fBmkvextract\fR(1) uses the default variables that determine the system\*(Aqs locale (e\&.g\&. \fILANG\fR @@ -717,7 +673,6 @@ the section about escaping special characters in text)\&. .RE .SH "SEE ALSO" .PP - \fBmkvmerge\fR(1), \fBmkvinfo\fR(1), \fBmkvpropedit\fR(1), diff --git a/doc/man/mkvextract.xml b/doc/man/mkvextract.xml index 7f12facd8..7d30e5d62 100644 --- a/doc/man/mkvextract.xml +++ b/doc/man/mkvextract.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mkvinfo.1 b/doc/man/mkvinfo.1 index a9c74da30..45a95f623 100644 --- a/doc/man/mkvinfo.1 +++ b/doc/man/mkvinfo.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mkvinfo .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: User Commands -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: English .\" -.TH "MKVINFO" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "User Commands" +.TH "MKVINFO" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -219,7 +219,6 @@ Matroska(TM) element\&. All other elements only print stuff about the elements that were just found\&. Level 3 adds meta information to ease debugging (read: it\*(Aqs intended for developers only)\&. All lines written by level 3 are enclosed in square brackets to make filtering them out easy\&. .SH "EXIT CODES" .PP - \fBmkvinfo\fR(1) exits with one of three exit codes: .sp @@ -231,7 +230,6 @@ exits with one of three exit codes: .sp -1 .IP \(bu 2.3 .\} - \fB0\fR \-\- This exit codes means that the run has completed successfully\&. .RE @@ -244,7 +242,6 @@ exits with one of three exit codes: .sp -1 .IP \(bu 2.3 .\} - \fB1\fR \-\- In this case \fBmkvinfo\fR(1) @@ -259,7 +256,6 @@ has output at least one warning, but the run did continue\&. A warning is prefix .sp -1 .IP \(bu 2.3 .\} - \fB2\fR \-\- This exit code is used after an error occurred\&. \fBmkvinfo\fR(1) @@ -272,7 +268,6 @@ There are a few places in which special characters in text must or should be esc The rules are: \*(Aq \*(Aq (a space) becomes \*(Aq\es\*(Aq, \*(Aq"\*(Aq (double quotes) becomes \*(Aq\e2\*(Aq, \*(Aq:\*(Aq becomes \*(Aq\ec\*(Aq, \*(Aq#\*(Aq becomes \*(Aq\eh\*(Aq and \*(Aq\e\*(Aq (a single backslash) itself becomes \*(Aq\e\e\*(Aq\&. .SH "ENVIRONMENT VARIABLES" .PP - \fBmkvinfo\fR(1) uses the default variables that determine the system\*(Aqs locale (e\&.g\&. \fILANG\fR @@ -301,7 +296,6 @@ the section about escaping special characters in text)\&. .RE .SH "SEE ALSO" .PP - \fBmkvmerge\fR(1), \fBmkvextract\fR(1), \fBmkvpropedit\fR(1), diff --git a/doc/man/mkvinfo.xml b/doc/man/mkvinfo.xml index e02f1d121..098835904 100644 --- a/doc/man/mkvinfo.xml +++ b/doc/man/mkvinfo.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mkvmerge.1 b/doc/man/mkvmerge.1 index c8d56d225..5ef90354e 100644 --- a/doc/man/mkvmerge.1 +++ b/doc/man/mkvmerge.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mkvmerge .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: User Commands -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: English .\" -.TH "MKVMERGE" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "User Commands" +.TH "MKVMERGE" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -141,7 +141,6 @@ This switch does also apply to chapters that are copied from certain container t .PP \fB\-\-cue\-chapter\-name\-format\fR \fIformat\fR .RS 4 - \fBmkvmerge\fR(1) supports reading CUE @@ -262,7 +261,6 @@ milliseconds of data into each cluster\&. The minimum for \fId\fR is \*(Aq100ms\*(Aq, and the maximum is \*(Aq32000ms\*(Aq\&. .sp - \fBmkvmerge\fR(1) defaults to putting at most 65535 data blocks and 5000ms of data into a cluster\&. .sp @@ -343,8 +341,7 @@ supports four different modes\&. Splitting by size\&. .sp Syntax: -\fB\-\-split\fR -[size:]\fId\fR[k|m|g] +\fB\-\-split\fR[size:]\fId\fR[k|m|g] .sp Examples: \-\-split size:700m @@ -369,8 +366,7 @@ The \*(Aqsize:\*(Aq prefix may be omitted for compatibility reasons\&. Splitting after a duration\&. .sp Syntax: -\fB\-\-split\fR -[duration:]\fIHH:MM:SS\&.nnnnnnnnn\fR|\fId\fRs +\fB\-\-split\fR[duration:]\fIHH:MM:SS\&.nnnnnnnnn\fR|\fId\fRs .sp Examples: \-\-split duration:00:60:00\&.000 @@ -405,8 +401,7 @@ The \*(Aqduration:\*(Aq prefix may be omitted for compatibility reasons\&. Splitting after specific timecodes\&. .sp Syntax: -\fB\-\-split\fR -timecodes:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] +\fB\-\-split\fRtimecodes:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] .sp Example: \-\-split timecodes:00:45:00\&.000,01:20:00\&.250,6300s @@ -431,8 +426,7 @@ The \*(Aqtimecodes:\*(Aq prefix must not be omitted\&. Keeping specific parts by specifying timecode ranges while discarding others\&. .sp Syntax: -\fB\-\-split\fR -parts:\fIstart1\fR\-\fIend1\fR[,[+]\fIstart2\fR\-\fIend2\fR[,[+]\fIstart3\fR\-\fIend3\fR\&.\&.\&.]] +\fB\-\-split\fRparts:\fIstart1\fR\-\fIend1\fR[,[+]\fIstart2\fR\-\fIend2\fR[,[+]\fIstart3\fR\-\fIend3\fR\&.\&.\&.]] .sp Examples: .sp @@ -553,8 +547,7 @@ will continue outputting the frames up to but excluding the following key frame\ Keeping specific parts by specifying frame/field number ranges while discarding others\&. .sp Syntax: -\fB\-\-split\fR -parts\-frames:\fIstart1\fR\-\fIend1\fR[,[+]\fIstart2\fR\-\fIend2\fR[,[+]\fIstart3\fR\-\fIend3\fR\&.\&.\&.]] +\fB\-\-split\fRparts\-frames:\fIstart1\fR\-\fIend1\fR[,[+]\fIstart2\fR\-\fIend2\fR[,[+]\fIstart3\fR\-\fIend3\fR\&.\&.\&.]] .sp Examples: .sp @@ -691,8 +684,7 @@ block contains either a full frame (for progressive content) or a single field ( Splitting after specific frames/fields\&. .sp Syntax: -\fB\-\-split\fR -frames:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] +\fB\-\-split\fRframes:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] .sp Example: \-\-split frames:120,237,891 @@ -740,11 +732,9 @@ block contains either a full frame (for progressive content) or a single field ( Splitting before specific chapters\&. .sp Syntax: -\fB\-\-split\fR -chapters:all +\fB\-\-split\fRchapters:all or -\fB\-\-split\fR -chapters:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] +\fB\-\-split\fRchapters:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] .sp Example: \-\-split chapters:5,8 @@ -944,7 +934,6 @@ option\&. .PP \fB\-\-attachment\-mime\-type\fR \fIMIME type\fR .RS 4 - MIME type of the following attachment\&. Applies to the next \fB\-\-attach\-file\fR @@ -979,7 +968,6 @@ are attached to all output files while the ones attached with \fB\-\-attach\-file\-once\fR are only attached to the first file created\&. If splitting is not used then both do the same\&. .sp - \fBmkvextract\fR(1) can be used to extract attached files from a Matroska(TM) @@ -1147,7 +1135,6 @@ ms\&. The track IDs are the same as the ones given with (see section track IDs)\&. .sp - \fIo\fR/\fIp\fR: adjust the timestamps by \fIo\fR/\fIp\fR to fix linear drifts\&. @@ -1382,7 +1369,6 @@ to the specified value\&. Works only for video tracks in the \*(AqMS compatibili .PP \fB\-\-display\-dimensions\fR \fITID:widthxheight\fR .RS 4 - Matroska(TM) files contain two values that set the display properties that a player should scale the image on playback to: display width and display height\&. These values can be set with this option, e\&.g\&. \*(Aq1:640x480\*(Aq\&. .sp @@ -1395,7 +1381,6 @@ option (see below)\&. These options are mutually exclusive\&. .PP \fB\-\-aspect\-ratio\fR \fITID:ratio|width/height\fR .RS 4 - Matroska(TM) files contain two values that set the display properties that a player should scale the image on playback to: display width and display height\&. With this option \fBmkvmerge\fR(1) @@ -1836,8 +1821,7 @@ Some movies start synced correctly but slowly drift out of sync\&. For these kin seconds out of sync at the end of the movie which was \fB77340\fR frames long\&. At -\fB29\&.97fps\fR -\fB0\&.2\fR +\fB29\&.97fps\fR\fB0\&.2\fR seconds correspond to approx\&. \fB6\fR frames\&. So I did @@ -2055,7 +2039,6 @@ Track IDs are assigned like this: .sp -1 .IP \(bu 2.3 .\} - AVI files: The video track has the ID 0\&. The audio tracks get IDs in ascending order starting at 1\&. .RE @@ -2068,7 +2051,6 @@ files: The video track has the ID 0\&. The audio tracks get IDs in ascending ord .sp -1 .IP \(bu 2.3 .\} - AAC, AC3, MP3, @@ -2128,7 +2110,6 @@ or for text originating from a Matroska(TM) file\&. .PP - \fBmkvmerge\fR(1) does this conversion automatically based on the presence of a byte order marker @@ -2185,7 +2166,6 @@ The following options exist that allow specifying the character sets: .sp -1 .IP \(bu 2.3 .\} - \fB\-\-sub\-charset\fR for text subtitle files and for text subtitle tracks stored in container formats for which the character set cannot be determined unambiguously (e\&.g\&. Ogg files), .RE @@ -2198,7 +2178,6 @@ for text subtitle files and for text subtitle tracks stored in container formats .sp -1 .IP \(bu 2.3 .\} - \fB\-\-chapter\-charset\fR for chapter text files and for chapters and file titles stored in container formats for which the character set cannot be determined unambiguously (e\&.g\&. Ogg files for chapter information, track and file titles etc; MP4 files for chapter information), .RE @@ -2211,7 +2190,6 @@ for chapter text files and for chapters and file titles stored in container form .sp -1 .IP \(bu 2.3 .\} - \fB\-\-command\-line\-charset\fR for all strings on the command line, .RE @@ -2224,7 +2202,6 @@ for all strings on the command line, .sp -1 .IP \(bu 2.3 .\} - \fB\-\-output\-charset\fR for all strings written to the console or to a file if the output has been redirected with the \fB\-\-redirect\-output\fR @@ -2348,7 +2325,6 @@ PGS bitmap subtitle files as found on BluRay discs .RE .SH "FILE LINKING" .PP - Matroska(TM) supports file linking which simply says that a specific file is the predecessor or successor of the current file\&. To be precise, it\*(Aqs not really the files that are linked but the Matroska(TM) @@ -2467,7 +2443,6 @@ OGM files\&. The full specifications can be found at \m[blue]\fBthe Matroska(TM) website\fR\m[]\&\s-2\u[1]\d\s+2\&. .PP - \fBmkvmerge\fR(1) supports two kinds of chapter files as its input\&. The first format, called \*(Aqsimple chapter format\*(Aq, is the same format that the OGM @@ -2494,11 +2469,9 @@ CHAPTER03NAME=Baby rocks the house .RE .\} .PP - \fBmkvmerge\fR(1) will transform every pair or lines into one -Matroska(TM) -ChapterAtom\&. It does not set any +Matroska(TM)ChapterAtom\&. It does not set any ChapterTrackNumber which means that the chapters all apply to all tracks in the file\&. .PP @@ -2627,7 +2600,6 @@ When splitting files \fBmkvmerge\fR(1) will correctly adjust the chapters as well\&. This means that each file only includes the chapter entries that apply to it, and that the timecodes will be offset to match the new timecodes of each output file\&. .PP - \fBmkvmerge\fR(1) is able to copy chapters from Matroska(TM) @@ -2650,7 +2622,6 @@ files manually and mux them afterwards\&. .SH "TAGS" .SS "Introduction" .PP - Matroska(TM) supports an extensive set of tags that is deprecated and a new, simpler system like it is is used in most other containers: \fIKEY=VALUE\fR\&. However, in @@ -2664,15 +2635,13 @@ example\-tags\-2\&.xml shows how to use this new system\&. .SS "Scope of the tags" .PP - Matroska(TM) tags do not automatically apply to the complete file\&. They can, but they also may apply to different parts of the file: to one or more tracks, to one or more chapters, or even to a combination of both\&. The \m[blue]\fBthe Matroska(TM) specification\fR\m[]\&\s-2\u[3]\d\s+2 gives more details about this fact\&. .PP One important fact is that tags are linked to tracks or chapters with the -Targets -Matroska(TM) +TargetsMatroska(TM) tag element, and that the UIDs used for this linking are \fInot\fR the track IDs @@ -2685,7 +2654,6 @@ Matroska(TM) file\&. Therefore it is difficult to know which UIDs to use in the tag file before the file is handed over to \fBmkvmerge\fR(1)\&. .PP - \fBmkvmerge\fR(1) knows two options with which you can add tags to Matroska(TM) @@ -2725,7 +2693,6 @@ $ mkvmerge \-o file\&.mkv \-\-tags 0:tags\&.xml file\&.avi .\} .SS "Tag file format" .PP - \fBmkvmerge\fR(1) supports a XML @@ -2757,8 +2724,7 @@ The outermost element must be .IP \(bu 2.3 .\} One logical tag is contained inside one pair of - -XML +XML tags\&. .RE .sp @@ -2924,7 +2890,6 @@ file would look like this: This might be the case for audio\-only files\&. .SH "EXTERNAL TIMECODE FILES" .PP - \fBmkvmerge\fR(1) allows the user to chose the timecodes for a specific track himself\&. This can be used in order to create files with variable frame rate video or include gaps in audio\&. A frame in this case is the unit that \fBmkvmerge\fR(1) @@ -3014,7 +2979,6 @@ gap, 10\&.050 This format is identical to the v2 format\&. The only difference is that the timecodes do not have to be sorted\&. This format should almost never be used\&. .SH "EXIT CODES" .PP - \fBmkvmerge\fR(1) exits with one of three exit codes: .sp @@ -3026,7 +2990,6 @@ exits with one of three exit codes: .sp -1 .IP \(bu 2.3 .\} - \fB0\fR \-\- This exit codes means that muxing has completed successfully\&. .RE @@ -3039,7 +3002,6 @@ exits with one of three exit codes: .sp -1 .IP \(bu 2.3 .\} - \fB1\fR \-\- In this case \fBmkvmerge\fR(1) @@ -3054,7 +3016,6 @@ has output at least one warning, but muxing did continue\&. A warning is prefixe .sp -1 .IP \(bu 2.3 .\} - \fB2\fR \-\- This exit code is used after an error occurred\&. \fBmkvmerge\fR(1) @@ -3062,7 +3023,6 @@ aborts right after outputting the error message\&. Error messages range from wro .RE .SH "ENVIRONMENT VARIABLES" .PP - \fBmkvmerge\fR(1) uses the default variables that determine the system\*(Aqs locale (e\&.g\&. \fILANG\fR @@ -3091,7 +3051,6 @@ the section about escaping special characters in text)\&. .RE .SH "SEE ALSO" .PP - \fBmkvinfo\fR(1), \fBmkvextract\fR(1), \fBmkvpropedit\fR(1), diff --git a/doc/man/mkvmerge.xml b/doc/man/mkvmerge.xml index b9a296302..590359621 100644 --- a/doc/man/mkvmerge.xml +++ b/doc/man/mkvmerge.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mkvpropedit.1 b/doc/man/mkvpropedit.1 index 5641a8d1e..aa354a235 100644 --- a/doc/man/mkvpropedit.1 +++ b/doc/man/mkvpropedit.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mkvpropedit .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: User Commands -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: English .\" -.TH "MKVPROPEDIT" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "User Commands" +.TH "MKVPROPEDIT" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -117,15 +117,13 @@ must be one of the words \fBglobal\fR or \fBtrack\fR\&. For -\fBall\fR -\fBmkvpropedit\fR(1) +\fBall\fR\fBmkvpropedit\fR(1) will replace or remove all tags in a file\&. With \fBglobal\fR only global tags will be replaced or removed\&. .sp With -\fBtrack\fR -\fBmkvpropedit\fR(1) +\fBtrack\fR\fBmkvpropedit\fR(1) will replace tags for a specific track\&. Additionally the tags read from filename will be assigned to the same track\&. The track is specified in the same way @@ -630,7 +628,6 @@ $ mkvpropedit movie\&.mkv \-\-delete\-attachment mime\-type:application/x\-truet .\} .SH "EXIT CODES" .PP - \fBmkvpropedit\fR(1) exits with one of three exit codes: .sp @@ -642,7 +639,6 @@ exits with one of three exit codes: .sp -1 .IP \(bu 2.3 .\} - \fB0\fR \-\- This exit codes means that the modification has completed successfully\&. .RE @@ -655,7 +651,6 @@ exits with one of three exit codes: .sp -1 .IP \(bu 2.3 .\} - \fB1\fR \-\- In this case \fBmkvpropedit\fR(1) @@ -670,7 +665,6 @@ has output at least one warning, but the modification did continue\&. A warning .sp -1 .IP \(bu 2.3 .\} - \fB2\fR \-\- This exit code is used after an error occurred\&. \fBmkvpropedit\fR(1) @@ -683,7 +677,6 @@ There are a few places in which special characters in text must or should be esc The rules are: \*(Aq \*(Aq (a space) becomes \*(Aq\es\*(Aq, \*(Aq"\*(Aq (double quotes) becomes \*(Aq\e2\*(Aq, \*(Aq:\*(Aq becomes \*(Aq\ec\*(Aq, \*(Aq#\*(Aq becomes \*(Aq\eh\*(Aq and \*(Aq\e\*(Aq (a single backslash) itself becomes \*(Aq\e\e\*(Aq\&. .SH "ENVIRONMENT VARIABLES" .PP - \fBmkvpropedit\fR(1) uses the default variables that determine the system\*(Aqs locale (e\&.g\&. \fILANG\fR @@ -712,7 +705,6 @@ the section about escaping special characters in text)\&. .RE .SH "SEE ALSO" .PP - \fBmkvmerge\fR(1), \fBmkvinfo\fR(1), \fBmkvextract\fR(1), diff --git a/doc/man/mkvpropedit.xml b/doc/man/mkvpropedit.xml index 4154ec157..ff9c88ac0 100644 --- a/doc/man/mkvpropedit.xml +++ b/doc/man/mkvpropedit.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mkvtoolnix-gui.xml b/doc/man/mkvtoolnix-gui.xml index dbc06e43a..f27ac98c1 100644 --- a/doc/man/mkvtoolnix-gui.xml +++ b/doc/man/mkvtoolnix-gui.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mmg.1 b/doc/man/mmg.1 index 96b518bd2..934228559 100644 --- a/doc/man/mmg.1 +++ b/doc/man/mmg.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mmg .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: User Commands -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: English .\" -.TH "MMG" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "User Commands" +.TH "MMG" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -34,7 +34,6 @@ mmg \- a GUI for \fBmkvmerge\fR(1) including a chapter and a header editor \fBmmg\fR [[\-\-edit\-headers\ {filename\&.mkv}] | [preferences\-file\&.mmg] | [source\-file\&.ext]] .SH "DESCRIPTION" .PP - \fBmmg\fR(1) is a wxWindows(TM) @@ -56,7 +55,6 @@ files\&. Included is also a header editor that can be used to quickly change pro Matroska(TM) files without needing a complete remux\&. .PP - \fBmmg\fR(1) knows few options\&. The first possibility is to start it with a single file name\&. If that file name\*(Aqs extenion is \*(Aq\&.mmg\*(Aq then it will be treated as a preferences file and \fBmmg\fR(1) @@ -71,7 +69,6 @@ run its header editor and load the file\&. The full documentation is available in HTML form (doc/mkvmerge\-gui\&.html)\&. .SH "SEE ALSO" .PP - \fBmkvmerge\fR(1), \fBmkvextract\fR(1), \fBmkvinfo\fR(1), diff --git a/doc/man/mmg.xml b/doc/man/mmg.xml index 048beb354..8c66a9d0d 100644 --- a/doc/man/mmg.xml +++ b/doc/man/mmg.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/nl/mkvextract.1 b/doc/man/nl/mkvextract.1 index 7a53dd147..7c7c300dd 100644 --- a/doc/man/nl/mkvextract.1 +++ b/doc/man/nl/mkvextract.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mkvextract .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: Gebruiker commando\*(Aqs -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Dutch .\" -.TH "MKVEXTRACT" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "Gebruiker commando\*(Aqs" +.TH "MKVEXTRACT" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "Gebruiker commando\*(Aqs" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -165,12 +165,7 @@ source\&.mkv .SS "Spoor uitpak mode" .PP Ingaven: -\fBmkvextract\fR -\fBtracks\fR -\fIsource\-filename\fR -[\fIoptions\fR] -\fITID1:dest\-filename1\fR -[\fITID2:dest\-filename2\fR \&.\&.\&.] +\fBmkvextract\fR\fBtracks\fR\fIsource\-filename\fR[\fIoptions\fR]\fITID1:dest\-filename1\fR[\fITID2:dest\-filename2\fR \&.\&.\&.] .PP De volgende commandoregel opties zijn beschikbaar voor elk spoor in \*(Aqtracks\*(Aq uitpak mode\&. Zij zullen vooraan moeten worden geplaatst in de spoor specificatie (zie hieronder) Zij zouden toegepast moeten zijn op\&. .PP @@ -241,10 +236,7 @@ $ mkvextract tracks input\&.mkv 1:output\-two\-tracks\&.rm 2:output\-two\-tracks .SS "Markeringen extraheren mode" .PP Ingaven: -\fBmkvextract\fR -\fBtags\fR -\fIsource\-filename\fR -[\fIoptions\fR] +\fBmkvextract\fR\fBtags\fR\fIsource\-filename\fR[\fIoptions\fR] .PP De ge\(:extraheerde markeringen zijn geschreven naar de apparaat/houder tenzij de uitvoer is omgeleid (zie de sectie over: Uitvoer omleiden @@ -252,12 +244,7 @@ voor details)\&. .SS "Bijlagen extraheren mode" .PP Ingaven: -\fBmkvextract\fR -\fBattachments\fR -\fIsource\-filename\fR -[\fIoptions\fR] -\fIAID1:outname1\fR -[\fIAID2:outname2\fR \&.\&.\&.] +\fBmkvextract\fR\fBattachments\fR\fIsource\-filename\fR[\fIoptions\fR]\fIAID1:outname1\fR[\fIAID2:outname2\fR \&.\&.\&.] .PP \fIAID\fR:\fIoutname\fR .RS 4 @@ -277,10 +264,7 @@ optie\&. .SS "Hoofdstuk uitpak mode" .PP Ingaven: -\fBmkvextract\fR -\fBchapters\fR -\fIsource\-filename\fR -[\fIoptions\fR] +\fBmkvextract\fR\fBchapters\fR\fIsource\-filename\fR[\fIoptions\fR] .PP \fB\-s\fR, \fB\-\-simple\fR .RS 4 @@ -297,10 +281,7 @@ voor details)\&. .SS "Volg document(en) (cue) extraheren mode" .PP Ingaven: -\fBmkvextract\fR -\fBcuesheet\fR -\fIsource\-filename\fR -[\fIoptions\fR] +\fBmkvextract\fR\fBcuesheet\fR\fIsource\-filename\fR[\fIoptions\fR] .PP De ge\(:extraheerde volg document(en) (cue) zijn geschreven naar de apparaat/houder tenzij de uitvoer is omgeleid (zie de sectie over: Uitvoer omleiden @@ -308,12 +289,7 @@ voor details)\&. .SS "Tijd code extraheren mode" .PP Ingaven: -\fBmkvextract\fR -\fBtimecodes_v2\fR -\fIsource\-filename\fR -[\fIoptions\fR] -\fITID1:dest\-filename1\fR -[\fITID2:dest\-filename2\fR \&.\&.\&.] +\fBmkvextract\fR\fBtimecodes_v2\fR\fIsource\-filename\fR[\fIoptions\fR]\fITID1:dest\-filename1\fR[\fITID2:dest\-filename2\fR \&.\&.\&.] .PP De ge\(:extraheerde hoofdstukken zijn geschreven naar de apparaat/houder tenzij de uitvoer is omgeleid (zie de sectie over: Uitvoer omleiden @@ -362,7 +338,6 @@ $ mkvextract tags source\&.mkv > tags\&.xml .RE .\} .PP - \fBmkvextract\fR(1)\*(Aqs eigen omleiding wordt aangehaald met \fB\-\-redirect\-output\fR option\&. Voorbeeld: @@ -402,7 +377,6 @@ De beslissing over het uitvoer formaat is gebaseerd op het spoor type, niet op d .PP V_MPEG4/ISO/AVC .RS 4 - H\&.264 / AVC @@ -428,7 +402,6 @@ bestanden\&. .PP V_REAL/* .RS 4 - RealVideo(TM) sporen worden geschreven naar RealMedia(TM) @@ -437,7 +410,6 @@ bestanden\&. .PP V_THEORA .RS 4 - Theora(TM) stromen worden geschreven binnen een Ogg(TM) @@ -500,7 +472,6 @@ bestand\&. .PP A_REAL/* .RS 4 - RealAudio(TM) sporen worden geschreven naar RealMedia(TM) @@ -509,7 +480,6 @@ bestanden\&. .PP A_TTA1 .RS 4 - TrueAudio(TM) sporen worden geschreven naar TTA @@ -522,7 +492,6 @@ CRC\&. .PP A_ALAC .RS 4 - ALAC worden geschreven naar CAF @@ -531,7 +500,6 @@ bestanden\&. .PP A_FLAC .RS 4 - FLAC sporen worden geschreven naar raw FLAC @@ -540,7 +508,6 @@ bestanden\&. .PP A_WAVPACK4 .RS 4 - WavPack(TM) sporen worden geschreven naar WV(TM) @@ -556,7 +523,6 @@ bestanden\&. .PP S_TEXT/SSA, S_TEXT/ASS .RS 4 - SSA en ASS @@ -567,7 +533,6 @@ bestanden\&. .PP S_KATE .RS 4 - Kate(TM) de stromen zullen binnen een Ogg(TM) @@ -576,7 +541,6 @@ bestand worden geschreven\&. .PP S_VOBSUB .RS 4 - VobSub(TM) ondetitels worden geschreven als SUB @@ -587,7 +551,6 @@ bestanden\&. .PP S_TEXT/USF .RS 4 - USF tekst ondertitels worden geschreven als USF @@ -596,7 +559,6 @@ bestanden\&. .PP S_HDMV/PGS .RS 4 - PGS ondertitels worden geschreven als SUP @@ -635,7 +597,6 @@ Tijd codes worden het eerst gesorteerd en daarna geschreven als en tijd code v2 .RE .SH "VERLAAT CODES" .PP - \fBmkvextract\fR(1) sluit af met drie afsluit codes: .sp @@ -647,7 +608,6 @@ sluit af met drie afsluit codes: .sp -1 .IP \(bu 2.3 .\} - \fB0\fR \-\- Deze verlaat code betekend dat de extractie succesvol is voltooid\&. .RE @@ -660,7 +620,6 @@ sluit af met drie afsluit codes: .sp -1 .IP \(bu 2.3 .\} - \fB1\fR \-\- In dit geval heeft \fBmkvextract\fR(1) @@ -675,7 +634,6 @@ minstens \('e\('en waarschuwing uitgegeven, maar extractie is doorgegaan\&. Een .sp -1 .IP \(bu 2.3 .\} - \fB2\fR \-\- Deze verlaat code wordt gebruikt nadat een fout is ontstaan\&. \fBmkvextract\fR(1) @@ -688,7 +646,6 @@ Er zijn een paar plaatsen waar speciale karakters zouden of moeten worden overge De regels zijn: \*(Aq \*(Aq (een spatie) wordt \*(Aq\es\*(Aq, \*(Aq"\*(Aq (dubbele aanhalingstekens) wordt \*(Aq\e2\*(Aq, \*(Aq:\*(Aq wordt \*(Aq\ec\*(Aq, \*(Aq#\*(Aq wordt \*(Aq\eh\*(Aq en \*(Aq\e\*(Aq (een enkele (backslash) zelf wordt \*(Aq\e\e\*(Aq\&. .SH "OMGEVINGSVARIABELEN" .PP - \fBmkvextract\fR(1) gebruikt de standaard variabelen vanuit het systeem locatie (b\&.v\&. \fILANG\fR @@ -717,7 +674,6 @@ Overslaan van speciale karakter(s) in tekst)\&. .RE .SH "ZIE OOK" .PP - \fBmkvmerge\fR(1), \fBmkvinfo\fR(1), \fBmkvpropedit\fR(1), diff --git a/doc/man/nl/mkvinfo.1 b/doc/man/nl/mkvinfo.1 index dcbf6e72a..5ae7a305e 100644 --- a/doc/man/nl/mkvinfo.1 +++ b/doc/man/nl/mkvinfo.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mkvinfo .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: Gebruiker commando\*(Aqs -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Dutch .\" -.TH "MKVINFO" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "Gebruiker commando\*(Aqs" +.TH "MKVINFO" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "Gebruiker commando\*(Aqs" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -220,7 +220,6 @@ Matroska(TM) element is gekoppeld\&. Alle overige elementen printen alleen info over de elementen die zojuist werden gevonden\&. Niveau 3 voegt meta informatie toe voor een makkelijkere fout opsporing (lees als: bedoelt voor ontwikkelaars)\&. Alle niveau 3 geschreven regels bevatten zich tussen [ ] om ze makkelijker te herkennen\&. .SH "VERLAAT CODES" .PP - \fBmkvinfo\fR(1) verlaat met \('e\('en van de drie afsluit codes: .sp @@ -232,7 +231,6 @@ verlaat met \('e\('en van de drie afsluit codes: .sp -1 .IP \(bu 2.3 .\} - \fB0\fR \-\- Deze verlaat code betekend dat alles succesvol voltooid is\&. .RE @@ -245,7 +243,6 @@ verlaat met \('e\('en van de drie afsluit codes: .sp -1 .IP \(bu 2.3 .\} - \fB1\fR \-\- In dit geval heeft \fBmkvinfo\fR(1) @@ -260,7 +257,6 @@ minimaal \('e\('en waarschuwing doen uitgaan, maar ging door\&. Een waarschuwing .sp -1 .IP \(bu 2.3 .\} - \fB2\fR \-\- Deze fout code wordt gegeven nadat er een fout optrad\&. \fBmkvinfo\fR(1) @@ -273,7 +269,6 @@ Er zijn een paar plaatsen waar speciale karakters zouden of moeten worden overge De regels zijn: \*(Aq \*(Aq (een spatie) wordt \*(Aq\es\*(Aq, \*(Aq"\*(Aq (dubbele aanhalingstekens) wordt \*(Aq\e2\*(Aq, \*(Aq:\*(Aq wordt \*(Aq\ec\*(Aq, \*(Aq#\*(Aq wordt \*(Aq\eh\*(Aq en \*(Aq\e\*(Aq (een enkele (backslash) zelf wordt \*(Aq\e\e\*(Aq\&. .SH "OMGEVINGSVARIABELEN" .PP - \fBmkvinfo\fR(1) gebruikt de standaard variabelen vanuit het systeem locatie (b\&.v\&. \fILANG\fR @@ -302,7 +297,6 @@ Overslaan van speciale karakter(s) in tekst)\&. .RE .SH "ZIE OOK" .PP - \fBmkvmerge\fR(1), \fBmkvextract\fR(1), \fBmkvpropedit\fR(1), diff --git a/doc/man/nl/mkvmerge.1 b/doc/man/nl/mkvmerge.1 index b7f8efed2..b2960839d 100644 --- a/doc/man/nl/mkvmerge.1 +++ b/doc/man/nl/mkvmerge.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mkvmerge .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: Gebruiker commando\*(Aqs -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Dutch .\" -.TH "MKVMERGE" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "Gebruiker commando\*(Aqs" +.TH "MKVMERGE" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "Gebruiker commando\*(Aqs" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -142,7 +142,6 @@ Deze schakelaar is ook van toepassing op hoofdstukken die zijn gekopieerd van en .PP \fB\-\-cue\-chapter\-name\-format\fR \fIformat\fR .RS 4 - \fBmkvmerge\fR(1) ondersteund lezen van CUE @@ -263,7 +262,6 @@ milliseconden aan data in elke cluster\&. Het minimum voor \fId\fR is \*(Aq100ms\*(Aq, en het maximum is \*(Aq32000ms\*(Aq\&. .sp - \fBmkvmerge\fR(1) plaatst standaard op zijn hoogst 65535 data blokken en 5000ms aan data in een cluster\&. .sp @@ -344,8 +342,7 @@ vier verschillende modes\&. Splitsen op grootte\&. .sp Ingaven: -\fB\-\-split\fR -[size:]\fId\fR[k|m|g] +\fB\-\-split\fR[size:]\fId\fR[k|m|g] .sp Voorbeelden: \-\-split size:700m @@ -370,8 +367,7 @@ De \*(Aqsize:\*(Aq mag vanwege de verenigbaarheid (compatibiliteit) weggelaten w Splitsen na een duur van\&. .sp Ingaven: -\fB\-\-split\fR -[duur:]\fIHH:MM:SS\&.nnnnnnnnn\fR|\fId\fRs +\fB\-\-split\fR[duur:]\fIHH:MM:SS\&.nnnnnnnnn\fR|\fId\fRs .sp Voorbeeld: \-\-split duration:00:60:00\&.000 @@ -406,8 +402,7 @@ De \*(Aqduration:\*(Aq mag vanwege de verenigbaarheid (compatibiliteit) weggelat Splitsen na een specifieke tijd code\&. .sp Ingaven: -\fB\-\-split\fR -timecodes:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] +\fB\-\-split\fRtimecodes:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] .sp Voorbeeld: \-\-split timecodes:00:45:00\&.000,01:20:00\&.250,6300s @@ -432,8 +427,7 @@ Het \*(Aqtimecodes:\*(Aq voorvoegsel mag niet wegelaten worden\&. Houden van specifieke delen door het specificeren van tijd code bereiken, terwijl het van anderen ontdaan wordt\&. .sp Ingaven: -\fB\-\-split\fR -parts:\fIstart1\fR\-\fIend1\fR[,[+]\fIstart2\fR\-\fIend2\fR[,[+]\fIstart3\fR\-\fIend3\fR\&.\&.\&.]] +\fB\-\-split\fRparts:\fIstart1\fR\-\fIend1\fR[,[+]\fIstart2\fR\-\fIend2\fR[,[+]\fIstart3\fR\-\fIend3\fR\&.\&.\&.]] .sp Voorbeeld: .sp @@ -554,8 +548,7 @@ beelden uitvoeren tot aan, maar exclusief de volgende sleutel beeld\&. Houden van specifieke delen door het specificeren van beeld/veld nummer bereiken, terwijl het van anderen ontdaan wordt\&. .sp Ingaven: -\fB\-\-split\fR -parts\-frames:\fIstart1\fR\-\fIend1\fR[,[+]\fIstart2\fR\-\fIend2\fR[,[+]\fIstart3\fR\-\fIend3\fR\&.\&.\&.]] +\fB\-\-split\fRparts\-frames:\fIstart1\fR\-\fIend1\fR[,[+]\fIstart2\fR\-\fIend2\fR[,[+]\fIstart3\fR\-\fIend3\fR\&.\&.\&.]] .sp Voorbeeld: .sp @@ -692,8 +685,7 @@ moeten gebruiken (twee velden per volledig beeld) als splits moment\&. Splitsen na specifieke beelden/velden codes\&. .sp Ingaven: -\fB\-\-split\fR -frames:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] +\fB\-\-split\fRframes:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] .sp Voorbeeld: \-\-split frames:120,237,891 @@ -741,11 +733,9 @@ moeten gebruiken (twee velden per volledig beeld) als splits moment\&. Splitsen na een specifieke hoofstukken\&. .sp Syntax: -\fB\-\-split\fR -chapters:all +\fB\-\-split\fRchapters:all or -\fB\-\-split\fR -chapters:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] +\fB\-\-split\fRchapters:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] .sp Voorbeeld: \-\-split chapters:5,8 @@ -946,7 +936,6 @@ optie\&. .PP \fB\-\-attachment\-mime\-type\fR \fIMIME type\fR .RS 4 - MIME type van de volgende bijlage\&. Is van toepassing op de volgende \fB\-\-attach\-file\fR @@ -982,7 +971,6 @@ aan alle uitvoerbestanden zijn vastgemaakt terwijl degene vastgemaakt met de \fB\-\-attach\-file\-once\fR alleen zijn vastgemaakt aan het eerste bestand\&. Is splitsen niet gebruikt dan doen beide hetzelfde\&. .sp - \fBmkvextract\fR(1) kan worden gebruikt om bestanden uit een Matroska(TM) @@ -1150,7 +1138,6 @@ ms\&. De spoor ID\*(Aqs zijn hetzelfde als degene gegeven met (zie sectie Spoor ID's)\&. .sp - \fIo\fR/\fIp\fR: Stel de tijd codes bij met \fIo\fR/\fIp\fR om lineaire driften te corrigeren\&. @@ -1386,7 +1373,6 @@ naar de opgegeven waarde\&. Werkt all\('e\('en voor video sporen in de \*(AqMS v .PP \fB\-\-display\-dimensions\fR \fITID:widthxheight\fR .RS 4 - Matroska(TM) bestanden bevatten twee waarden die het scherm eigenschappen instelt waarnaar een af speler met afspelen naar toe zou moeten schalen: scherm breedte en scherm hoogte\&. Deze waarden worden ingesteld met deze optie, b\&.v\&. \*(Aq1:640x480\*(Aq\&. .sp @@ -1399,7 +1385,6 @@ optie (zie hieronder)\&. Deze opties zijn wederzijds \- exclusief\&. .PP \fB\-\-aspect\-ratio\fR \fITID:ratio|width/height\fR .RS 4 - Matroska(TM) bestanden bevatten twee waarden die de scherm eigenschappen instelt waarnaar een af speler met afspelen naar toe zou moeten schalen: scherm breedte en scherm hoogte\&. Met deze optie zal \fBmkvmerge\fR(1) @@ -2062,7 +2047,6 @@ Spoor ID\*(Aqs worden toegewezen zoals dit: .sp -1 .IP \(bu 2.3 .\} - AVI bestanden: Het video spoor heeft het ID 0\&. De audio sporen krijgen de ID\*(Aqs in oplopende volgorde beginnend bij 1\&. .RE @@ -2075,7 +2059,6 @@ bestanden: Het video spoor heeft het ID 0\&. De audio sporen krijgen de ID\*(Aqs .sp -1 .IP \(bu 2.3 .\} - AAC, AC3, MP3, @@ -2136,7 +2119,6 @@ of voor de originele tekst uit een Matroska(TM) bestand\&. .PP - \fBmkvmerge\fR(1) doet deze conversie automatisch gebaseerd op de aanwezigheid van een Byte Order Marker (byte volgorde markering) @@ -2193,7 +2175,6 @@ Als de volgende optie aanwezig is dan is het toegestaan het karakter set te spec .sp -1 .IP \(bu 2.3 .\} - \fB\-\-sub\-charset\fR voor tekst ondertitels en tekst ondertitel sporen opgeslagen in de houder formaat waarvan de karakter set niet onomstotelijk kan worden vastgesteld (b\&.v\&. Ogg bestanden), .RE @@ -2206,7 +2187,6 @@ voor tekst ondertitels en tekst ondertitel sporen opgeslagen in de houder formaa .sp -1 .IP \(bu 2.3 .\} - \fB\-\-chapter\-charset\fR voor tekst hoofdstuk bestanden en voor hoofdstukken en bestand titels opgeslagen in de houder formaat waarvan de karakter set niet onomstotelijk kan worden vastgesteld (b\&.v\&. Ogg bestanden voor hoofdstuk informatie, spoor en bestand titels etc\&.; MP4 bestanden voor hoofdstuk informatie), .RE @@ -2219,7 +2199,6 @@ voor tekst hoofdstuk bestanden en voor hoofdstukken en bestand titels opgeslagen .sp -1 .IP \(bu 2.3 .\} - \fB\-\-command\-line\-charset\fR voor alle ingaven op de commandoregel, .RE @@ -2232,7 +2211,6 @@ voor alle ingaven op de commandoregel, .sp -1 .IP \(bu 2.3 .\} - \fB\-\-output\-charset\fR voor alle reeksen geschreven naar de apparaat/houder of naar een bestand wanneer de uitvoer is omgeleid met de \fB\-\-redirect\-output\fR @@ -2356,7 +2334,6 @@ PGS bitmap ondertitel bestanden zoals gevonden op BluRay schijven .RE .SH "BESTAND LINKEN" .PP - Matroska(TM) ondersteunt bestand linken welke eenvoudig zegt, dat een specifiek bestand de voorganger of de opvolger van het huidige bestand is\&. Om precies te zijn, het zijn niet echt de bestanden die gelinkt zijn maar de Matroska(TM) @@ -2475,7 +2452,6 @@ bestanden\&. De volledige specificatie kan gevonden worden op de \m[blue]\fBMatroska(TM)\fR\m[]\&\s-2\u[1]\d\s+2 website\&. .PP - \fBmkvmerge\fR(1) ondersteunt twee soorten van hoofdstuk bestanden als invoer\&. Het eerste formaat, genoemd \*(Aqsimpel hoofdstuk format\*(Aq, is hetzelfde format dat het OGM @@ -2502,11 +2478,9 @@ CHAPTER03NAME=Baby rocks the house .RE .\} .PP - \fBmkvmerge\fR(1) zal elk paar of regels transformeren naar \('e\('en -Matroska(TM) -ChapterAtom\&. Het plaatst geen +Matroska(TM)ChapterAtom\&. Het plaatst geen ChapterTrackNumber Wat inhoudt, dat de hoofdstukken van toepassing zijn aan alle sporen in het bestand\&. .PP @@ -2635,7 +2609,6 @@ Bij het splitsen van bestanden dan zal \fBmkvmerge\fR(1) tevens de hoofdstukken juist bijstellen\&. Dit betekent, dat elk bestand slechts de hoofdstukingangen omvat waarop het van toepassing is, en dat de tijd codes worden gecompenseerd om te voldoen aan de nieuwe tijd codes van elk uitvoer bestand\&. .PP - \fBmkvmerge\fR(1) is in staat hoofdstukken te kopi\(:eren van Matroska(TM) @@ -2657,7 +2630,6 @@ bestanden aaneenkoppelen en nadien samenvoegen\&. .SH "MARKERINGEN" .SS "Introductie" .PP - Matroska(TM) ondersteunt een uitgebreide set markeringen welke zijn verouderd, een nieuw simpeler systeem welke worden gebruikt in de meeste overige inhoudsformaten: \fIKEY=VALUE\fR\&. Hoewel, in @@ -2671,15 +2643,13 @@ example\-tags\-2\&.xml toont hoe dit nieuwe systeem te gebruiken\&. .SS "Gebied van de markeringen" .PP - Matroska(TM) markeringen worden niet automatisch toegekend aan het hele bestand\&. Dat kunnen zij, maar zij kunnen ook op verschillende delen van het bestand van toepassing zijn: aan \('e\('en of meerdere sporen, aan \('e\('en of meerdere hoofdstukken, of zelfs een combinatie van beide\&. \m[blue]\fBDe Matroska(TM) specificaties\fR\m[]\&\s-2\u[3]\d\s+2 geeft meer informatie over dit feit\&. .PP E\('en belangrijk feit is, dat markeringen gelinkt zijn naar sporen of hoofdstukken met de -Targets -Matroska(TM) +TargetsMatroska(TM) markeer element, en dat de gebruikte UID\*(Aqs voor dit linken \fIniet\fR zijn, de spoor ID\*(Aqs die overal door @@ -2693,7 +2663,6 @@ Matroska(TM) bestand is\&. Daarom is het moeilijk te bepalen, welke UID\*(Aqs te gebruiken in het markeer bestand voordat het bestand wordt overgedragen naar \fBmkvmerge\fR(1)\&. .PP - \fBmkvmerge\fR(1) kent twee opties waarmee je markeringen kunt toevoegen aan Matroska(TM) @@ -2733,7 +2702,6 @@ $ mkvmerge \-o file\&.mkv \-\-tags 0:tags\&.xml file\&.avi .\} .SS "Markeer bestandsformaat" .PP - \fBmkvmerge\fR(1) ondersteunt een XML @@ -2766,8 +2734,7 @@ Het buitenste element moet zijn .IP \(bu 2.3 .\} E\('en logische markering welke binnenin \('e\('en paar bevindt van - -XML +XML markeringen\&. .RE .sp @@ -2932,7 +2899,6 @@ bestand zou lijken op dit: Dit kan het geval zijn voor all\('e\('en\-audio bestanden\&. .SH "EXTERNE TIJD CODE BESTANDEN" .PP - \fBmkvmerge\fR(1) staat de gebruiker toe, de tijd codes voor een specifiek spoor zelf te kiezen\&. Dit kan worden gebruikt, om bestanden met de variabele video beeld verhouding te cre\(:eren of \*(Aqgaten\*(Aq in audio te laten bevatten\&. Een beeld in dit geval, is de unit welke \fBmkvmerge\fR(1) @@ -3022,7 +2988,6 @@ gap, 10\&.050 Dit format is identiek aan het v2 format\&. Het enige verschil is dat de tijd codes niet gesorteerd behoeven te zijn\&. Dit format zou bijna nooit gebruikt moeten worden\&. .SH "VERLAAT CODES" .PP - \fBmkvinfo\fR(1) verlaat met \('e\('en van de drie afsluit codes: .sp @@ -3034,7 +2999,6 @@ verlaat met \('e\('en van de drie afsluit codes: .sp -1 .IP \(bu 2.3 .\} - \fB0\fR \-\- Deze verlaat code betekend dat het samenvoegen succesvol voltooid is\&. .RE @@ -3047,7 +3011,6 @@ verlaat met \('e\('en van de drie afsluit codes: .sp -1 .IP \(bu 2.3 .\} - \fB1\fR \-\- In dit geval heeft \fBmkvmerge\fR(1) @@ -3062,7 +3025,6 @@ ten miste \('e\('en waarschuwing uitgevaardigd, maar het samenvoegen ging door\& .sp -1 .IP \(bu 2.3 .\} - \fB2\fR \-\- Deze afsluit code wordt gebruikt nadat er een fout ontstond\&. \fBmkvmerge\fR(1) @@ -3070,7 +3032,6 @@ breekt direct af na het geven van dit waarschuw bericht\&. Fout! bereik in beric .RE .SH "OMGEVINGSVARIABELEN" .PP - \fBmkvmerge\fR(1) gebruikt de standaard variabelen vanuit het systeem locatie (b\&.v\&. \fILANG\fR @@ -3099,7 +3060,6 @@ Overslaan van speciale karakter(s) in tekst)\&. .RE .SH "ZIE OOK" .PP - \fBmkvinfo\fR(1), \fBmkvextract\fR(1), \fBmkvpropedit\fR(1), diff --git a/doc/man/nl/mkvpropedit.1 b/doc/man/nl/mkvpropedit.1 index ce2049b90..ba8d88ce1 100644 --- a/doc/man/nl/mkvpropedit.1 +++ b/doc/man/nl/mkvpropedit.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mkvpropedit .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: Gebruiker commando\*(Aqs -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Dutch .\" -.TH "MKVPROPEDIT" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "Gebruiker commando\*(Aqs" +.TH "MKVPROPEDIT" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "Gebruiker commando\*(Aqs" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -633,7 +633,6 @@ $ mkvpropedit movie\&.mkv \-\-delete\-attachment mime\-type:application/x\-truet .\} .SH "VERLAAT CODES" .PP - \fBmkvpropedit\fR(1) verlaat met \('e\('en van drie verlaat codes: .sp @@ -645,7 +644,6 @@ verlaat met \('e\('en van drie verlaat codes: .sp -1 .IP \(bu 2.3 .\} - \fB0\fR \-\- Deze verlaat code betekend dat het modificeren succesvol voltooid is\&. .RE @@ -658,7 +656,6 @@ verlaat met \('e\('en van drie verlaat codes: .sp -1 .IP \(bu 2.3 .\} - \fB1\fR \-\- In dit geval heeft \fBmkvpropedit\fR(1) @@ -673,7 +670,6 @@ minstends \('e\('en waarschuwing uitgegeven, maar extractie is doorgegaan\&. Een .sp -1 .IP \(bu 2.3 .\} - \fB2\fR \-\- Deze afsluit code wordt gebruikt nadat er een fout ontstond\&. \fBmkvpropedit\fR(1) @@ -686,7 +682,6 @@ Er zijn een paar plaatsen waar speciale karakters zouden of moeten worden overge De regels zijn: \*(Aq \*(Aq (een spatie) wordt \*(Aq\es\*(Aq, \*(Aq"\*(Aq (dubbele aanhalingstekens) wordt \*(Aq\e2\*(Aq, \*(Aq:\*(Aq wordt \*(Aq\ec\*(Aq, \*(Aq#\*(Aq wordt \*(Aq\eh\*(Aq en \*(Aq\e\*(Aq (een enkele (backslash) zelf wordt \*(Aq\e\e\*(Aq\&. .SH "OMGEVINGSVARIABELEN" .PP - \fBmkvpropedit\fR(1) gebruikt de standaard variabelen vanuit het systeem locatie (b\&.v\&. \fILANG\fR @@ -715,7 +710,6 @@ Overslaan van speciale karakter(s) in tekst)\&. .RE .SH "ZIE OOK" .PP - \fBmkvmerge\fR(1), \fBmkvinfo\fR(1), \fBmkvextract\fR(1), diff --git a/doc/man/nl/mmg.1 b/doc/man/nl/mmg.1 index 49b6a2fa6..c22ea5161 100644 --- a/doc/man/nl/mmg.1 +++ b/doc/man/nl/mmg.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mmg .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: Gebruiker commando\*(Aqs -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Dutch .\" -.TH "MMG" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "Gebruiker commando\*(Aqs" +.TH "MMG" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "Gebruiker commando\*(Aqs" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -34,7 +34,6 @@ mmg \- een grafische schil voor \fBmkvmerge\fR(1) inclusief een hoofdstuk en kop \fBmmg\fR [[\-\-edit\-headers\ {filename\&.mkv}] | [preferences\-file\&.mmg] | [source\-file\&.ext]] .SH "BESCHRIJVING" .PP - \fBmmg\fR(1) is een wxWindows(TM) @@ -56,7 +55,6 @@ bestanden\&. Tevens is ingesloten een kopstuk bewerker welke gebruikt kan worden Matroska(TM) bestanden zonder een volledige samenvoeging\&. .PP - \fBmmg\fR(1) kent een paar opties\&. De eerste, de mogelijkheid om op te starten met een enkele bestandnaam\&. Als die bestandsnaam de extensie \*(Aq\&.mmg\*(Aq bevat, dan zal het behandeld worden als instellingen bestand en zal \fBmmg\fR(1) @@ -71,7 +69,6 @@ toe zijn kopbewerker te starten en het bestand te laden\&. De volledige documentatie is beschikbaar in HTML format (doc/mkvmerge\-gui\&.html)\&. .SH "ZIE OOK" .PP - \fBmkvmerge\fR(1), \fBmkvextract\fR(1), \fBmkvinfo\fR(1), diff --git a/doc/man/po4a/po/ja.po b/doc/man/po4a/po/ja.po index 34c7f9219..84943e884 100644 --- a/doc/man/po4a/po/ja.po +++ b/doc/man/po4a/po/ja.po @@ -26,8 +26,8 @@ msgstr "mkvextract" #. type: Content of the version entity #: doc/man/mkvextract.xml:6 doc/man/mkvinfo.xml:6 doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 doc/man/mmg.xml:6 -msgid "6.2.0" -msgstr "6.2.0" +msgid "6.3.0" +msgstr "6.3.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 doc/man/mkvinfo.xml:7 doc/man/mkvmerge.xml:7 diff --git a/doc/man/po4a/po/nl.po b/doc/man/po4a/po/nl.po index c0ac91359..d7dffb3ed 100644 --- a/doc/man/po4a/po/nl.po +++ b/doc/man/po4a/po/nl.po @@ -23,8 +23,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mmg.xml:6 -msgid "6.2.0" -msgstr "6.2.0" +msgid "6.3.0" +msgstr "6.3.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/po4a/po/uk.po b/doc/man/po4a/po/uk.po index 444623572..5d57b6bc3 100644 --- a/doc/man/po4a/po/uk.po +++ b/doc/man/po4a/po/uk.po @@ -26,8 +26,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mmg.xml:6 -msgid "6.2.0" -msgstr "6.2.0" +msgid "6.3.0" +msgstr "6.3.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/po4a/po/zh_CN.po b/doc/man/po4a/po/zh_CN.po index 7ecd51062..b424e2a88 100644 --- a/doc/man/po4a/po/zh_CN.po +++ b/doc/man/po4a/po/zh_CN.po @@ -29,8 +29,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mmg.xml:6 -msgid "6.2.0" -msgstr "6.2.0" +msgid "6.3.0" +msgstr "6.3.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/uk/mkvextract.1 b/doc/man/uk/mkvextract.1 index 1b47d67ad..3a20dd1b5 100644 --- a/doc/man/uk/mkvextract.1 +++ b/doc/man/uk/mkvextract.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mkvextract .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: Користувацькі команди -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Ukrainian .\" -.TH "mkvextract" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "Користувацькі команди" +.TH "mkvextract" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "Користувацькі команди" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -86,8 +86,7 @@ Matroska(TM)\&. Всі зазначені аргументи є опціями і \fILC_ALL\fR\&. Після введення list\*(Aq як -\fIcode\fR -\fBmkvextract\fR(1) +\fIcode\fR\fBmkvextract\fR(1) відобразить список доступних перекладів\&. .RE .PP @@ -162,12 +161,7 @@ source\&.mkv .SS "Режим витягнення доріжок" .PP Синтаксис: -\fBmkvextract\fR -\fBtracks\fR -\fIsource\-filename\fR -[\fIoptions\fR] -\fITID1:dest\-filename1\fR -[\fITID2:dest\-filename2\fR \&.\&.\&.] +\fBmkvextract\fR\fBtracks\fR\fIsource\-filename\fR[\fIoptions\fR]\fITID1:dest\-filename1\fR[\fITID2:dest\-filename2\fR \&.\&.\&.] .PP Наступні опції командного рядка доступні для кожної доріжки в режимі витягнення \*(Aqtracks\*(Aq\&. Вони мають бути присутні після вказання доріжки (див\&. нижче), до якої будуть застосовуватись\&. .PP @@ -238,22 +232,14 @@ $ mkvextract tracks input\&.mkv 1:output\-two\-tracks\&.rm 2:output\-two\-tracks .SS "Режим витягнення тегів" .PP Синтаксис: -\fBmkvextract\fR -\fBtags\fR -\fIsource\-filename\fR -[\fIoptions\fR] +\fBmkvextract\fR\fBtags\fR\fIsource\-filename\fR[\fIoptions\fR] .PP Витягнуті теги записуються до консолі, якщо інформація на виході не перенаправляється (щоб розібратися детально, див\&. розділ output redirection)\&. .SS "Режим витягнення вкладень" .PP Синтаксис: -\fBmkvextract\fR -\fBattachments\fR -\fIsource\-filename\fR -[\fIoptions\fR] -\fIAID1:outname1\fR -[\fIAID2:outname2\fR \&.\&.\&.] +\fBmkvextract\fR\fBattachments\fR\fIsource\-filename\fR[\fIoptions\fR]\fIAID1:outname1\fR[\fIAID2:outname2\fR \&.\&.\&.] .PP \fIAID\fR:\fIoutname\fR .RS 4 @@ -272,10 +258,7 @@ Matroska(TM)\&. Дану опцію можна задавати декілька .SS "Режим витягнення розділів" .PP Синтаксис: -\fBmkvextract\fR -\fBchapters\fR -\fIsource\-filename\fR -[\fIoptions\fR] +\fBmkvextract\fR\fBchapters\fR\fIsource\-filename\fR[\fIoptions\fR] .PP \fB\-s\fR, \fB\-\-simple\fR .RS 4 @@ -290,22 +273,14 @@ output redirection)\&.\&. .SS "Режим витягнення списків Cue" .PP Синтаксис: -\fBmkvextract\fR -\fBcuesheet\fR -\fIsource\-filename\fR -[\fIoptions\fR] +\fBmkvextract\fR\fBcuesheet\fR\fIsource\-filename\fR[\fIoptions\fR] .PP Витягнуті списки Cue записуються до консолі, якщо інформація на виході не перенаправляється (щоб розібратися детально, див\&. розділ output redirection)\&. .SS "Режим витягнення тайм\-кодів" .PP Синтаксис: -\fBmkvextract\fR -\fBtimecodes_v2\fR -\fIsource\-filename\fR -[\fIoptions\fR] -\fITID1:dest\-filename1\fR -[\fITID2:dest\-filename2\fR \&.\&.\&.] +\fBmkvextract\fR\fBtimecodes_v2\fR\fIsource\-filename\fR[\fIoptions\fR]\fITID1:dest\-filename1\fR[\fITID2:dest\-filename2\fR \&.\&.\&.] .PP Витягнуті тайм\-коди записуються до консолі, якщо інформація на виході не перенаправляється (щоб розібратися детально, див\&. розділ output redirection)\&. @@ -391,7 +366,6 @@ $ mkvextract tags source\&.mkv \-\-redirect\-output tags\&.xml .PP V_MPEG4/ISO/AVC .RS 4 - H\&.264 / AVC @@ -423,7 +397,6 @@ RealMedia(TM)\&. .PP V_THEORA .RS 4 - Theora(TM) streams will be written within an Ogg(TM) @@ -432,7 +405,6 @@ container .PP V_VP8 .RS 4 - VP8 tracks are written to IVF @@ -502,7 +474,6 @@ CRC\&. .PP A_ALAC .RS 4 - ALAC tracks are written to CAF @@ -511,7 +482,6 @@ files\&. .PP A_FLAC .RS 4 - FLAC tracks are written to raw FLAC @@ -520,7 +490,6 @@ files\&. .PP A_WAVPACK4 .RS 4 - WavPack(TM) tracks are written to WV @@ -554,7 +523,6 @@ Ogg(TM)\&. .PP S_VOBSUB .RS 4 - VobSub(TM) subtitles will be written as SUB @@ -565,7 +533,6 @@ files\&. .PP S_TEXT/USF .RS 4 - USF text subtitles will be written as USF @@ -574,7 +541,6 @@ files\&. .PP S_HDMV/PGS .RS 4 - PGS subtitles will be written as SUP @@ -610,7 +576,6 @@ OGM\&. .RE .SH "КОДИ ЗАВЕРШЕННЯ" .PP - \fBmkvextract\fR(1) завершує роботу одним з трьох кодів завершення: .sp @@ -622,7 +587,6 @@ OGM\&. .sp -1 .IP \(bu 2.3 .\} - \fB0\fR \-\- Цей код означає, що витягнення пройшло успішно\&. .RE @@ -635,7 +599,6 @@ OGM\&. .sp -1 .IP \(bu 2.3 .\} - \fB1\fR \-\- В цьому випадку \fBmkvextract\fR(1) @@ -650,7 +613,6 @@ OGM\&. .sp -1 .IP \(bu 2.3 .\} - \fB2\fR \-\- Цей код завершення використовується у випадку помилки\&. \fBmkvextract\fR(1) @@ -663,7 +625,6 @@ OGM\&. The rules are: \*(Aq \*(Aq (a space) becomes \*(Aq\es\*(Aq, \*(Aq"\*(Aq (double quotes) becomes \*(Aq\e2\*(Aq, \*(Aq:\*(Aq becomes \*(Aq\ec\*(Aq, \*(Aq#\*(Aq becomes \*(Aq\eh\*(Aq and \*(Aq\e\*(Aq (a single backslash) itself becomes \*(Aq\e\e\*(Aq\&. .SH "Environment variables" .PP - \fBmkvextract\fR(1) uses the default variables that determine the system\*(Aqs locale (e\&.g\&. \fILANG\fR @@ -692,7 +653,6 @@ the section about escaping special characters in text)\&. .RE .SH "ДИВІТЬСЯ ТАКОЖ" .PP - \fBmkvmerge\fR(1), \fBmkvinfo\fR(1), \fBmkvpropedit\fR(1), diff --git a/doc/man/uk/mkvinfo.1 b/doc/man/uk/mkvinfo.1 index df836b9fa..3e6597a33 100644 --- a/doc/man/uk/mkvinfo.1 +++ b/doc/man/uk/mkvinfo.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mkvinfo .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: Користувацькі команди -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Ukrainian .\" -.TH "mkvinfo" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "Користувацькі команди" +.TH "mkvinfo" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "Користувацькі команди" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -219,7 +219,6 @@ Matroska(TM) element\&. All other elements only print stuff about the elements that were just found\&. Level 3 adds meta information to ease debugging (read: it\*(Aqs intended for developers only)\&. All lines written by level 3 are enclosed in square brackets to make filtering them out easy\&. .SH "КОДИ ЗАВЕРШЕННЯ" .PP - \fBmkvinfo\fR(1) exits with one of three exit codes: .sp @@ -231,7 +230,6 @@ exits with one of three exit codes: .sp -1 .IP \(bu 2.3 .\} - \fB0\fR \-\- This exit codes means that the run has completed successfully\&. .RE @@ -244,7 +242,6 @@ exits with one of three exit codes: .sp -1 .IP \(bu 2.3 .\} - \fB1\fR \-\- In this case \fBmkvinfo\fR(1) @@ -259,7 +256,6 @@ has output at least one warning, but the run did continue\&. A warning is prefix .sp -1 .IP \(bu 2.3 .\} - \fB2\fR \-\- This exit code is used after an error occurred\&. \fBmkvinfo\fR(1) @@ -272,7 +268,6 @@ aborts right after outputting the error message\&. Error messages range from wro The rules are: \*(Aq \*(Aq (a space) becomes \*(Aq\es\*(Aq, \*(Aq"\*(Aq (double quotes) becomes \*(Aq\e2\*(Aq, \*(Aq:\*(Aq becomes \*(Aq\ec\*(Aq, \*(Aq#\*(Aq becomes \*(Aq\eh\*(Aq and \*(Aq\e\*(Aq (a single backslash) itself becomes \*(Aq\e\e\*(Aq\&. .SH "Environment variables" .PP - \fBmkvinfo\fR(1) uses the default variables that determine the system\*(Aqs locale (e\&.g\&. \fILANG\fR @@ -301,7 +296,6 @@ the section about escaping special characters in text)\&. .RE .SH "ДИВІТЬСЯ ТАКОЖ" .PP - \fBmkvmerge\fR(1), \fBmkvextract\fR(1), \fBmkvpropedit\fR(1), diff --git a/doc/man/uk/mkvmerge.1 b/doc/man/uk/mkvmerge.1 index 5d5ae1ade..f1524dceb 100644 --- a/doc/man/uk/mkvmerge.1 +++ b/doc/man/uk/mkvmerge.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mkvmerge .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: Користувацькі команди -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Ukrainian .\" -.TH "mkvmerge" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "Користувацькі команди" +.TH "mkvmerge" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "Користувацькі команди" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -141,7 +141,6 @@ This switch does also apply to chapters that are copied from certain container t .PP \fB\-\-cue\-chapter\-name\-format\fR \fIformat\fR .RS 4 - \fBmkvmerge\fR(1) supports reading CUE @@ -262,7 +261,6 @@ milliseconds of data into each cluster\&. The minimum for \fId\fR is \*(Aq100ms\*(Aq, and the maximum is \*(Aq32000ms\*(Aq\&. .sp - \fBmkvmerge\fR(1) defaults to putting at most 65535 data blocks and 5000ms of data into a cluster\&. .sp @@ -343,8 +341,7 @@ supports four different modes\&. Splitting by size\&. .sp Syntax: -\fB\-\-split\fR -[size:]\fId\fR[k|m|g] +\fB\-\-split\fR[size:]\fId\fR[k|m|g] .sp Examples: \-\-split size:700m @@ -369,8 +366,7 @@ The \*(Aqsize:\*(Aq prefix may be omitted for compatibility reasons\&. Splitting after a duration\&. .sp Syntax: -\fB\-\-split\fR -[duration:]\fIHH:MM:SS\&.nnnnnnnnn\fR|\fId\fRs +\fB\-\-split\fR[duration:]\fIHH:MM:SS\&.nnnnnnnnn\fR|\fId\fRs .sp Examples: \-\-split duration:00:60:00\&.000 @@ -405,8 +401,7 @@ The \*(Aqduration:\*(Aq prefix may be omitted for compatibility reasons\&. Splitting after specific timecodes\&. .sp Syntax: -\fB\-\-split\fR -timecodes:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] +\fB\-\-split\fRtimecodes:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] .sp Example: \-\-split timecodes:00:45:00\&.000,01:20:00\&.250,6300s @@ -431,8 +426,7 @@ The \*(Aqtimecodes:\*(Aq prefix must not be omitted\&. Keeping specific parts by specifying timecode ranges while discarding others\&. .sp Syntax: -\fB\-\-split\fR -parts:\fIstart1\fR\-\fIend1\fR[,[+]\fIstart2\fR\-\fIend2\fR[,[+]\fIstart3\fR\-\fIend3\fR\&.\&.\&.]] +\fB\-\-split\fRparts:\fIstart1\fR\-\fIend1\fR[,[+]\fIstart2\fR\-\fIend2\fR[,[+]\fIstart3\fR\-\fIend3\fR\&.\&.\&.]] .sp Examples: .sp @@ -553,8 +547,7 @@ will continue outputting the frames up to but excluding the following key frame\ Keeping specific parts by specifying frame/field number ranges while discarding others\&. .sp Syntax: -\fB\-\-split\fR -parts\-frames:\fIstart1\fR\-\fIend1\fR[,[+]\fIstart2\fR\-\fIend2\fR[,[+]\fIstart3\fR\-\fIend3\fR\&.\&.\&.]] +\fB\-\-split\fRparts\-frames:\fIstart1\fR\-\fIend1\fR[,[+]\fIstart2\fR\-\fIend2\fR[,[+]\fIstart3\fR\-\fIend3\fR\&.\&.\&.]] .sp Examples: .sp @@ -691,8 +684,7 @@ block contains either a full frame (for progressive content) or a single field ( Splitting after specific frames/fields\&. .sp Syntax: -\fB\-\-split\fR -frames:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] +\fB\-\-split\fRframes:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] .sp Example: \-\-split frames:120,237,891 @@ -740,11 +732,9 @@ block contains either a full frame (for progressive content) or a single field ( Splitting before specific chapters\&. .sp Syntax: -\fB\-\-split\fR -chapters:all +\fB\-\-split\fRchapters:all or -\fB\-\-split\fR -chapters:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] +\fB\-\-split\fRchapters:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] .sp Example: \-\-split chapters:5,8 @@ -944,7 +934,6 @@ option\&. .PP \fB\-\-attachment\-mime\-type\fR \fIMIME type\fR .RS 4 - MIME type of the following attachment\&. Applies to the next \fB\-\-attach\-file\fR @@ -979,7 +968,6 @@ are attached to all output files while the ones attached with \fB\-\-attach\-file\-once\fR are only attached to the first file created\&. If splitting is not used then both do the same\&. .sp - \fBmkvextract\fR(1) can be used to extract attached files from a Matroska(TM) @@ -1147,7 +1135,6 @@ ms\&. The track IDs are the same as the ones given with (see section track IDs)\&. .sp - \fIo\fR/\fIp\fR: adjust the timestamps by \fIo\fR/\fIp\fR to fix linear drifts\&. @@ -1382,7 +1369,6 @@ to the specified value\&. Works only for video tracks in the \*(AqMS compatibili .PP \fB\-\-display\-dimensions\fR \fITID:widthxheight\fR .RS 4 - Matroska(TM) files contain two values that set the display properties that a player should scale the image on playback to: display width and display height\&. These values can be set with this option, e\&.g\&. \*(Aq1:640x480\*(Aq\&. .sp @@ -1395,7 +1381,6 @@ option (see below)\&. These options are mutually exclusive\&. .PP \fB\-\-aspect\-ratio\fR \fITID:ratio|width/height\fR .RS 4 - Matroska(TM) files contain two values that set the display properties that a player should scale the image on playback to: display width and display height\&. With this option \fBmkvmerge\fR(1) @@ -1836,8 +1821,7 @@ Some movies start synced correctly but slowly drift out of sync\&. For these kin seconds out of sync at the end of the movie which was \fB77340\fR frames long\&. At -\fB29\&.97fps\fR -\fB0\&.2\fR +\fB29\&.97fps\fR\fB0\&.2\fR seconds correspond to approx\&. \fB6\fR frames\&. So I did @@ -2055,7 +2039,6 @@ Track IDs are assigned like this: .sp -1 .IP \(bu 2.3 .\} - AVI files: The video track has the ID 0\&. The audio tracks get IDs in ascending order starting at 1\&. .RE @@ -2068,7 +2051,6 @@ files: The video track has the ID 0\&. The audio tracks get IDs in ascending ord .sp -1 .IP \(bu 2.3 .\} - AAC, AC3, MP3, @@ -2128,7 +2110,6 @@ or for text originating from a Matroska(TM) file\&. .PP - \fBmkvmerge\fR(1) does this conversion automatically based on the presence of a byte order marker @@ -2185,7 +2166,6 @@ The following options exist that allow specifying the character sets: .sp -1 .IP \(bu 2.3 .\} - \fB\-\-sub\-charset\fR for text subtitle files and for text subtitle tracks stored in container formats for which the character set cannot be determined unambiguously (e\&.g\&. Ogg files), .RE @@ -2198,7 +2178,6 @@ for text subtitle files and for text subtitle tracks stored in container formats .sp -1 .IP \(bu 2.3 .\} - \fB\-\-chapter\-charset\fR for chapter text files and for chapters and file titles stored in container formats for which the character set cannot be determined unambiguously (e\&.g\&. Ogg files for chapter information, track and file titles etc; MP4 files for chapter information), .RE @@ -2211,7 +2190,6 @@ for chapter text files and for chapters and file titles stored in container form .sp -1 .IP \(bu 2.3 .\} - \fB\-\-command\-line\-charset\fR for all strings on the command line, .RE @@ -2224,7 +2202,6 @@ for all strings on the command line, .sp -1 .IP \(bu 2.3 .\} - \fB\-\-output\-charset\fR for all strings written to the console or to a file if the output has been redirected with the \fB\-\-redirect\-output\fR @@ -2348,7 +2325,6 @@ PGS bitmap subtitle files as found on BluRay discs .RE .SH "File linking" .PP - Matroska(TM) supports file linking which simply says that a specific file is the predecessor or successor of the current file\&. To be precise, it\*(Aqs not really the files that are linked but the Matroska(TM) @@ -2467,7 +2443,6 @@ OGM files\&. The full specifications can be found at \m[blue]\fBthe Matroska(TM) website\fR\m[]\&\s-2\u[1]\d\s+2\&. .PP - \fBmkvmerge\fR(1) supports two kinds of chapter files as its input\&. The first format, called \*(Aqsimple chapter format\*(Aq, is the same format that the OGM @@ -2494,11 +2469,9 @@ CHAPTER03NAME=Baby rocks the house .RE .\} .PP - \fBmkvmerge\fR(1) will transform every pair or lines into one -Matroska(TM) -ChapterAtom\&. It does not set any +Matroska(TM)ChapterAtom\&. It does not set any ChapterTrackNumber which means that the chapters all apply to all tracks in the file\&. .PP @@ -2627,7 +2600,6 @@ When splitting files \fBmkvmerge\fR(1) will correctly adjust the chapters as well\&. This means that each file only includes the chapter entries that apply to it, and that the timecodes will be offset to match the new timecodes of each output file\&. .PP - \fBmkvmerge\fR(1) is able to copy chapters from Matroska(TM) @@ -2650,7 +2622,6 @@ files manually and mux them afterwards\&. .SH "ТЕГИ" .SS "Introduction" .PP - Matroska(TM) supports an extensive set of tags that is deprecated and a new, simpler system like it is is used in most other containers: \fIKEY=VALUE\fR\&. However, in @@ -2664,15 +2635,13 @@ example\-tags\-2\&.xml shows how to use this new system\&. .SS "Scope of the tags" .PP - Matroska(TM) tags do not automatically apply to the complete file\&. They can, but they also may apply to different parts of the file: to one or more tracks, to one or more chapters, or even to a combination of both\&. The \m[blue]\fBthe Matroska(TM) specification\fR\m[]\&\s-2\u[3]\d\s+2 gives more details about this fact\&. .PP One important fact is that tags are linked to tracks or chapters with the -Targets -Matroska(TM) +TargetsMatroska(TM) tag element, and that the UIDs used for this linking are \fInot\fR the track IDs @@ -2685,7 +2654,6 @@ Matroska(TM) file\&. Therefore it is difficult to know which UIDs to use in the tag file before the file is handed over to \fBmkvmerge\fR(1)\&. .PP - \fBmkvmerge\fR(1) knows two options with which you can add tags to Matroska(TM) @@ -2725,7 +2693,6 @@ $ mkvmerge \-o file\&.mkv \-\-tags 0:tags\&.xml file\&.avi .\} .SS "Tag file format" .PP - \fBmkvmerge\fR(1) supports a XML @@ -2757,8 +2724,7 @@ The outermost element must be .IP \(bu 2.3 .\} One logical tag is contained inside one pair of - -XML +XML tags\&. .RE .sp @@ -2924,7 +2890,6 @@ file would look like this: This might be the case for audio\-only files\&. .SH "External timecode files" .PP - \fBmkvmerge\fR(1) allows the user to chose the timecodes for a specific track himself\&. This can be used in order to create files with variable frame rate video or include gaps in audio\&. A frame in this case is the unit that \fBmkvmerge\fR(1) @@ -3014,7 +2979,6 @@ gap, 10\&.050 This format is identical to the v2 format\&. The only difference is that the timecodes do not have to be sorted\&. This format should almost never be used\&. .SH "КОДИ ЗАВЕРШЕННЯ" .PP - \fBmkvmerge\fR(1) exits with one of three exit codes: .sp @@ -3026,7 +2990,6 @@ exits with one of three exit codes: .sp -1 .IP \(bu 2.3 .\} - \fB0\fR \-\- This exit codes means that muxing has completed successfully\&. .RE @@ -3039,7 +3002,6 @@ exits with one of three exit codes: .sp -1 .IP \(bu 2.3 .\} - \fB1\fR \-\- In this case \fBmkvmerge\fR(1) @@ -3054,7 +3016,6 @@ has output at least one warning, but muxing did continue\&. A warning is prefixe .sp -1 .IP \(bu 2.3 .\} - \fB2\fR \-\- This exit code is used after an error occurred\&. \fBmkvmerge\fR(1) @@ -3062,7 +3023,6 @@ aborts right after outputting the error message\&. Error messages range from wro .RE .SH "Environment variables" .PP - \fBmkvmerge\fR(1) uses the default variables that determine the system\*(Aqs locale (e\&.g\&. \fILANG\fR @@ -3091,7 +3051,6 @@ the section about escaping special characters in text)\&. .RE .SH "ДИВІТЬСЯ ТАКОЖ" .PP - \fBmkvinfo\fR(1), \fBmkvextract\fR(1), \fBmkvpropedit\fR(1), diff --git a/doc/man/uk/mkvpropedit.1 b/doc/man/uk/mkvpropedit.1 index 58bed315f..2cf16b1b4 100644 --- a/doc/man/uk/mkvpropedit.1 +++ b/doc/man/uk/mkvpropedit.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mkvpropedit .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: Користувацькі команди -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Ukrainian .\" -.TH "mkvpropedit" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "Користувацькі команди" +.TH "mkvpropedit" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "Користувацькі команди" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -117,15 +117,13 @@ must be one of the words \fBglobal\fR or \fBtrack\fR\&. For -\fBall\fR -\fBmkvpropedit\fR(1) +\fBall\fR\fBmkvpropedit\fR(1) will replace or remove all tags in a file\&. With \fBglobal\fR only global tags will be replaced or removed\&. .sp With -\fBtrack\fR -\fBmkvpropedit\fR(1) +\fBtrack\fR\fBmkvpropedit\fR(1) will replace tags for a specific track\&. Additionally the tags read from filename will be assigned to the same track\&. The track is specified in the same way @@ -268,8 +266,7 @@ is honored\&. і \fILC_ALL\fR\&. Після введення list\*(Aq як -\fIcode\fR -\fBmkvextract\fR(1) +\fIcode\fR\fBmkvextract\fR(1) відобразить список доступних перекладів\&. .RE .PP @@ -628,7 +625,6 @@ $ mkvpropedit movie\&.mkv \-\-delete\-attachment mime\-type:application/x\-truet .\} .SH "КОДИ ЗАВЕРШЕННЯ" .PP - \fBmkvpropedit\fR(1) exits with one of three exit codes: .sp @@ -640,7 +636,6 @@ exits with one of three exit codes: .sp -1 .IP \(bu 2.3 .\} - \fB0\fR \-\- This exit codes means that the modification has completed successfully\&. .RE @@ -653,7 +648,6 @@ exits with one of three exit codes: .sp -1 .IP \(bu 2.3 .\} - \fB1\fR \-\- In this case \fBmkvpropedit\fR(1) @@ -668,7 +662,6 @@ has output at least one warning, but the modification did continue\&. A warning .sp -1 .IP \(bu 2.3 .\} - \fB2\fR \-\- This exit code is used after an error occurred\&. \fBmkvpropedit\fR(1) @@ -681,7 +674,6 @@ aborts right after outputting the error message\&. Error messages range from wro The rules are: \*(Aq \*(Aq (a space) becomes \*(Aq\es\*(Aq, \*(Aq"\*(Aq (double quotes) becomes \*(Aq\e2\*(Aq, \*(Aq:\*(Aq becomes \*(Aq\ec\*(Aq, \*(Aq#\*(Aq becomes \*(Aq\eh\*(Aq and \*(Aq\e\*(Aq (a single backslash) itself becomes \*(Aq\e\e\*(Aq\&. .SH "Environment variables" .PP - \fBmkvpropedit\fR(1) uses the default variables that determine the system\*(Aqs locale (e\&.g\&. \fILANG\fR @@ -710,7 +702,6 @@ the section about escaping special characters in text)\&. .RE .SH "ДИВІТЬСЯ ТАКОЖ" .PP - \fBmkvmerge\fR(1), \fBmkvinfo\fR(1), \fBmkvextract\fR(1), diff --git a/doc/man/uk/mmg.1 b/doc/man/uk/mmg.1 index e26c03769..e886ca68b 100644 --- a/doc/man/uk/mmg.1 +++ b/doc/man/uk/mmg.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mmg .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: Користувацькі команди -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Ukrainian .\" -.TH "mmg" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "Користувацькі команди" +.TH "mmg" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "Користувацькі команди" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -34,7 +34,6 @@ mmg \- a GUI for \fBmkvmerge\fR(1) including a chapter and a header editor \fBmmg\fR [[\-\-edit\-headers\ {filename\&.mkv}] | [preferences\-file\&.mmg] | [source\-file\&.ext]] .SH "ОПИС" .PP - \fBmmg\fR(1) is a wxWindows(TM) @@ -56,7 +55,6 @@ files\&. Included is also a header editor that can be used to quickly change pro Matroska(TM) files without needing a complete remux\&. .PP - \fBmmg\fR(1) knows few options\&. The first possibility is to start it with a single file name\&. If that file name\*(Aqs extenion is \*(Aq\&.mmg\*(Aq then it will be treated as a preferences file and \fBmmg\fR(1) @@ -71,7 +69,6 @@ run its header editor and load the file\&. The full documentation is available in HTML form (doc/mkvmerge\-gui\&.html)\&. .SH "ДИВІТЬСЯ ТАКОЖ" .PP - \fBmkvmerge\fR(1), \fBmkvextract\fR(1), \fBmkvinfo\fR(1), diff --git a/doc/man/zh_CN/mkvextract.1 b/doc/man/zh_CN/mkvextract.1 index 3368e6eca..d56401402 100644 --- a/doc/man/zh_CN/mkvextract.1 +++ b/doc/man/zh_CN/mkvextract.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mkvextract .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: 用户命令 -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Chinese .\" -.TH "MKVEXTRACT" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "用户命令" +.TH "MKVEXTRACT" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "用户命令" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -159,12 +159,7 @@ tracks .SS "轨道提取模式" .PP 语法: -\fBmkvextract\fR -\fBtracks\fR -\fI源文件名\fR -[\fI选项\fR] -\fITID1:目标文件名1\fR -[\fITID2:目标文件名2\fR \&.\&.\&.] +\fBmkvextract\fR\fBtracks\fR\fI源文件名\fR[\fI选项\fR]\fITID1:目标文件名1\fR[\fITID2:目标文件名2\fR \&.\&.\&.] .PP 以下命令行在 \*(Aqtracks\*(Aq 轨道提取模式下对各轨道可用。它们应当在所应用到的轨道指令（参阅下文）之前出现。 .PP @@ -237,10 +232,7 @@ $ mkvextract tracks 输入\&.mkv 1:输出两条轨道\&.rm 2:输出两条轨道\ .SS "标签提取模式" .PP 语法: -\fBmkvextract\fR -\fBtags\fR -\fI源文件名\fR -[\fI选项\fR] +\fBmkvextract\fR\fBtags\fR\fI源文件名\fR[\fI选项\fR] .PP 提取出的标签将被输出到命令行，除非输出被重定向（详情参见关于 输出重定向 @@ -248,12 +240,7 @@ $ mkvextract tracks 输入\&.mkv 1:输出两条轨道\&.rm 2:输出两条轨道\ .SS "附件提取模式" .PP 语法: -\fBmkvextract\fR -\fBattachments\fR -\fI源文件名\fR -[\fI选项\fR] -\fIAID1:输出文件名1\fR -[\fIAID2:输出文件名2\fR \&.\&.\&.] +\fBmkvextract\fR\fBattachments\fR\fI源文件名\fR[\fI选项\fR]\fIAID1:输出文件名1\fR[\fIAID2:输出文件名2\fR \&.\&.\&.] .PP \fIAID\fR:\fI输出文件名\fR .RS 4 @@ -273,10 +260,7 @@ Matroska(TM) .SS "章节提取模式" .PP 语法: -\fBmkvextract\fR -\fBchapters\fR -\fI源文件名\fR -[\fI选项\fR] +\fBmkvextract\fR\fBchapters\fR\fI源文件名\fR[\fI选项\fR] .PP \fB\-s\fR, \fB\-\-simple\fR .RS 4 @@ -293,10 +277,7 @@ XML .SS "Cue 表单提取模式" .PP 语法: -\fBmkvextract\fR -\fBcuesheet\fR -\fI源文件名\fR -[\fI选项\fR] +\fBmkvextract\fR\fBcuesheet\fR\fI源文件名\fR[\fI选项\fR] .PP 提取出的 cue 表单将被输出到命令行，除非输出被重定向（详情参见关于 输出重定向 @@ -304,12 +285,7 @@ XML .SS "时间码提取模式" .PP 语法: -\fBmkvextract\fR -\fBtimecodes_v2\fR -\fI源文件名\fR -[\fI选项\fR] -\fITID1:目标文件名1\fR -[\fITID2:目标文件名2\fR \&.\&.\&.] +\fBmkvextract\fR\fBtimecodes_v2\fR\fI源文件名\fR[\fI选项\fR]\fITID1:目标文件名1\fR[\fITID2:目标文件名2\fR \&.\&.\&.] .PP 提取出的时间码将被输出到命令行，除非输出被重定向（详情参见关于 输出重定向 @@ -358,7 +334,6 @@ $ mkvextract tags 源\&.mkv > 标签\&.xml .RE .\} .PP - \fBmkvextract\fR(1) 自身的重定向功能可通过 \fB\-\-redirect\-output\fR @@ -399,7 +374,6 @@ $ mkvextract tags 源\&.mkv \-\-redirect\-output 标签\&.xml .PP V_MPEG4/ISO/AVC .RS 4 - H\&.264 / AVC @@ -425,7 +399,6 @@ AVI .PP V_REAL/* .RS 4 - RealVideo(TM) 轨道将被输出为 RealMedia(TM) @@ -434,7 +407,6 @@ RealMedia(TM) .PP V_THEORA .RS 4 - Theora(TM) 流将以 Ogg(TM) @@ -443,7 +415,6 @@ Ogg(TM) .PP V_VP8 .RS 4 - VP8 轨道将输出为 IVF @@ -496,7 +467,6 @@ OggVorbis(TM) .PP A_REAL/* .RS 4 - RealAudio(TM) 轨道将被输出为 RealMedia(TM) @@ -505,7 +475,6 @@ RealMedia(TM) .PP A_TTA1 .RS 4 - TrueAudio(TM) 轨道将被输出为 TTA @@ -518,7 +487,6 @@ CRC。 .PP A_ALAC .RS 4 - ALAC 轨道将输出为 CAF @@ -527,7 +495,6 @@ CAF .PP A_FLAC .RS 4 - FLAC 轨道将输出为原始的 FLAC @@ -536,7 +503,6 @@ FLAC .PP A_WAVPACK4 .RS 4 - WavPack(TM) 轨道将输出为 WV @@ -552,7 +518,6 @@ SRT .PP S_TEXT/SSA, S_TEXT/ASS .RS 4 - SSA 与 ASS @@ -563,7 +528,6 @@ SSA/ASS .PP S_KATE .RS 4 - Kate(TM) 流将以 Ogg(TM) @@ -572,7 +536,6 @@ Ogg(TM) .PP S_VOBSUB .RS 4 - VobSub(TM) 字幕将输出为 SUB @@ -582,7 +545,6 @@ IDX）。 .PP S_TEXT/USF .RS 4 - USF 文本字幕将输出为 USF @@ -591,7 +553,6 @@ USF .PP S_HDMV/PGS .RS 4 - PGS 字幕将输出为 SUP @@ -630,7 +591,6 @@ OGM .RE .SH "退出代码" .PP - \fBmkvextract\fR(1) 退出时会返回以下三个退出代码中的一个： .sp @@ -642,7 +602,6 @@ OGM .sp -1 .IP \(bu 2.3 .\} - \fB0\fR \-\- 此退出代码说明已成功完成提取。 .RE @@ -655,7 +614,6 @@ OGM .sp -1 .IP \(bu 2.3 .\} - \fB1\fR \-\- 这种情况下 \fBmkvextract\fR(1) @@ -670,7 +628,6 @@ OGM .sp -1 .IP \(bu 2.3 .\} - \fB2\fR \-\- 此退出代码用于错误发生之后。 \fBmkvextract\fR(1) @@ -683,7 +640,6 @@ OGM 规则为: \*(Aq \*(Aq (空格) 变为 \*(Aq\es\*(Aq、\*(Aq"\*(Aq (双引号) 变为 \*(Aq\e2\*(Aq、\*(Aq:\*(Aq 变为 \*(Aq\ec\*(Aq、\*(Aq#\*(Aq 变为 \*(Aq\eh\*(Aq，而 \*(Aq\e\*(Aq (单个反斜杠) 自己则变为 \*(Aq\e\e\*(Aq。 .SH "环境变量" .PP - \fBmkvextract\fR(1) 使用决定系统区域设置的默认变量 (如 \fILANG\fR @@ -711,7 +667,6 @@ OGM .RE .SH "参阅" .PP - \fBmkvmerge\fR(1), \fBmkvinfo\fR(1), \fBmkvpropedit\fR(1), diff --git a/doc/man/zh_CN/mkvinfo.1 b/doc/man/zh_CN/mkvinfo.1 index 6dc3925ed..385178415 100644 --- a/doc/man/zh_CN/mkvinfo.1 +++ b/doc/man/zh_CN/mkvinfo.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mkvinfo .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: 用户命令 -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Chinese .\" -.TH "MKVINFO" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "用户命令" +.TH "MKVINFO" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "用户命令" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -186,7 +186,6 @@ download_url）。 .RE .SH "\(lq详细\(rq程度" .PP - \fB\-v\fR 选项可以使 \fBmkvinfo\fR(1) @@ -217,7 +216,6 @@ Matroska(TM) 元素不直接相连的信息。对于其他元素，将只输出发现的基本信息。Level 3 增加了元信息以便调试（换句话说：它是为开发人员设计的）。Level 3 输出的所有行都以方括号嵌套以便过滤。 .SH "退出代码" .PP - \fBmkvinfo\fR(1) 退出时会返回以下三个退出代码中的一个： .sp @@ -229,7 +227,6 @@ Matroska(TM) .sp -1 .IP \(bu 2.3 .\} - \fB0\fR \-\- 此退出代码说明已成功完成运行。 .RE @@ -242,7 +239,6 @@ Matroska(TM) .sp -1 .IP \(bu 2.3 .\} - \fB1\fR \-\- 这种情况下 \fBmkvinfo\fR(1) @@ -257,7 +253,6 @@ Matroska(TM) .sp -1 .IP \(bu 2.3 .\} - \fB2\fR \-\- 此退出代码用于错误发生之后。 \fBmkvinfo\fR(1) @@ -270,7 +265,6 @@ Matroska(TM) 规则为: \*(Aq \*(Aq (空格) 变为 \*(Aq\es\*(Aq、\*(Aq"\*(Aq (双引号) 变为 \*(Aq\e2\*(Aq、\*(Aq:\*(Aq 变为 \*(Aq\ec\*(Aq、\*(Aq#\*(Aq 变为 \*(Aq\eh\*(Aq，而 \*(Aq\e\*(Aq (单个反斜杠) 自己则变为 \*(Aq\e\e\*(Aq。 .SH "环境变量" .PP - \fBmkvinfo\fR(1) 会使用决定系统区域设置的默认变量 (如 \fILANG\fR @@ -298,7 +292,6 @@ Matroska(TM) .RE .SH "参阅" .PP - \fBmkvmerge\fR(1), \fBmkvextract\fR(1), \fBmkvpropedit\fR(1), diff --git a/doc/man/zh_CN/mkvmerge.1 b/doc/man/zh_CN/mkvmerge.1 index 404f1c35c..94759af40 100644 --- a/doc/man/zh_CN/mkvmerge.1 +++ b/doc/man/zh_CN/mkvmerge.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mkvmerge .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: 用户命令 -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Chinese .\" -.TH "MKVMERGE" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "用户命令" +.TH "MKVMERGE" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "用户命令" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -141,7 +141,6 @@ DTD .PP \fB\-\-cue\-chapter\-name\-format\fR \fI格式\fR .RS 4 - \fBmkvmerge\fR(1) 支持读取音频文件的 CUE @@ -256,7 +255,6 @@ CUE 毫秒的数据。\fId\fR 的最小值是 \*(Aq100ms\*(Aq，最大值是 \*(Aq32000ms\*(Aq。 .sp - \fBmkvmerge\fR(1) 默认每簇最多放置 65535 个数据块或 5000ms 的数据。 .sp @@ -333,8 +331,7 @@ Matroska(TM) 文件规划 按尺寸切割。 .sp 语法: -\fB\-\-split\fR -[size:]\fId\fR[k|m|g] +\fB\-\-split\fR[size:]\fId\fR[k|m|g] .sp 示例: \-\-split size:700m @@ -359,8 +356,7 @@ Matroska(TM) 文件规划 在一定时长后切割。 .sp 语法: -\fB\-\-split\fR -[duration:]\fIHH:MM:SS\&.nnnnnnnnn\fR|\fId\fRs +\fB\-\-split\fR[duration:]\fIHH:MM:SS\&.nnnnnnnnn\fR|\fId\fRs .sp 示例: \-\-split duration:00:60:00\&.000 @@ -390,8 +386,7 @@ Matroska(TM) 文件规划 在指定时间码后切割。 .sp 语法: -\fB\-\-split\fR -timecodes:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] +\fB\-\-split\fRtimecodes:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] .sp 示例: \-\-split timecodes:00:45:00\&.000,01:20:00\&.250,6300s @@ -414,8 +409,7 @@ timecodes:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] 通过指定时间码范围，保留特定部分，并丢弃其余部分。 .sp 语法: -\fB\-\-split\fR -parts:\fI起点1\fR\-\fI终点1\fR[,[+]\fI起点3\fR\-\fI终点2\fR[,[+]\fI起点3\fR\-\fI终点3\fR\&.\&.\&.]] +\fB\-\-split\fRparts:\fI起点1\fR\-\fI终点1\fR[,[+]\fI起点3\fR\-\fI终点2\fR[,[+]\fI起点3\fR\-\fI终点3\fR\&.\&.\&.]] .sp 示例: .sp @@ -452,7 +446,6 @@ parts:\fI起点1\fR\-\fI终点1\fR[,[+]\fI起点3\fR\-\fI终点2\fR[,[+]\fI起 \-\-split parts:\-00:02:45,00:05:50\- .RE .sp - parts 模式可以告诉 \fBmkvmerge\fR(1) @@ -539,8 +532,7 @@ parts: 通过指定帧/场序号范围，保留特定部分，并丢弃其余部分。 .sp 语法: -\fB\-\-split\fR -parts\-frames:\fI起点1\fR\-\fI终点1\fR[,[+]\fI起点2\fR\-\fI终点2\fR[,[+]\fI起点3\fR\-\fI终点3\fR\&.\&.\&.]] +\fB\-\-split\fRparts\-frames:\fI起点1\fR\-\fI终点1\fR[,[+]\fI起点2\fR\-\fI终点2\fR[,[+]\fI起点3\fR\-\fI终点3\fR\&.\&.\&.]] .sp 示例: .sp @@ -577,7 +569,6 @@ parts\-frames:\fI起点1\fR\-\fI终点1\fR[,[+]\fI起点2\fR\-\fI终点2\fR[,[+] \-\-split parts\-frames:\-430,2512\- .RE .sp - parts\-frames 模式可以告诉 \fBmkvmerge\fR(1) @@ -680,8 +671,7 @@ Matroska(TM) 在指定帧/场后切割。 .sp 语法: -\fB\-\-split\fR -frames:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] +\fB\-\-split\fRframes:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] .sp 示例: \-\-split frames:120,237,891 @@ -727,11 +717,9 @@ Matroska(TM) 在指定章节之前切割。 .sp 语法: -\fB\-\-split\fR -chapters:all +\fB\-\-split\fRchapters:all or -\fB\-\-split\fR -chapters:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] +\fB\-\-split\fRchapters:\fIA\fR[,\fIB\fR[,\fIC\fR\&.\&.\&.]] .sp 示例: \-\-split chapters:5,8 @@ -757,7 +745,6 @@ all \fB注意\fR .ps -1 .br - Matroska(TM) 文件格式支持任意深度嵌套的章节结构，称为\(lq版本条目\(rq与\(lq章节原子\(rq。 但该模式仅考虑所有版本条目中最顶层的章节。 .sp .5v @@ -1133,7 +1120,6 @@ ms 进行调整。轨道 ID 与 轨道 ID 段落)。 .sp - \fIo\fR/\fIp\fR: 按 \fIo\fR/\fIp\fR 调整时间戳以修复线性偏移。如果省略 @@ -1250,8 +1236,7 @@ HE\-AAC 或 AAC+)。下述情况下需要此选项：a) 源文件是 AAC -文件 (\fI不是\fR -Matroska(TM) +文件 (\fI不是\fRMatroska(TM) 文件) 且 b) 该 AAC 文件含有 @@ -1372,7 +1357,6 @@ FourCC .PP \fB\-\-display\-dimensions\fR \fITID:宽度x高度\fR .RS 4 - Matroska(TM) 文件含有两个设定播放器回放时应当将画面缩放到的显示属性值: 显示宽度与显示高度。 可以使用本选项设定这些数值，如 \*(Aq1:640x480\*(Aq。 .sp @@ -1385,7 +1369,6 @@ Matroska(TM) .PP \fB\-\-aspect\-ratio\fR \fITID:宽高比|宽度/高度\fR .RS 4 - Matroska(TM) 文件含有两个设定播放器回放时应当将画面缩放到的显示属性值: 显示宽度与显示高度。 通过本选项 \fBmkvmerge\fR(1) @@ -2016,7 +1999,6 @@ $ mkvmerge \-o 无压缩\&.mkv \-\-compression \-1:none 我的影片\&.avi \-\-c .\} .SH "轨道 ID" .PP - \fBmkvmerge\fR(1) 的一些选项要求提供轨道 ID 以指定应应用到的轨道。 当读取器分离当前输入文件时，或者使用 \fB\-\-identify\fR @@ -2051,7 +2033,6 @@ Track ID 2: 音频 (A_MPEG/L3) .sp -1 .IP \(bu 2.3 .\} - AVI 文件: 视频轨 ID 为 0。音频轨的 ID 由 1 开始升序分配。 .RE @@ -2064,7 +2045,6 @@ AVI .sp -1 .IP \(bu 2.3 .\} - AAC、AC3、MP3、SRT 与 WAV @@ -2107,7 +2087,6 @@ WAV .sp .5v .RE .PP - Matroska(TM) 文件中的所有文本均使用 UTF\-8 编码。这意味着 \fBmkvmerge\fR(1) @@ -2119,7 +2098,6 @@ Matroska(TM) Matroska(TM) 文件中的文本。 .PP - \fBmkvmerge\fR(1) 根据是否有 字节顺序标记 @@ -2173,7 +2151,6 @@ GUI .sp -1 .IP \(bu 2.3 .\} - \fB\-\-sub\-charset\fR 用于文本字幕文件以及存储于字符集含糊的容器格式（如 Ogg 文件）中的文本字幕轨, .RE @@ -2186,7 +2163,6 @@ GUI .sp -1 .IP \(bu 2.3 .\} - \fB\-\-chapter\-charset\fR 用于章节文本文件以及存储于字符集含糊的容器格式（如 Ogg 文件的章节信息，轨道和文件标题等；MP4 文件的章节信息）中的章节和文件标题, .RE @@ -2199,7 +2175,6 @@ GUI .sp -1 .IP \(bu 2.3 .\} - \fB\-\-command\-line\-charset\fR 用于所有命令行上的字符串, .RE @@ -2212,7 +2187,6 @@ GUI .sp -1 .IP \(bu 2.3 .\} - \fB\-\-output\-charset\fR 用于输出到命令行或文件（当使用 \fB\-\-redirect\-output\fR @@ -2220,7 +2194,6 @@ GUI .RE .SH "选项文件" .PP - \fBmkvmerge\fR(1) 可从选项文件中读取额外的命令行参数。这样可以规避 shell 或操作系统在执行外部程序时的特定限制，如命令行长度的限制。 .PP @@ -2338,7 +2311,6 @@ BluRay 光盘中的 PGS 位图字幕文件 .RE .SH "文件链接" .PP - Matroska(TM) 支持文件链接，即声明当前文件的前趋与后继文件是哪个文件。严谨地讲，被连接的不是文件而是 Matroska(TM) @@ -2394,7 +2366,6 @@ SID 建立链接。 .SH "默认值" .PP - Matroska(TM) 规范提到，一些元素有其默认值。通常为了节省空间，如果一个元素的值等同于其默认值，它将不被写入文件。用户在 \fBmkvinfo\fR(1) @@ -2453,7 +2424,6 @@ Matroska(TM) 选项修改。 .SH "章节" .PP - Matroska(TM) 章节系统比大家知道的旧系统\(em\(em OGM @@ -2461,7 +2431,6 @@ OGM \m[blue]\fBMatroska(TM) 网站\fR\m[]\&\s-2\u[1]\d\s+2 找到。 .PP - \fBmkvmerge\fR(1) 支持输入两种章节文件。第一种格式，叫作 \*(Aq简单章节格式\*(Aq，与 OGM @@ -2489,11 +2458,9 @@ CHAPTER03NAME=宝宝摇屋子 .RE .\} .PP - \fBmkvmerge\fR(1) 将转换每两行为一个 -Matroska(TM) -章节单位（ChapterAtom）。这种情况不会设定任何 +Matroska(TM)章节单位（ChapterAtom）。这种情况不会设定任何 章节轨道号（ChapterTrackNumber），也就是说所有章节被应用到文件的所有轨道。 .PP 由于是文本文件，可能需要进行字符集转换。关于 @@ -2617,11 +2584,9 @@ Chapters (主) .\} .SS "一般性备注" .PP - \fBmkvmerge\fR(1) 切割文件时会同时适当调整章节。这意味着每个文件只包含应用到该文件的章节项，时间码也将被调整到与各输出文件相匹配。 .PP - \fBmkvmerge\fR(1) 能够从 Matroska(TM) @@ -2643,7 +2608,6 @@ XML .SH "标签" .SS "介绍" .PP - Matroska(TM) 广泛支持废弃标签，还支持一种新式的、类似其他大多数容器使用的较简单的标签系统: \fIKEY=VALUE\fR。然而，在 @@ -2656,17 +2620,14 @@ example\-tags\-2\&.xml 展示了如何使用这个新系统。 .SS "标签细述" .PP - Matroska(TM) 标签不会自动应用到整个文件上。它们可以应用到整个文件，还可以应用到文件的不同部分: 一个或多个轨道, 一个或多个章节, 甚至是两者的组合。\m[blue]\fBMatroska(TM) 规范\fR\m[]\&\s-2\u[3]\d\s+2 有这方面的更多详情。 .PP 重要的一点是标签通过 -Targets -Matroska(TM) +TargetsMatroska(TM) 标签元素与轨道或章节相连，而用于此链接的 UID -\fI并非\fR -\fBmkvmerge\fR(1) +\fI并非\fR\fBmkvmerge\fR(1) 常用的轨道 ID。而是 \fBmkvmerge\fR(1) 自动计算而来 (当轨道来自非 @@ -2677,7 +2638,6 @@ Matroska(TM) \fBmkvmerge\fR(1) 处理过之前很难知道应该在标签文件中使用哪些 UID。 .PP - \fBmkvmerge\fR(1) 支持两个为 Matroska(TM) @@ -2715,7 +2675,6 @@ $ mkvmerge \-o 文件\&.mkv \-\-tags 0:标签\&.xml 文件\&.avi .\} .SS "标签文件格式" .PP - \fBmkvmerge\fR(1) 支持基于 XML @@ -2748,8 +2707,7 @@ example\-tags\-2\&.xml .IP \(bu 2.3 .\} 实际意义上的标签放在 - -XML +XML 标签对中。 .RE .sp @@ -2870,7 +2828,6 @@ Info (主) .\} .SH "MATROSKA(TM) 文件规划" .PP - Matroska(TM) 文件规划非常灵活。\fBmkvmerge\fR(1) 将按预先定义的方式渲染文件。生成的文件是这样的： @@ -2912,7 +2869,6 @@ Matroska(TM) 这也是纯音频文件的样子。 .SH "外部时间码文件" .PP - \fBmkvmerge\fR(1) 允许用户为各轨道选择特定的时间码。这可用来创建包含可变帧率视频或音频中有空隙的文件。这种情况下的帧是 \fBmkvmerge\fR(1) @@ -2936,7 +2892,6 @@ $ mkvmerge \&.\&.\&. \-\-timecodes 0:我的时间码\&.txt v1\&.avi +v2\&.avi .RE .\} .PP - \fBmkvmerge\fR(1) 可识别四种格式的时间码。版本号在时间码文件的第一行内。空行，只含有空格的行，以及以 \*(Aq#\*(Aq 开头的行在处理时将被忽略。 .SS "时间码文件格式 v1" @@ -3001,7 +2956,6 @@ gap, 10\&.050 此格式与 v2 格式相似。 唯一的不同在于时间码不必经过排序。 通常不应使用此格式。 .SH "退出代码" .PP - \fBmkvmerge\fR(1) 退出时会返回以下三个退出代码中的一个： .sp @@ -3013,7 +2967,6 @@ gap, 10\&.050 .sp -1 .IP \(bu 2.3 .\} - \fB0\fR \-\- 此退出代码说明已成功完成混流。 .RE @@ -3026,7 +2979,6 @@ gap, 10\&.050 .sp -1 .IP \(bu 2.3 .\} - \fB1\fR \-\- 这种情况下 \fBmkvmerge\fR(1) @@ -3041,7 +2993,6 @@ gap, 10\&.050 .sp -1 .IP \(bu 2.3 .\} - \fB2\fR \-\- 此退出代码用于错误发生之后。 \fBmkvmerge\fR(1) @@ -3049,7 +3000,6 @@ gap, 10\&.050 .RE .SH "环境变量" .PP - \fBmkvmerge\fR(1) 会使用决定系统区域设置的默认变量 (如 \fILANG\fR @@ -3077,7 +3027,6 @@ gap, 10\&.050 .RE .SH "参阅" .PP - \fBmkvinfo\fR(1), \fBmkvextract\fR(1), \fBmkvpropedit\fR(1), diff --git a/doc/man/zh_CN/mkvpropedit.1 b/doc/man/zh_CN/mkvpropedit.1 index 66cb8a9ca..a701f5d89 100644 --- a/doc/man/zh_CN/mkvpropedit.1 +++ b/doc/man/zh_CN/mkvpropedit.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mkvpropedit .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: 用户命令 -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Chinese .\" -.TH "MKVPROPEDIT" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "用户命令" +.TH "MKVPROPEDIT" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "用户命令" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -108,7 +108,6 @@ Matroska(TM) \fBmkvmerge\fR(1) 所读取的相同。 .sp - \fI选择器\fR 必须是 \fBall\fR、\fBglobal\fR @@ -180,7 +179,6 @@ Matroska(TM) \fI文件名\fR 的内容替代。 .sp - \fI选择器\fR 可以有四种格式。各格式说明位于下文 附件选择器 @@ -205,7 +203,6 @@ Matroska(TM) \fI选择器\fR 相匹配的一或多个附件。 .sp - \fI选择器\fR 可以有四种格式。各格式说明位于下文 附件选择器 @@ -352,7 +349,6 @@ name=评论 .RE .SH "编辑选择器" .PP - \fB\-\-edit\fR 选项设置后续的 添加, @@ -648,7 +644,6 @@ $ mkvpropedit 影片\&.mkv \-\-delete\-attachment mime\-type:application/x\-true .\} .SH "退出代码" .PP - \fBmkvpropedit\fR(1) 退出时会返回以下三个退出代码中的一个： .sp @@ -660,7 +655,6 @@ $ mkvpropedit 影片\&.mkv \-\-delete\-attachment mime\-type:application/x\-true .sp -1 .IP \(bu 2.3 .\} - \fB0\fR \-\- 此退出代码说明已成功完成修改。 .RE @@ -673,7 +667,6 @@ $ mkvpropedit 影片\&.mkv \-\-delete\-attachment mime\-type:application/x\-true .sp -1 .IP \(bu 2.3 .\} - \fB1\fR \-\- 这种情况下 \fBmkvpropedit\fR(1) @@ -688,7 +681,6 @@ $ mkvpropedit 影片\&.mkv \-\-delete\-attachment mime\-type:application/x\-true .sp -1 .IP \(bu 2.3 .\} - \fB2\fR \-\- 此退出代码用于错误发生之后。 \fBmkvpropedit\fR(1) @@ -701,7 +693,6 @@ $ mkvpropedit 影片\&.mkv \-\-delete\-attachment mime\-type:application/x\-true 规则为: \*(Aq \*(Aq (空格) 变为 \*(Aq\es\*(Aq、\*(Aq"\*(Aq (双引号) 变为 \*(Aq\e2\*(Aq、\*(Aq:\*(Aq 变为 \*(Aq\ec\*(Aq、\*(Aq#\*(Aq 变为 \*(Aq\eh\*(Aq，而 \*(Aq\e\*(Aq (单个反斜杠) 自己则变为 \*(Aq\e\e\*(Aq。 .SH "环境变量" .PP - \fBmkvpropedit\fR(1) 会使用决定系统区域设置的默认变量 (如 \fILANG\fR @@ -729,7 +720,6 @@ $ mkvpropedit 影片\&.mkv \-\-delete\-attachment mime\-type:application/x\-true .RE .SH "参阅" .PP - \fBmkvmerge\fR(1), \fBmkvinfo\fR(1), \fBmkvextract\fR(1), diff --git a/doc/man/zh_CN/mmg.1 b/doc/man/zh_CN/mmg.1 index 4a3e5c527..f0c2b0505 100644 --- a/doc/man/zh_CN/mmg.1 +++ b/doc/man/zh_CN/mmg.1 @@ -1,13 +1,13 @@ '\" t .\" Title: mmg .\" Author: Moritz Bunkus -.\" Generator: DocBook XSL Stylesheets v1.78.0 -.\" Date: 2013-04-27 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 2013-06-27 .\" Manual: 用户命令 -.\" Source: MKVToolNix 6.2.0 +.\" Source: MKVToolNix 6.3.0 .\" Language: Chinese .\" -.TH "MMG" "1" "2013\-04\-27" "MKVToolNix 6\&.2\&.0" "用户命令" +.TH "MMG" "1" "2013\-06\-27" "MKVToolNix 6\&.3\&.0" "用户命令" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -34,7 +34,6 @@ mmg \- \fBmkvmerge\fR(1) 的 GUI，包含章节编辑器和头部字段编辑器 \fBmmg\fR [[\-\-edit\-headers\ {文件名\&.mkv}] | [偏好设置文件\&.mmg] | [源文件\&.扩展名]] .SH "说明" .PP - \fBmmg\fR(1) 是 \fBmkvmerge\fR(1) @@ -56,7 +55,6 @@ Matroska(TM) Matroska(TM) 文件的属性，且无须进行完整的重新混流。 .PP - \fBmmg\fR(1) 需要的选项很少。最可能的情况是附带一个文件名启动它。如果文件的扩展名为 \*(Aq\&.mmg\*(Aq，则该文件将被当作配置文件处理，\fBmmg\fR(1) 启动时将载入其中的配置。如果文件名包含其他扩展名，则将被理解为即将添加的输入文件名。 @@ -70,7 +68,6 @@ Matroska(TM) 另有完整的 HTML 格式的文档（doc/mkvmerge\-gui\&.html）。 .SH "参阅" .PP - \fBmkvmerge\fR(1), \fBmkvextract\fR(1), \fBmkvinfo\fR(1), diff --git a/installer/mkvtoolnix-unicode.nsi b/installer/mkvtoolnix-unicode.nsi index cea5dc41c..1a605f647 100644 --- a/installer/mkvtoolnix-unicode.nsi +++ b/installer/mkvtoolnix-unicode.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "MKVToolNix" -!define PRODUCT_VERSION "6.2.0" +!define PRODUCT_VERSION "6.3.0" !define PRODUCT_VERSION_BUILD "" # Intentionally left empty for releases !define PRODUCT_PUBLISHER "Moritz Bunkus" !define PRODUCT_WEB_SITE "http://www.bunkus.org/videotools/mkvtoolnix/" diff --git a/src/common/version.cpp b/src/common/version.cpp index f114b449e..0a3150c8a 100644 --- a/src/common/version.cpp +++ b/src/common/version.cpp @@ -25,7 +25,7 @@ #include "common/strings/parsing.h" #include "common/version.h" -#define VERSIONNAME "Promised Land" +#define VERSIONNAME "You can't stop me!" version_number_t::version_number_t() : valid(false) diff --git a/src/extract/resources.rc b/src/extract/resources.rc index ec4467078..a63b71943 100644 --- a/src/extract/resources.rc +++ b/src/extract/resources.rc @@ -1,8 +1,8 @@ mkvextract ICON "../../share/icons/windows/mkvextract.ico" 1 VERSIONINFO - FILEVERSION 6, 2, 0, 0 - PRODUCTVERSION 6, 2, 0, 0 + FILEVERSION 6, 3, 0, 0 + PRODUCTVERSION 6, 3, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -12,12 +12,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvextract" - VALUE "FileVersion", "6.2.0" + VALUE "FileVersion", "6.3.0" VALUE "InternalName", "mkvextract" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mkvextract" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "6.2.0" + VALUE "ProductVersion", "6.3.0" END END BLOCK "VarFileInfo" diff --git a/src/info/resources.rc b/src/info/resources.rc index 1bb5aad38..16cdfd791 100644 --- a/src/info/resources.rc +++ b/src/info/resources.rc @@ -6,8 +6,8 @@ mkvinfo ICON "../../share/icons/windows/mkvinfo.ico" #endif 1 VERSIONINFO - FILEVERSION 6, 2, 0, 0 - PRODUCTVERSION 6, 2, 0, 0 + FILEVERSION 6, 3, 0, 0 + PRODUCTVERSION 6, 3, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -17,12 +17,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvinfo" - VALUE "FileVersion", "6.2.0" + VALUE "FileVersion", "6.3.0" VALUE "InternalName", "mkvinfo" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mkvinfo" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "6.2.0" + VALUE "ProductVersion", "6.3.0" END END BLOCK "VarFileInfo" diff --git a/src/merge/resources.rc b/src/merge/resources.rc index 3f822d1b0..71e690288 100644 --- a/src/merge/resources.rc +++ b/src/merge/resources.rc @@ -1,8 +1,8 @@ MATROSKAICON ICON "../../share/icons/windows/mkvmerge.ico" 1 VERSIONINFO - FILEVERSION 6, 2, 0, 0 - PRODUCTVERSION 6, 2, 0, 0 + FILEVERSION 6, 3, 0, 0 + PRODUCTVERSION 6, 3, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -12,12 +12,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvmerge" - VALUE "FileVersion", "6.2.0" + VALUE "FileVersion", "6.3.0" VALUE "InternalName", "mkvmerge" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mkvmerge" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "6.2.0" + VALUE "ProductVersion", "6.3.0" END END BLOCK "VarFileInfo" diff --git a/src/mkvtoolnix-gui/resources.rc b/src/mkvtoolnix-gui/resources.rc index 8656b5de5..9f5418e14 100644 --- a/src/mkvtoolnix-gui/resources.rc +++ b/src/mkvtoolnix-gui/resources.rc @@ -3,8 +3,8 @@ mkvmergeGUI ICON "../../share/icons/windows/mkvmergeGUI.ico" #define wxUSE_NO_MANIFEST 1 1 VERSIONINFO - FILEVERSION 6, 2, 0, 0 - PRODUCTVERSION 6, 2, 0, 0 + FILEVERSION 6, 3, 0, 0 + PRODUCTVERSION 6, 3, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -14,12 +14,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvtoolnix-gui" - VALUE "FileVersion", "6.2.0" + VALUE "FileVersion", "6.3.0" VALUE "InternalName", "mkvtoolnix-gui" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mkvtoolnix-gui" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "6.2.0" + VALUE "ProductVersion", "6.3.0" END END BLOCK "VarFileInfo" diff --git a/src/mmg/resources.rc b/src/mmg/resources.rc index da94073f4..94434e073 100644 --- a/src/mmg/resources.rc +++ b/src/mmg/resources.rc @@ -4,8 +4,8 @@ mkvmergeGUI ICON "../../share/icons/windows/mkvmergeGUI.ico" #include "wx/msw/wx.rc" 1 VERSIONINFO - FILEVERSION 6, 2, 0, 0 - PRODUCTVERSION 6, 2, 0, 0 + FILEVERSION 6, 3, 0, 0 + PRODUCTVERSION 6, 3, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -15,12 +15,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mmg" - VALUE "FileVersion", "6.2.0" + VALUE "FileVersion", "6.3.0" VALUE "InternalName", "mmg" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mmg" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "6.2.0" + VALUE "ProductVersion", "6.3.0" END END BLOCK "VarFileInfo" diff --git a/src/propedit/resources.rc b/src/propedit/resources.rc index 5deb4e781..fa90b2c5f 100644 --- a/src/propedit/resources.rc +++ b/src/propedit/resources.rc @@ -1,8 +1,8 @@ mkvpropedit ICON "../../share/icons/windows/mkvpropedit.ico" 1 VERSIONINFO - FILEVERSION 6, 2, 0, 0 - PRODUCTVERSION 6, 2, 0, 0 + FILEVERSION 6, 3, 0, 0 + PRODUCTVERSION 6, 3, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -12,12 +12,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvpropedit" - VALUE "FileVersion", "6.2.0" + VALUE "FileVersion", "6.3.0" VALUE "InternalName", "mkvpropedit" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mkvpropedit" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "6.2.0" + VALUE "ProductVersion", "6.3.0" END END BLOCK "VarFileInfo"