diff --git a/po/ja.po b/po/ja.po
index 967c7168..eee9a791 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,285 +7,311 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extensions master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"shell&keywords=I18N+L10N&component=extensions\n"
-"POT-Creation-Date: 2011-09-25 12:13+0000\n"
-"PO-Revision-Date: 2011-09-26 11:43+0900\n"
-"Last-Translator: Jiro Matsuzawa <jmatsuzawa@src.gnome.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell&keywords=I18N+L10N&component=extensions\n"
+"POT-Creation-Date: 2013-01-22 08:36+0000\n"
+"PO-Revision-Date: 2013-01-26 00:21+0900\n"
+"Last-Translator: OKANO Takayoshi <kano@na.rim.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"
 
-#: ../extensions/alternative-status-menu/extension.js:44
-msgid "Notifications"
-msgstr "メッセージ通知"
+#: ../data/gnome-classic.desktop.in.h:1
+#: ../data/gnome-classic.session.desktop.in.in.h:1
+msgid "GNOME Classic"
+msgstr ""
 
-#: ../extensions/alternative-status-menu/extension.js:52
-msgid "Online Accounts"
-msgstr "オンラインアカウント"
+#: ../data/gnome-classic.desktop.in.h:2
+msgid "This session logs you into GNOME Classic"
+msgstr ""
 
-#: ../extensions/alternative-status-menu/extension.js:56
-msgid "System Settings"
-msgstr "システム設定"
+#: ../data/gnome-shell-classic.desktop.in.in.h:1
+msgid "GNOME Shell Classic"
+msgstr ""
 
-#: ../extensions/alternative-status-menu/extension.js:63
-msgid "Lock Screen"
-msgstr "画面のロック"
+#: ../data/gnome-shell-classic.desktop.in.in.h:2
+msgid "Window management and application launching"
+msgstr ""
 
-#: ../extensions/alternative-status-menu/extension.js:68
-msgid "Switch User"
-msgstr "ユーザーの切り替え"
+#: ../extensions/alternate-tab/prefs.js:20
+msgid "Thumbnail only"
+msgstr ""
 
-#: ../extensions/alternative-status-menu/extension.js:73
-msgid "Log Out..."
-msgstr "ログアウト..."
+#: ../extensions/alternate-tab/prefs.js:21
+#, fuzzy
+#| msgid "Application and workspace list"
+msgid "Application icon only"
+msgstr "アプリケーションとワークスペースのリスト"
 
-#: ../extensions/alternative-status-menu/extension.js:81
+#: ../extensions/alternate-tab/prefs.js:22
+msgid "Thumbnail and application icon"
+msgstr ""
+
+#: ../extensions/alternate-tab/prefs.js:37
+msgid "Present windows as"
+msgstr ""
+
+#: ../extensions/alternate-tab/prefs.js:62
+msgid "Show only windows in the current workspace"
+msgstr ""
+
+#. add the new entries
+#: ../extensions/alternative-status-menu/extension.js:144
 msgid "Suspend"
 msgstr "サスペンド"
 
-#: ../extensions/alternative-status-menu/extension.js:87
+#: ../extensions/alternative-status-menu/extension.js:147
 msgid "Hibernate"
 msgstr "ハイバーネート"
 
-#: ../extensions/alternative-status-menu/extension.js:93
-msgid "Power Off..."
+#: ../extensions/alternative-status-menu/extension.js:150
+#, fuzzy
+#| msgid "Power Off..."
+msgid "Power Off"
 msgstr "電源オフ..."
 
