Merge branch 'master' of ssh+git://dev.laptop.org/git/sugar

3 files changed, 180 insertions, 160 deletions

diff --git a/bin/sugar-emulator b/bin/sugar-emulator
index f6cafd6..33bd71f 100644
--- a/bin/sugar-emulator
+++ b/bin/sugar-emulator
@@ -25,18 +25,21 @@ import gobject
 
 from sugar import env
 
-def _run_xephyr(display, dpi):
+def _run_xephyr(display, dpi, dimensions):
     cmd = [ 'Xephyr' ]
     cmd.append(':%d' % display)
     cmd.append('-ac') 
 
-    if gtk.gdk.screen_width() < 1200 or gtk.gdk.screen_height() < 900:
+    if dimensions is not None:
+        cmd.append('-screen')
+        cmd.append(dimensions)
+    elif gtk.gdk.screen_width() < 1200 or gtk.gdk.screen_height() < 900:
         cmd.append('-fullscreen')
     else:
         cmd.append('-screen')
         cmd.append('%dx%d' % (1200, 900))
 
-    if not dpi:
+    if dpi is None:
         dpi = gtk.settings_get_default().get_property('gtk-xft-dpi') / 1024
     if dpi > 0:
         cmd.append('-dpi')
@@ -54,10 +57,10 @@ def _check_xephyr(display):
                              stderr=open(os.devnull, "w"))
     return result == 0
 
-def _start_xephyr(dpi=None):
+def _start_xephyr(dpi, dimensions):
     for display in range(100, 110):
         if not _check_xephyr(display):
-            _run_xephyr(display, dpi)
+            _run_xephyr(display, dpi, dimensions)
 
             tries = 10
             while tries > 0:
@@ -90,14 +93,13 @@ def main():
     parser = OptionParser()
     parser.add_option('-d', '--dpi', dest='dpi', help='Emulator dpi')
     parser.add_option('-s', '--scaling', dest='scaling', help='Sugar scaling')
+    parser.add_option('-i', '--dimensions', dest='dimensions',
+                      help='Emulator dimensions (ex. 1200x900)')
     (options, args) = parser.parse_args()
 
     _setup_env()
 
-    if options.dpi:
-        _start_xephyr(dpi=options.dpi)
-    else:
-        _start_xephyr()
+    _start_xephyr(options.dpi, options.dimensions)
 
     if options.scaling:
         os.environ['SUGAR_SCALING'] = options.scaling
diff --git a/po/it.po b/po/it.po
index dc2ed6c..408a8d2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-09-25 00:30-0400\n"
-"PO-Revision-Date: 2008-09-26 04:16-0400\n"
+"PO-Revision-Date: 2008-10-09 08:42-0400\n"
 "Last-Translator: Carlo Falciola <cfalciola@yahoo.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -114,7 +114,7 @@ msgstr ""
 #: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
 #: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
 msgid "Erase"
-msgstr "Cancella"
+msgstr "Elimina"
 
 #: ../src/view/home/HomeBox.py:117
 msgid "Software Update"
@@ -459,7 +459,7 @@ msgstr "istantaneamente"
 #: ../src/controlpanel/frame/view.py:28
 #, python-format
 msgid "%s seconds"
-msgstr "%d secondi"
+msgstr "%s secondi"
 
 #: ../src/controlpanel/frame/view.py:52
 msgid "Activation Delay"
diff --git a/po/ja.po b/po/ja.po
index f504784..24d6787 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-18 13:20-0400\n"
-"PO-Revision-Date: 2008-09-20 02:04-0400\n"
+"POT-Creation-Date: 2008-09-25 00:30-0400\n"
+"PO-Revision-Date: 2008-10-09 11:39-0400\n"
 "Last-Translator: korakurider <korakurider@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Pootle 1.1.0rc2\n"
 
-#: ../src/intro/window.py:93 ../src/controlpanel/view/aboutme.py:100
+#: ../src/intro/window.py:93 ../src/controlpanel/aboutme/view.py:100
 msgid "Name:"
 msgstr "名前:"
 
