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

Conflicts:
	po/ja.po
This commit is contained in:
Moritz Bunkus 2010-12-25 21:36:30 +01:00
commit f63ceb24b8

View File

@ -6,9 +6,9 @@
# Katsuhiko Nishimra <kat841@hotmail.com> 2010.
msgid ""
msgstr ""
"Project-Id-Version: ja\n"
"Report-Msgid-Bugs-To: Hiroki Taniura <boiled.sugar@gmail.com>\n"
"POT-Creation-Date: 2009-02-27 00:38+0900\n"
"Project-Id-Versio#~ n: ja\n"
"Report-Msgid-Bugs#~ -To: Hiroki Taniura <boiled.sugar@gmail.com>\n"
"POT-Creation-Date#~ : 2009-02-27 00:38+0900\n"
"PO-Revision-Date: 2010-12-25 21:29+0100\n"
"Last-Translator: Hiroki Taniura <boiled.sugar@gmail.com>\n"
"Language-Team: Japanese <boiled.sugar@gmail.com>\n"
@ -4255,9 +4255,8 @@ msgid "No track corresponding to the edit specification '%1%' was found. %2%\n"
msgstr "editで指定された'%1%'に対応するトラックが見つかりませんでした。%2%\n"
#: src/extract/tracks.cpp:311
#, fuzzy
msgid "No track with the ID %1% was found in the source file.\n"
msgstr "ID %1%の添付ファイルが見つかりませんでした。\n"
msgstr "ソースファイル中にID %1%のトラックが見つかりませんでした。\n"
#: src/mmg/tabs/input.cpp:615
msgid "No tracks found"