diff --git a/po/ja.po b/po/ja.po
index f37971fb1..439e68718 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the gnome-shell package.
 # Nishio Futoshi <fut_nis@d3.dion.ne.jp>, 2010.
 # Kiyotaka NISHIBORI <ml.nishibori.kiyotaka@gmail.com>, 2011.
-# Jiro Matsuzawa <matsuzawa.jr@gmail.com>, 2011.
+# Jiro Matsuzawa <jmatsuzawa@src.gnome.org>, 2011.
 # Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>, 2011.
 #
 msgid ""
@@ -11,14 +11,14 @@ msgstr ""
 "Project-Id-Version: gnome-shell master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "shell&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-04-22 21:34+0000\n"
-"PO-Revision-Date: 2011-04-19 23:13+0900\n"
-"Last-Translator: Jiro Matsuzawa <matsuzawa.jr@gmail.com>\n"
+"POT-Creation-Date: 2011-09-06 02:16+0000\n"
+"PO-Revision-Date: 2011-07-12 22:54+0900\n"
+"Last-Translator: Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/gnome-shell.desktop.in.in.h:1
@@ -50,9 +50,11 @@ msgid "Framerate used for recording screencasts."
 msgstr "スクリーンキャスト録画のフレームレート"
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:5
+#, fuzzy
 msgid ""
 "GNOME Shell extensions have a uuid property; this key lists extensions which "
-"should not be loaded."
+"should be loaded. disabled-extensions overrides this setting for extensions "
+"that appear in both lists."
 msgstr ""
 "GNOME Shell の拡張機能のうち読み込まれないものの UUID の一覧を表示します。"
 
@@ -69,18 +71,24 @@ msgid "If true, display date in the clock, in addition to time."
 msgstr "日付と時刻を表示します。"
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:9
-msgid "If true, display seconds in time."
+#, fuzzy
+#| msgid "If true, display seconds in time."
+msgid "If true, display onscreen keyboard."
 msgstr "時刻を秒まで表示します。"
 
 #: ../data/org.gnome.shell.gschema.xml.in.h:10
+msgid "If true, display seconds in time."
+msgstr "時刻を秒まで表示します。"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:11
 msgid "If true, display the ISO week date in the calendar."
 msgstr "ISO 8601 方式の暦週日付を表示します。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:11
+#: ../data/org.gnome.shell.gschema.xml.in.h:12
 msgid "List of desktop file IDs for favorite applications"
 msgstr "お気に入りのアプリケーションの .desktop ファイル ID の一覧"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:13
+#: ../data/org.gnome.shell.gschema.xml.in.h:14
 #, no-c-format
 msgid ""
 "Sets the GStreamer pipeline used to encode recordings. It follows the syntax "
@@ -104,25 +112,31 @@ msgstr ""
 "使用され、VP8 コーデックを使用した WebM 形式で録画します。 '%T' はシステムの"
 "最適スレッド数の推量値を示すプレースホルダーです。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.shell.gschema.xml.in.h:15
 msgid "Show date in clock"
 msgstr "日付を表示"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#, fuzzy
+#| msgid "Screen Keyboard"
+msgid "Show the onscreen keyboard"
+msgstr "スクリーンキーボード"
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:17
 msgid "Show the week date in the calendar"
 msgstr "暦週日付を表示"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.shell.gschema.xml.in.h:18
 msgid "Show time with seconds"
 msgstr "秒を表示"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.shell.gschema.xml.in.h:19
 msgid ""
 "The applications corresponding to these identifiers will be displayed in the "
 "favorites area."
 msgstr "これらの ID で示されるアプリケーションは「お気に入り」に表示されます。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.shell.gschema.xml.in.h:20
 msgid ""
 "The filename for recorded screencasts will be a unique filename based on the "
 "current date, and use this extension. It should be changed when recording to "
@@ -132,7 +146,7 @@ msgstr ""
 "とこの拡張子をファイル名として使用します。異なる形式で録画するときは拡張子を"
 "変更する必要があります。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.shell.gschema.xml.in.h:21
 msgid ""
 "The framerate of the resulting screencast recordered by GNOME Shell's "
 "screencast recorder in frames-per-second."
@@ -140,11 +154,11 @@ msgstr ""
 "GNOME Shell のスクリーンキャスト・レコーダーで録画するスクリーンキャストの 1"
 "秒あたりのフレーム数です。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.shell.gschema.xml.in.h:22
 msgid "The gstreamer pipeline used to encode the screencast"
 msgstr "スクリーンキャストのエンコードに使用する Gstreamer パイプライン"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.shell.gschema.xml.in.h:23
 msgid ""
 "The shell normally monitors active applications in order to present the most "
 "used ones (e.g. in launchers). While this data will be kept private, you may "
@@ -155,84 +169,130 @@ msgstr ""
 "ます。この情報が外部へ送信されることはありませんが、不安を感じるならば監視を"
 "無効にすることができます。なお既に収集された情報は消去できません。"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:22
-msgid "Uuids of extensions to disable"
+#: ../data/org.gnome.shell.gschema.xml.in.h:24
+msgid "The type of keyboard to use."
+msgstr ""
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:25
+#, fuzzy
+msgid "Uuids of extensions to enable"
 msgstr "無効にされた拡張機能の UUID"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.shell.gschema.xml.in.h:26
 msgid "Whether to collect stats about applications usage"
 msgstr "アプリケーション使用状況の 有効/無効"
 
-#: ../data/org.gnome.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.shell.gschema.xml.in.h:27
+msgid "Which keyboard to use"
+msgstr ""
+
+#: ../data/org.gnome.shell.gschema.xml.in.h:28
 msgid "disabled OpenSearch providers"
 msgstr "OpenSearch プロバイダーを無効にする"
 
-#: ../js/misc/util.js:71
+#: ../js/gdm/loginDialog.js:601
+#, fuzzy
+#| msgid "Searching..."
+msgid "Session..."
+msgstr "検索しています..."
+
+#: ../js/gdm/loginDialog.js:758 ../js/gdm/loginDialog.js:931
+msgid "Sign In"
+msgstr ""
+
+#: ../js/gdm/loginDialog.js:816
+msgid "Not listed?"
+msgstr ""
+
+#: ../js/gdm/loginDialog.js:926 ../js/ui/endSessionDialog.js:410
+#: ../js/ui/networkAgent.js:158 ../js/ui/polkitAuthenticationAgent.js:170
+#: ../js/ui/status/bluetooth.js:480
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: ../js/gdm/loginDialog.js:1251
+#, fuzzy
+#| msgid "New Window"
+msgid "Login Window"
+msgstr "新しいウィンドウで開く"
+
+#: ../js/misc/util.js:68
 msgid "Command not found"
 msgstr "コマンドが見つかりません"
 
 #. Replace "Error invoking GLib.shell_parse_argv: " with
 #. something nicer
-#: ../js/misc/util.js:98
+#: ../js/misc/util.js:95
 msgid "Could not parse command:"
 msgstr "次のコマンドは解析できません:"
 
-#: ../js/misc/util.js:106
+#: ../js/misc/util.js:103
 #, c-format
 msgid "Execution of '%s' failed:"
 msgstr "'%s'の実行に失敗しました:"
 
 #. Translators: Filter to display all applications
-#: ../js/ui/appDisplay.js:230
+#: ../js/ui/appDisplay.js:255
 msgid "All"
 msgstr "すべて"
 
-#: ../js/ui/appDisplay.js:329
+#: ../js/ui/appDisplay.js:319
 msgid "APPLICATIONS"
 msgstr "アプリケーション"
 
-#: ../js/ui/appDisplay.js:355
+#: ../js/ui/appDisplay.js:377
 msgid "SETTINGS"
 msgstr "設定"
 
-#: ../js/ui/appDisplay.js:626
+#: ../js/ui/appDisplay.js:685
 msgid "New Window"
 msgstr "新しいウィンドウで開く"
 
-#: ../js/ui/appDisplay.js:629
+#: ../js/ui/appDisplay.js:688
 msgid "Remove from Favorites"
 msgstr "お気に入りから削除"
 
-#: ../js/ui/appDisplay.js:630
+#: ../js/ui/appDisplay.js:689
 msgid "Add to Favorites"
 msgstr "お気に入りに追加"
 