-#: ../extensions/alternate-tab/extension.js:44
-msgid ""
-"This is the first time you use the Alternate Tab extension. \n"
-"Please choose your preferred behaviour:\n"
-"\n"
-"All & Thumbnails:\n"
-"    This mode presents all applications from all workspaces in one "
-"selection \n"
-"    list. Instead of using the application icon of every window, it uses "
-"small \n"
-"    thumbnails resembling the window itself. \n"
-"\n"
-"Workspace & Icons:\n"
-"    This mode let's you switch between the applications of your current \n"
-"    workspace and gives you additionally the option to switch to the last "
-"used \n"
-"    application of your previous workspace. This is always the last symbol "
-"in \n"
-"    the list and is segregated by a separator/vertical line if available. \n"
-"    Every window is represented by its application icon.  \n"
-"\n"
-"Native:\n"
-"    This mode is the native GNOME 3 behaviour or in other words: Clicking \n"
-"    native switches the Alternate Tab extension off. \n"
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:1
+msgid "Enable suspending"
 msgstr ""
 
-#: ../extensions/alternate-tab/extension.js:269
-msgid "Alt Tab Behaviour"
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:2
+msgid "Control the visibility of the Suspend menu item"
 msgstr ""
 
-#: ../extensions/alternate-tab/extension.js:285
-msgid "All & Thumbnails"
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:3
+msgid "Enable hibernating"
 msgstr ""
 
-#: ../extensions/alternate-tab/extension.js:292
-msgid "Workspace & Icons"
-msgstr ""
-
-#: ../extensions/alternate-tab/extension.js:299
-msgid "Native"
-msgstr ""
-
-#: ../extensions/alternate-tab/extension.js:306
-msgid "Cancel"
-msgstr ""
-
-#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:1
-msgid "Ask the user for a default behaviour if true."
-msgstr ""
-
-#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:2
-msgid "Indicates if Alternate Tab is newly installed"
-msgstr ""
-
-#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:3
-msgid ""
-"Sets the Alt-Tab behaviour. Possible values are: native, all_thumbnails and "
-"workspace_icons."
-msgstr ""
-
-#: ../extensions/alternate-tab/org.gnome.shell.extensions.alternate-tab.gschema.xml.in.h:4
-msgid "The alt tab behaviour."
+#: ../extensions/alternative-status-menu/org.gnome.shell.extensions.alternative-status-menu.gschema.xml.in.h:4
+msgid "Control the visibility of the Hibernate menu item"
 msgstr ""
 
 #: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:1
-msgid ""
-"A list of strings, each containing an application id (desktop file name), "
-"followed by a colon and the workspace number"
-msgstr ""
-"アプリケーションの識別子 (.desktop ファイル名) とコロンの後にワークスペース番"
-"号を付与した文字列を要素とするリストです"
-
-#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
 msgid "Application and workspace list"
 msgstr "アプリケーションとワークスペースのリスト"
 
-#: ../extensions/dock/extension.js:486
-msgid "Drag here to add favorites"
-msgstr "ドラッグでお気に入りに追加"
+#: ../extensions/auto-move-windows/org.gnome.shell.extensions.auto-move-windows.gschema.xml.in.h:2
+msgid "A list of strings, each containing an application id (desktop file name), followed by a colon and the workspace number"
+msgstr "アプリケーションの識別子 (.desktop ファイル名) とコロンの後にワークスペース番号を付与した文字列を要素とするリストです"
 
-#: ../extensions/dock/extension.js:820
-msgid "New Window"
-msgstr "新しいウィンドウで開く"
-
-#: ../extensions/dock/extension.js:822
-msgid "Quit Application"
+#: ../extensions/auto-move-windows/prefs.js:55
+#, fuzzy
+#| msgid "Quit Application"
+msgid "Application"
 msgstr "アプリケーションを終了"
 
