diff --git a/mozilla/calendar/resources/locale/ja-JP/calendar.dtd b/mozilla/calendar/resources/locale/ja-JP/calendar.dtd
index e6cc1433a82..27cdadd9f9b 100644
--- a/mozilla/calendar/resources/locale/ja-JP/calendar.dtd
+++ b/mozilla/calendar/resources/locale/ja-JP/calendar.dtd
@@ -156,7 +156,7 @@
 <!ENTITY newtodo.duedate.warning    "開始日付が期日後です。">
 <!ENTITY newtodo.repeatstart.warning "開始日付が周期設定に必要です。">
 
-<!ENTITY calendar.confirm.deleteallevents  "Are you sure you want to delete all the selected events?" >
+<!ENTITY calendar.confirm.deleteallevents  "選択イベントすべてを削除しますか？" >
 <!ENTITY calendar.confirm.deleteevent "このタイトルのイベントを削除しますか: " >
 <!ENTITY calendar.confirm.deleteuntitledevent "タイトルなしのイベントを削除しますか？" >
 
@@ -224,10 +224,10 @@
 <!ENTITY calendar.events.filter.month.label "翌月のイベント">
 <!ENTITY calendar.events.filter.future.label "すべてのこれからのイベント">
 <!ENTITY calendar.events.filter.current.label "今、選択中の日">
-<!ENTITY calendar.events.filter.next7Days.label "Events in the Next 7 Days">
-<!ENTITY calendar.events.filter.next14Days.label "Events in the Next 14 Days">
-<!ENTITY calendar.events.filter.next31Days.label "Events in the Next 31 Days">
-<!ENTITY calendar.events.filter.thisCalendarMonth.label "Events in this Calendar Month">
+<!ENTITY calendar.events.filter.next7Days.label "次の 7 日間のイベント">
+<!ENTITY calendar.events.filter.next14Days.label "次の 14 日間のイベント">
+<!ENTITY calendar.events.filter.next31Days.label "次の 31 日間のイベント">
+<!ENTITY calendar.events.filter.thisCalendarMonth.label "このカレンダー月のイベント">
 
 <!ENTITY calendar.unifinder.tree.done.label          "完了">
 <!ENTITY calendar.unifinder.tree.priority.label      "優先度">
@@ -284,10 +284,10 @@
 <!ENTITY calendar.subscribe.button.label           "購読" >
 <!ENTITY calendar.publish.button.label             "公開" >
 
-<!ENTITY calendar.localreload.button.label   "Local Reload" >
-<!ENTITY calendar.localreload.button.tooltip  "Reload all local calendars" >
-<!ENTITY calendar.remotereload.button.label   "Reload" >
-<!ENTITY calendar.remotereload.button.tooltip   "Reload all remote calendars" >
+<!ENTITY calendar.localreload.button.label   "ローカルの再読み込み" >
+<!ENTITY calendar.localreload.button.tooltip  "すべてのローカルカレンダーの再読み込み" >
+<!ENTITY calendar.remotereload.button.label   "再読み込み" >
+<!ENTITY calendar.remotereload.button.tooltip   "すべてのリモートカレンダーの読み込み" >
 
 <!ENTITY calendar.dayview.button.label          "デー" >
 <!ENTITY calendar.weekview.button.label         "ウィーク" >
@@ -427,8 +427,8 @@
 
 
 <!-- Calendar Server Dialog -->
-<!ENTITY calendar.server.dialog.title.new           "New Calendar File">
-<!ENTITY calendar.server.dialog.title.open          "Open Calendar File">
+<!ENTITY calendar.server.dialog.title.new           "新しいカレンダーファイル">
+<!ENTITY calendar.server.dialog.title.open          "カレンダーファイルを開く">
 <!ENTITY calendar.server.dialog.title.edit          "カレンダーを編集">
 <!ENTITY calendar.server.dialog.name.label          "名前">
 <!ENTITY calendar.server.dialog.publish.label       "自動的に変更を公開しますか？サーバにある新しいカレンダーをダウンロードして、追加や編集、イベント削除を行い、その新しいファイルをアップロードします。">
diff --git a/mozilla/calendar/resources/locale/ja-JP/calendar.properties b/mozilla/calendar/resources/locale/ja-JP/calendar.properties
index d383dbb16ed..5dccad1952c 100644
--- a/mozilla/calendar/resources/locale/ja-JP/calendar.properties
+++ b/mozilla/calendar/resources/locale/ja-JP/calendar.properties
@@ -47,28 +47,28 @@ AllDayEvents=\u7d42\u65e5\u30a4\u30d9\u30f3\u30c8
 statusTentative  =\u672a\u78ba\u8a8d
 statusConfirmed  =\u78ba\u8a8d\u6e08
 statusCancelled  =\u30ad\u30e3\u30f3\u30bb\u30eb