-#: ../js/ui/appFavorites.js:91
+#: ../js/ui/appFavorites.js:89
 #, c-format
 msgid "%s has been added to your favorites."
 msgstr "%s をお気に入りに追加しました。"
 
-#: ../js/ui/appFavorites.js:122
+#: ../js/ui/appFavorites.js:120
 #, c-format
 msgid "%s has been removed from your favorites."
 msgstr "%s をお気に入りから削除しました。"
 
+#: ../js/ui/autorunManager.js:592
+#, c-format
+msgid "Open with %s"
+msgstr ""
+
+#: ../js/ui/autorunManager.js:618
+#, fuzzy
+#| msgid "Reject"
+msgid "Eject"
+msgstr "拒否"
+
 #. Translators: Shown in calendar event list for all day events
 #. * Keep it short, best if you can use less then 10 characters
 #.
-#: ../js/ui/calendar.js:66
+#: ../js/ui/calendar.js:63
 msgctxt "event list time"
 msgid "All Day"
 msgstr "終日"
 
 #. Translators: Shown in calendar event list, if 24h format
-#: ../js/ui/calendar.js:71
+#: ../js/ui/calendar.js:68
 msgctxt "event list time"
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. Transators: Shown in calendar event list, if 12h format
-#: ../js/ui/calendar.js:78
+#: ../js/ui/calendar.js:75
 msgctxt "event list time"
 msgid "%l:%M %p"
 msgstr "%p%l:%M"
@@ -242,43 +302,43 @@ msgstr "%p%l:%M"
 #. * NOTE: These grid abbreviations are always shown together
 #. * and in order, e.g. "S M T W T F S".
 #.
-#: ../js/ui/calendar.js:118
+#: ../js/ui/calendar.js:115
 msgctxt "grid sunday"
 msgid "S"
 msgstr "日"
 
 #. Translators: Calendar grid abbreviation for Monday
-#: ../js/ui/calendar.js:120
+#: ../js/ui/calendar.js:117
 msgctxt "grid monday"
 msgid "M"
 msgstr "月"
 
 #. Translators: Calendar grid abbreviation for Tuesday
-#: ../js/ui/calendar.js:122
+#: ../js/ui/calendar.js:119
 msgctxt "grid tuesday"
 msgid "T"
 msgstr "火"
 
 #. Translators: Calendar grid abbreviation for Wednesday
-#: ../js/ui/calendar.js:124
+#: ../js/ui/calendar.js:121
 msgctxt "grid wednesday"
 msgid "W"
 msgstr "水"
 
 #. Translators: Calendar grid abbreviation for Thursday
-#: ../js/ui/calendar.js:126
+#: ../js/ui/calendar.js:123
 msgctxt "grid thursday"
 msgid "T"
 msgstr "木"
 
 #. Translators: Calendar grid abbreviation for Friday
-#: ../js/ui/calendar.js:128
+#: ../js/ui/calendar.js:125
 msgctxt "grid friday"
 msgid "F"
 msgstr "金"
 
 #. Translators: Calendar grid abbreviation for Saturday
-#: ../js/ui/calendar.js:130
+#: ../js/ui/calendar.js:127
 msgctxt "grid saturday"
 msgid "S"
 msgstr "土"
@@ -289,310 +349,436 @@ msgstr "土"
 #. * so they need to be unique (e.g. Tuesday and Thursday cannot
 #. * both be 'T').
 #.
-#: ../js/ui/calendar.js:143
+#: ../js/ui/calendar.js:140
 msgctxt "list sunday"
 msgid "Su"
 msgstr "日"
 
 #. Translators: Event list abbreviation for Monday
-#: ../js/ui/calendar.js:145
+#: ../js/ui/calendar.js:142
 msgctxt "list monday"
 msgid "M"
 msgstr "月"
 
 #. Translators: Event list abbreviation for Tuesday
-#: ../js/ui/calendar.js:147
+#: ../js/ui/calendar.js:144
 msgctxt "list tuesday"
 msgid "T"
 msgstr "火"
 
 #. Translators: Event list abbreviation for Wednesday
-#: ../js/ui/calendar.js:149
+#: ../js/ui/calendar.js:146
 msgctxt "list wednesday"
 msgid "W"
 msgstr "水"
 
 #. Translators: Event list abbreviation for Thursday
-#: ../js/ui/calendar.js:151
+#: ../js/ui/calendar.js:148
 msgctxt "list thursday"
 msgid "Th"
 msgstr "木"
 
 #. Translators: Event list abbreviation for Friday
-#: ../js/ui/calendar.js:153
+#: ../js/ui/calendar.js:150
 msgctxt "list friday"
 msgid "F"
 msgstr "金"
 
 #. Translators: Event list abbreviation for Saturday
-#: ../js/ui/calendar.js:155
+#: ../js/ui/calendar.js:152
 msgctxt "list saturday"
 msgid "S"
 msgstr "土"
 
 #. Translators: Text to show if there are no events
-#: ../js/ui/calendar.js:704
+#: ../js/ui/calendar.js:687
 msgid "Nothing Scheduled"
 msgstr "予定がありません"
 
 #. Translators: Shown on calendar heading when selected day occurs on current year
-#: ../js/ui/calendar.js:720 ../js/ui/telepathyClient.js:492
+#: ../js/ui/calendar.js:703
 msgctxt "calendar heading"
 msgid "%A, %B %d"
 msgstr "%B%e日 (%a)"
 
 #. Translators: Shown on calendar heading when selected day occurs on different year
-#: ../js/ui/calendar.js:723 ../js/ui/telepathyClient.js:495
+#: ../js/ui/calendar.js:706
 msgctxt "calendar heading"
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%B%e日 (%a)"
 
-#: ../js/ui/calendar.js:733
+#: ../js/ui/calendar.js:716
 msgid "Today"
 msgstr "今日"
 
-#: ../js/ui/calendar.js:737
+#: ../js/ui/calendar.js:720
 msgid "Tomorrow"
 msgstr "明日"
 
-#: ../js/ui/calendar.js:746
+#: ../js/ui/calendar.js:729
 msgid "This week"
 msgstr "今週"
 
-#: ../js/ui/calendar.js:754
+#: ../js/ui/calendar.js:737
 msgid "Next week"
 msgstr "来週"
 
-#: ../js/ui/dash.js:174 ../js/ui/messageTray.js:1037
+#: ../js/ui/contactDisplay.js:59 ../js/ui/notificationDaemon.js:444
+#: ../js/ui/status/power.js:223 ../src/shell-app.c:355
+msgid "Unknown"
+msgstr "不明なデバイス"
+
+#: ../js/ui/contactDisplay.js:80 ../js/ui/userMenu.js:147
+msgid "Available"
+msgstr "在席中"
+
+#: ../js/ui/contactDisplay.js:85 ../js/ui/userMenu.js:156
+msgid "Away"
+msgstr ""
+
+#: ../js/ui/contactDisplay.js:89 ../js/ui/userMenu.js:150
+msgid "Busy"
+msgstr "取り込み中"
+
+#: ../js/ui/contactDisplay.js:93
+msgid "Offline"
+msgstr ""
+
+#: ../js/ui/contactDisplay.js:140
+msgid "CONTACTS"
+msgstr ""
+
+#: ../js/ui/dash.js:172 ../js/ui/messageTray.js:1197
 msgid "Remove"
 msgstr "削除"
 
-#: ../js/ui/dateMenu.js:91
+#: ../js/ui/dateMenu.js:99
 msgid "Date and Time Settings"
 msgstr "日時の設定"
 
-#: ../js/ui/dateMenu.js:111
+#: ../js/ui/dateMenu.js:125
 msgid "Open Calendar"
 msgstr "カレンダーを開く"
 
 #. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../js/ui/dateMenu.js:164
+#: ../js/ui/dateMenu.js:183
 msgid "%a %b %e, %R:%S"
-msgstr "%m/%e (%a) %R:%S"
+msgstr "%m/%d (%a) %R:%S"
 
-#: ../js/ui/dateMenu.js:165
+#: ../js/ui/dateMenu.js:184
 msgid "%a %b %e, %R"