-#: ../extensions/dock/extension.js:827
-msgid "Remove from Favorites"
-msgstr "お気に入りから削除"
-
-#: ../extensions/dock/extension.js:828
-msgid "Add to Favorites"
-msgstr "お気に入りに追加"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:1
-msgid "Autohide duration"
+#: ../extensions/auto-move-windows/prefs.js:64
+#: ../extensions/auto-move-windows/prefs.js:106
+msgid "Workspace"
 msgstr ""
 
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:2
-msgid "Autohide effect"
+#: ../extensions/auto-move-windows/prefs.js:80
+msgid "Add rule"
 msgstr ""
 
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:3
-msgid "Enable/disable autohide"
+#: ../extensions/auto-move-windows/prefs.js:94
+msgid "Create new matching rule"
 msgstr ""
 
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:4
-msgid "Icon size"
-msgstr "アイコンのサイズ"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:5
-msgid "Position of the dock"
-msgstr "ドックの位置"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:6
-msgid "Sets icon size of the dock."
-msgstr "ドックに表示するアイコンの大きさを指定します。"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:7
-#, fuzzy
-msgid ""
-"Sets the effect of the hide dock. Allowed values are 'resize' or 'rescale'"
-msgstr ""
-"ドックをデスクトップに表示する位置を指定します。指定可能な値: 'right'、'left'"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:8
-msgid ""
-"Sets the position of the dock in the screen. Allowed values are 'right' or "
-"'left'"
-msgstr ""
-"ドックをデスクトップに表示する位置を指定します。指定可能な値: 'right'、'left'"
-
-#: ../extensions/dock/org.gnome.shell.extensions.dock.gschema.xml.in.h:9
-msgid "Sets the time duration of the autohide effect."
+#: ../extensions/auto-move-windows/prefs.js:98
+msgid "Add"
 msgstr ""
 
-#: ../extensions/example/extension.js:11
+#: ../extensions/drive-menu/extension.js:72
+#, c-format
+msgid "Ejecting drive '%s' failed:"
+msgstr ""
+
+#: ../extensions/drive-menu/extension.js:89
+msgid "Removable devices"
+msgstr ""
+
+#: ../extensions/drive-menu/extension.js:106
+msgid "Open File"
+msgstr ""
+
+#: ../extensions/example/extension.js:17
 msgid "Hello, world!"
 msgstr "Hello, world!"
 
-#: ../extensions/gajim/extension.js:227
-#, c-format
-msgid "%s is away."
-msgstr "%s さんは離席中です。"
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:1
+msgid "Alternative greeting text."
+msgstr ""
 
-#: ../extensions/gajim/extension.js:230
-#, c-format
-msgid "%s is offline."
-msgstr "%s さんはオフラインです。"
+#: ../extensions/example/org.gnome.shell.extensions.example.gschema.xml.in.h:2
+msgid "If not empty, it contains the text that will be shown when clicking on the panel."
+msgstr ""
 
-#: ../extensions/gajim/extension.js:233
-#, c-format
-msgid "%s is online."
-msgstr "%s さんはオンラインです。"
+#. TRANSLATORS: Example is the name of the extension, should not be
+#. translated
+#: ../extensions/example/prefs.js:30
+msgid ""
+"Example aims to show how to build well behaved extensions for the Shell and as such it has little functionality on its own.\n"
+"Nevertheless it's possible to customize the greeting message."
+msgstr ""
 
-#: ../extensions/gajim/extension.js:236
-#, c-format
-msgid "%s is busy."
-msgstr "%s さんは取り込み中です。"
+#: ../extensions/example/prefs.js:36
+msgid "Message:"
+msgstr ""
 
 #: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:1