-statusNeedsAction=Needs Action
-statusInProcess  =In Process
-statusCompleted  =Completed
+statusNeedsAction=\u8981\u30a2\u30af\u30b7\u30e7\u30f3
+statusInProcess  =\u9032\u884c\u4e2d
+statusCompleted  =\u5b8c\u4e86
 
-noEventsOrTasksToImport=No events or tasks to import\nfrom file "%1$S".
+noEventsOrTasksToImport=\u30d5\u30a1\u30a4\u30eb "%1$S" \u304b\u3089\n\u30a4\u30f3\u30dd\u30fc\u30c8\u3059\u308b\u30a4\u30d9\u30f3\u30c8\u307e\u305f\u306f\u3001ToDo \u304c\u3042\u308a\u307e\u305b\u3093\u3002
 noEventsToSave=\u4fdd\u5b58\u3059\u308b\u9078\u629e\u30a4\u30d9\u30f3\u30c8\u304c\u3042\u308a\u307e\u305b\u3093\u3002
 
 # about to import x: "<br>into calendar y<br>from file z" (calendar more likely to wrong, so before file).
-aboutToImportNewEventsTitle=Import New Events
-aboutToImportNewEvents=About to import %1$S new event(s)\ninto calendar "%2$S"\nfrom file "%3$S".\nWhat do you want to do?
+aboutToImportNewEventsTitle=\u65b0\u3057\u3044\u30a4\u30d9\u30f3\u30c8\u306e\u30a4\u30f3\u30dd\u30fc\u30c8
+aboutToImportNewEvents=\u30d5\u30a1\u30a4\u30eb "%3$S" \u304b\u3089\n\u30ab\u30ec\u30f3\u30c0\u30fc "%2$S" \u306b\n%1$S \u306e\u65b0\u3057\u3044\u30a4\u30d9\u30f3\u30c8\u3092\u30a4\u30f3\u30dd\u30fc\u30c8\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307e\u3059\u3002\n\u3069\u3046\u6271\u3044\u307e\u3059\u304b\uff1f
 # aboutToImport=%1$S \u306e\u30a4\u30d9\u30f3\u30c8\u306e\u30a4\u30f3\u30dd\u30fc\u30c8\u306b\u3064\u3044\u3066\u3002\n\u30a4\u30f3\u30dd\u30fc\u30c8\u524d\u306b\u3059\u3079\u3066\u306e\u65b0\u3057\u3044\u30a4\u30d9\u30f3\u30c8\u3092\u958b\u304d\u307e\u3059\u304b\uff1f
-aboutToImportDupEventsTitle=Import Duplicate Events
-aboutToImportDupEvents=About to import %1$S event(s) that are duplicates of events in your calendar,\ninto calendar "%2$S"\nfrom file "%3$S".\nWhat do you want to do?
+aboutToImportDupEventsTitle=\u91cd\u8907\u30a4\u30d9\u30f3\u30c8\u306e\u30a4\u30f3\u30dd\u30fc\u30c8
+aboutToImportDupEvents=\u30d5\u30a1\u30a4\u30eb "%3$S" \u304b\u3089\n\u30ab\u30ec\u30f3\u30c0\u30fc "%2$S" \u306b\n\u91cd\u8907\u3059\u308b %1$S \u306e\u30a4\u30d9\u30f3\u30c8\u3092\u30a4\u30f3\u30dd\u30fc\u30c8\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307e\u3059\u3002\n\u3069\u3046\u6271\u3044\u307e\u3059\u304b\uff1f
 # aboutToImportDupEvents=\u91cd\u8907\u3059\u308b %1$S \u306e\u30a4\u30d9\u30f3\u30c8\u3092\u30a4\u30f3\u30dd\u30fc\u30c8\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307e\u3059\u3002\n\u3069\u3046\u6271\u3044\u307e\u3059\u304b\uff1f