@@ -48,11 +48,11 @@ msgstr "お友だちを登録"
 msgid "Invite to %s"
 msgstr "%s に招待する"
 
-#: ../src/view/clipboardmenu.py:50
+#: ../src/view/clipboardmenu.py:51
 msgid "Remove"
 msgstr "削除"
 
-#: ../src/view/clipboardmenu.py:55 ../src/view/clipboardmenu.py:77
+#: ../src/view/clipboardmenu.py:56 ../src/view/clipboardmenu.py:78
 msgid "Open"
 msgstr "開く"
 
@@ -60,18 +60,18 @@ msgstr "開く"
 # TODO: Implement stopping downloads
 # self._stop_item.connect('activate', self._stop_item_activate_cb)
 # self.append_menu_item(self._stop_item)
-#: ../src/view/clipboardmenu.py:60 ../src/view/home/HomeBox.py:87
+#: ../src/view/clipboardmenu.py:61 ../src/view/home/HomeBox.py:84
 msgid "Keep"
 msgstr "ジャーナルに保存"
 
-#: ../src/view/clipboardmenu.py:82
+#: ../src/view/clipboardmenu.py:83
 msgid "Open with"
 msgstr "次のもので開く："
 
-#: ../src/view/clipboardmenu.py:227
+#: ../src/view/clipboardmenu.py:228
 #, python-format
 msgid "%s clipping"
-msgstr ""
+msgstr "%sのクリッピング"
 
 #: ../src/hardware/keydialog.py:150
 msgid "Key Type:"
@@ -101,68 +101,56 @@ msgstr "サーバーは要求の処理を完了できませんでした"
 msgid "Screenshot"
 msgstr "スクリーンショット"
 
-#: ../src/view/home/HomeBox.py:81
+#: ../src/view/home/HomeBox.py:78
 msgid "Confirm erase"
 msgstr "消去の確認"
 
-#: ../src/view/home/HomeBox.py:83
+#: ../src/view/home/HomeBox.py:80
 #, python-format
 msgid "Confirm erase: Do you want to permanently erase %s?"
 msgstr "消去の確認： %s を完全に消去しますか？"
 
-#: ../src/view/home/HomeBox.py:90 ../src/view/palettes.py:120
+#: ../src/view/home/HomeBox.py:87 ../src/view/palettes.py:120
 #: ../src/journal/journaltoolbox.py:335 ../src/journal/palettes.py:75
 msgid "Erase"
 msgstr "消去する"
 
-#: ../src/view/home/HomeBox.py:120
+#: ../src/view/home/HomeBox.py:117
 msgid "Software Update"
 msgstr "ソフトウェアの更新"
 
-#: ../src/view/home/HomeBox.py:121
+#: ../src/view/home/HomeBox.py:118
 msgid "Update your activities to ensure compatibility with your new software"
 msgstr "新しいソフトウェアとの互換性を保つため、アクティビティを更新してください"
 
-#: ../src/view/home/HomeBox.py:125 ../src/controlpanel/toolbar.py:115
+#: ../src/view/home/HomeBox.py:122 ../src/controlpanel/toolbar.py:115
 msgid "Cancel"
 msgstr "中止"
 
-#: ../src/view/home/HomeBox.py:127 ../src/controlpanel/gui.py:286
+#: ../src/view/home/HomeBox.py:124 ../src/controlpanel/gui.py:273
 msgid "Later"
 msgstr "あとで"
 
-#: ../src/view/home/HomeBox.py:130
+#: ../src/view/home/HomeBox.py:127
 msgid "Check now"
 msgstr "今すぐ調べる"
 
-#: ../src/view/home/HomeBox.py:266
+#: ../src/view/home/HomeBox.py:261
 msgid "List view"
 msgstr "リスト表示"
 
-#: ../src/view/home/HomeBox.py:267
+#: ../src/view/home/HomeBox.py:262
 msgid "<Ctrl>2"
 msgstr "<Ctrl>2"
 
