Commits

Wagner Bruna committed 8ac00e5

i18n: pull latest ja and ru translations from Launchpad

Comments (0)

Files changed (2)

i18n/tortoisehg/ja.po

 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-03-27 21:18-0300\n"
-"PO-Revision-Date: 2012-03-22 15:59+0000\n"
-"Last-Translator: Takumi Iino <Unknown>\n"
+"PO-Revision-Date: 2012-03-28 16:40+0000\n"
+"Last-Translator: Yuya Nishihara <Unknown>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2012-03-28 04:50+0000\n"
-"X-Generator: Launchpad (build 15027)\n"
+"X-Launchpad-Export-Date: 2012-03-29 04:39+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
 
 #: TortoiseHgOverlayServer.py:51
 msgid "TortoiseHg Overlay Icon Server"
 msgid ""
 "%d files have <b>merge conflicts</b> that must be <a "
 "href=\"resolve\"><b>resolved</b></a>"
-msgstr ""
+msgstr "%d つのファイルで <b>マージ衝突</b> - <a href=\"resolve\"><b>解決する</b></a>"
 
 #: tortoisehg/hgqt/backout.py:377 tortoisehg/hgqt/merge.py:405
 msgid "No merge conflicts, ready to commit"
 
 #: tortoisehg/hgqt/cmdui.py:315
 msgid "Failed!"
-msgstr ""
+msgstr "失敗!"
 
 #: tortoisehg/hgqt/cmdui.py:543
 msgid "failed to run command\n"
 
 #: tortoisehg/hgqt/commit.py:408
 msgid "Create &Branch"
-msgstr ""
+msgstr "ブランチ作成(&B)"
 
 #: tortoisehg/hgqt/commit.py:439
 msgctxt "start progress"
 "Consider setting HGENCODING environment variable\n"
 "Replace untranslatable characters with \"?\"?\n"
 msgstr ""
+"メッセージをローカルエンコーディングへ変換できませんでした。\n"
+"HGENCODING 環境変数を設定してみてください。\n"
+"変換できない文字を \"?\" へ置き換えますか?\n"
 
 #: tortoisehg/hgqt/commit.py:731
 msgid "&Replace"
 
 #: tortoisehg/hgqt/csinfo.py:113
 msgid "Converted From:"
-msgstr ""
+msgstr "変換元:"
 
 #: tortoisehg/hgqt/cslist.py:48 tortoisehg/hgqt/cslist.py:130
 msgid "No items to display"
 
 #: tortoisehg/hgqt/filedata.py:51
 msgid "File is binary"
-msgstr ""
+msgstr "バイナリファイル"
 
 #: tortoisehg/hgqt/filedata.py:59 tortoisehg/hgqt/filedata.py:370
 #, python-format
 #: tortoisehg/hgqt/filerevmodel.py:23
 msgctxt "column header"
 msgid "Filename"
-msgstr ""
+msgstr "ファイル名"
 
 #: tortoisehg/hgqt/fileview.py:62
 msgid "Diff Toolbar"

i18n/tortoisehg/ru.po

 "Project-Id-Version: tortoisehg\n"
 "Report-Msgid-Bugs-To: Andrei Polushin <polushin@gmail.com>\n"
 "POT-Creation-Date: 2012-03-27 21:18-0300\n"
-"PO-Revision-Date: 2012-03-26 23:03+0000\n"
+"PO-Revision-Date: 2012-03-31 04:28+0000\n"
 "Last-Translator: Andrei Polushin <polushin@gmail.com>\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2012-03-28 04:52+0000\n"
-"X-Generator: Launchpad (build 15027)\n"
+"X-Launchpad-Export-Date: 2012-03-31 05:10+0000\n"
+"X-Generator: Launchpad (build 15032)\n"
 "Language: ru\n"
 "X-Poedit-Language: Russian\n"
 
 
 #: tortoisehg/hgqt/commit.py:1306
 msgid "TortoiseHg Commit"
-msgstr ""
+msgstr "Фиксация TortoiseHg"
 
 #: tortoisehg/hgqt/commit.py:1307
 msgid "Are you sure that you want to cancel the commit operation?"
-msgstr ""
+msgstr "Вы правда хотите отменить операцию фиксации?"
 
 #: tortoisehg/hgqt/compress.py:38
 msgid "Compress changesets up to and including"