-msgstr "%m/%e (%a) %R"
+msgstr "%m/%d (%a) %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../js/ui/dateMenu.js:169
+#: ../js/ui/dateMenu.js:188
 msgid "%a %R:%S"
 msgstr "%A %R:%S"
 
-#: ../js/ui/dateMenu.js:170
+#: ../js/ui/dateMenu.js:189
 msgid "%a %R"
 msgstr "%A %R"
 
 #. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../js/ui/dateMenu.js:177
+#: ../js/ui/dateMenu.js:196
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%B%e日 (%a) %p%l:%M:%S"
 
-#: ../js/ui/dateMenu.js:178
+#: ../js/ui/dateMenu.js:197
 msgid "%a %b %e, %l:%M %p"
 msgstr "%B%e日 (%a) %p%l:%M"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../js/ui/dateMenu.js:182
+#: ../js/ui/dateMenu.js:201
 msgid "%a %l:%M:%S %p"
 msgstr "%A %p%l:%M:%S "
 
-#: ../js/ui/dateMenu.js:183
+#: ../js/ui/dateMenu.js:202
 msgid "%a %l:%M %p"
 msgstr "%A %p%l:%M"
 
 #. Translators: This is the date format to use when the calendar popup is
 #. * shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
 #.
-#: ../js/ui/dateMenu.js:194
+#: ../js/ui/dateMenu.js:213
 msgid "%A %B %e, %Y"
 msgstr "%Y年%B%e日 (%a)"
 
-#: ../js/ui/docDisplay.js:19
+#: ../js/ui/docDisplay.js:16
 msgid "RECENT ITEMS"
 msgstr "最近使用した項目"
 
-#: ../js/ui/endSessionDialog.js:63
+#: ../js/ui/endSessionDialog.js:60
 #, c-format
 msgid "Log Out %s"
 msgstr "%s のログアウト"
 
-#: ../js/ui/endSessionDialog.js:64 ../js/ui/endSessionDialog.js:70
+#: ../js/ui/endSessionDialog.js:61 ../js/ui/endSessionDialog.js:67
 msgid "Log Out"
 msgstr "ログアウト"
 
-#: ../js/ui/endSessionDialog.js:65
+#: ../js/ui/endSessionDialog.js:62
 msgid "Click Log Out to quit these applications and log out of the system."
 msgstr "起動中のアプリケーションを終了しシステムからログアウトします。"
 
-#: ../js/ui/endSessionDialog.js:66
+#: ../js/ui/endSessionDialog.js:63
 #, c-format
 msgid "%s will be logged out automatically in %d seconds."
 msgstr "%s は %d 秒後に自動的にログアウトします。"
 
-#: ../js/ui/endSessionDialog.js:67
+#: ../js/ui/endSessionDialog.js:64
 #, c-format
 msgid "You will be logged out automatically in %d seconds."
 msgstr "%d 秒後に自動的にログアウトします。"
 
-#: ../js/ui/endSessionDialog.js:68
+#: ../js/ui/endSessionDialog.js:65
 msgid "Logging out of the system."
 msgstr "システムからログアウトします。"
 
-#: ../js/ui/endSessionDialog.js:75 ../js/ui/endSessionDialog.js:82
+#: ../js/ui/endSessionDialog.js:72 ../js/ui/endSessionDialog.js:79
 msgid "Power Off"
 msgstr "電源オフ"
 
-#: ../js/ui/endSessionDialog.js:76
+#: ../js/ui/endSessionDialog.js:73
 msgid "Click Power Off to quit these applications and power off the system."
 msgstr ""
 "電源オフをクリックすると、起動中のアプリケーションを終了しシステムの電源を切"
 "ります。"
 
-#: ../js/ui/endSessionDialog.js:77
+#: ../js/ui/endSessionDialog.js:74
 #, c-format
 msgid "The system will power off automatically in %d seconds."
 msgstr "%d 秒後に自動的にシステムの電源を切ります。"
 
-#: ../js/ui/endSessionDialog.js:78
+#: ../js/ui/endSessionDialog.js:75
 msgid "Powering off the system."
 msgstr "システムの電源を切ります。"
 
-#: ../js/ui/endSessionDialog.js:80 ../js/ui/endSessionDialog.js:88
-#: ../js/ui/endSessionDialog.js:93
+#: ../js/ui/endSessionDialog.js:77 ../js/ui/endSessionDialog.js:85
+#: ../js/ui/endSessionDialog.js:90
 msgid "Restart"
 msgstr "再起動"
 
-#: ../js/ui/endSessionDialog.js:89
+#: ../js/ui/endSessionDialog.js:86
 msgid "Click Restart to quit these applications and restart the system."
 msgstr "起動中のアプリケーションを終了しシステムを再起動します。"
 
-#: ../js/ui/endSessionDialog.js:90
+#: ../js/ui/endSessionDialog.js:87
 #, c-format
 msgid "The system will restart automatically in %d seconds."
 msgstr "%d 秒後にシステムを再起動します。"
 
-#: ../js/ui/endSessionDialog.js:91
+#: ../js/ui/endSessionDialog.js:88
 msgid "Restarting the system."
 msgstr "システムを再起動します。"
 
-#: ../js/ui/endSessionDialog.js:413 ../js/ui/polkitAuthenticationAgent.js:172
-#: ../js/ui/status/bluetooth.js:466
-msgid "Cancel"
-msgstr "キャンセル"
+#: ../js/ui/keyboard.js:508 ../js/ui/status/power.js:211
+msgid "Keyboard"
+msgstr "キーボード"
 
-#: ../js/ui/lookingGlass.js:588
+#: ../js/ui/lookingGlass.js:640
 msgid "No extensions installed"
 msgstr "機能拡張はインストールされていません"
 
-#: ../js/ui/lookingGlass.js:625
+#: ../js/ui/lookingGlass.js:686
 msgid "Enabled"
 msgstr "利用可能にする"
 
 #. translators:
 #. * The device has been disabled
-#: ../js/ui/lookingGlass.js:627 ../src/gvc/gvc-mixer-control.c:1091
+#: ../js/ui/lookingGlass.js:688 ../src/gvc/gvc-mixer-control.c:1093
 msgid "Disabled"
 msgstr "利用不可能にする"
 
-#: ../js/ui/lookingGlass.js:629
+#: ../js/ui/lookingGlass.js:690
 msgid "Error"
 msgstr "エラー"
 
-#: ../js/ui/lookingGlass.js:631
+#: ../js/ui/lookingGlass.js:692
 msgid "Out of date"
 msgstr "最新ではありません"
 
-#: ../js/ui/lookingGlass.js:656
+#: ../js/ui/lookingGlass.js:694
+msgid "Downloading"
+msgstr ""
+
+#: ../js/ui/lookingGlass.js:719
 msgid "View Source"
 msgstr "ソースの表示"
 
-#: ../js/ui/lookingGlass.js:662
+#: ../js/ui/lookingGlass.js:725
 msgid "Web Page"
 msgstr "ウェブページ"
 
-#: ../js/ui/messageTray.js:1030
+#: ../js/ui/messageTray.js:1190
 msgid "Open"
 msgstr "開く"
 
-#: ../js/ui/messageTray.js:2194
+#: ../js/ui/messageTray.js:2352
 msgid "System Information"
 msgstr "システム情報"
 