-#: ../src/view/home/HomeBox.py:325
+#: ../src/view/home/HomeBox.py:320
 msgid "Favorites view"
 msgstr "お気に入り"
 
-#: ../src/view/home/HomeBox.py:326
+#: ../src/view/home/HomeBox.py:321
 msgid "<Ctrl>1"
 msgstr "<Ctrl>1"
 
-# TRANS: label for the freeform layout in the favorites view
-#. TRANS: label for the freeform layout in the favorites view
-#: ../src/view/home/HomeBox.py:334
-msgid "Freeform"
-msgstr "自由に並べる"
-
-# TRANS: label for the ring layout in the favorites view
-#. TRANS: label for the ring layout in the favorites view
-#: ../src/view/home/HomeBox.py:341
-msgid "Ring"
-msgstr "円に並べる"
-
 #: ../src/view/home/MeshBox.py:97
 msgid "Connect"
 msgstr "接続"
@@ -183,16 +171,17 @@ msgstr "切断しています..."
 # priority over the normal wireless device.  NM doesn't have a "disconnect"
 # method for a device either (for various reasons) so this doesn't
 # have a good mapping
-#: ../src/view/home/MeshBox.py:152
+#: ../src/view/home/MeshBox.py:159
 msgid "Connecting..."
 msgstr "接続しています..."
 
+# TODO: show the channel number
 #. TODO: show the channel number
-#: ../src/view/home/MeshBox.py:159
+#: ../src/view/home/MeshBox.py:166
 msgid "Connected"
 msgstr "接続しました"
 
-#: ../src/view/home/MeshBox.py:211 ../src/view/devices/network/mesh.py:41
+#: ../src/view/home/MeshBox.py:218 ../src/view/devices/network/mesh.py:41
 #: ../src/view/devices/network/mesh.py:68
 #: ../src/view/devices/network/mesh.py:72
 msgid "Mesh Network"
@@ -202,18 +191,18 @@ msgstr "メッシュネットワーク"
 # priority over the normal wireless device.  NM doesn't have a "disconnect"
 # method for a device either (for various reasons) so this doesn't
 # have a good mapping
-#: ../src/view/home/MeshBox.py:214 ../src/view/devices/network/wireless.py:119
+#: ../src/view/home/MeshBox.py:221 ../src/view/devices/network/wireless.py:125
 #: ../src/view/devices/network/mesh.py:89
 msgid "Disconnect..."
 msgstr "切断..."
 
 #. TRANS: Action label for resuming an activity.
-#: ../src/view/home/MeshBox.py:302 ../src/view/palettes.py:61
+#: ../src/view/home/MeshBox.py:309 ../src/view/palettes.py:61
 #: ../src/journal/journaltoolbox.py:399 ../src/journal/palettes.py:57
 msgid "Resume"
 msgstr "再開"
 
-#: ../src/view/home/MeshBox.py:307 ../src/view/frame/activitiestray.py:206
+#: ../src/view/home/MeshBox.py:314 ../src/view/frame/activitiestray.py:206
 msgid "Join"
 msgstr "参加"
 
@@ -254,7 +243,7 @@ msgstr "音を消す"
 msgid "Disconnected"
 msgstr "切断されました"
 
-#: ../src/view/devices/network/wireless.py:137
+#: ../src/view/devices/network/wireless.py:143
 msgid "Channel"
 msgstr "チャンネル"
 
@@ -321,148 +310,107 @@ msgstr ""
 msgid "To apply your changes you have to restart sugar.\n"
 msgstr "変更を適用するにはsugarを再起動しなければいけません。\n"
 
-#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:296
+#: ../src/controlpanel/toolbar.py:121 ../src/view/home/favoritesview.py:305
 msgid "Ok"
 msgstr "了解"
 
-#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:278
+#: ../src/controlpanel/sectionview.py:42 ../src/controlpanel/gui.py:265
 msgid "Changes require restart"
 msgstr "変更には再起動が必要です"
 
-#: ../src/controlpanel/gui.py:277
+#: ../src/controlpanel/gui.py:264
 msgid "Warning"
 msgstr "注意"
 