-aboutToImportNewTasksTitle=Import New Tasks
-aboutToImportNewTasks=About to import %1$S new task(s)\ninto calendar "%2$S"\nfrom file "%3$S".\nWhat do you want to do?
-aboutToImportDupTasksTitle=Import Duplicate Tasks
-aboutToImportDupTasks=About to import %1$S task(s) that are duplicates of tasks in your calendar,\ninto calendar "%2$S"\nfrom file "%3$S".\nWhat do you want to do?
+aboutToImportNewTasksTitle=\u65b0\u3057\u3044 ToDo \u306e\u30a4\u30f3\u30dd\u30fc\u30c8
+aboutToImportNewTasks=\u30d5\u30a1\u30a4\u30eb "%3$S" \u304b\u3089\n\u30ab\u30ec\u30f3\u30c0\u30fc "%2$S" \u306b\n %1$S \u306e\u65b0\u3057\u3044 ToDo \u3092\u30a4\u30f3\u30dd\u30fc\u30c8\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307e\u3059\u3002\n\u3069\u3046\u6271\u3044\u307e\u3059\u304b\uff1f
+aboutToImportDupTasksTitle=\u91cd\u8907 ToDo \u306e\u30a4\u30f3\u30dd\u30fc\u30c8
+aboutToImportDupTasks=\u30d5\u30a1\u30a4\u30eb "%3$S" \u304b\u3089\n\u30ab\u30ec\u30f3\u30c0\u30fc "%2$S" \u306b\n\u91cd\u8907\u3059\u308b %1$S \u306e ToDo \u3092\u30a4\u30f3\u30dd\u30fc\u30c8\u3057\u3088\u3046\u3068\u3057\u3066\u3044\u307e\u3059\u3002\n\u3069\u3046\u6271\u3044\u307e\u3059\u304b\uff1f
 
 discardAll=\u3059\u3079\u3066\u30a4\u30f3\u30dd\u30fc\u30c8\u3057\u306a\u3044
 importAll=\u3059\u3079\u3066\u30a4\u30f3\u30dd\u30fc\u30c8\u3059\u308b
-promptForEach=Prompt for each
+promptForEach=\u500b\u5225\u306b\u5c0b\u306d\u308b
 addDuplicate=\u91cd\u8907\u30a8\u30f3\u30c8\u30ea\u8ffd\u52a0:
 
 #spaces needed at the end of the following lines
@@ -143,19 +143,19 @@ tooltipLocation =\u5834\u6240:
 # event date, usually an interval, such as
 #  Date: 7:00--8:00 Thu 9 Oct 2011
 #  Date: Thu 9 Oct 2000 -- Fri 10 Oct 2000
-tooltipDate     =Date:
+tooltipDate     =\u65e5\u4ed8:
 # event status: tentative, confirmed, cancelled
-tooltipStatus   =Status:
+tooltipStatus   =\u72b6\u614b:
 # task/todo fields
 # start date time, due date time, task priority number, completed date time
 tooltipStart    =\u958b\u59cb:
-tooltipDue      =Due:
-tooltipPriority =Priority:
-tooltipPercent  =% Complete:
-tooltipCompleted=Completed:
+tooltipDue      =\u671f\u9650:
+tooltipPriority =\u512a\u5148\u5ea6:
+tooltipPercent  =% \u5b8c\u4e86:
+tooltipCompleted=\u5b8c\u4e86:
 
 #File commands and dialogs
-New=New
+New=\u65b0\u898f
 Open=\u958b\u304f
 Save=\u4fdd\u5b58
 SaveAs=\u540d\u524d\u3092\u4ed8\u3051\u3066\u4fdd\u5b58
@@ -176,29 +176,29 @@ filterRdf=iCalendar RDF
 
 # Literal Outlook CSV headers.  Take from a .csv file exported by Outlook.
 # For matching first line of .csv file to import Outlook Comma Separated events.