+#: ../js/ui/networkAgent.js:138
+#, fuzzy
+#| msgid "Password:"
+msgid "Show password"
+msgstr "パスワード:"
+
+#: ../js/ui/networkAgent.js:153
+#, fuzzy
+#| msgid "Connection"
+msgid "Connect"
+msgstr "接続"
+
+#. Cisco LEAP
+#: ../js/ui/networkAgent.js:248 ../js/ui/networkAgent.js:260
+#: ../js/ui/networkAgent.js:287 ../js/ui/networkAgent.js:307
+#: ../js/ui/networkAgent.js:317
+#, fuzzy
+#| msgid "Password:"
+msgid "Password: "
+msgstr "パスワード:"
+
+#. static WEP
+#: ../js/ui/networkAgent.js:253
+msgid "Key: "
+msgstr ""
+
+#. TTLS and PEAP are actually much more complicated, but this complication
+#. is not visible here since we only care about phase2 authentication
+#. (and don't even care of which one)
+#: ../js/ui/networkAgent.js:285 ../js/ui/networkAgent.js:303
+msgid "Username: "
+msgstr ""
+
+#: ../js/ui/networkAgent.js:291
+msgid "Identity: "
+msgstr ""
+
+#: ../js/ui/networkAgent.js:293
+msgid "Private key password: "
+msgstr ""
+
+#: ../js/ui/networkAgent.js:305
+msgid "Service: "
+msgstr ""
+
+#: ../js/ui/networkAgent.js:334
+#, fuzzy
+#| msgid "Authentication Required"
+msgid "Authentication required by wireless network"
+msgstr "認証が要求されました"
+
+#: ../js/ui/networkAgent.js:335
+#, c-format
+msgid ""
+"Passwords or encryption keys are required to access the wireless network '%"
+"s'."
+msgstr ""
+
+#: ../js/ui/networkAgent.js:339
+msgid "Wired 802.1X authentication"
+msgstr ""
+
+#: ../js/ui/networkAgent.js:341
+#, fuzzy
+#| msgid "Network Manager"
+msgid "Network name: "
+msgstr "ネットワークマネージャ"
+
+#: ../js/ui/networkAgent.js:346
+#, fuzzy
+#| msgid "authentication required"
+msgid "DSL authentication"
+msgstr "認証要求"
+
+#: ../js/ui/networkAgent.js:353
+msgid "PIN code required"
+msgstr ""
+
+#: ../js/ui/networkAgent.js:354
+msgid "PIN code is needed for the mobile broadband device"
+msgstr ""
+
+#: ../js/ui/networkAgent.js:355
+msgid "PIN: "
+msgstr ""
+
+#: ../js/ui/networkAgent.js:361
+#, fuzzy
+#| msgid "Mobile broadband"
+msgid "Mobile broadband network password"
+msgstr "モバイルブロードバンド"
+
+#: ../js/ui/networkAgent.js:362
+#, fuzzy, c-format
+#| msgid "You're now connected to '%s'"
+msgid "A password is required to connect to '%s'."
+msgstr "'%s' に接続しました"
+
 #: ../js/ui/overview.js:91
 msgid "Undo"
 msgstr "元に戻す"
 
-#: ../js/ui/overview.js:186
+#: ../js/ui/overview.js:205
 msgid "Windows"
 msgstr "ウィンドウ"
 
-#: ../js/ui/overview.js:189
+#: ../js/ui/overview.js:208
 msgid "Applications"
 msgstr "アプリケーション"
 
 #. Translators: this is the name of the dock/favorites area on
 #. the left of the overview
-#: ../js/ui/overview.js:205
+#: ../js/ui/overview.js:230
 msgid "Dash"
 msgstr "ダッシュボード"
 
 #. TODO - _quit() doesn't really work on apps in state STARTING yet
-#: ../js/ui/panel.js:524
+#: ../js/ui/panel.js:538
 #, c-format
 msgid "Quit %s"
 msgstr "%s を終了"
 
-#. Button on the left side of the panel.
-#. Translators: If there is no suitable word for "Activities" in your language, you can use the word for "Overview".
-#: ../js/ui/panel.js:902
+#. Translators: If there is no suitable word for "Activities"
+#. in your language, you can use the word for "Overview".
+#: ../js/ui/panel.js:574
 msgid "Activities"
 msgstr "アクティビティ"
 
-#: ../js/ui/panel.js:1003
+#: ../js/ui/panel.js:967
 msgid "Top Bar"
 msgstr "トップバー"
 
-#: ../js/ui/placeDisplay.js:122
+#: ../js/ui/placeDisplay.js:120
 #, c-format
 msgid "Failed to unmount '%s'"
 msgstr "'%s'のアンマウントに失敗しました"
 
-#: ../js/ui/placeDisplay.js:125
+#: ../js/ui/placeDisplay.js:123
 msgid "Retry"
 msgstr "再試行"
 
-#: ../js/ui/placeDisplay.js:165
+#: ../js/ui/placeDisplay.js:163
 msgid "Connect to..."
-msgstr "接続します..."
+msgstr "サーバへ接続..."
 
-#: ../js/ui/placeDisplay.js:380
+#: ../js/ui/placeDisplay.js:375
 msgid "PLACES & DEVICES"
 msgstr "場所とデバイス"
 
-#: ../js/ui/polkitAuthenticationAgent.js:74
+#: ../js/ui/polkitAuthenticationAgent.js:72
 msgid "Authentication Required"
 msgstr "認証が要求されました"
 
-#: ../js/ui/polkitAuthenticationAgent.js:108
+#: ../js/ui/polkitAuthenticationAgent.js:106
 msgid "Administrator"
 msgstr "アドミニストレータ"
 
-#: ../js/ui/polkitAuthenticationAgent.js:176
+#: ../js/ui/polkitAuthenticationAgent.js:174
 msgid "Authenticate"
 msgstr "認証"
 
@@ -600,11 +786,11 @@ msgstr "認証"
 #. * requested authentication was not gained; this can happen
 #. * because of an authentication error (like invalid password),
 #. * for instance.
-#: ../js/ui/polkitAuthenticationAgent.js:264
+#: ../js/ui/polkitAuthenticationAgent.js:262
 msgid "Sorry, that didn't work. Please try again."
 msgstr "申し訳ありません、認証できませんでした。再試行してください。"
 
-#: ../js/ui/polkitAuthenticationAgent.js:276
+#: ../js/ui/polkitAuthenticationAgent.js:274
 msgid "Password:"
 msgstr "パスワード:"
 
@@ -613,60 +799,27 @@ msgstr "パスワード:"
 #. "ON" and "OFF") or "toggle-switch-intl" (for toggle
 #. switches containing "◯" and "|"). Other values will
 #. simply result in invisible toggle switches.
-#: ../js/ui/popupMenu.js:679
+#: ../js/ui/popupMenu.js:687
 msgid "toggle-switch-us"
 msgstr "toggle-switch-us"
 
-#: ../js/ui/runDialog.js:205
+#: ../js/ui/runDialog.js:208
 msgid "Please enter a command:"
 msgstr "コマンド:"
 
-#: ../js/ui/searchDisplay.js:311
+#: ../js/ui/searchDisplay.js:340
 msgid "Searching..."
 msgstr "検索しています..."
 
-#: ../js/ui/searchDisplay.js:325
+#: ../js/ui/searchDisplay.js:363
 msgid "No matching results."
 msgstr "一致するものがありません。"
 
-#: ../js/ui/statusMenu.js:161 ../js/ui/statusMenu.js:163
-#: ../js/ui/statusMenu.js:228
-msgid "Power Off..."
-msgstr "電源オフ..."
+#: ../js/ui/shellMountOperation.js:285
+msgid "Wrong password, please try again"
+msgstr ""
 
-#: ../js/ui/statusMenu.js:163 ../js/ui/statusMenu.js:227
-msgid "Suspend"
-msgstr "サスペンド"
-
-#: ../js/ui/statusMenu.js:184
-msgid "Available"
-msgstr "在席中"
-
-#: ../js/ui/statusMenu.js:189
-msgid "Busy"
-msgstr "離席中"
-
-#: ../js/ui/statusMenu.js:197
-msgid "My Account"
-msgstr "アカウント"
-
-#: ../js/ui/statusMenu.js:201
-msgid "System Settings"
-msgstr "システム設定"
-
-#: ../js/ui/statusMenu.js:208
-msgid "Lock Screen"
-msgstr "画面のロック"
-
-#: ../js/ui/statusMenu.js:213
-msgid "Switch User"
-msgstr "ユーザーの切り替え"
-
-#: ../js/ui/statusMenu.js:218
-msgid "Log Out..."
-msgstr "ログアウト..."
-
-#: ../js/ui/status/accessibility.js:62
+#: ../js/ui/status/accessibility.js:60
 msgid "Zoom"
 msgstr "ズーム"
 
@@ -676,442 +829,741 @@ msgstr "ズーム"
 #. let screenKeyboard = this._buildItem(_("Screen Keyboard"), APPLICATIONS_SCHEMA,
 #. 'screen-keyboard-enabled');
 #. this.menu.addMenuItem(screenKeyboard);
-#: ../js/ui/status/accessibility.js:77
+#: ../js/ui/status/accessibility.js:75
 msgid "Visual Alerts"
 msgstr "視覚警告"
 