-#: ../src/controlpanel/gui.py:281
+#: ../src/controlpanel/gui.py:268
 msgid "Cancel changes"
 msgstr "変更を取りやめる"
 
-#: ../src/controlpanel/gui.py:290
+#: ../src/controlpanel/gui.py:277
 msgid "Restart now"
 msgstr "今すぐ再起動"
 
-#: ../src/controlpanel/model/aboutme.py:44
+#: ../src/controlpanel/aboutme/model.py:44
 msgid "You must enter a name."
 msgstr "名前の入力が必要です"
 
-#: ../src/controlpanel/model/aboutme.py:69
+#: ../src/controlpanel/aboutme/model.py:69
 #, python-format
 msgid "stroke:   color=%s hue=%s"
 msgstr "線:   色=%s 色相=%s"
 
-#: ../src/controlpanel/model/aboutme.py:72
+#: ../src/controlpanel/aboutme/model.py:72
 #, python-format
 msgid "stroke:   %s"
 msgstr "線:   %s"
 
-#: ../src/controlpanel/model/aboutme.py:74
+#: ../src/controlpanel/aboutme/model.py:74
 #, python-format
 msgid "fill:     color=%s hue=%s"
 msgstr "塗りつぶし:   色=%s 色相=%s"
 
-#: ../src/controlpanel/model/aboutme.py:76
+#: ../src/controlpanel/aboutme/model.py:76
 #, python-format
 msgid "fill:     %s"
 msgstr "塗りつぶし:     %s"
 
-#: ../src/controlpanel/model/aboutme.py:87
+#: ../src/controlpanel/aboutme/model.py:87
 msgid "Error in specified color modifiers."
 msgstr "カラーモディファイアの指定でエラー"
 
-#: ../src/controlpanel/model/aboutme.py:90
+#: ../src/controlpanel/aboutme/model.py:90
 msgid "Error in specified colors."
 msgstr "色の指定でエラー"
 
-#: ../src/controlpanel/model/aboutxo.py:24
-msgid "Not available"
-msgstr "不明です"
-
-#: ../src/controlpanel/model/datetime.py:89
-msgid "Error timezone does not exist."
-msgstr "エラー：そのタイムゾーンは存在しません。"
-
-#: ../src/controlpanel/model/frame.py:38 ../src/controlpanel/model/frame.py:60
-msgid "Value must be an integer."
-msgstr "値は整数でなくてはなりません"
-
-#: ../src/controlpanel/model/language.py:28
-msgid "Could not access ~/.i18n. Create standard settings."
-msgstr "~/.i18nにアクセスできませんでした。標準設定を作ってください。"
-
-#: ../src/controlpanel/model/language.py:114
-#, python-format
-msgid "Language for code=%s could not be determined."
-msgstr "コード%sの言語が不明です。"
-
-#: ../src/controlpanel/model/language.py:131
-#, python-format
-msgid "Sorry I do not speak '%s'."
-msgstr "ごめんなさい。'%s'は話せません。"
-
-#: ../src/controlpanel/model/network.py:62
-msgid "State is unknown."
-msgstr "状態が不明です"
-
-#: ../src/controlpanel/model/network.py:82
-msgid "Error in specified radio argument use on/off."
-msgstr "radio引数指定でエラー、on/offを使ってください。"
-
-#: ../src/controlpanel/model/power.py:57
-msgid "Error in automatic pm argument, use on/off."
-msgstr "automatic_pm 引数指定でエラー、 on/offを指定してください"
-
-#: ../src/controlpanel/model/power.py:86
-msgid "Error in extreme pm argument, use on/off."
-msgstr "extreme_pm 引数指定のエラー、 on/offを指定してください。"
-
-#: ../src/controlpanel/view/aboutme.py:32
+#: ../src/controlpanel/aboutme/view.py:32
+#: ../src/controlpanel/aboutme/__init__.py:22
 msgid "About Me"
 msgstr "私について"
 