-msgid ""
-"If true, place window captions on top the respective thumbnail, overriding "
-"shell default of placing it at the bottom. Changing this setting requires "
-"restarting the shell to have any effect."
-msgstr ""
-"TRUE にすると、ウィンドウのサムネイルの上端にそのウィンドウのタイトルバーを表"
-"示します (これは、サムネイルの下端にタイトルバーを表示する GNOME シェルのデ"
-"フォルト値よりも優先されます)。この設定を適用する際は GNOME シェルを再起動し"
-"て下さい。"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
-msgid "Place window captions on top"
-msgstr "ウィンドウのタイトルバーを上端に表示するかどうか"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
-msgid ""
-"The algorithm used to layout thumbnails in the overview. 'grid' to use the "
-"default grid based algorithm, 'natural' to use another one that reflects "
-"more the position and size of the actual window"
-msgstr ""
-"オーバービュー・モードでウィンドウのサムネイルを配置する際のアルゴリズムで"
-"す。指定可能な値: 'grid' (原則的に格子状に配置していくアルゴリズ"
-"ム)、'natural' (ウィンドウの実際の位置や大きさを考慮して配置していくアルゴリ"
-"ズム)"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
-msgid ""
-"Try to use more screen for placing window thumbnails by adapting to screen "
-"aspect ratio, and consolidating them further to reduce the bounding box. "
-"This setting applies only with the natural placement strategy."
-msgstr ""
-"ウィンドウのサムネイルを複数配置する際に、画面のアスペクト比に合わせて、境界"
-"部分を減らすことにより、ウィンドウを統合しすることで、さらにたくさんの画面を"
-"使用できるようにするかどうかです。この設定は 'natural' の配置アルゴリズムを採"
-"用している場合にのみ適用されます。"
-
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:5
 msgid "Use more screen for windows"
 msgstr "ウィンドウにたくさんの画面を使うかどうか"
 
-#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:6
-msgid "Window placement strategy"
-msgstr "ウィンドウを配置するアルゴリズム"
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:2
+msgid "Try to use more screen for placing window thumbnails by adapting to screen aspect ratio, and consolidating them further to reduce the bounding box. This setting applies only with the natural placement strategy."
+msgstr "ウィンドウのサムネイルを複数配置する際に、画面のアスペクト比に合わせて、境界部分を減らすことにより、ウィンドウを統合することで、さらにたくさんの画面を使用できるようにするかどうかです。この設定は 'natural' の配置アルゴリズムを採用している場合にのみ適用されます。"
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:3
+msgid "Place window captions on top"
+msgstr "ウィンドウのタイトルバーを上端に表示するかどうか"
+
+#: ../extensions/native-window-placement/org.gnome.shell.extensions.native-window-placement.gschema.xml.in.h:4
+msgid "If true, place window captions on top the respective thumbnail, overriding shell default of placing it at the bottom. Changing this setting requires restarting the shell to have any effect."
+msgstr "TRUE にすると、ウィンドウのサムネイルの上端にそのウィンドウのタイトルバーを表示します (これは、サムネイルの下端にタイトルバーを表示する GNOME シェルのデフォルト値よりも優先されます)。この設定を適用する際は GNOME シェルを再起動して下さい。"
+
+#: ../extensions/places-menu/extension.js:57
+msgid "Places"
+msgstr ""
+
+#: ../extensions/places-menu/placeDisplay.js:48
+#, c-format
+msgid "Failed to launch \"%s\""
+msgstr ""
+
+#: ../extensions/places-menu/placeDisplay.js:121
+msgid "Home"
+msgstr ""
+
+#: ../extensions/places-menu/placeDisplay.js:195
+msgid "File System"
+msgstr ""
+
+#: ../extensions/places-menu/placeDisplay.js:199
+msgid "Browse network"
+msgstr ""
+
+#: ../extensions/systemMonitor/extension.js:213
+msgid "CPU"
+msgstr ""
+
+#: ../extensions/systemMonitor/extension.js:266
+msgid "Memory"
+msgstr ""
 
 #: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:1
-msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
-msgstr "テーマの名前です (~/.themes/name/gnome-shell 配下に格納します)"
-
-#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
 msgid "Theme name"
 msgstr "テーマの名前"
 
-#: ../extensions/xrandr-indicator/extension.js:26
+#: ../extensions/user-theme/org.gnome.shell.extensions.user-theme.gschema.xml.in.h:2
+msgid "The name of the theme, to be loaded from ~/.themes/name/gnome-shell"
+msgstr "テーマの名前です (~/.themes/name/gnome-shell 配下に格納します)"
+
+#: ../extensions/workspace-indicator/extension.js:30
+msgid "Workspace Indicator"
+msgstr ""
+
+#: ../extensions/workspace-indicator/prefs.js:141
+msgid "Workspace names:"
+msgstr ""
+
+#: ../extensions/workspace-indicator/prefs.js:152
+msgid "Name"
+msgstr ""
+
+#: ../extensions/workspace-indicator/prefs.js:186
+#, c-format
+msgid "Workspace %d"
+msgstr ""
+
+#: ../extensions/xrandr-indicator/extension.js:30
 msgid "Normal"
 msgstr "標準"
 