-#: ../js/ui/status/accessibility.js:80
+#: ../js/ui/status/accessibility.js:78
 msgid "Sticky Keys"
 msgstr "スティッキー・キー"
 
-#: ../js/ui/status/accessibility.js:83
+#: ../js/ui/status/accessibility.js:81
 msgid "Slow Keys"
 msgstr "スロー・キー"
 
-#: ../js/ui/status/accessibility.js:86
+#: ../js/ui/status/accessibility.js:84
 msgid "Bounce Keys"
 msgstr "バウンス・キー"
 
-#: ../js/ui/status/accessibility.js:89
+#: ../js/ui/status/accessibility.js:87
 msgid "Mouse Keys"
 msgstr "マウス・キー"
 
-#: ../js/ui/status/accessibility.js:93
+#: ../js/ui/status/accessibility.js:91
 msgid "Universal Access Settings"
 msgstr "ユニバーサルアクセスの設定"
 
-#: ../js/ui/status/accessibility.js:146
+#: ../js/ui/status/accessibility.js:141
 msgid "High Contrast"
 msgstr "ハイコントラスト"
 
-#: ../js/ui/status/accessibility.js:183
+#: ../js/ui/status/accessibility.js:178
 msgid "Large Text"
 msgstr "大きな文字"
 
-#: ../js/ui/status/bluetooth.js:42 ../js/ui/status/bluetooth.js:237
-#: ../js/ui/status/bluetooth.js:333 ../js/ui/status/bluetooth.js:367
-#: ../js/ui/status/bluetooth.js:407 ../js/ui/status/bluetooth.js:440
+#: ../js/ui/status/bluetooth.js:39 ../js/ui/status/bluetooth.js:261
+#: ../js/ui/status/bluetooth.js:347 ../js/ui/status/bluetooth.js:381
+#: ../js/ui/status/bluetooth.js:421 ../js/ui/status/bluetooth.js:454
 msgid "Bluetooth"
 msgstr "Bluetooth"
 
-#: ../js/ui/status/bluetooth.js:55
+#: ../js/ui/status/bluetooth.js:52
 msgid "Visibility"
 msgstr "検出可能かどうか"
 
-#: ../js/ui/status/bluetooth.js:69
+#: ../js/ui/status/bluetooth.js:66
 msgid "Send Files to Device..."
 msgstr "デバイスにファイルを送る..."
 
-#: ../js/ui/status/bluetooth.js:70
-msgid "Setup a New Device..."
+#: ../js/ui/status/bluetooth.js:67
+msgid "Set up a New Device..."
 msgstr "新しいデバイスを設定..."
 
-#: ../js/ui/status/bluetooth.js:95
+#: ../js/ui/status/bluetooth.js:91
 msgid "Bluetooth Settings"
 msgstr "Bluetooth の設定"
 
-#: ../js/ui/status/bluetooth.js:188
+#. TRANSLATORS: this means that bluetooth was disabled by hardware rfkill
+#: ../js/ui/status/bluetooth.js:111
+#, fuzzy
+msgid "hardware disabled"
+msgstr "利用不可"
+
+#: ../js/ui/status/bluetooth.js:208
 msgid "Connection"
 msgstr "接続"
 
-#: ../js/ui/status/bluetooth.js:224
+#: ../js/ui/status/bluetooth.js:217 ../js/ui/status/network.js:486
+msgid "disconnecting..."
+msgstr "切断中..."
+
+#: ../js/ui/status/bluetooth.js:230 ../js/ui/status/network.js:492
+msgid "connecting..."
+msgstr "接続中..."
+
+#: ../js/ui/status/bluetooth.js:248
 msgid "Send Files..."
 msgstr "ファイルを送信..."
 
-#: ../js/ui/status/bluetooth.js:229
+#: ../js/ui/status/bluetooth.js:253
 msgid "Browse Files..."
 msgstr "ファイルを検索..."
 
-#: ../js/ui/status/bluetooth.js:238
+#: ../js/ui/status/bluetooth.js:262
 msgid "Error browsing device"
 msgstr "デバイスの通信エラー"
 
-#: ../js/ui/status/bluetooth.js:239
+#: ../js/ui/status/bluetooth.js:263
 #, c-format
 msgid "The requested device cannot be browsed, error is '%s'"
 msgstr "要求されたデバイスと通信できません。エラー内容: %s"
 
-#: ../js/ui/status/bluetooth.js:247
+#: ../js/ui/status/bluetooth.js:271
 msgid "Keyboard Settings"
 msgstr "キーボードの設定"
 
-#: ../js/ui/status/bluetooth.js:252
+#: ../js/ui/status/bluetooth.js:274
 msgid "Mouse Settings"
 msgstr "マウスの設定"
 
-#: ../js/ui/status/bluetooth.js:259 ../js/ui/status/volume.js:66
+#: ../js/ui/status/bluetooth.js:279 ../js/ui/status/volume.js:62
 msgid "Sound Settings"
 msgstr "サウンドの設定"
 
-#: ../js/ui/status/bluetooth.js:368
+#: ../js/ui/status/bluetooth.js:382
 #, c-format
 msgid "Authorization request from %s"
 msgstr "%s からアクセス許可の要求"
 
-#: ../js/ui/status/bluetooth.js:374
+#: ../js/ui/status/bluetooth.js:388
 #, c-format
 msgid "Device %s wants access to the service '%s'"
 msgstr "デバイス '%s' が サービス '%s' へのアクセスを要求しています"
 
-#: ../js/ui/status/bluetooth.js:376
+#: ../js/ui/status/bluetooth.js:390
 msgid "Always grant access"
 msgstr "許可"
 
-#: ../js/ui/status/bluetooth.js:377
+#: ../js/ui/status/bluetooth.js:391
 msgid "Grant this time only"
 msgstr "今回のみ許可"
 
-#: ../js/ui/status/bluetooth.js:378
+#: ../js/ui/status/bluetooth.js:392 ../js/ui/telepathyClient.js:1185
 msgid "Reject"
 msgstr "拒否"
 
-#: ../js/ui/status/bluetooth.js:408
+#: ../js/ui/status/bluetooth.js:422
 #, c-format
 msgid "Pairing confirmation for %s"
 msgstr "%s からペアリングの確認"
 
-#: ../js/ui/status/bluetooth.js:414 ../js/ui/status/bluetooth.js:448
+#: ../js/ui/status/bluetooth.js:428 ../js/ui/status/bluetooth.js:462
 #, c-format
 msgid "Device %s wants to pair with this computer"
 msgstr "デバイス %s がこのコンピュータとのペアリングを要求しています"
 
-#: ../js/ui/status/bluetooth.js:415
+#: ../js/ui/status/bluetooth.js:429
 #, c-format
 msgid "Please confirm whether the PIN '%s' matches the one on the device."
 msgstr "'%s' がデバイスの PIN コードと一致しているか確認してください。"
 
-#: ../js/ui/status/bluetooth.js:417
+#: ../js/ui/status/bluetooth.js:431
 msgid "Matches"
 msgstr "一致"
 
-#: ../js/ui/status/bluetooth.js:418
+#: ../js/ui/status/bluetooth.js:432
 msgid "Does not match"
 msgstr "不一致"
 
-#: ../js/ui/status/bluetooth.js:441
+#: ../js/ui/status/bluetooth.js:455
 #, c-format
 msgid "Pairing request for %s"
 msgstr "%s からペアリングの要求"
 
-#: ../js/ui/status/bluetooth.js:449
+#: ../js/ui/status/bluetooth.js:463
 msgid "Please enter the PIN mentioned on the device."
 msgstr "デバイスの PIN コードを入力してください。"
 
-#: ../js/ui/status/bluetooth.js:465
+#: ../js/ui/status/bluetooth.js:479
 msgid "OK"
 msgstr "OK"
 
-#: ../js/ui/status/keyboard.js:73
-msgid "Show Keyboard Layout..."
+#: ../js/ui/status/keyboard.js:71
+#, fuzzy
+#| msgid "Show Keyboard Layout..."
+msgid "Show Keyboard Layout"
 msgstr "キーボードレイアウトの表示..."
 