-#: ../src/controlpanel/view/aboutme.py:134
+#: ../src/controlpanel/aboutme/view.py:134
 msgid "Click to change your color:"
 msgstr "クリックして色を変更:"
 
-#: ../src/controlpanel/view/aboutxo.py:28
-msgid "About my XO"
-msgstr "私のXOについて"
+#: ../src/controlpanel/aboutxo/model.py:24
+msgid "Not available"
+msgstr "不明です"
 
-#: ../src/controlpanel/view/aboutxo.py:59
+#: ../src/controlpanel/aboutxo/view.py:55
 msgid "Identity"
 msgstr "個体の識別"
 
-#: ../src/controlpanel/view/aboutxo.py:68
+#: ../src/controlpanel/aboutxo/view.py:64
 msgid "Serial Number:"
 msgstr "シリアル番号:"
 
-#: ../src/controlpanel/view/aboutxo.py:91
+#: ../src/controlpanel/aboutxo/view.py:87
 msgid "Software"
 msgstr "ソフトウェア"
 
-#: ../src/controlpanel/view/aboutxo.py:100
+#: ../src/controlpanel/aboutxo/view.py:96
 msgid "Build:"
 msgstr "ビルド:"
 
-#: ../src/controlpanel/view/aboutxo.py:115
+#: ../src/controlpanel/aboutxo/view.py:111
 msgid "Sugar:"
 msgstr "Sugar:"
 
-#: ../src/controlpanel/view/aboutxo.py:130
+#: ../src/controlpanel/aboutxo/view.py:126
 msgid "Firmware:"
 msgstr "ファームウェア:"
 
-#: ../src/controlpanel/view/aboutxo.py:152
+#: ../src/controlpanel/aboutxo/view.py:148
 msgid "Copyright and License"
 msgstr "著作権とライセンス"
 
-#: ../src/controlpanel/view/aboutxo.py:160
+#: ../src/controlpanel/aboutxo/view.py:156
 msgid ""
 "© 2008 One Laptop per Child Association Inc; Red Hat Inc; and Contributors."
 msgstr ""
 "(C) 2008 One Laptop per Child Association Inc; Red Hat Inc; and "
 "Contributors."
 
-#: ../src/controlpanel/view/aboutxo.py:167
+#: ../src/controlpanel/aboutxo/view.py:163
 msgid ""
 "Sugar is the graphical user interface that you are looking at. Sugar is free "
 "software, covered by the GNU General Public License, and you are welcome to "
@@ -472,101 +420,144 @@ msgstr ""
 "Sugarは、あなたが見ているグラフィカルユーザインターフェースです。Sugarはフリーソフトウェアで、GNU General Public Licen"
 "se（一般公衆利用許諾契約書）による保護対象です。ここに記載されている条件の範囲で、Sugarを変更したりコピーを配布することが自由に行えます。"
 
-#: ../src/controlpanel/view/aboutxo.py:179
+#: ../src/controlpanel/aboutxo/view.py:175
 msgid "Full license:"
 msgstr "ライセンス全文:"
 
-#: ../src/controlpanel/view/datetime.py:29
-msgid "Date & Time"
-msgstr "日付・時刻"
+#: ../src/controlpanel/aboutxo/__init__.py:21
+msgid "About my XO"
+msgstr "私のXOについて"
 
-#: ../src/controlpanel/view/datetime.py:72
+#: ../src/controlpanel/datetime/model.py:89
+msgid "Error timezone does not exist."
+msgstr "エラー：そのタイムゾーンは存在しません。"
+
+#: ../src/controlpanel/datetime/view.py:68
 msgid "Timezone"
 msgstr "タイムゾーン"
 
-#: ../src/controlpanel/view/frame.py:28
-msgid "Frame"
-msgstr "フレーム"
+#: ../src/controlpanel/datetime/__init__.py:21
+msgid "Date & Time"
+msgstr "日付・時刻"
 
-#: ../src/controlpanel/view/frame.py:30
+#: ../src/controlpanel/frame/model.py:38 ../src/controlpanel/frame/model.py:60
+msgid "Value must be an integer."
+msgstr "値は整数でなくてはなりません"
+
+#: ../src/controlpanel/frame/view.py:26
 msgid "never"
 msgstr "表示しない"
 