-outlookCSVTitle      =Subject
-outlookCSVStartDate  =Start Date
-outlookCSVStartTime  =Start Time
-outlookCSVEndDate    =End Date
-outlookCSVEndTime    =End Time
-outlookCSVAllDayEvent=All day event
-outlookCSVAlarm      =Reminder on/off
-outlookCSVAlarmDate  =Reminder Date
-outlookCSVAlarmTime  =Reminder Time
-outlookCSVCategories =Categories
-outlookCSVDescription=Description
-outlookCSVLocation   =Location
-outlookCSVPrivate    =Private
+outlookCSVTitle      =\u4ef6\u540d
+outlookCSVStartDate  =\u958b\u59cb\u65e5
+outlookCSVStartTime  =\u958b\u59cb\u6642\u9593
+outlookCSVEndDate    =\u7d42\u4e86\u65e5
+outlookCSVEndTime    =\u7d42\u4e86\u6642\u9593
+outlookCSVAllDayEvent=\u7d42\u65e5\u30a4\u30d9\u30f3\u30c8
+outlookCSVAlarm      =\u30ea\u30de\u30a4\u30f3\u30c0 on/off
+outlookCSVAlarmDate  =\u30ea\u30de\u30a4\u30f3\u30c0\u65e5
+outlookCSVAlarmTime  =\u30ea\u30de\u30a4\u30f3\u30c0\u6642\u9593
+outlookCSVCategories =\u30ab\u30c6\u30b4\u30ea
+outlookCSVDescription=\u8a73\u7d30
+outlookCSVLocation   =\u5834\u6240
+outlookCSVPrivate    =\u30d7\u30e9\u30a4\u30d9\u30fc\u30c8
 # Literal values for True and False in .csv files exported by Outlook
 outlookCSVValueTrue  =True
 outlookCSVValueFalse =False
 
 # Questions to user about how to parse values
 outlookCSVDateParseConfirm=\
-  A date in this file is formatted as "%1$S".\n\
-  The operating system is set to parse this date as "%2$S".\n\
-  Is this OK?\n\
-  (If not, adjust settings so format matches, then restart this application.)
+  \u3053\u306e\u30d5\u30a1\u30a4\u30eb\u4e2d\u306e\u65e5\u4ed8\u5f62\u5f0f\u306f "%1$S" \u3067\u3059\u3002\n\
+  OS \u306f\u3053\u306e\u65e5\u4ed8\u3092 "%2$S" \u3068\u3057\u3066\u6271\u3046\u3088\u3046\u306b\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002\n\
+  \u3088\u308d\u3057\u3044\u3067\u3059\u304b\uff1f\n\
+  (\u6271\u3044\u304c\u9055\u3046\u5834\u5408\u306f\u3001\u8a2d\u5b9a\u3092\u5f62\u5f0f\u306b\u4e00\u81f4\u3059\u308b\u3088\u3046\u306b\u8abf\u6574\u3057\u3066\u3001\u3053\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u3092\u518d\u8d77\u52d5\u3057\u3066\u304f\u3060\u3055\u3044\u3002)
 
 # Remote calendar errors
 errorTitle=\u30ab\u30ec\u30f3\u30c0\u30fc\u306e\u53d6\u5f97\u30a8\u30e9\u30fc
diff --git a/mozilla/calendar/resources/locale/ja-JP/menuOverlay.dtd b/mozilla/calendar/resources/locale/ja-JP/menuOverlay.dtd
index c0af24dcd44..c347a0cb166 100644
--- a/mozilla/calendar/resources/locale/ja-JP/menuOverlay.dtd
+++ b/mozilla/calendar/resources/locale/ja-JP/menuOverlay.dtd
@@ -56,7 +56,7 @@
 <!ENTITY calendar.new.server.key                "L">
 <!ENTITY calendar.new.server.accesskey          "l">
 
-<!ENTITY calendar.open.file.label "Open Calendar File…">
+<!ENTITY calendar.open.file.label               "カレンダーファイルを開く…">
 <!ENTITY calendar.open.file.key                 "O">
 <!ENTITY calendar.open.file.accesskey "O">
 
@@ -97,7 +97,7 @@
 <!ENTITY calendar.subscribe.label               "別のカレンダーを購読...">
 <!ENTITY calendar.subscribe.accesskey           "R">
 
-<!ENTITY calendar.reloadserver.label            "Reload Remote Calendars">
+<!ENTITY calendar.reloadserver.label            "リモートカレンダーを再読み込み">
 <!ENTITY calendar.reloadserver.key              "R">
 <!ENTITY calendar.reloadserver.accesskey        "R">
 
@@ -183,8 +183,8 @@
 <!ENTITY aboutCmd.accesskey                     "A">
 
 <!-- Mac OS X "Window" menu items -->
-<!ENTITY windowMenu.label                       "Window">
-<!ENTITY minimizeWindow.label                   "Minimize">
-<!ENTITY zoomWindow.label                       "Zoom">
+<!ENTITY windowMenu.label                       "ウィンドウ">
+<!ENTITY minimizeWindow.label                   "最小化">
+<!ENTITY zoomWindow.label                       "ズーム">
 <!ENTITY minimizeWindow.key                     "M">
-<!ENTITY bringAllToFront.label                  "Bring All to Front">
+<!ENTITY bringAllToFront.label                  "すべてを前面に移動">