-#: ../js/ui/status/keyboard.js:76
-msgid "Localization Settings"
-msgstr "ローカライズ設定"
+#: ../js/ui/status/keyboard.js:75
+#, fuzzy
+#| msgid "Date and Time Settings"
+msgid "Region and Language Settings"
+msgstr "日時の設定"
 
-#: ../js/ui/status/network.js:109 ../js/ui/status/network.js:1498
+#: ../js/ui/status/network.js:97
 msgid "<unknown>"
 msgstr "< 不明 >"
 
 #. Translators: this indicates that wireless or wwan is disabled by hardware killswitch
-#: ../js/ui/status/network.js:326
+#: ../js/ui/status/network.js:285
 msgid "disabled"
 msgstr "利用不可"
 
-#: ../js/ui/status/network.js:521
-msgid "connecting..."
-msgstr "接続中..."
+#. Translators: this is for network devices that are physically present but are not
+#. under NetworkManager's control (and thus cannot be used in the menu)
+#: ../js/ui/status/network.js:484
+msgid "unmanaged"
+msgstr "管理対象外"
 
 #. Translators: this is for network connections that require some kind of key or password
-#: ../js/ui/status/network.js:524
+#: ../js/ui/status/network.js:495
 msgid "authentication required"
 msgstr "認証要求"
 
 #. Translators: this is for devices that require some kind of firmware or kernel
 #. module, which is missing
-#: ../js/ui/status/network.js:534
+#: ../js/ui/status/network.js:505
 msgid "firmware missing"
 msgstr "ファームウェア無し"
 
 #. Translators: this is for wired network devices that are physically disconnected
-#: ../js/ui/status/network.js:541
+#: ../js/ui/status/network.js:512
 msgid "cable unplugged"
 msgstr "ケーブル抜け"
 
 #. Translators: this is for a network device that cannot be activated (for example it
 #. is disabled by rfkill, or it has no coverage
-#: ../js/ui/status/network.js:546
+#: ../js/ui/status/network.js:517
 msgid "unavailable"
 msgstr "利用不可"
 
-#: ../js/ui/status/network.js:548
+#: ../js/ui/status/network.js:519
 msgid "connection failed"
 msgstr "接続失敗"
 
+#: ../js/ui/status/network.js:575 ../js/ui/status/network.js:1515
+msgid "More..."
+msgstr "その他..."
+
 #. TRANSLATORS: this is the indication that a connection for another logged in user is active,
 #. and we cannot access its settings (including the name)
-#: ../js/ui/status/network.js:628 ../js/ui/status/network.js:1446
+#: ../js/ui/status/network.js:611 ../js/ui/status/network.js:1455
 msgid "Connected (private)"
 msgstr "接続 (制限付)"
 
-#: ../js/ui/status/network.js:713
+#: ../js/ui/status/network.js:689
 msgid "Auto Ethernet"
 msgstr "自動イーサネット接続"
 
-#: ../js/ui/status/network.js:788
+#: ../js/ui/status/network.js:753
 msgid "Auto broadband"
 msgstr "自動ブロードバンド接続"
 
-#: ../js/ui/status/network.js:791
+#: ../js/ui/status/network.js:756
 msgid "Auto dial-up"
 msgstr "自動ダイヤルアップ"
 
 #. TRANSLATORS: this the automatic wireless connection name (including the network name)
-#: ../js/ui/status/network.js:937 ../js/ui/status/network.js:1458
+#: ../js/ui/status/network.js:878 ../js/ui/status/network.js:1467
 #, c-format
 msgid "Auto %s"
 msgstr "自動 %s"
 
-#: ../js/ui/status/network.js:939
+#: ../js/ui/status/network.js:880
 msgid "Auto bluetooth"
 msgstr "自動 Bluetooth 接続"
 
-#: ../js/ui/status/network.js:1460
+#: ../js/ui/status/network.js:1469
 msgid "Auto wireless"
 msgstr "自動無線接続"
 
-#: ../js/ui/status/network.js:1518
-msgid "More..."
-msgstr "その他..."
-
-#: ../js/ui/status/network.js:1541
+#: ../js/ui/status/network.js:1558
 msgid "Enable networking"
 msgstr "ネットワークを利用可能にする"
 
-#: ../js/ui/status/network.js:1553
+#: ../js/ui/status/network.js:1570
 msgid "Wired"
 msgstr "有線接続"
 
-#: ../js/ui/status/network.js:1564
+#: ../js/ui/status/network.js:1581
 msgid "Wireless"
 msgstr "無線接続"
 
-#: ../js/ui/status/network.js:1574
+#: ../js/ui/status/network.js:1591
 msgid "Mobile broadband"
 msgstr "モバイルブロードバンド"
 
-#: ../js/ui/status/network.js:1584
+#: ../js/ui/status/network.js:1601
 msgid "VPN Connections"
 msgstr "VPN 接続"
 
-#: ../js/ui/status/network.js:1596
+#: ../js/ui/status/network.js:1612
 msgid "Network Settings"
 msgstr "ネットワークの設定"
 
-#: ../js/ui/status/network.js:1890
-#, c-format
-msgid "You're now connected to mobile broadband connection '%s'"
-msgstr "モバイルブロードバンド '%s' に接続しました"
+#: ../js/ui/status/network.js:1747
+#, fuzzy
+#| msgid "Connection"
+msgid "Connectivity lost"
+msgstr "接続"
 
-#: ../js/ui/status/network.js:1894
-#, c-format
-msgid "You're now connected to wireless network '%s'"
-msgstr "無線ネットワーク '%s' に接続しました"
-
-#: ../js/ui/status/network.js:1898
-#, c-format
-msgid "You're now connected to wired network '%s'"
+#: ../js/ui/status/network.js:1748
+#, fuzzy
+#| msgid "You're now connected to wired network '%s'"
+msgid "You're no longer connected to the network"
 msgstr "有線ネットワーク '%s' に接続しました"
 
-#: ../js/ui/status/network.js:1902
-#, c-format
-msgid "You're now connected to VPN network '%s'"
-msgstr "VPN ネットワーク '%s' に接続しました"
+#: ../js/ui/status/network.js:1756
+#, fuzzy
+#| msgid "connection failed"
+msgid "Connection failed"
+msgstr "接続失敗"
 
-#: ../js/ui/status/network.js:1907
-#, c-format
-msgid "You're now connected to '%s'"
-msgstr "'%s' に接続しました"
+#: ../js/ui/status/network.js:1757
+#, fuzzy
+#| msgid "connection failed"
+msgid "Activation of network connection failed"
+msgstr "接続失敗"
 
-#: ../js/ui/status/network.js:1915
-msgid "Connection established"
-msgstr "接続を確立しました"
-
-#: ../js/ui/status/network.js:2041
+#: ../js/ui/status/network.js:1992
 msgid "Networking is disabled"
 msgstr "ネットワークを利用できません"
 
-#: ../js/ui/status/network.js:2166
+#: ../js/ui/status/network.js:2117
 msgid "Network Manager"
 msgstr "ネットワークマネージャ"
 
-#: ../js/ui/status/power.js:85
+#: ../js/ui/status/power.js:82
 msgid "Power Settings"
 msgstr "電源設定"
 
 #. 0 is reported when UPower does not have enough data
 #. to estimate battery life
-#: ../js/ui/status/power.js:111
+#: ../js/ui/status/power.js:103
 msgid "Estimating..."
 msgstr "推計しています..."
 
-#: ../js/ui/status/power.js:118
+#: ../js/ui/status/power.js:110
 #, c-format
 msgid "%d hour remaining"
 msgid_plural "%d hours remaining"
 msgstr[0] "残り %d時間"
 
 #. TRANSLATORS: this is a time string, as in "%d hours %d minutes remaining"
-#: ../js/ui/status/power.js:121
+#: ../js/ui/status/power.js:113
 #, c-format
 msgid "%d %s %d %s remaining"
 msgstr "残り %d%s %d%s"
 
-#: ../js/ui/status/power.js:123
+#: ../js/ui/status/power.js:115
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "時間"
 
-#: ../js/ui/status/power.js:123
+#: ../js/ui/status/power.js:115
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分"
 
-#: ../js/ui/status/power.js:126
+#: ../js/ui/status/power.js:118
 #, c-format
 msgid "%d minute remaining"
 msgid_plural "%d minutes remaining"
 msgstr[0] "残り %d分"
 