-#: ../src/controlpanel/view/frame.py:31
+#: ../src/controlpanel/frame/view.py:27
 msgid "instantaneous"
 msgstr "すぐに表示"
 
-#: ../src/controlpanel/view/frame.py:32
+#: ../src/controlpanel/frame/view.py:28
 #, python-format
 msgid "%s seconds"
 msgstr "%s 秒"
 
-#: ../src/controlpanel/view/frame.py:56
+#: ../src/controlpanel/frame/view.py:52
 msgid "Activation Delay"
 msgstr "表示するまでの時間"
 
-#: ../src/controlpanel/view/frame.py:80
+#: ../src/controlpanel/frame/view.py:76
 msgid "Corner"
 msgstr "画面の４すみ"
 
-#: ../src/controlpanel/view/frame.py:115
+#: ../src/controlpanel/frame/view.py:111
 msgid "Edge"
 msgstr "画面のふち"
 
-#: ../src/controlpanel/view/language.py:29
-#: ../src/controlpanel/view/language.py:74
+#: ../src/controlpanel/frame/__init__.py:21
+msgid "Frame"
+msgstr "フレーム"
+
+#: ../src/controlpanel/language/model.py:28
+msgid "Could not access ~/.i18n. Create standard settings."
+msgstr "~/.i18nにアクセスできませんでした。標準設定を作ってください。"
+
+#: ../src/controlpanel/language/model.py:114
+#, python-format
+msgid "Language for code=%s could not be determined."
+msgstr "コード%sの言語が不明です。"
+
+#: ../src/controlpanel/language/model.py:131
+#, python-format
+msgid "Sorry I do not speak '%s'."
+msgstr "ごめんなさい。'%s'は話せません。"
+
+#: ../src/controlpanel/language/view.py:70
+#: ../src/controlpanel/language/__init__.py:21
 msgid "Language"
 msgstr "言語"
 
-#: ../src/controlpanel/view/network.py:28
+#: ../src/controlpanel/network/model.py:62
+msgid "State is unknown."
+msgstr "状態が不明です"
+
+#: ../src/controlpanel/network/model.py:82
+msgid "Error in specified radio argument use on/off."
+msgstr "radio引数指定でエラー、on/offを使ってください。"
+
+#: ../src/controlpanel/network/view.py:28
+#: ../src/controlpanel/network/__init__.py:21
 msgid "Network"
 msgstr "ネットワーク"
 
-#: ../src/controlpanel/view/network.py:54
+#: ../src/controlpanel/network/view.py:54
 msgid "Wireless"
 msgstr "無線"
 
-#: ../src/controlpanel/view/network.py:62
+#: ../src/controlpanel/network/view.py:62
 msgid "Turn of the wireless radio to save battery life"
 msgstr "電池を節約するため、無線を止める"
 
-#: ../src/controlpanel/view/network.py:75
+#: ../src/controlpanel/network/view.py:75
 msgid "Radio"
 msgstr "電波"
 
-#: ../src/controlpanel/view/network.py:91
+#: ../src/controlpanel/network/view.py:91
 msgid "Discard network history if you have trouble connecting to the network"
 msgstr "ネットワーク接続で問題がある場合、接続履歴を破棄します"
 
-#: ../src/controlpanel/view/network.py:100
+#: ../src/controlpanel/network/view.py:100
 msgid "Discard network history"
 msgstr "ネットワーク接続履歴を破棄"
 
-#: ../src/controlpanel/view/network.py:113
+#: ../src/controlpanel/network/view.py:113
 msgid "Mesh"
 msgstr "メッシュ"
 
-#: ../src/controlpanel/view/network.py:122
+#: ../src/controlpanel/network/view.py:122
 msgid "Server:"
 msgstr "サーバー:"
 
