diff --git a/po/de.po b/po/de.po index 40f47abe3..5a2a7c083 100644 --- a/po/de.po +++ b/po/de.po @@ -525,7 +525,7 @@ msgid "" " --track-tags Copy the tags for tracks n,m etc. Default: copy\n" " tags for all tracks.\n" msgstr "" -" --track-tags nur Tags für Spuren n, m etc kopieren (Standard:\n" +" --track-tags nur Tags für Spuren n, m etc. kopieren (Standard:\n" " Tags für alle Spuren kopieren)\n" #: src/merge/mkvmerge.cpp:279 @@ -587,7 +587,7 @@ msgid "" " all buttons tracks.\n" msgstr "" " -b, --button-tracks \n" -" nur Button-Spuren n, m etc kopieren (Standard: alle\n" +" nur Button-Spuren n, m etc. kopieren (Standard: alle\n" " Button-Spuren kopieren)\n" #: src/merge/mkvmerge.cpp:179 @@ -597,7 +597,7 @@ msgid "" " video tracks.\n" msgstr "" " -d, --video-tracks \n" -" nur Videospuren n, m etc kopieren (Standard: alle\n" +" nur Videospuren n, m etc. kopieren (Standard: alle\n" " Videospuren kopieren)\n" #: src/merge/mkvmerge.cpp:240 @@ -623,7 +623,7 @@ msgstr " -l, --list-types zeigt eine Liste mit unterstützten Formaten #: src/merge/mkvmerge.cpp:191 msgid "" " -m, --attachments \n" -" Copy the attachments with the IDs n, m etc to\n" +" Copy the attachments with the IDs n, m etc. to\n" " all or only the first output file. Default: copy\n" " all attachments to all output files.\n" msgstr "" @@ -2145,8 +2145,8 @@ msgid "ALAC private data size mismatch\n" msgstr "Größe der ALAC-Initialisierungsdaten stimmt nicht\n" #: src/mkvtoolnix-gui/header_editor/value_page.cpp:151 -msgid "ASCII string (no special chars like Umlaute etc)" -msgstr "ASCII-Zeichenkette (keine Sonderzeichen wie Umlaute etc)" +msgid "ASCII string (no special chars like Umlaute etc.)" +msgstr "ASCII-Zeichenkette (keine Sonderzeichen wie Umlaute etc.)" #: src/common/file_types.cpp:70 #: src/output/p_mpeg4_p10.h:34 @@ -2704,7 +2704,7 @@ msgid "Available:" msgstr "Verfügbar:" #: src/mkvtoolnix-gui/header_editor/value_page.cpp:155 -msgid "Binary (displayed as hex numbers)" +msgid "Binary (displayed as hexadecimal numbers)" msgstr "Binärwerte (angezeigt als Hexadezimalzahlen)" #: src/info/mkvinfo.cpp:560 @@ -2763,8 +2763,8 @@ msgid "Bogus aid %1%\n" msgstr "ungültige AID %1%\n" #: src/mkvtoolnix-gui/header_editor/value_page.cpp:156 -msgid "Boolean (yes/no, on/off etc)" -msgstr "boolescher Wert (ja/nein, an/aus etc)" +msgid "Boolean (yes/no, on/off etc.)" +msgstr "boolescher Wert (ja/nein, an/aus etc.)" #: src/merge/generic_packetizer.cpp:198 msgid "Both the aspect ratio and '--display-dimensions' were given.\n" @@ -2846,7 +2846,7 @@ msgstr "Marging kann nicht gestartet werden" #: src/extract/xtr_textsubs.cpp:302 #, boost-format -msgid "Cannot write track %1% with the CodecID '%2%' to the file '%3%' because track %4% with the CodecID '%5%' is already being written to the same file, and their CodecPrivate data (the USF styles etc) do not match.\n" +msgid "Cannot write track %1% with the CodecID '%2%' to the file '%3%' because track %4% with the CodecID '%5%' is already being written to the same file, and their CodecPrivate data (the USF styles etc.) do not match.\n" msgstr "Die Spur %1% mit der CodecID »%2%« kann nicht in die Datei »%3%« geschrieben werden, weil bereits Spur %4% mit der CodecID »%5%« in dieselbe Datei geschrieben wird und sich ihre privaten Codec-Daten (z.B. USF-Stile) unterscheiden.\n" #: src/extract/xtr_avi.cpp:49 @@ -8441,7 +8441,7 @@ msgstr "Die Zeitstempeldatei »%1%« enthält nicht einen einzigen gültigen Ein #: src/merge/timestamp_factory.cpp:206 #, boost-format msgid "" -"The timecode v2 file '%1%' contains timecodes that are not ordered. Due to a bug in mkvmerge versions up to and including v1.5.0 this was necessary if the track to which the timecode file was applied contained B frames. Starting with v1.5.1 mkvmerge now handles this correctly, and the timecodes in the timecode file must be ordered normally. For example, the frame sequence 'IPBBP...' at 25 FPS requires a timecode file with the first timecodes being '0', '40', '80', '120' etc and not '0', '120', '40', '80' etc.\n" +"The timecode v2 file '%1%' contains timecodes that are not ordered. Due to a bug in mkvmerge versions up to and including v1.5.0 this was necessary if the track to which the timecode file was applied contained B frames. Starting with v1.5.1 mkvmerge now handles this correctly, and the timecodes in the timecode file must be ordered normally. For example, the frame sequence 'IPBBP...' at 25 FPS requires a timecode file with the first timecodes being '0', '40', '80', '120' etc. and not '0', '120', '40', '80' etc.\n" "\n" "If you really have to specify non-sorted timecodes then use the timecode format v4. It is identical to format v2 but allows non-sorted timecodes.\n" msgstr "" @@ -10757,4 +10757,3 @@ msgstr "– keine Vorauswahl –" #: src/mkvtoolnix-gui/chapter_editor/mass_modification_dialog.cpp:38 msgid "– set to none –" msgstr "– leer setzen –" - diff --git a/src/extract/xtr_textsubs.cpp b/src/extract/xtr_textsubs.cpp index fef463c25..a4e5dc708 100644 --- a/src/extract/xtr_textsubs.cpp +++ b/src/extract/xtr_textsubs.cpp @@ -300,7 +300,7 @@ xtr_usf_c::create_file(xtr_base_c *master, if (m_codec_private != usf_master->m_codec_private) mxerror(boost::format(Y("Cannot write track %1% with the CodecID '%2%' to the file '%3%' because track %4% with the CodecID '%5%' is already " - "being written to the same file, and their CodecPrivate data (the USF styles etc) do not match.\n")) + "being written to the same file, and their CodecPrivate data (the USF styles etc.) do not match.\n")) % m_tid % m_codec_id % m_file_name % master->m_tid % master->m_codec_id); m_doc = usf_master->m_doc; diff --git a/src/merge/mkvmerge.cpp b/src/merge/mkvmerge.cpp index 4b5093efc..c4fb55ea9 100644 --- a/src/merge/mkvmerge.cpp +++ b/src/merge/mkvmerge.cpp @@ -189,7 +189,7 @@ set_usage() { " all buttons tracks.\n"); usage_text += Y(" -B, --no-buttons Don't copy any buttons track from this file.\n"); usage_text += Y(" -m, --attachments \n" - " Copy the attachments with the IDs n, m etc to\n" + " Copy the attachments with the IDs n, m etc. to\n" " all or only the first output file. Default: copy\n" " all attachments to all output files.\n"); usage_text += Y(" -M, --no-attachments Don't copy attachments from a source file.\n"); diff --git a/src/merge/timestamp_factory.cpp b/src/merge/timestamp_factory.cpp index 352f4d0af..bd43e6e66 100644 --- a/src/merge/timestamp_factory.cpp +++ b/src/merge/timestamp_factory.cpp @@ -208,7 +208,7 @@ timestamp_factory_v2_c::parse(mm_io_c &in) { "if the track to which the timecode file was applied contained B frames. " "Starting with v1.5.1 mkvmerge now handles this correctly, and the timecodes in the timecode file must be ordered normally. " "For example, the frame sequence 'IPBBP...' at 25 FPS requires a timecode file with " - "the first timecodes being '0', '40', '80', '120' etc and not '0', '120', '40', '80' etc.\n\n" + "the first timecodes being '0', '40', '80', '120' etc and. not '0', '120', '40', '80' etc.\n\n" "If you really have to specify non-sorted timecodes then use the timecode format v4. " "It is identical to format v2 but allows non-sorted timecodes.\n")) % in.get_file_name()); diff --git a/src/mkvtoolnix-gui/header_editor/value_page.cpp b/src/mkvtoolnix-gui/header_editor/value_page.cpp index da7d36473..d2c762167 100644 --- a/src/mkvtoolnix-gui/header_editor/value_page.cpp +++ b/src/mkvtoolnix-gui/header_editor/value_page.cpp @@ -148,12 +148,12 @@ ValuePage::retranslateUi() { m_lTitle->setText(Q(m_title.get_translated())); - auto type = ValueType::AsciiString == m_valueType ? QY("ASCII string (no special chars like Umlaute etc)") + auto type = ValueType::AsciiString == m_valueType ? QY("ASCII string (no special chars like Umlaute etc.)") : ValueType::String == m_valueType ? QY("String") : ValueType::UnsignedInteger == m_valueType ? QY("Unsigned integer") : ValueType::Float == m_valueType ? QY("Floating point number") - : ValueType::Binary == m_valueType ? QY("Binary (displayed as hex numbers)") - : ValueType::Bool == m_valueType ? QY("Boolean (yes/no, on/off etc)") + : ValueType::Binary == m_valueType ? QY("Binary (displayed as hexadecimal numbers)") + : ValueType::Bool == m_valueType ? QY("Boolean (yes/no, on/off etc.)") : QY("unknown"); m_lTypeLabel->setText(QY("Type:"));