-#: ../js/ui/status/power.js:228
+#: ../js/ui/status/power.js:201
 msgid "AC adapter"
 msgstr "AC アダプタ"
 
-#: ../js/ui/status/power.js:230
+#: ../js/ui/status/power.js:203
 msgid "Laptop battery"
 msgstr "バッテリー"
 
-#: ../js/ui/status/power.js:232
+#: ../js/ui/status/power.js:205
 msgid "UPS"
 msgstr "無停電電源装置"
 
-#: ../js/ui/status/power.js:234
+#: ../js/ui/status/power.js:207
 msgid "Monitor"
 msgstr "モニタ"
 
-#: ../js/ui/status/power.js:236
+#: ../js/ui/status/power.js:209
 msgid "Mouse"
 msgstr "マウス"
 
-#: ../js/ui/status/power.js:238
-msgid "Keyboard"
-msgstr "キーボード"
-
-#: ../js/ui/status/power.js:240
+#: ../js/ui/status/power.js:213
 msgid "PDA"
 msgstr "PDA"
 
-#: ../js/ui/status/power.js:242
+#: ../js/ui/status/power.js:215
 msgid "Cell phone"
 msgstr "携帯電話"
 
-#: ../js/ui/status/power.js:244
+#: ../js/ui/status/power.js:217
 msgid "Media player"
 msgstr "メディアプレイヤ"
 
-#: ../js/ui/status/power.js:246
+#: ../js/ui/status/power.js:219
 msgid "Tablet"
 msgstr "タブレット端末"
 
-#: ../js/ui/status/power.js:248
+#: ../js/ui/status/power.js:221
 msgid "Computer"
 msgstr "コンピュータ"
 
-#: ../js/ui/status/power.js:250 ../src/shell-app-system.c:1088
-msgid "Unknown"
-msgstr "不明なデバイス"
-
-#: ../js/ui/status/volume.js:45
+#: ../js/ui/status/volume.js:42
 msgid "Volume"
 msgstr "音量"
 
-#: ../js/ui/status/volume.js:58
+#: ../js/ui/status/volume.js:54
 msgid "Microphone"
 msgstr "マイク"
 
-#: ../js/ui/telepathyClient.js:335
+#. We got the TpContact
+#. FIXME: We don't have a 'chat room' icon (bgo #653737) use
+#. system-users for now as Empathy does.
+#: ../js/ui/telepathyClient.js:256
+msgid "Invitation"
+msgstr ""
+
+#. We got the TpContact
+#: ../js/ui/telepathyClient.js:322
+#, fuzzy
+#| msgid "Cancel"
+msgid "Call"
+msgstr "キャンセル"
+
+#. We got the TpContact
+#: ../js/ui/telepathyClient.js:350
+msgid "File Transfer"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:432
+#, fuzzy
+#| msgid "Authorization request from %s"
+msgid "Subscription request"
+msgstr "%s からアクセス許可の要求"
+
+#: ../js/ui/telepathyClient.js:460
+#, fuzzy
+#| msgid "Connection"
+msgid "Connection error"
+msgstr "接続"
+
+#: ../js/ui/telepathyClient.js:722
 #, c-format
 msgid "%s is online."
 msgstr "%s はオンラインです。"
 
-#: ../js/ui/telepathyClient.js:340
+#: ../js/ui/telepathyClient.js:727
 #, c-format
 msgid "%s is offline."
 msgstr "%s はオフラインです。"
 
-#: ../js/ui/telepathyClient.js:343
+#: ../js/ui/telepathyClient.js:730
 #, c-format
 msgid "%s is away."
 msgstr "'%s' は外出中です。"
 
-#: ../js/ui/telepathyClient.js:346
+#: ../js/ui/telepathyClient.js:733
 #, c-format
 msgid "%s is busy."
-msgstr "%s は離席中です。"
+msgstr "%s は取り込み中です。"
 
 #. Translators: this is a time format string followed by a date.
 #. If applicable, replace %X with a strftime format valid for your
 #. locale, without seconds.
-#: ../js/ui/telepathyClient.js:484
-#, no-c-format
-msgid "Sent at %X on %A"
+#: ../js/ui/telepathyClient.js:967
+#, fuzzy, no-c-format
+#| msgid "Sent at %X on %A"
+msgid "Sent at <b>%X</b> on <b>%A</b>"
 msgstr "%Aの%Xに送信"
 
+#. Translators: this is a time format in the style of "Wednesday, May 25",
+#. shown when you get a chat message in the same year.
+#: ../js/ui/telepathyClient.js:973
+#, no-c-format
+msgid "Sent on <b>%A</b>, <b>%B %d</b>"
+msgstr ""
+
+#. Translators: this is a time format in the style of "Wednesday, May 25, 2012",
+#. shown when you get a chat message in a different year.
+#: ../js/ui/telepathyClient.js:978
+#, no-c-format
+msgid "Sent on <b>%A</b>, <b>%B %d</b>, %Y"
+msgstr ""
+
+#. Translators: this is the other person changing their old IM name to their new
+#. IM name.
+#: ../js/ui/telepathyClient.js:1020
+#, c-format
+msgid "%s is now known as %s"
+msgstr ""
+
+#. translators: argument is a room name like
+#. * room@jabber.org for example.
+#: ../js/ui/telepathyClient.js:1129
+#, c-format
+msgid "Invitation to %s"
+msgstr ""
+
+#. translators: first argument is the name of a contact and the second
+#. * one the name of a room. "Alice is inviting you to join room@jabber.org
+#. * for example.
+#: ../js/ui/telepathyClient.js:1137
+#, c-format
+msgid "%s is inviting you to join %s"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1139 ../js/ui/telepathyClient.js:1228
+#: ../js/ui/telepathyClient.js:1332
+msgid "Decline"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1140 ../js/ui/telepathyClient.js:1229
+#: ../js/ui/telepathyClient.js:1333
+msgid "Accept"
+msgstr ""
+
+#. translators: argument is a contact name like Alice for example.
+#: ../js/ui/telepathyClient.js:1173
+#, c-format
+msgid "Video call from %s"
+msgstr ""
+
+#. translators: argument is a contact name like Alice for example.
+#: ../js/ui/telepathyClient.js:1176
+#, c-format
+msgid "Call from %s"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1186
+msgid "Answer"
+msgstr ""
+
+#. To translators: The first parameter is
+#. * the contact's alias and the second one is the
+#. * file name. The string will be something
+#. * like: "Alice is sending you test.ogg"
+#.
+#: ../js/ui/telepathyClient.js:1222
+#, c-format
+msgid "%s is sending you %s"
+msgstr ""
+
+#. To translators: The parameter is the contact's alias
+#: ../js/ui/telepathyClient.js:1297
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1395
+#, fuzzy
+#| msgid "Network Manager"
+msgid "Network error"
+msgstr "ネットワークマネージャ"
+
+#: ../js/ui/telepathyClient.js:1397
+#, fuzzy
+#| msgid "Authentication Required"
+msgid "Authentication failed"
+msgstr "認証が要求されました"
+
+#: ../js/ui/telepathyClient.js:1399
+msgid "Encryption error"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1401
+msgid "Certificate not provided"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1403
+msgid "Certificate untrusted"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1405
+msgid "Certificate expired"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1407
+msgid "Certificate not activated"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1409
+msgid "Certificate hostname mismatch"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1411
+msgid "Certificate fingerprint mismatch"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1413
+msgid "Certificate self-signed"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1415
+#, fuzzy
+#| msgid "%s is offline."
+msgid "Status is set to offline"
+msgstr "%s はオフラインです。"
+
+#: ../js/ui/telepathyClient.js:1417
+msgid "Encryption is not available"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1419
+msgid "Certificate is invalid"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1421
+#, fuzzy
+#| msgid "Connection established"
+msgid "Connection has been refused"
+msgstr "接続を確立しました"
+
+#: ../js/ui/telepathyClient.js:1423
+#, fuzzy
+#| msgid "Connection established"
+msgid "Connection can't be established"
+msgstr "接続を確立しました"
+
+#: ../js/ui/telepathyClient.js:1425
+#, fuzzy
+#| msgid "Connection established"
+msgid "Connection has been lost"
+msgstr "接続を確立しました"
+
+#: ../js/ui/telepathyClient.js:1427
+msgid "This resource is already connected to the server"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1429
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1431
+msgid "The account already exists on the server"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1433
+msgid "Server is currently too busy to handle the connection"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1435
+msgid "Certificate has been revoked"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1437
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr ""
+
+#: ../js/ui/telepathyClient.js:1439
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr ""
+
+#. translators: argument is the account name, like
+#. * name@jabber.org for example.
+#: ../js/ui/telepathyClient.js:1448
+#, fuzzy, c-format
+#| msgid "connection failed"
+msgid "Connection to %s failed"
+msgstr "接続失敗"
+
+#: ../js/ui/telepathyClient.js:1455
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown reason"
+msgstr "不明なデバイス"
+
+#: ../js/ui/telepathyClient.js:1462
+#, fuzzy
+#| msgid "Reject"
+msgid "Reconnect"
+msgstr "拒否"
+
+#: ../js/ui/telepathyClient.js:1463
+#, fuzzy
+#| msgid "My Account"
+msgid "Edit account"
+msgstr "アカウント"
+
+#: ../js/ui/userMenu.js:153
+msgid "Hidden"
+msgstr ""
+
+#: ../js/ui/userMenu.js:159
+msgid "Idle"
+msgstr ""
+
+#: ../js/ui/userMenu.js:162
+#, fuzzy
+#| msgid "unavailable"
+msgid "Unavailable"
+msgstr "利用不可"
+
+#: ../js/ui/userMenu.js:516 ../js/ui/userMenu.js:520 ../js/ui/userMenu.js:589
+msgid "Power Off..."
+msgstr "電源オフ..."
+
+#: ../js/ui/userMenu.js:518 ../js/ui/userMenu.js:520 ../js/ui/userMenu.js:588
+msgid "Suspend"
+msgstr "サスペンド"
+
+#: ../js/ui/userMenu.js:551
+msgid "Do Not Disturb"
+msgstr ""
+
+#: ../js/ui/userMenu.js:559
+#, fuzzy
+#| msgid "My Account"
+msgid "Online Accounts"
+msgstr "アカウント"
+
+#: ../js/ui/userMenu.js:563
+msgid "System Settings"
+msgstr "システム設定"
+
+#: ../js/ui/userMenu.js:570
+msgid "Lock Screen"
+msgstr "画面のロック"
+
+#: ../js/ui/userMenu.js:575
+msgid "Switch User"
+msgstr "ユーザーの切り替え"
+
+#: ../js/ui/userMenu.js:580
+msgid "Log Out..."
+msgstr "ログアウト..."
+
 #. Translators: this is the text displayed
 #. in the search entry when no search is
 #. active; it should not exceed ~30
 #. characters.