-#: ../src/controlpanel/view/power.py:27
-msgid "Power"
-msgstr "電源"
+#: ../src/controlpanel/power/model.py:55
+msgid "Error in automatic pm argument, use on/off."
+msgstr "automatic_pm 引数指定でエラー、 on/offを指定してください"
 
-#: ../src/controlpanel/view/power.py:51
+#: ../src/controlpanel/power/model.py:84
+msgid "Error in extreme pm argument, use on/off."
+msgstr "extreme_pm 引数指定のエラー、 on/offを指定してください。"
+
+#: ../src/controlpanel/power/view.py:47
 msgid "Power management"
 msgstr "電源の管理"
 
-#: ../src/controlpanel/view/power.py:61
+#: ../src/controlpanel/power/view.py:57
 msgid "Automatic power management (increases battery life)"
 msgstr "自動的な電源管理（電池が長持ちします）"
 
-#: ../src/controlpanel/view/power.py:89
+#: ../src/controlpanel/power/view.py:85
 msgid ""
 "Extreme power management (disableswireless radio, increases battery life)"
 msgstr "最大の電源管理（無線の電波を停めて、電池を長持ちさせます）"
 
+#: ../src/controlpanel/power/__init__.py:21
+msgid "Power"
+msgstr "電源"
+
 #: ../src/view/devices/network/mesh.py:111
 msgid "Connected to a School Mesh Portal"
 msgstr "スクールメッシュポータルに接続しました。"
@@ -599,36 +590,63 @@ msgstr "不明なメッシュ"
 msgid "Decline"
 msgstr "断る"
 
-#: ../src/view/home/favoritesview.py:286
+# TRANS: label for the freeform layout in the favorites view
+#. TRANS: label for the freeform layout in the favorites view
+#: ../src/view/home/favoriteslayout.py:107
+msgid "Freeform"
+msgstr "自由に並べる"
+
+# TRANS: label for the ring layout in the favorites view
+#. TRANS: label for the ring layout in the favorites view
+#: ../src/view/home/favoriteslayout.py:189
+msgid "Ring"
+msgstr "円に並べる"
+
+#. TRANS: label for the spiral layout in the favorites view
+#: ../src/view/home/favoriteslayout.py:334
+msgid "Spiral"
+msgstr "渦巻きに並べる"
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/view/home/favoriteslayout.py:401
+msgid "Box"
+msgstr "箱型に並べる"
+
+#. TRANS: label for the box layout in the favorites view
+#: ../src/view/home/favoriteslayout.py:442
+msgid "Triangle"
+msgstr "三角形に並べる"
+
+#: ../src/view/home/favoritesview.py:295
 msgid "Registration Failed"
 msgstr "登録失敗"
 
-#: ../src/view/home/favoritesview.py:287
+#: ../src/view/home/favoritesview.py:296
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: ../src/view/home/favoritesview.py:289
+#: ../src/view/home/favoritesview.py:298
 msgid "Registration Successful"
 msgstr "登録成功"
 
-#: ../src/view/home/favoritesview.py:290
+#: ../src/view/home/favoritesview.py:299
 msgid "You are now registered with your school server."
 msgstr "あなたはスクールサーバーに登録されました"
 
-#: ../src/view/home/favoritesview.py:411
+#: ../src/view/home/favoritesview.py:420
 msgid "Settings"
-msgstr ""
+msgstr "設定"
 
-#: ../src/view/home/favoritesview.py:416
+#: ../src/view/home/favoritesview.py:425
 msgid "Restart"
 msgstr "再起動"
 
-#: ../src/view/home/favoritesview.py:421
+#: ../src/view/home/favoritesview.py:430
 msgid "Shutdown"
 msgstr "シャットダウン"
 
-#: ../src/view/home/favoritesview.py:427
+#: ../src/view/home/favoritesview.py:436
 msgid "Register"
 msgstr "登録"
 
@@ -753,7 +771,7 @@ msgstr "閉じる"
 msgid "Unmount"
 msgstr "取りはずす"
 
-#: ../src/journal/misc.py:93
+#: ../src/journal/misc.py:95
 msgid "No date"
 msgstr "日付無し"