-#: ../extensions/xrandr-indicator/extension.js:27
+#: ../extensions/xrandr-indicator/extension.js:31
 msgid "Left"
 msgstr "左回り"
 
-#: ../extensions/xrandr-indicator/extension.js:28
+#: ../extensions/xrandr-indicator/extension.js:32
 msgid "Right"
 msgstr "右回り"
 
-#: ../extensions/xrandr-indicator/extension.js:29
+#: ../extensions/xrandr-indicator/extension.js:33
 msgid "Upside-down"
 msgstr "逆さま"
 
-#: ../extensions/xrandr-indicator/extension.js:78
-msgid "Configure display settings..."
-msgstr "ディスプレイの設定..."
+#: ../extensions/xrandr-indicator/extension.js:50
+msgid "Display"
+msgstr ""
+
+#: ../extensions/xrandr-indicator/extension.js:80
+#, fuzzy
+#| msgid "System Settings"
+msgid "Display Settings"
+msgstr "システム設定"
+
+#~ msgid "Notifications"
+#~ msgstr "メッセージ通知"
+
+#~ msgid "Online Accounts"
+#~ msgstr "オンラインアカウント"
+
+#~ msgid "Lock Screen"
+#~ msgstr "画面のロック"
+
+#~ msgid "Switch User"
+#~ msgstr "ユーザーの切り替え"
+
+#~ msgid "Log Out..."
+#~ msgstr "ログアウト..."
+
+#~ msgid "Drag here to add favorites"
+#~ msgstr "ドラッグでお気に入りに追加"
+
+#~ msgid "New Window"
+#~ msgstr "新しいウィンドウで開く"
+
+#~ msgid "Remove from Favorites"
+#~ msgstr "お気に入りから削除"
+
+#~ msgid "Add to Favorites"
+#~ msgstr "お気に入りに追加"
+
+#~ msgid "Icon size"
+#~ msgstr "アイコンのサイズ"
+
+#~ msgid "Position of the dock"
+#~ msgstr "ドックの位置"
+
+#~ msgid "Sets icon size of the dock."
+#~ msgstr "ドックに表示するアイコンの大きさを指定します。"
+
+#, fuzzy
+#~ msgid "Sets the effect of the hide dock. Allowed values are 'resize' or 'rescale'"
+#~ msgstr "ドックをデスクトップに表示する位置を指定します。指定可能な値: 'right'、'left'"
+
+#~ msgid "Sets the position of the dock in the screen. Allowed values are 'right' or 'left'"
+#~ msgstr "ドックをデスクトップに表示する位置を指定します。指定可能な値: 'right'、'left'"
+
+#~ msgid "%s is away."
+#~ msgstr "%s さんは離席中です。"
+
+#~ msgid "%s is offline."
+#~ msgstr "%s さんはオフラインです。"
+
+#~ msgid "%s is online."
+#~ msgstr "%s さんはオンラインです。"
+
+#~ msgid "%s is busy."
+#~ msgstr "%s さんは取り込み中です。"
+
+#~ msgid "The algorithm used to layout thumbnails in the overview. 'grid' to use the default grid based algorithm, 'natural' to use another one that reflects more the position and size of the actual window"
+#~ msgstr "オーバービュー・モードでウィンドウのサムネイルを配置する際のアルゴリズムです。指定可能な値: 'grid' (原則的に格子状に配置していくアルゴリズム)、'natural' (ウィンドウの実際の位置や大きさを考慮して配置していくアルゴリズム)"
+
+#~ msgid "Window placement strategy"
+#~ msgstr "ウィンドウを配置するアルゴリズム"
+
+#~ msgid "Configure display settings..."
+#~ msgstr "ディスプレイの設定..."