-#: ../js/ui/viewSelector.js:122
+#: ../js/ui/viewSelector.js:120
 msgid "Type to search..."
 msgstr "検索ワードを入力..."
 
-#: ../js/ui/viewSelector.js:142 ../src/shell-util.c:250
+#: ../js/ui/viewSelector.js:140 ../src/shell-util.c:261
 msgid "Search"
 msgstr "検索"
 
-#: ../js/ui/windowAttentionHandler.js:42
+#: ../js/ui/windowAttentionHandler.js:39
 #, c-format
 msgid "%s has finished starting"
 msgstr "%s の開始が完了しました"
 
-#: ../js/ui/windowAttentionHandler.js:44
+#: ../js/ui/windowAttentionHandler.js:41
 #, c-format
 msgid "'%s' is ready"
 msgstr "'%s' は準備完了です"
 
 #. translators:
 #. * The number of sound outputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1098
+#: ../src/gvc/gvc-mixer-control.c:1100
 #, c-format
 msgid "%u Output"
 msgid_plural "%u Outputs"
@@ -1119,53 +1571,29 @@ msgstr[0] "出力数: %u"
 
 #. translators:
 #. * The number of sound inputs on a particular device
-#: ../src/gvc/gvc-mixer-control.c:1108
+#: ../src/gvc/gvc-mixer-control.c:1110
 #, c-format
 msgid "%u Input"
 msgid_plural "%u Inputs"
 msgstr[0] "入力数: %u"
 
-#: ../src/gvc/gvc-mixer-control.c:1406
+#: ../src/gvc/gvc-mixer-control.c:1408
 msgid "System Sounds"
 msgstr "システムのサウンド"
 
-#: ../src/main.c:445
+#: ../src/main.c:480
 msgid "Print version"
 msgstr "バージョンを表示"
 
-#: ../src/shell-app.c:454
+#: ../src/main.c:486
+msgid "Mode used by GDM for login screen"
+msgstr ""
+
+#: ../src/shell-app.c:581
 #, c-format
 msgid "Failed to launch '%s'"
 msgstr "'%s'の起動に失敗しました"
 
-#: ../src/shell-global.c:1395
-msgid "Less than a minute ago"
-msgstr "1 分以内"
-
-#: ../src/shell-global.c:1399
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d分前"
-
-#: ../src/shell-global.c:1404
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d時間前"
-
-#: ../src/shell-global.c:1409
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d日前"
-
-#: ../src/shell-global.c:1414
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d週間前"
-
 #: ../src/shell-mobile-providers.c:80
 msgid "United Kingdom"
 msgstr "英国"
@@ -1178,13 +1606,13 @@ msgstr "既定"
 msgid "Authentication dialog was dismissed by the user"
 msgstr "認証ダイアログはユーザに拒否されました"
 
-#: ../src/shell-util.c:89
+#: ../src/shell-util.c:100
 msgid "Home Folder"
 msgstr "ホームフォルダ"
 
 #. Translators: this is the same string as the one found in
 #. * nautilus
-#: ../src/shell-util.c:104
+#: ../src/shell-util.c:115
 msgid "File System"
 msgstr "ファイルシステム"
 
@@ -1193,11 +1621,57 @@ msgstr "ファイルシステム"
 #. * example, "Trash: some-directory". It means that the
 #. * directory called "some-directory" is in the trash.
 #.
-#: ../src/shell-util.c:300
+#: ../src/shell-util.c:311
 #, c-format
 msgid "%1$s: %2$s"
 msgstr "%1$s: %2$s"
 
+#: ../src/shell-util.c:600
+msgid "calendar:week_start:0"
+msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "GNOME Shell extensions have a uuid property; this key lists extensions "
+#~ "which should not be loaded. This setting overrides enabled-extensions for "
+#~ "extensions that appear in both lists."
+#~ msgstr ""
+#~ "GNOME Shell の拡張機能のうち読み込まれないものの UUID の一覧を表示します。"
+
+#~ msgid "Uuids of extensions to disable"
+#~ msgstr "無効にされた拡張機能の UUID"
+
+#~ msgid "Localization Settings"
+#~ msgstr "ローカライズ設定"
+
+#~ msgid "You're now connected to mobile broadband connection '%s'"
+#~ msgstr "モバイルブロードバンド '%s' に接続しました"
+
+#~ msgid "You're now connected to wireless network '%s'"
+#~ msgstr "無線ネットワーク '%s' に接続しました"
+
+#~ msgid "You're now connected to VPN network '%s'"
+#~ msgstr "VPN ネットワーク '%s' に接続しました"
+
+#~ msgid "Less than a minute ago"
+#~ msgstr "1 分以内"
+
+#~ msgid "%d minute ago"
+#~ msgid_plural "%d minutes ago"
+#~ msgstr[0] "%d分前"
+
+#~ msgid "%d hour ago"
+#~ msgid_plural "%d hours ago"
+#~ msgstr[0] "%d時間前"
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%d日前"
+
+#~ msgid "%d week ago"
+#~ msgid_plural "%d weeks ago"
+#~ msgstr[0] "%d週間前"
+
 #~ msgid "Shut Down"
 #~ msgstr "シャットダウン"
 
@@ -1222,9 +1696,6 @@ msgstr "%1$s: %2$s"
 #~ msgid "Screen Reader"
 #~ msgstr "スクリーンリーダー"
 
-#~ msgid "Screen Keyboard"
-#~ msgstr "スクリーンキーボード"
-
 #~ msgid "PREFERENCES"
 #~ msgstr "お気に入り"