merged origin master

diff --cc source/locale/ja/LC_MESSAGES/nvda.po
index e95cf56,05248b6..f8a760d
--- 1/source/locale/ja/LC_MESSAGES/nvda.po
--- 2/source/locale/ja/LC_MESSAGES/nvda.po
+++ b/source/locale/ja/LC_MESSAGES/nvda.po
@@@ -1,12 -1,12 +1,9 @@@
  # Japanese Translation of NVDA messages.
--# Copyright (C) 2006-2012 NVDA Contributors
++# Copyright (C) 2006-2014 NVDA Contributors
  #
  msgid ""
  msgstr ""
--"Project-Id-Version: NVDA bzr main:5884\n"
--"Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2014-02-07 18:54+1000\n"
- "PO-Revision-Date: 2014-02-11 22:41+0900\n"
 -"PO-Revision-Date: 2014-02-10 22:38+0900\n"
++"PO-Revision-Date: 2014-02-18 21:36+0900\n"
  "Last-Translator: Takuya Nishimoto <nishimotz@gmail.com>\n"
  "Language-Team: NVDA Japanese Team <nishimotz@gmail.com>\n"
  "Language: ja\n"